Quake & Distortion Cleanup (#1102)

* quake cleanup

* cleanup

* more cleanup

* remove cast

* q comes before r...

* unname goron function, leave it to another PR

* PR Suggestions
This commit is contained in:
engineer124
2022-09-30 22:01:39 -04:00
committed by GitHub
parent b080fb3700
commit ab5fd663cc
40 changed files with 496 additions and 389 deletions
+11 -11
View File
@@ -373,8 +373,8 @@ asm/non_matchings/code/z_actor/Actor_TestFloorInDirection.s,Actor_TestFloorInDir
asm/non_matchings/code/z_actor/Actor_IsTargeted.s,Actor_IsTargeted,0x800BC5B8,0xD
asm/non_matchings/code/z_actor/Actor_OtherIsTargeted.s,Actor_OtherIsTargeted,0x800BC5EC,0xD
asm/non_matchings/code/z_actor/func_800BC620.s,func_800BC620,0x800BC620,0x54
asm/non_matchings/code/z_actor/func_800BC770.s,func_800BC770,0x800BC770,0x1A
asm/non_matchings/code/z_actor/func_800BC7D8.s,func_800BC7D8,0x800BC7D8,0x1C
asm/non_matchings/code/z_actor/Actor_AddQuake.s,Actor_AddQuake,0x800BC770,0x1A
asm/non_matchings/code/z_actor/Actor_AddQuakeWithSpeed.s,Actor_AddQuakeWithSpeed,0x800BC7D8,0x1C
asm/non_matchings/code/z_actor/func_800BC848.s,func_800BC848,0x800BC848,0x1C
asm/non_matchings/code/z_actor/Actor_DrawDoorLock.s,Actor_DrawDoorLock,0x800BC8B8,0xA6
asm/non_matchings/code/z_actor/Actor_SpawnShieldParticlesMetal.s,Actor_SpawnShieldParticlesMetal,0x800BCB50,0x8
@@ -589,7 +589,7 @@ asm/non_matchings/code/z_bgcheck/SurfaceType_GetEcho.s,SurfaceType_GetEcho,0x800
asm/non_matchings/code/z_bgcheck/SurfaceType_IsHookshotSurface.s,SurfaceType_IsHookshotSurface,0x800C9CEC,0xA
asm/non_matchings/code/z_bgcheck/SurfaceType_IsIgnoredByEntities.s,SurfaceType_IsIgnoredByEntities,0x800C9D14,0xF
asm/non_matchings/code/z_bgcheck/SurfaceType_IsIgnoredByProjectiles.s,SurfaceType_IsIgnoredByProjectiles,0x800C9D50,0xF
asm/non_matchings/code/z_bgcheck/SurfaceType_GetConveyorType.s,SurfaceType_GetConveyorType,0x800C9D8C,0x14
asm/non_matchings/code/z_bgcheck/SurfaceType_IsFloorConveyor.s,SurfaceType_IsFloorConveyor,0x800C9D8C,0x14
asm/non_matchings/code/z_bgcheck/func_800C9DDC.s,func_800C9DDC,0x800C9DDC,0xF
asm/non_matchings/code/z_bgcheck/SurfaceType_GetConveyorSpeed.s,SurfaceType_GetConveyorSpeed,0x800C9E18,0xA
asm/non_matchings/code/z_bgcheck/SurfaceType_GetConveyorDirection.s,SurfaceType_GetConveyorDirection,0x800C9E40,0x12
@@ -1796,15 +1796,15 @@ asm/non_matchings/code/z_prenmi/PreNMI_Destroy.s,PreNMI_Destroy,0x8012A02C,0x3
asm/non_matchings/code/z_prenmi/PreNMI_Init.s,PreNMI_Init,0x8012A038,0x12
asm/non_matchings/code/z_quake/Quake_Random.s,Quake_Random,0x8012A080,0xB
asm/non_matchings/code/z_quake/Quake_UpdateShakeInfo.s,Quake_UpdateShakeInfo,0x8012A0AC,0x83
asm/non_matchings/code/z_quake/Quake_Callback1.s,Quake_Callback1,0x8012A2B8,0x22
asm/non_matchings/code/z_quake/Quake_Callback5.s,Quake_Callback5,0x8012A340,0x1D
asm/non_matchings/code/z_quake/Quake_Callback6.s,Quake_Callback6,0x8012A3B4,0x21
asm/non_matchings/code/z_quake/Quake_Callback3.s,Quake_Callback3,0x8012A438,0x26
asm/non_matchings/code/z_quake/Quake_Callback2.s,Quake_Callback2,0x8012A4D0,0x1C
asm/non_matchings/code/z_quake/Quake_Callback4.s,Quake_Callback4,0x8012A540,0x26
asm/non_matchings/code/z_quake/Quake_CallbackType1.s,Quake_CallbackType1,0x8012A2B8,0x22
asm/non_matchings/code/z_quake/Quake_CallbackType5.s,Quake_CallbackType5,0x8012A340,0x1D
asm/non_matchings/code/z_quake/Quake_CallbackType6.s,Quake_CallbackType6,0x8012A3B4,0x21
asm/non_matchings/code/z_quake/Quake_CallbackType3.s,Quake_CallbackType3,0x8012A438,0x26
asm/non_matchings/code/z_quake/Quake_CallbackType2.s,Quake_CallbackType2,0x8012A4D0,0x1C
asm/non_matchings/code/z_quake/Quake_CallbackType4.s,Quake_CallbackType4,0x8012A540,0x26
asm/non_matchings/code/z_quake/Quake_GetFreeIndex.s,Quake_GetFreeIndex,0x8012A5D8,0x18
asm/non_matchings/code/z_quake/Quake_AddImpl.s,Quake_AddImpl,0x8012A638,0x2E
asm/non_matchings/code/z_quake/Quake_Remove.s,Quake_Remove,0x8012A6F0,0xA
asm/non_matchings/code/z_quake/Quake_RemoveRequest.s,Quake_RemoveRequest,0x8012A6F0,0xA
asm/non_matchings/code/z_quake/Quake_GetRequest.s,Quake_GetRequest,0x8012A718,0x17
asm/non_matchings/code/z_quake/Quake_SetValue.s,Quake_SetValue,0x8012A774,0x4D
asm/non_matchings/code/z_quake/Quake_SetSpeed.s,Quake_SetSpeed,0x8012A8A8,0x12
@@ -1814,7 +1814,7 @@ asm/non_matchings/code/z_quake/Quake_SetQuakeValues.s,Quake_SetQuakeValues,0x801
asm/non_matchings/code/z_quake/Quake_SetQuakeValues2.s,Quake_SetQuakeValues2,0x8012A9E0,0x1A
asm/non_matchings/code/z_quake/Quake_Init.s,Quake_Init,0x8012AA48,0x15
asm/non_matchings/code/z_quake/Quake_Add.s,Quake_Add,0x8012AA9C,0x9
asm/non_matchings/code/z_quake/Quake_RemoveFromIdx.s,Quake_RemoveFromIdx,0x8012AAC0,0x12
asm/non_matchings/code/z_quake/Quake_Remove.s,Quake_Remove,0x8012AAC0,0x12
asm/non_matchings/code/z_quake/Quake_Calc.s,Quake_Calc,0x8012AB08,0xD8
asm/non_matchings/code/z_quake/Distortion_Init.s,Distortion_Init,0x8012AE68,0x11
asm/non_matchings/code/z_quake/Distortion_SetCountdown.s,Distortion_SetCountdown,0x8012AEAC,0xA
1 asm/non_matchings/code/z_en_a_keep/EnAObj_Init.s EnAObj_Init 0x800A5AC0 0x2B
373 asm/non_matchings/code/z_actor/Actor_IsTargeted.s Actor_IsTargeted 0x800BC5B8 0xD
374 asm/non_matchings/code/z_actor/Actor_OtherIsTargeted.s Actor_OtherIsTargeted 0x800BC5EC 0xD
375 asm/non_matchings/code/z_actor/func_800BC620.s func_800BC620 0x800BC620 0x54
376 asm/non_matchings/code/z_actor/func_800BC770.s asm/non_matchings/code/z_actor/Actor_AddQuake.s func_800BC770 Actor_AddQuake 0x800BC770 0x1A
377 asm/non_matchings/code/z_actor/func_800BC7D8.s asm/non_matchings/code/z_actor/Actor_AddQuakeWithSpeed.s func_800BC7D8 Actor_AddQuakeWithSpeed 0x800BC7D8 0x1C
378 asm/non_matchings/code/z_actor/func_800BC848.s func_800BC848 0x800BC848 0x1C
379 asm/non_matchings/code/z_actor/Actor_DrawDoorLock.s Actor_DrawDoorLock 0x800BC8B8 0xA6
380 asm/non_matchings/code/z_actor/Actor_SpawnShieldParticlesMetal.s Actor_SpawnShieldParticlesMetal 0x800BCB50 0x8
589 asm/non_matchings/code/z_bgcheck/SurfaceType_IsHookshotSurface.s SurfaceType_IsHookshotSurface 0x800C9CEC 0xA
590 asm/non_matchings/code/z_bgcheck/SurfaceType_IsIgnoredByEntities.s SurfaceType_IsIgnoredByEntities 0x800C9D14 0xF
591 asm/non_matchings/code/z_bgcheck/SurfaceType_IsIgnoredByProjectiles.s SurfaceType_IsIgnoredByProjectiles 0x800C9D50 0xF
592 asm/non_matchings/code/z_bgcheck/SurfaceType_GetConveyorType.s asm/non_matchings/code/z_bgcheck/SurfaceType_IsFloorConveyor.s SurfaceType_GetConveyorType SurfaceType_IsFloorConveyor 0x800C9D8C 0x14
593 asm/non_matchings/code/z_bgcheck/func_800C9DDC.s func_800C9DDC 0x800C9DDC 0xF
594 asm/non_matchings/code/z_bgcheck/SurfaceType_GetConveyorSpeed.s SurfaceType_GetConveyorSpeed 0x800C9E18 0xA
595 asm/non_matchings/code/z_bgcheck/SurfaceType_GetConveyorDirection.s SurfaceType_GetConveyorDirection 0x800C9E40 0x12
1796 asm/non_matchings/code/z_prenmi/PreNMI_Init.s PreNMI_Init 0x8012A038 0x12
1797 asm/non_matchings/code/z_quake/Quake_Random.s Quake_Random 0x8012A080 0xB
1798 asm/non_matchings/code/z_quake/Quake_UpdateShakeInfo.s Quake_UpdateShakeInfo 0x8012A0AC 0x83
1799 asm/non_matchings/code/z_quake/Quake_Callback1.s asm/non_matchings/code/z_quake/Quake_CallbackType1.s Quake_Callback1 Quake_CallbackType1 0x8012A2B8 0x22
1800 asm/non_matchings/code/z_quake/Quake_Callback5.s asm/non_matchings/code/z_quake/Quake_CallbackType5.s Quake_Callback5 Quake_CallbackType5 0x8012A340 0x1D
1801 asm/non_matchings/code/z_quake/Quake_Callback6.s asm/non_matchings/code/z_quake/Quake_CallbackType6.s Quake_Callback6 Quake_CallbackType6 0x8012A3B4 0x21
1802 asm/non_matchings/code/z_quake/Quake_Callback3.s asm/non_matchings/code/z_quake/Quake_CallbackType3.s Quake_Callback3 Quake_CallbackType3 0x8012A438 0x26
1803 asm/non_matchings/code/z_quake/Quake_Callback2.s asm/non_matchings/code/z_quake/Quake_CallbackType2.s Quake_Callback2 Quake_CallbackType2 0x8012A4D0 0x1C
1804 asm/non_matchings/code/z_quake/Quake_Callback4.s asm/non_matchings/code/z_quake/Quake_CallbackType4.s Quake_Callback4 Quake_CallbackType4 0x8012A540 0x26
1805 asm/non_matchings/code/z_quake/Quake_GetFreeIndex.s Quake_GetFreeIndex 0x8012A5D8 0x18
1806 asm/non_matchings/code/z_quake/Quake_AddImpl.s Quake_AddImpl 0x8012A638 0x2E
1807 asm/non_matchings/code/z_quake/Quake_Remove.s asm/non_matchings/code/z_quake/Quake_RemoveRequest.s Quake_Remove Quake_RemoveRequest 0x8012A6F0 0xA
1808 asm/non_matchings/code/z_quake/Quake_GetRequest.s Quake_GetRequest 0x8012A718 0x17
1809 asm/non_matchings/code/z_quake/Quake_SetValue.s Quake_SetValue 0x8012A774 0x4D
1810 asm/non_matchings/code/z_quake/Quake_SetSpeed.s Quake_SetSpeed 0x8012A8A8 0x12
1814 asm/non_matchings/code/z_quake/Quake_SetQuakeValues2.s Quake_SetQuakeValues2 0x8012A9E0 0x1A
1815 asm/non_matchings/code/z_quake/Quake_Init.s Quake_Init 0x8012AA48 0x15
1816 asm/non_matchings/code/z_quake/Quake_Add.s Quake_Add 0x8012AA9C 0x9
1817 asm/non_matchings/code/z_quake/Quake_RemoveFromIdx.s asm/non_matchings/code/z_quake/Quake_Remove.s Quake_RemoveFromIdx Quake_Remove 0x8012AAC0 0x12
1818 asm/non_matchings/code/z_quake/Quake_Calc.s Quake_Calc 0x8012AB08 0xD8
1819 asm/non_matchings/code/z_quake/Distortion_Init.s Distortion_Init 0x8012AE68 0x11
1820 asm/non_matchings/code/z_quake/Distortion_SetCountdown.s Distortion_SetCountdown 0x8012AEAC 0xA