Play (2 NON_MATCHINGS) (#1109)

* Bring over progress from another branch

Co-authored-by: Maide <34639600+Kelebek1@users.noreply.github.com>

* cleanup, fake match Play_Init

* small fixes

* Some small cleanup

* Match func_80165460 (from debug)

* Match func_80165658

* Match func_80165DB8, func_80165DCC, func_80165DF0, func_80165E04

* Match func_80167DE4 (from debug)

* Match func_80167F0C

* Match func_80168DAC

* Matched func_80169100

* Matched func_801691F0

* import D_801DFA18

* match Play_Main thanks to debug

* cleanup

* synray does it again

* add docs from debug

* fix func_801656A4

* more docs and cleanup

* Match func_80166B30 and diff fake match in Init

* import transition docs from OoT

* Play Update, sort of

* cleanup Play_Update

* more cleanup

* slightly more docs

* small docs

* Play_Draw WIP Thanks @petrie911

* progress?

* two more matches

* format

* misc play docs

* transitions cleanup

* Motion Blur

* Transitions

* Fog

* Bombers notebook + small cleanup

* bss

* Camera Functions

* Picto functions

* Init

* MotionBlur Clean up

* Floor Surface

* Pictographs some more

* regs

* fix circular dependency problem

* Cleanup PR commits outside play

* namefixer

* PR picto

* PR audio

* PR small clean ups

* debug strings

* Picto defines

* bss

* enums

* remove void

* typedefs

* Hireso -> BombersNotebook

* bss comments

* bss and I8/I5 functions

* Smaller PR comments

* Transitions

* Combine enums

* Revert "Combine enums"

This reverts commit 0da1ebcaed69a3ce0fbd5942460b67f80f0e15e7.

* Fix Transition defines

* RGBA16 macros

* Unname

* worldCoverAlpha

* Rename Update and Draw

* PR review, plus annotate bug

* Clean up nonmatchings with a closer DrawGame

* Format

* New macros

* UpdateMain and DrawMain

* Fix merge

* Small cleanups from PR

* zFar

* Intensity macros

* Format

* Remove bss comments

* Compression/decompression

* Small cleanup

* Format

* More PR cleanup

* Cleanup picto stuff

* format

* Fix compression comments

* Play processes state enums DONE -> READY

* cutscene comment

* fix bss

Co-authored-by: Maide <34639600+Kelebek1@users.noreply.github.com>
Co-authored-by: engineer124 <engineer124engineer124@gmail.com>
Co-authored-by: petrie911 <pmontag@PHYS-S129.iowa.uiowa.edu>
Co-authored-by: angie <angheloalf95@gmail.com>

tools/disasm/functions.txt

@@ -1708,11 +1708,11 @@
     0x800F5004:("Font_LoadOrderedFont",),
     0x800F5090:("func_800F5090",),
     0x800F50D4:("func_800F50D4",),
-    0x800F510C:("Kankyo_Init",),
+    0x800F510C:("Environment_Init",),
     0x800F5954:("func_800F5954",),
     0x800F5A8C:("Environment_LerpWeight",),
     0x800F5B10:("func_800F5B10",),
-    0x800F5CD0:("func_800F5CD0",),
+    0x800F5CD0:("Environment_UpdateSkybox",),
     0x800F6834:("func_800F6834",),
     0x800F694C:("func_800F694C",),
     0x800F6A04:("func_800F6A04",),
@@ -1727,13 +1727,13 @@
     0x800F88C4:("func_800F88C4",),
     0x800F8970:("func_800F8970",),
     0x800F8A9C:("func_800F8A9C",),
-    0x800F8CD4:("func_800F8CD4",),
+    0x800F8CD4:("Environment_Update",),
     0x800F8D84:("func_800F8D84",),
-    0x800F9728:("func_800F9728",),
+    0x800F9728:("Environment_DrawSunLensFlare",),
     0x800F9824:("func_800F9824",),
     0x800FA39C:("func_800FA39C",),
     0x800FA3C4:("func_800FA3C4",),
-    0x800FA9FC:("func_800FA9FC",),
+    0x800FA9FC:("Environment_DrawRain",),
     0x800FAAB4:("func_800FAAB4",),
     0x800FAC20:("func_800FAC20",),
     0x800FAF74:("func_800FAF74",),
@@ -1742,13 +1742,13 @@
     0x800FB388:("func_800FB388",),
     0x800FB758:("func_800FB758",),
     0x800FB9B4:("func_800FB9B4",),
-    0x800FBCBC:("func_800FBCBC",),
+    0x800FBCBC:("Environment_DrawCustomLensFlare",),
     0x800FBDEC:("Kankyo_InitGameOverLights",),
     0x800FBF3C:("Kankyo_FadeInGameOverLights",),
     0x800FC158:("Kankyo_FadeOutGameOverLights",),
     0x800FC3DC:("func_800FC3DC",),
-    0x800FC444:("func_800FC444",),
-    0x800FC64C:("func_800FC64C",),
+    0x800FC444:("Environment_FillScreen",),
+    0x800FC64C:("Environment_DrawSandstorm",),
     0x800FD2B4:("func_800FD2B4",),
     0x800FD538:("func_800FD538",),
     0x800FD59C:("func_800FD59C",),
@@ -1881,7 +1881,7 @@
     0x80102464:("Lights_FreeNode",),
     0x801024AC:("LightContext_Init",),
     0x80102518:("LightContext_SetAmbientColor",),
-    0x80102544:("func_80102544",),
+    0x80102544:("LightContext_SetFog",),
     0x80102580:("LightContext_NewLights",),
     0x801025B8:("LightContext_InitList",),
     0x801025C8:("LightContext_DestroyList",),
@@ -2458,7 +2458,7 @@
     0x801306E8:("Scene_ProcessHeader",),
     0x80130768:("Entrance_Create",),
     0x80130784:("Entrance_CreateFromSpawn",),
-    0x801307C0:("Scene_ExecuteDrawConfig",),
+    0x801307C0:("Scene_Draw",),
     0x801307F4:("Scene_DrawConfigDefault",),
     0x80130834:("AnimatedMat_TexScroll",),
     0x801308A0:("AnimatedMat_DrawTexScroll",),
@@ -2786,7 +2786,7 @@
     0x801435A0:("SkyboxDraw_UpdateMatrix",),
     0x80143624:("SkyboxDraw_SetColors",),
     0x80143668:("SkyboxDraw_Draw",),
-    0x80143A04:("SkyboxDraw_Noop",),
+    0x80143A04:("SkyboxDraw_Update",),
     0x80143A10:("Sram_ActivateOwl",),
     0x80143A54:("Sram_ClearHighscores",),
     0x80143AC4:("Sram_ClearFlagsAtDawnOfTheFirstDay",),
@@ -2870,8 +2870,8 @@
     0x80153E7C:("func_80153E7C",),
     0x80153EF0:("func_80153EF0",),
     0x801541D4:("func_801541D4",),
-    0x80156758:("func_80156758",),
-    0x8015680C:("func_8015680C",),
+    0x80156758:("Message_Draw",),
+    0x8015680C:("Message_Update",),
     0x801586A4:("func_801586A4",),
     0x801586D4:("Message_Init",),
     0x801588D0:("Message_FindMessageNES",),
@@ -2940,10 +2940,10 @@
     0x80163D80:("Transition_Destroy",),
     0x80163DC0:("func_80163DC0",),
     0x8016418C:("func_8016418C",),
-    0x8016424C:("func_8016424C",),
-    0x801642D8:("func_801642D8",),
+    0x8016424C:("TransitionUnk_Destroy",),
+    0x801642D8:("TransitionUnk_Init",),
     0x80164438:("func_80164438",),
-    0x8016454C:("func_8016454C",),
+    0x8016454C:("TransitionUnk_Draw",),
     0x80164678:("func_80164678",),
     0x801647AC:("func_801647AC",),
     0x801647B8:("func_801647B8",),
@@ -2970,41 +2970,41 @@
     0x8016537C:("TransitionOverlay_Free",),
     0x80165438:("TransitionOverlay_ClearLoadInfo",),
     0x80165444:("TransitionOverlay_SetSegment",),
-    0x80165460:("func_80165460",),
-    0x80165608:("func_80165608",),
-    0x80165630:("func_80165630",),
-    0x80165658:("func_80165658",),
-    0x8016566C:("func_8016566C",),
-    0x80165690:("func_80165690",),
-    0x801656A4:("func_801656A4",),
-    0x80165DB8:("func_80165DB8",),
-    0x80165DCC:("func_80165DCC",),
-    0x80165DF0:("func_80165DF0",),
-    0x80165E04:("func_80165E04",),
-    0x80165E1C:("func_80165E1C",),
-    0x80165E7C:("func_80165E7C",),
-    0x80165EC0:("func_80165EC0",),
-    0x80166060:("func_80166060",),
-    0x801660B8:("func_801660B8",),
+    0x80165460:("Play_DrawMotionBlur",),
+    0x80165608:("Play_InitMotionBlur",),
+    0x80165630:("Play_DestroyMotionBlur",),
+    0x80165658:("Play_SetMotionBlurAlpha",),
+    0x8016566C:("Play_EnableMotionBlur",),
+    0x80165690:("Play_DisableMotionBlur",),
+    0x801656A4:("Play_ConvertRgba16ToIntensityImage",),
+    0x80165DB8:("Play_SetMotionBlurPriorityAlpha",),
+    0x80165DCC:("Play_EnableMotionBlurPriority",),
+    0x80165DF0:("Play_DisableMotionBlurPriority",),
+    0x80165E04:("Play_StartPictographPhoto",),
+    0x80165E1C:("Play_TakePictoPhoto",),
+    0x80165E7C:("Play_ChooseDynamicTransition",),
+    0x80165EC0:("Play_SetupTransition",),
+    0x80166060:("Play_ClearTransition",),
+    0x801660B8:("Play_SetFog",),
     0x8016613C:("Play_Destroy",),
     0x801663C4:("Play_CompressI8ToI5",),
     0x80166644:("Play_DecompressI5ToI8",),
-    0x801668B4:("func_801668B4",),
-    0x80166968:("func_80166968",),
-    0x80166B30:("func_80166B30",),
-    0x80167814:("Play_Update",),
-    0x80167DE4:("func_80167DE4",),
-    0x80167F0C:("func_80167F0C",),
-    0x80168090:("Play_Draw",),
-    0x80168DAC:("func_80168DAC",),
+    0x801668B4:("Play_GetWaterSurface",),
+    0x80166968:("Play_UpdateWaterCamera",),
+    0x80166B30:("Play_UpdateTransition",),
+    0x80167814:("Play_UpdateMain",),
+    0x80167DE4:("Play_Update",),
+    0x80167F0C:("Play_PostWorldDraw",),
+    0x80168090:("Play_DrawMain",),
+    0x80168DAC:("Play_Draw",),
     0x80168F64:("Play_Main",),
     0x801690CC:("Play_InCsMode",),
-    0x80169100:("func_80169100",),
-    0x801691F0:("func_801691F0",),
-    0x80169220:("Play_LoadScene",),
-    0x8016927C:("func_8016927C",),
-    0x801692C4:("func_801692C4",),
-    0x801693D4:("Play_SceneInit",),
+    0x80169100:("Play_GetFloorSurfaceImpl",),
+    0x801691F0:("Play_GetFloorSurface",),
+    0x80169220:("Play_LoadFile",),
+    0x8016927C:("Play_InitEnvironment",),
+    0x801692C4:("Play_InitScene",),
+    0x801693D4:("Play_SpawnScene",),
     0x80169474:("Play_GetScreenPos",),
     0x801694DC:("Play_CreateSubCamera",),
     0x80169584:("Play_GetActiveCamId",),
@@ -3048,11 +3048,11 @@
     0x8016CD4C:("func_8016CD4C",),
     0x8016E40C:("func_8016E40C",),
     0x8016EA90:("func_8016EA90",),
-    0x8016F1A8:("func_8016F1A8",),
+    0x8016F1A8:("BombersNotebook_Draw",),
     0x8016F4EC:("func_8016F4EC",),
-    0x8016F5A8:("func_8016F5A8",),
-    0x8016FC78:("func_8016FC78",),
-    0x8016FC98:("func_8016FC98",),
+    0x8016F5A8:("BombersNotebook_Update",),
+    0x8016FC78:("BombersNotebook_Init",),
+    0x8016FC98:("BombersNotebook_Destroy",),
     0x8016FCF0:("PreRender_SetValuesSave",),
     0x8016FD2C:("PreRender_Init",),
     0x8016FD60:("PreRender_SetValues",),
@@ -4082,7 +4082,7 @@
     0x801AA610:("GameOver_Init",),
     0x801AA624:("GameOver_FadeLights",),
     0x801AA68C:("GameOver_Update",),
-    0x801AAAA0:("func_801AAAA0",),
+    0x801AAAA0:("Regs_InitData",),
     0x80800000:("ConsoleLogo_UpdateCounters",),
     0x8080009C:("ConsoleLogo_RenderView",),
     0x80800134:("ConsoleLogo_Draw",),
@@ -11339,8 +11339,8 @@
     0x80A90478:("EnTest5_HandleBottleAction",),
     0x80A905A4:("EnTest5_Update",),
     0x80A90730:("func_80A90730",),
-    0x80A90C08:("func_80A90C08",),
-    0x80A90C34:("func_80A90C34",),
+    0x80A90C08:("EnTest6_EnableMotionBlur",),
+    0x80A90C34:("EnTest6_DisableMotionBlur",),
     0x80A90C54:("func_80A90C54",),
     0x80A90D20:("func_80A90D20",),
     0x80A90D34:("func_80A90D34",),

tools/disasm/variables.txt

@@ -2137,11 +2137,11 @@
     0x801D0D28:("TransitionCircle_InitVars","UNK_PTR","",0x4),
     0x801D0D50:("gDbgCamEnabled","UNK_TYPE4","",0x4),
     0x801D0D54:("D_801D0D54","UNK_TYPE1","",0x1),
-    0x801D0D58:("D_801D0D58","UNK_TYPE2","",0x2),
-    0x801D0D5C:("D_801D0D5C","UNK_TYPE2","",0x2),
+    0x801D0D58:("sQuakeIndex","UNK_TYPE2","",0x2),
+    0x801D0D5C:("sIsCameraUnderwater","UNK_TYPE2","",0x2),
     0x801D0D60:("D_801D0D60","Input*","",0x4),
     0x801D0D64:("D_801D0D64","s16","[10]",0x14),
-    0x801D0D7A:("D_801D0D7A","UNK_TYPE1","",0x1),
+    0x801D0D78:("D_801D0D78","u16","[4]",0x4),
     0x801D0D80:("D_801D0D80","UNK_TYPE1","",0x1),
     0x801D11F4:("D_801D11F4","UNK_TYPE1","",0x1),
     0x801D1230:("D_801D1230","UNK_TYPE1","",0x1),
@@ -4051,18 +4051,18 @@
     0x801F6BF0:("sKaleidoAreaFaultClient","FaultAddrConvClient","",0xC),
     0x801F6C00:("sKaleidoScopeUpdateFunc","void*","",0x4),
     0x801F6C04:("sKaleidoScopeDrawFunc","void*","",0x4),
-    0x801F6C10:("D_801F6C10","UNK_TYPE1","",0x1),
+    0x801F6C10:("sTransitionFillTimer","UNK_TYPE1","",0x1),
     0x801F6C18:("D_801F6C18","Input","",0x18),
-    0x801F6C30:("D_801F6C30","UNK_TYPE1","",0x1),
+    0x801F6C30:("sTrnsnUnk","UNK_TYPE1","",0x1),
     0x801F6D0C:("D_801F6D0C","UNK_TYPE1","",0x1),
-    0x801F6D10:("D_801F6D10","UNK_TYPE4","",0x4),
-    0x801F6D18:("D_801F6D18","UNK_TYPE1","",0x1),
-    0x801F6D30:("D_801F6D30","Color_RGBA8","",0x4),
+    0x801F6D10:("gTrnsnUnkState","UNK_TYPE4","",0x4),
+    0x801F6D18:("sVisMono","UNK_TYPE1","",0x1),
+    0x801F6D30:("gVisMonoColor","Color_RGBA8","",0x4),
     0x801F6D38:("D_801F6D38","UNK_TYPE1","",0x1),
     0x801F6D4C:("D_801F6D4C","UNK_TYPE4","",0x4),
-    0x801F6D50:("D_801F6D50","UNK_TYPE1","",0x1),
-    0x801F6DFC:("D_801F6DFC","u8","",0x1),
-    0x801F6DFD:("D_801F6DFD","UNK_TYPE1","",0x1),
+    0x801F6D50:("sBombersNotebook","UNK_TYPE1","",0x1),
+    0x801F6DFC:("sBombersNotebookOpen","u8","",0x1),
+    0x801F6DFD:("sMotionBlurStatus","UNK_TYPE1","",0x1),
     0x801F6E00:("D_801F6E00","SlowlyTask","",0x1c0),
     0x801F6FC0:("D_801F6FC0","UNK_TYPE1","",0x1),
     0x801F6FC8:("slowlyStackEntry","StackEntry","",0x1c),

tools/namefixer.py

@@ -472,6 +472,7 @@ wordReplace = {
     "func_800DFC90": "Camera_GetCamDir",
     "func_800DFD04": "Camera_AddQuake",
     "func_800DFFAC": "Camera_ChangeDoorCam",
+
     "func_801694DC": "Play_CreateSubCamera",
     "Play_GetActiveCameraIndex": "Play_GetActiveCamId",
     "func_80169590": "Play_ChangeCameraStatus",
@@ -499,6 +500,11 @@ wordReplace = {
     "func_80169E6C": "Play_SetupRespawnPoint",
     "func_8016A0AC": "Play_IsUnderwater",
     "func_801690CC": "Play_InCsMode",
+    "func_80165658": "Play_SetMotionBlurAlpha",
+    "func_8016566C": "Play_EnableMotionBlur",
+    "func_80165690": "Play_DisableMotionBlur",
+    "func_801660B8": "Play_SetFog",
+
     "func_801129E4": "Interface_SetSceneRestrictions",
     "func_8011B4E0": "Interface_SetPerfectLetters",
     "func_80112AFC": "Interface_InitMinigame",
@@ -519,7 +525,7 @@ wordReplace = {
     "func_80115130": "Inventory_ConsumeFairy",
     "func_801152B8": "Inventory_UpdateItem",
     "func_80115908": "Health_ChangeBy",
-    "func_801159c0": "Health_GiveHearts",
+    "func_801159C0": "Health_GiveHearts",
     "func_801159EC": "Rupees_ChangeBy",
     "func_80115A14": "Inventory_ChangeAmmo",
     "Parameter_AddMagic": "Magic_Add",
@@ -644,6 +650,8 @@ wordReplace = {
     "Entrance_CreateIndex": "Entrance_Create",
     "Entrance_CreateIndexFromSpawn": "Entrance_CreateFromSpawn",
 
+    "func_80102544": "LightContext_SetFog",
+
     # Structs
     "ActorAnimationEntry": "AnimationInfo",
     "ActorAnimationEntryS": "AnimationInfoS",
@@ -830,6 +838,30 @@ wordReplace = {
     "ITEM_FISHING_POLE": "ITEM_FISHING_ROD",
     "PLAYER_AP_FISHING_POLE": "PLAYER_IA_FISHING_ROD",
 
+    # Enums
+    "TRANS_TYPE_00": "TRANS_TYPE_WIPE",
+    "TRANS_TYPE_01": "TRANS_TYPE_TRIFORCE",
+    "TRANS_TYPE_02": "TRANS_TYPE_FADE_BLACK",
+    "TRANS_TYPE_03": "TRANS_TYPE_FADE_WHITE",
+    "TRANS_TYPE_04": "TRANS_TYPE_FADE_BLACK_FAST",
+    "TRANS_TYPE_05": "TRANS_TYPE_FADE_WHITE_FAST",
+    "TRANS_TYPE_06": "TRANS_TYPE_FADE_BLACK_SLOW",
+    "TRANS_TYPE_07": "TRANS_TYPE_FADE_WHITE_SLOW",
+    "TRANS_TYPE_08": "TRANS_TYPE_WIPE_FAST",
+    "TRANS_TYPE_09": "TRANS_TYPE_FILL_WHITE_FAST",
+    "TRANS_TYPE_10": "TRANS_TYPE_FILL_WHITE",
+    "TRANS_TYPE_11": "TRANS_TYPE_INSTANT",
+    "TRANS_TYPE_12": "TRANS_TYPE_FILL_BROWN",
+    "TRANS_TYPE_13": "TRANS_TYPE_FADE_WHITE_CS_DELAYED",
+    "TRANS_TYPE_14": "TRANS_TYPE_SANDSTORM_PERSIST",
+    "TRANS_TYPE_15": "TRANS_TYPE_SANDSTORM_END",
+    "TRANS_TYPE_16": "TRANS_TYPE_CS_BLACK_FILL",
+    "TRANS_TYPE_17": "TRANS_TYPE_FADE_WHITE_INSTANT",
+    "TRANS_TYPE_18": "TRANS_TYPE_FADE_GREEN",
+    "TRANS_TYPE_19": "TRANS_TYPE_FADE_BLUE",
+    "TRANS_TYPE_20": "TRANS_TYPE_FADE_DYNAMIC",
+    "TRANS_TYPE_21": "TRANS_TYPE_CIRCLE",
+    "TRANS_TYPE_22": "TRANS_TYPE_WIPE5",
     # Example of custom behaviour:
     # "PLAYER": ("GET_PLAYER(play)", {"ignore": (-1, '"PLAYER"')}), # ignore "PLAYER" in sSoundBankNames
 }

tools/permuter_settings.toml

@@ -20,6 +20,7 @@ CLOCK_TIME = "int"
 CURRENT_DAY = "int"
 CHECK_NEWF = "int"
 NULL = "int"
+"SCREEN_.*" = "int"
 GET_PLAYER = "int"
 CHECK_WEEKEVENTREG = "int"
 SET_WEEKEVENTREG = "int"

tools/sizes/code_functions.csv

@@ -1222,11 +1222,11 @@ asm/non_matchings/code/z_kanfont/Font_LoadMessageBoxEndIcon.s,Font_LoadMessageBo
 asm/non_matchings/code/z_kanfont/Font_LoadOrderedFont.s,Font_LoadOrderedFont,0x800F5004,0x23
 asm/non_matchings/code/z_kankyo/func_800F5090.s,func_800F5090,0x800F5090,0x11
 asm/non_matchings/code/z_kankyo/func_800F50D4.s,func_800F50D4,0x800F50D4,0xE
-asm/non_matchings/code/z_kankyo/Kankyo_Init.s,Kankyo_Init,0x800F510C,0x212
+asm/non_matchings/code/z_kankyo/Environment_Init.s,Environment_Init,0x800F510C,0x212
 asm/non_matchings/code/z_kankyo/func_800F5954.s,func_800F5954,0x800F5954,0x4E
 asm/non_matchings/code/z_kankyo/Environment_LerpWeight.s,Environment_LerpWeight,0x800F5A8C,0x21
 asm/non_matchings/code/z_kankyo/func_800F5B10.s,func_800F5B10,0x800F5B10,0x70
-asm/non_matchings/code/z_kankyo/func_800F5CD0.s,func_800F5CD0,0x800F5CD0,0x2D9
+asm/non_matchings/code/z_kankyo/Environment_UpdateSkybox.s,Environment_UpdateSkybox,0x800F5CD0,0x2D9
 asm/non_matchings/code/z_kankyo/func_800F6834.s,func_800F6834,0x800F6834,0x46
 asm/non_matchings/code/z_kankyo/func_800F694C.s,func_800F694C,0x800F694C,0x2E
 asm/non_matchings/code/z_kankyo/func_800F6A04.s,func_800F6A04,0x800F6A04,0xF
@@ -1241,13 +1241,13 @@ asm/non_matchings/code/z_kankyo/func_800F8554.s,func_800F8554,0x800F8554,0xDC
 asm/non_matchings/code/z_kankyo/func_800F88C4.s,func_800F88C4,0x800F88C4,0x2B
 asm/non_matchings/code/z_kankyo/func_800F8970.s,func_800F8970,0x800F8970,0x4B
 asm/non_matchings/code/z_kankyo/func_800F8A9C.s,func_800F8A9C,0x800F8A9C,0x8E
-asm/non_matchings/code/z_kankyo/func_800F8CD4.s,func_800F8CD4,0x800F8CD4,0x2C
+asm/non_matchings/code/z_kankyo/Environment_Update.s,Environment_Update,0x800F8CD4,0x2C
 asm/non_matchings/code/z_kankyo/func_800F8D84.s,func_800F8D84,0x800F8D84,0x269
-asm/non_matchings/code/z_kankyo/func_800F9728.s,func_800F9728,0x800F9728,0x3F
+asm/non_matchings/code/z_kankyo/Environment_DrawSunLensFlare.s,Environment_DrawSunLensFlare,0x800F9728,0x3F
 asm/non_matchings/code/z_kankyo/func_800F9824.s,func_800F9824,0x800F9824,0x2DE
 asm/non_matchings/code/z_kankyo/func_800FA39C.s,func_800FA39C,0x800FA39C,0xA
 asm/non_matchings/code/z_kankyo/func_800FA3C4.s,func_800FA3C4,0x800FA3C4,0x18E
-asm/non_matchings/code/z_kankyo/func_800FA9FC.s,func_800FA9FC,0x800FA9FC,0x2E
+asm/non_matchings/code/z_kankyo/Environment_DrawRain.s,Environment_DrawRain,0x800FA9FC,0x2E
 asm/non_matchings/code/z_kankyo/func_800FAAB4.s,func_800FAAB4,0x800FAAB4,0x5B
 asm/non_matchings/code/z_kankyo/func_800FAC20.s,func_800FAC20,0x800FAC20,0xD5
 asm/non_matchings/code/z_kankyo/func_800FAF74.s,func_800FAF74,0x800FAF74,0x27
@@ -1256,13 +1256,13 @@ asm/non_matchings/code/z_kankyo/Environment_AddLightningBolts.s,Environment_AddL
 asm/non_matchings/code/z_kankyo/func_800FB388.s,func_800FB388,0x800FB388,0xF4
 asm/non_matchings/code/z_kankyo/func_800FB758.s,func_800FB758,0x800FB758,0x97
 asm/non_matchings/code/z_kankyo/func_800FB9B4.s,func_800FB9B4,0x800FB9B4,0xC2
-asm/non_matchings/code/z_kankyo/func_800FBCBC.s,func_800FBCBC,0x800FBCBC,0x4C
+asm/non_matchings/code/z_kankyo/Environment_DrawCustomLensFlare.s,Environment_DrawCustomLensFlare,0x800FBCBC,0x4C
 asm/non_matchings/code/z_kankyo/Kankyo_InitGameOverLights.s,Kankyo_InitGameOverLights,0x800FBDEC,0x54
 asm/non_matchings/code/z_kankyo/Kankyo_FadeInGameOverLights.s,Kankyo_FadeInGameOverLights,0x800FBF3C,0x87
 asm/non_matchings/code/z_kankyo/Kankyo_FadeOutGameOverLights.s,Kankyo_FadeOutGameOverLights,0x800FC158,0xA1
 asm/non_matchings/code/z_kankyo/func_800FC3DC.s,func_800FC3DC,0x800FC3DC,0x1A
-asm/non_matchings/code/z_kankyo/func_800FC444.s,func_800FC444,0x800FC444,0x82
-asm/non_matchings/code/z_kankyo/func_800FC64C.s,func_800FC64C,0x800FC64C,0x31A
+asm/non_matchings/code/z_kankyo/Environment_FillScreen.s,Environment_FillScreen,0x800FC444,0x82
+asm/non_matchings/code/z_kankyo/Environment_DrawSandstorm.s,Environment_DrawSandstorm,0x800FC64C,0x31A
 asm/non_matchings/code/z_kankyo/func_800FD2B4.s,func_800FD2B4,0x800FD2B4,0xA1
 asm/non_matchings/code/z_kankyo/func_800FD538.s,func_800FD538,0x800FD538,0x19
 asm/non_matchings/code/z_kankyo/func_800FD59C.s,func_800FD59C,0x800FD59C,0x11
@@ -1395,7 +1395,7 @@ asm/non_matchings/code/z_lights/Lights_FindBufSlot.s,Lights_FindBufSlot,0x801023
 asm/non_matchings/code/z_lights/Lights_FreeNode.s,Lights_FreeNode,0x80102464,0x12
 asm/non_matchings/code/z_lights/LightContext_Init.s,LightContext_Init,0x801024AC,0x1B
 asm/non_matchings/code/z_lights/LightContext_SetAmbientColor.s,LightContext_SetAmbientColor,0x80102518,0xB
-asm/non_matchings/code/z_lights/func_80102544.s,func_80102544,0x80102544,0xF
+asm/non_matchings/code/z_lights/LightContext_SetFog.s,LightContext_SetFog,0x80102544,0xF
 asm/non_matchings/code/z_lights/LightContext_NewLights.s,LightContext_NewLights,0x80102580,0xE
 asm/non_matchings/code/z_lights/LightContext_InitList.s,LightContext_InitList,0x801025B8,0x4
 asm/non_matchings/code/z_lights/LightContext_DestroyList.s,LightContext_DestroyList,0x801025C8,0x17
@@ -1972,7 +1972,7 @@ asm/non_matchings/code/z_scene/Scene_SetExitFade.s,Scene_SetExitFade,0x801306A4,
 asm/non_matchings/code/z_scene/Scene_ProcessHeader.s,Scene_ProcessHeader,0x801306E8,0x20
 asm/non_matchings/code/z_scene/Entrance_Create.s,Entrance_Create,0x80130768,0x7
 asm/non_matchings/code/z_scene/Entrance_CreateFromSpawn.s,Entrance_CreateFromSpawn,0x80130784,0xF
-asm/non_matchings/code/z_scene_proc/Scene_ExecuteDrawConfig.s,Scene_ExecuteDrawConfig,0x801307C0,0xD
+asm/non_matchings/code/z_scene_proc/Scene_Draw.s,Scene_Draw,0x801307C0,0xD
 asm/non_matchings/code/z_scene_proc/Scene_DrawConfigDefault.s,Scene_DrawConfigDefault,0x801307F4,0x10
 asm/non_matchings/code/z_scene_proc/AnimatedMat_TexScroll.s,AnimatedMat_TexScroll,0x80130834,0x1B
 asm/non_matchings/code/z_scene_proc/AnimatedMat_DrawTexScroll.s,AnimatedMat_DrawTexScroll,0x801308A0,0x28
@@ -2384,8 +2384,8 @@ asm/non_matchings/code/z_message/func_80153750.s,func_80153750,0x80153750,0x1CB
 asm/non_matchings/code/z_message/func_80153E7C.s,func_80153E7C,0x80153E7C,0x1D
 asm/non_matchings/code/z_message/func_80153EF0.s,func_80153EF0,0x80153EF0,0xB9
 asm/non_matchings/code/z_message/func_801541D4.s,func_801541D4,0x801541D4,0x961
-asm/non_matchings/code/z_message/func_80156758.s,func_80156758,0x80156758,0x2D
-asm/non_matchings/code/z_message/func_8015680C.s,func_8015680C,0x8015680C,0x7A6
+asm/non_matchings/code/z_message/Message_Draw.s,Message_Draw,0x80156758,0x2D
+asm/non_matchings/code/z_message/Message_Update.s,Message_Update,0x8015680C,0x7A6
 asm/non_matchings/code/z_message/func_801586A4.s,func_801586A4,0x801586A4,0xC
 asm/non_matchings/code/z_message/Message_Init.s,Message_Init,0x801586D4,0x7F
 asm/non_matchings/code/z_message_nes/Message_FindMessageNES.s,Message_FindMessageNES,0x801588D0,0x2E
@@ -2454,10 +2454,10 @@ asm/non_matchings/code/z_fbdemo_dlftbls/Transition_Init.s,Transition_Init,0x8016
 asm/non_matchings/code/z_fbdemo_dlftbls/Transition_Destroy.s,Transition_Destroy,0x80163D80,0x10
 asm/non_matchings/code/z_fbdemo/func_80163DC0.s,func_80163DC0,0x80163DC0,0xF3
 asm/non_matchings/code/z_fbdemo/func_8016418C.s,func_8016418C,0x8016418C,0x30
-asm/non_matchings/code/z_fbdemo/func_8016424C.s,func_8016424C,0x8016424C,0x23
-asm/non_matchings/code/z_fbdemo/func_801642D8.s,func_801642D8,0x801642D8,0x58
+asm/non_matchings/code/z_fbdemo/TransitionUnk_Destroy.s,TransitionUnk_Destroy,0x8016424C,0x23
+asm/non_matchings/code/z_fbdemo/TransitionUnk_Init.s,TransitionUnk_Init,0x801642D8,0x58
 asm/non_matchings/code/z_fbdemo/func_80164438.s,func_80164438,0x80164438,0x45
-asm/non_matchings/code/z_fbdemo/func_8016454C.s,func_8016454C,0x8016454C,0x4B
+asm/non_matchings/code/z_fbdemo/TransitionUnk_Draw.s,TransitionUnk_Draw,0x8016454C,0x4B
 asm/non_matchings/code/z_fbdemo/func_80164678.s,func_80164678,0x80164678,0x4D
 asm/non_matchings/code/z_fbdemo/func_801647AC.s,func_801647AC,0x801647AC,0x3
 asm/non_matchings/code/z_fbdemo/func_801647B8.s,func_801647B8,0x801647B8,0x6
@@ -2484,41 +2484,41 @@ asm/non_matchings/code/z_overlay/TransitionOverlay_Load.s,TransitionOverlay_Load
 asm/non_matchings/code/z_overlay/TransitionOverlay_Free.s,TransitionOverlay_Free,0x8016537C,0x2F
 asm/non_matchings/code/z_overlay/TransitionOverlay_ClearLoadInfo.s,TransitionOverlay_ClearLoadInfo,0x80165438,0x3
 asm/non_matchings/code/z_overlay/TransitionOverlay_SetSegment.s,TransitionOverlay_SetSegment,0x80165444,0x7
-asm/non_matchings/code/z_play/func_80165460.s,func_80165460,0x80165460,0x6A
-asm/non_matchings/code/z_play/func_80165608.s,func_80165608,0x80165608,0xA
-asm/non_matchings/code/z_play/func_80165630.s,func_80165630,0x80165630,0xA
-asm/non_matchings/code/z_play/func_80165658.s,func_80165658,0x80165658,0x5
-asm/non_matchings/code/z_play/func_8016566C.s,func_8016566C,0x8016566C,0x9
-asm/non_matchings/code/z_play/func_80165690.s,func_80165690,0x80165690,0x5
-asm/non_matchings/code/z_play/func_801656A4.s,func_801656A4,0x801656A4,0x1C5
-asm/non_matchings/code/z_play/func_80165DB8.s,func_80165DB8,0x80165DB8,0x5
-asm/non_matchings/code/z_play/func_80165DCC.s,func_80165DCC,0x80165DCC,0x9
-asm/non_matchings/code/z_play/func_80165DF0.s,func_80165DF0,0x80165DF0,0x5
-asm/non_matchings/code/z_play/func_80165E04.s,func_80165E04,0x80165E04,0x6
-asm/non_matchings/code/z_play/func_80165E1C.s,func_80165E1C,0x80165E1C,0x18
-asm/non_matchings/code/z_play/func_80165E7C.s,func_80165E7C,0x80165E7C,0x11
-asm/non_matchings/code/z_play/func_80165EC0.s,func_80165EC0,0x80165EC0,0x68
-asm/non_matchings/code/z_play/func_80166060.s,func_80166060,0x80166060,0x16
-asm/non_matchings/code/z_play/func_801660B8.s,func_801660B8,0x801660B8,0x21
+asm/non_matchings/code/z_play/Play_DrawMotionBlur.s,Play_DrawMotionBlur,0x80165460,0x6A
+asm/non_matchings/code/z_play/Play_InitMotionBlur.s,Play_InitMotionBlur,0x80165608,0xA
+asm/non_matchings/code/z_play/Play_DestroyMotionBlur.s,Play_DestroyMotionBlur,0x80165630,0xA
+asm/non_matchings/code/z_play/Play_SetMotionBlurAlpha.s,Play_SetMotionBlurAlpha,0x80165658,0x5
+asm/non_matchings/code/z_play/Play_EnableMotionBlur.s,Play_EnableMotionBlur,0x8016566C,0x9
+asm/non_matchings/code/z_play/Play_DisableMotionBlur.s,Play_DisableMotionBlur,0x80165690,0x5
+asm/non_matchings/code/z_play/Play_ConvertRgba16ToIntensityImage.s,Play_ConvertRgba16ToIntensityImage,0x801656A4,0x1C5
+asm/non_matchings/code/z_play/Play_SetMotionBlurPriorityAlpha.s,Play_SetMotionBlurPriorityAlpha,0x80165DB8,0x5
+asm/non_matchings/code/z_play/Play_EnableMotionBlurPriority.s,Play_EnableMotionBlurPriority,0x80165DCC,0x9
+asm/non_matchings/code/z_play/Play_DisableMotionBlurPriority.s,Play_DisableMotionBlurPriority,0x80165DF0,0x5
+asm/non_matchings/code/z_play/Play_TriggerPictoPhoto.s,Play_TriggerPictoPhoto,0x80165E04,0x6
+asm/non_matchings/code/z_play/Play_TakePictoPhoto.s,Play_TakePictoPhoto,0x80165E1C,0x18
+asm/non_matchings/code/z_play/Play_ChooseDynamicTransition.s,Play_ChooseDynamicTransition,0x80165E7C,0x11
+asm/non_matchings/code/z_play/Play_SetupTransition.s,Play_SetupTransition,0x80165EC0,0x68
+asm/non_matchings/code/z_play/Play_ClearTransition.s,Play_ClearTransition,0x80166060,0x16
+asm/non_matchings/code/z_play/Play_SetFog.s,Play_SetFog,0x801660B8,0x21
 asm/non_matchings/code/z_play/Play_Destroy.s,Play_Destroy,0x8016613C,0xA2
 asm/non_matchings/code/z_play/Play_CompressI8ToI5.s,Play_CompressI8ToI5,0x801663C4,0xA0
 asm/non_matchings/code/z_play/Play_DecompressI5ToI8.s,Play_DecompressI5ToI8,0x80166644,0x9C
-asm/non_matchings/code/z_play/func_801668B4.s,func_801668B4,0x801668B4,0x2D
-asm/non_matchings/code/z_play/func_80166968.s,func_80166968,0x80166968,0x72
-asm/non_matchings/code/z_play/func_80166B30.s,func_80166B30,0x80166B30,0x339
-asm/non_matchings/code/z_play/Play_Update.s,Play_Update,0x80167814,0x174
-asm/non_matchings/code/z_play/func_80167DE4.s,func_80167DE4,0x80167DE4,0x4A
-asm/non_matchings/code/z_play/func_80167F0C.s,func_80167F0C,0x80167F0C,0x61
-asm/non_matchings/code/z_play/Play_Draw.s,Play_Draw,0x80168090,0x347
-asm/non_matchings/code/z_play/func_80168DAC.s,func_80168DAC,0x80168DAC,0x6E
+asm/non_matchings/code/z_play/Play_GetWaterSurface.s,Play_GetWaterSurface,0x801668B4,0x2D
+asm/non_matchings/code/z_play/Play_UpdateWaterCamera.s,Play_UpdateWaterCamera,0x80166968,0x72
+asm/non_matchings/code/z_play/Play_UpdateTransition.s,Play_UpdateTransition,0x80166B30,0x339
+asm/non_matchings/code/z_play/Play_UpdateMain.s,Play_UpdateMain,0x80167814,0x174
+asm/non_matchings/code/z_play/Play_Update.s,Play_Update,0x80167DE4,0x4A
+asm/non_matchings/code/z_play/Play_PostWorldDraw.s,Play_PostWorldDraw,0x80167F0C,0x61
+asm/non_matchings/code/z_play/Play_DrawMain.s,Play_DrawMain,0x80168090,0x347
+asm/non_matchings/code/z_play/Play_Draw.s,Play_Draw,0x80168DAC,0x6E
 asm/non_matchings/code/z_play/Play_Main.s,Play_Main,0x80168F64,0x5A
 asm/non_matchings/code/z_play/Play_InCsMode.s,Play_InCsMode,0x801690CC,0xD
-asm/non_matchings/code/z_play/func_80169100.s,func_80169100,0x80169100,0x3C
-asm/non_matchings/code/z_play/func_801691F0.s,func_801691F0,0x801691F0,0xC
-asm/non_matchings/code/z_play/Play_LoadScene.s,Play_LoadScene,0x80169220,0x17
-asm/non_matchings/code/z_play/func_8016927C.s,func_8016927C,0x8016927C,0x12
-asm/non_matchings/code/z_play/func_801692C4.s,func_801692C4,0x801692C4,0x44
-asm/non_matchings/code/z_play/Play_SceneInit.s,Play_SceneInit,0x801693D4,0x28
+asm/non_matchings/code/z_play/Play_GetFloorSurfaceImpl.s,Play_GetFloorSurfaceImpl,0x80169100,0x3C
+asm/non_matchings/code/z_play/Play_GetFloorSurface.s,Play_GetFloorSurface,0x801691F0,0xC
+asm/non_matchings/code/z_play/Play_LoadFile.s,Play_LoadFile,0x80169220,0x17
+asm/non_matchings/code/z_play/Play_InitEnvironment.s,Play_InitEnvironment,0x8016927C,0x12
+asm/non_matchings/code/z_play/Play_InitScene.s,Play_InitScene,0x801692C4,0x44
+asm/non_matchings/code/z_play/Play_SpawnScene.s,Play_SpawnScene,0x801693D4,0x28
 asm/non_matchings/code/z_play/Play_GetScreenPos.s,Play_GetScreenPos,0x80169474,0x1A
 asm/non_matchings/code/z_play/Play_CreateSubCamera.s,Play_CreateSubCamera,0x801694DC,0x2A
 asm/non_matchings/code/z_play/Play_GetActiveCamId.s,Play_GetActiveCamId,0x80169584,0x3
@@ -2562,11 +2562,11 @@ asm/non_matchings/code/z_play_hireso/func_8016C344.s,func_8016C344,0x8016C344,0x
 asm/non_matchings/code/z_play_hireso/func_8016CD4C.s,func_8016CD4C,0x8016CD4C,0x5B0
 asm/non_matchings/code/z_play_hireso/func_8016E40C.s,func_8016E40C,0x8016E40C,0x1A1
 asm/non_matchings/code/z_play_hireso/func_8016EA90.s,func_8016EA90,0x8016EA90,0x1C6
-asm/non_matchings/code/z_play_hireso/func_8016F1A8.s,func_8016F1A8,0x8016F1A8,0xD1
+asm/non_matchings/code/z_play_hireso/BombersNotebook_Draw.s,BombersNotebook_Draw,0x8016F1A8,0xD1
 asm/non_matchings/code/z_play_hireso/func_8016F4EC.s,func_8016F4EC,0x8016F4EC,0x2F
-asm/non_matchings/code/z_play_hireso/func_8016F5A8.s,func_8016F5A8,0x8016F5A8,0x1B4
-asm/non_matchings/code/z_play_hireso/func_8016FC78.s,func_8016FC78,0x8016FC78,0x8
-asm/non_matchings/code/z_play_hireso/func_8016FC98.s,func_8016FC98,0x8016FC98,0x16
+asm/non_matchings/code/z_play_hireso/BombersNotebook_Update.s,BombersNotebook_Update,0x8016F5A8,0x1B4
+asm/non_matchings/code/z_play_hireso/BombersNotebook_Init.s,BombersNotebook_Init,0x8016FC78,0x8
+asm/non_matchings/code/z_play_hireso/BombersNotebook_Destroy.s,BombersNotebook_Destroy,0x8016FC98,0x16
 asm/non_matchings/code/PreRender/PreRender_SetValuesSave.s,PreRender_SetValuesSave,0x8016FCF0,0xF
 asm/non_matchings/code/PreRender/PreRender_Init.s,PreRender_Init,0x8016FD2C,0xD
 asm/non_matchings/code/PreRender/PreRender_SetValues.s,PreRender_SetValues,0x8016FD60,0xD
@@ -3598,4 +3598,4 @@ asm/non_matchings/code/jpegdecoder/JpegDecoder_ReadBits.s,JpegDecoder_ReadBits,0
 asm/non_matchings/code/z_game_over/GameOver_Init.s,GameOver_Init,0x801AA610,0x5
 asm/non_matchings/code/z_game_over/GameOver_FadeLights.s,GameOver_FadeLights,0x801AA624,0x1A
 asm/non_matchings/code/z_game_over/GameOver_Update.s,GameOver_Update,0x801AA68C,0x105
-asm/non_matchings/code/z_construct/func_801AAAA0.s,func_801AAAA0,0x801AAAA0,0x4
+asm/non_matchings/code/z_construct/Regs_InitData.s,Regs_InitData,0x801AAAA0,0x4