Fix misc 17 (#1392)

* Some cleanup on bgcheck waterbox y funcs

* Fix some typo/spelling

* EnFz_ApplyDamage match fixup

* Turn another sus construction into a switch

* Fixup comment on restoring MS as adult

* "doesnt, isnt" -> "doesn't, isn't"

* Hunt down whitespace at end of lines

* Format (clang-format does not like figs bug comment on bongo cutscene unskip sadge)

* Viewport z scale/translation: `0x1FF` -> `G_MAXZ/2` (see proman "9.7 Mixing CPU and SP Addresses", "12.7.6 Depth Source")

* static symbols: g -> s prefix

* Link young/old -> child/adult

* Fixups

* Get rid of signed vs unsigned comparison warning by changing room temps to s32

* waterbox search funcs consistency

* Revert "waterbox search funcs consistency"

This reverts commit 8f386e038f.

* `curWaterBox` -> `waterBox`

include/tables/dmadata_table_mqdbg.h

@@ -1,6 +1,6 @@
 /**
  * Matching dmadata layout for PAL MQ Debug
- * 
+ *
  * DEFINE_DMA_ENTRY should be used for all dmadata entries
  *    - Argument 1: Name of the spec segment
  *    - Argument 2: String matching the original name of the segment

include/tables/entrance_table.h

@@ -7,7 +7,7 @@
  *    - Argument 3: Spawn number for this entrance
  *    - Argument 4: Toggle if bgm should continue during the transition using this entrance (true or false)
  *                  NOTE: For non-cutscene layers, this field is only read from the `SCENE_LAYER_CHILD_DAY` layer.
- *                  Meaning, the setting only matters for the first entry within a group of layers and that 
+ *                  Meaning, the setting only matters for the first entry within a group of layers and that
  *                  setting will apply to the other 3 non-cutscene layers.
  *    - Argument 5: Toggle if a title card should display when using this entrance (true or false)
  *    - Argument 6: Transition type when entering using this entrance (second half of a scene transition)

include/ultra64/rdb.h

@@ -28,7 +28,7 @@
 #define RDB_TYPE_HtoG_DEBUG             14
 #define RDB_TYPE_HtoG_DEBUG_CT          15
 #define RDB_TYPE_HtoG_DATA              16
-#define RDB_TYPE_HtoG_DATA_DONE         17 
+#define RDB_TYPE_HtoG_DATA_DONE         17
 #define RDB_TYPE_HtoG_REQ_RAMROM        18
 #define RDB_TYPE_HtoG_FREE_RAMROM       19
 #define RDB_TYPE_HtoG_KDEBUG            20

include/ultra64/ucode.h

@@ -9,7 +9,7 @@
 #define SP_UCODE_SIZE           0x1000
 
 #define SP_UCODE_DATA_SIZE      0x800
-   
+
 extern u64 rspbootTextStart[], rspbootTextEnd[];
 
 extern u64 aspMainTextStart[], aspMainTextEnd[];

include/z64.h

@@ -966,7 +966,7 @@ typedef enum {
     /*  6 */ TRANS_TYPE_FADE_BLACK_SLOW,
     /*  7 */ TRANS_TYPE_FADE_WHITE_SLOW,
     /*  8 */ TRANS_TYPE_WIPE_FAST,
-    /*  9 */ TRANS_TYPE_FILL_WHITE2, 
+    /*  9 */ TRANS_TYPE_FILL_WHITE2,
     /* 10 */ TRANS_TYPE_FILL_WHITE,
     /* 11 */ TRANS_TYPE_INSTANT,
     /* 12 */ TRANS_TYPE_FILL_BROWN,

include/z64audio.h

@@ -607,7 +607,7 @@ typedef struct {
 /**
  * The high-level audio specifications requested when initializing or resetting the audio heap.
  * The audio heap can be reset on various occasions, including on most scene transitions.
- */ 
+ */
 typedef struct {
     /* 0x00 */ u32 samplingFrequency; // Target sampling rate in Hz
     /* 0x04 */ u8 unk_04;
@@ -909,7 +909,7 @@ typedef struct {
     /* 0x2990 */ AudioAllocPool sessionPool; // A sub-pool to main pool, contains all sub-pools and data that changes every audio reset
     /* 0x29A0 */ AudioAllocPool externalPool; // pool allocated externally to the audio heap. Never used in game
     /* 0x29B0 */ AudioAllocPool initPool;// A sub-pool to the main pool, contains all sub-pools and data that persists every audio reset
-    /* 0x29C0 */ AudioAllocPool miscPool; // A sub-pool to the session pool. 
+    /* 0x29C0 */ AudioAllocPool miscPool; // A sub-pool to the session pool.
     /* 0x29D0 */ char unk_29D0[0x20]; // probably two unused pools
     /* 0x29F0 */ AudioAllocPool cachePool; // The common pool for cache entries
     /* 0x2A00 */ AudioAllocPool persistentCommonPool; // A sub-pool to the cache pool, contains caches for data stored persistently

include/z64camera.h

@@ -27,7 +27,7 @@
 #define PARENT_CAM(cam) ((cam)->play->cameraPtrs[(cam)->parentCamId])
 #define CHILD_CAM(cam) ((cam)->play->cameraPtrs[(cam)->childCamId])
 
-// All scenes using `SCENE_CAM_TYPE_FIXED_SHOP_VIEWPOINT` or `SCENE_CAM_TYPE_FIXED_TOGGLE_VIEWPOINT` are expected 
+// All scenes using `SCENE_CAM_TYPE_FIXED_SHOP_VIEWPOINT` or `SCENE_CAM_TYPE_FIXED_TOGGLE_VIEWPOINT` are expected
 // to have their first two bgCamInfo entries be the following:
 #define BGCAM_INDEX_TOGGLE_LOCKED 0
 #define BGCAM_INDEX_TOGGLE_PIVOT 1
@@ -102,7 +102,7 @@ typedef enum {
     /* 0x3A */ CAM_SET_NORMAL2,
     /* 0x3B */ CAM_SET_FISHING, // Fishing pond by the lake
     /* 0x3C */ CAM_SET_CS_C, // Various cutscenes "DEMOC"
-    /* 0x3D */ CAM_SET_JABU_TENTACLE, // Jabu-Jabu Parasitic Tenticle Rooms "UO_FIBER"
+    /* 0x3D */ CAM_SET_JABU_TENTACLE, // Jabu-Jabu Parasitic Tentacle Rooms "UO_FIBER"
     /* 0x3E */ CAM_SET_DUNGEON2,
     /* 0x3F */ CAM_SET_DIRECTED_YAW, // Does not auto-update yaw, tends to keep the camera pointed at a certain yaw (used by biggoron and final spirit lowering platform) "TEPPEN"
     /* 0x40 */ CAM_SET_PIVOT_FROM_SIDE, // Fixed side view, allows rotation of camera (eg. Potion Shop, Meadow at fairy grotto) "CIRCLE7"

include/z64environment.h

@@ -26,12 +26,12 @@
 #define LIGHT_BLEND_OVERRIDE_NONE 0
 #define LIGHT_BLEND_OVERRIDE_ON 1
 
-// This mode disables the light system's automatic blending between 
+// This mode disables the light system's automatic blending between
 // light settings for `LIGHT_MODE_SETTINGS` (or using a light setting override).
 // This is a bit of a hack used only by bosses in the original game.
 #define LIGHT_BLEND_OVERRIDE_FULL_CONTROL 2
 
-typedef enum { 
+typedef enum {
     /* 0 */ LIGHT_MODE_TIME, // environment lights use `lightConfig` and change based on time of day
     /* 1 */ LIGHT_MODE_SETTINGS // environment lights use `lightSetting`
 } LightMode;
@@ -76,7 +76,7 @@ typedef enum {
 
 typedef enum {
     /* 0 */ PRECIP_RAIN_MAX, // max number of raindrops that can draw; uses this or SOS_MAX, whichever is larger
-    /* 1 */ PRECIP_RAIN_CUR, // current number of rain drops being drawn on screen 
+    /* 1 */ PRECIP_RAIN_CUR, // current number of rain drops being drawn on screen
     /* 2 */ PRECIP_SNOW_CUR, // current number of snowflakes being drawn on screen
     /* 3 */ PRECIP_SNOW_MAX, // max number of snowflakes that can draw
     /* 4 */ PRECIP_SOS_MAX, // max number of rain drops requested from song of storms specifically

include/z64ocarina.h

@@ -148,14 +148,14 @@ typedef enum {
 
 /**
  * bFlat4Flag Note:
- * Flag for resolving whether (pitch = OCARINA_PITCH_BFLAT4) 
+ * Flag for resolving whether (pitch = OCARINA_PITCH_BFLAT4)
  * gets mapped to either C_RIGHT and C_LEFT
- * 
+ *
  * This is required as C_RIGHT and C_LEFT are the only notes
  * that map to two semitones apart (OCARINA_PITCH_A4 and OCARINA_PITCH_B4)
  *      0x40 - BTN_Z is pressed to lower note by a semitone
  *      0x80 - BTN_R is pressed to raise note by a semitone
- */ 
+ */
 
 typedef struct {
     /* 0x0 */ u8 pitch; // number of semitones above middle C

include/z64save.h

@@ -12,7 +12,7 @@ typedef enum {
     /* 0x4 */ MAGIC_STATE_METER_FLASH_2, // Flashes border and draws yellow magic to preview target consumption
     /* 0x5 */ MAGIC_STATE_RESET, // Reset colors and return to idle
     /* 0x6 */ MAGIC_STATE_METER_FLASH_3, // Flashes border with no additional behaviour
-    /* 0x7 */ MAGIC_STATE_CONSUME_LENS, // Magic slowly consumed by lens. 
+    /* 0x7 */ MAGIC_STATE_CONSUME_LENS, // Magic slowly consumed by lens.
     /* 0x8 */ MAGIC_STATE_STEP_CAPACITY, // Step `magicCapacity` to full capacity
     /* 0x9 */ MAGIC_STATE_FILL, // Add magic until magicFillTarget is reached.
     /* 0xA */ MAGIC_STATE_ADD // Add requested magic
@@ -257,7 +257,7 @@ typedef enum {
     /* 1 */ SCENE_LAYER_CHILD_NIGHT,
     /* 2 */ SCENE_LAYER_ADULT_DAY,
     /* 3 */ SCENE_LAYER_ADULT_NIGHT,
-    /* 4 */ SCENE_LAYER_CUTSCENE_FIRST 
+    /* 4 */ SCENE_LAYER_CUTSCENE_FIRST
 } SceneLayer;
 
 #define IS_CUTSCENE_LAYER (gSaveContext.sceneLayer >= SCENE_LAYER_CUTSCENE_FIRST)