merge master

This commit is contained in:
engineer124
2022-09-30 10:09:44 -04:00
174 changed files with 7049 additions and 2742 deletions
+19 -19
View File
@@ -1607,17 +1607,17 @@ asm/non_matchings/code/z_parameter/func_8010D9F4.s,func_8010D9F4,0x8010D9F4,0x99
asm/non_matchings/code/z_parameter/func_8010DC58.s,func_8010DC58,0x8010DC58,0x78
asm/non_matchings/code/z_parameter/func_8010DE38.s,func_8010DE38,0x8010DE38,0x7C
asm/non_matchings/code/z_parameter/func_8010E028.s,func_8010E028,0x8010E028,0x250
asm/non_matchings/code/z_parameter/func_8010E968.s,func_8010E968,0x8010E968,0x22
asm/non_matchings/code/z_parameter/func_8010E9F0.s,func_8010E9F0,0x8010E9F0,0x2B
asm/non_matchings/code/z_parameter/func_8010EA9C.s,func_8010EA9C,0x8010EA9C,0x2D
asm/non_matchings/code/z_parameter/func_8010EB50.s,func_8010EB50,0x8010EB50,0x14
asm/non_matchings/code/z_parameter/func_8010EBA0.s,func_8010EBA0,0x8010EBA0,0x2D
asm/non_matchings/code/z_parameter/func_8010EC54.s,func_8010EC54,0x8010EC54,0x88
asm/non_matchings/code/z_parameter/Interface_PostmanTimerCallback.s,Interface_PostmanTimerCallback,0x8010E968,0x22
asm/non_matchings/code/z_parameter/Interface_StartTimer.s,Interface_StartTimer,0x8010E9F0,0x2B
asm/non_matchings/code/z_parameter/Interface_StartPostmanTimer.s,Interface_StartPostmanTimer,0x8010EA9C,0x2D
asm/non_matchings/code/z_parameter/Interface_StartGoronRaceTimer.s,Interface_StartGoronRaceTimer,0x8010EB50,0x14
asm/non_matchings/code/z_parameter/Interface_StartBottleTimer.s,Interface_StartBottleTimer,0x8010EBA0,0x2D
asm/non_matchings/code/z_parameter/Interface_GetCompressedTimerDigits.s,Interface_GetCompressedTimerDigits,0x8010EC54,0x88
asm/non_matchings/code/z_parameter/func_8010EE74.s,func_8010EE74,0x8010EE74,0x3D
asm/non_matchings/code/z_parameter/Interface_ChangeAlpha.s,Interface_ChangeAlpha,0x8010EF68,0xD
asm/non_matchings/code/z_parameter/func_8010EF9C.s,func_8010EF9C,0x8010EF9C,0x4E
asm/non_matchings/code/z_parameter/func_8010F0D4.s,func_8010F0D4,0x8010F0D4,0x35
asm/non_matchings/code/z_parameter/func_8010F1A8.s,func_8010F1A8,0x8010F1A8,0x3A4
asm/non_matchings/code/z_parameter/Interface_SetHudVisibility.s,Interface_SetHudVisibility,0x8010EF68,0xD
asm/non_matchings/code/z_parameter/Interface_UpdateButtonAlphasByStatus.s,Interface_UpdateButtonAlphasByStatus,0x8010EF9C,0x4E
asm/non_matchings/code/z_parameter/Interface_UpdateButtonAlphas.s,Interface_UpdateButtonAlphas,0x8010F0D4,0x35
asm/non_matchings/code/z_parameter/Interface_UpdateHudAlphas.s,Interface_UpdateHudAlphas,0x8010F1A8,0x3A4
asm/non_matchings/code/z_parameter/func_80110038.s,func_80110038,0x80110038,0x71F
asm/non_matchings/code/z_parameter/func_80111CB4.s,func_80111CB4,0x80111CB4,0x34C
asm/non_matchings/code/z_parameter/func_801129E4.s,func_801129E4,0x801129E4,0x44
@@ -1670,16 +1670,16 @@ asm/non_matchings/code/z_parameter/func_8011B5C0.s,func_8011B5C0,0x8011B5C0,0x10
asm/non_matchings/code/z_parameter/func_8011B9E0.s,func_8011B9E0,0x8011B9E0,0x164
asm/non_matchings/code/z_parameter/func_8011BF70.s,func_8011BF70,0x8011BF70,0x155
asm/non_matchings/code/z_parameter/func_8011C4C4.s,func_8011C4C4,0x8011C4C4,0xD1
asm/non_matchings/code/z_parameter/func_8011C808.s,func_8011C808,0x8011C808,0x24
asm/non_matchings/code/z_parameter/func_8011C898.s,func_8011C898,0x8011C898,0x73
asm/non_matchings/code/z_parameter/func_8011CA64.s,func_8011CA64,0x8011CA64,0x654
asm/non_matchings/code/z_parameter/func_8011E3B4.s,func_8011E3B4,0x8011E3B4,0xDF
asm/non_matchings/code/z_parameter/Interface_StartMoonCrash.s,Interface_StartMoonCrash,0x8011C808,0x24
asm/non_matchings/code/z_parameter/Interface_GetTimerDigits.s,Interface_GetTimerDigits,0x8011C898,0x73
asm/non_matchings/code/z_parameter/Interface_DrawTimers.s,Interface_DrawTimers,0x8011CA64,0x654
asm/non_matchings/code/z_parameter/Interface_UpdateBottleTimers.s,Interface_UpdateBottleTimers,0x8011E3B4,0xDF
asm/non_matchings/code/z_parameter/func_8011E730.s,func_8011E730,0x8011E730,0x26C
asm/non_matchings/code/z_parameter/Interface_Draw.s,Interface_Draw,0x8011F0E0,0x7AC
asm/non_matchings/code/z_parameter/func_80120F90.s,func_80120F90,0x80120F90,0x35
asm/non_matchings/code/z_parameter/func_80121064.s,func_80121064,0x80121064,0x1F
asm/non_matchings/code/z_parameter/Interface_Update.s,Interface_Update,0x801210E0,0x3AD
asm/non_matchings/code/z_parameter/func_80121F94.s,func_80121F94,0x80121F94,0xC
asm/non_matchings/code/z_parameter/Interface_Destroy.s,Interface_Destroy,0x80121F94,0xC
asm/non_matchings/code/z_parameter/func_80121FC4.s,func_80121FC4,0x80121FC4,0x147
asm/non_matchings/code/z_path/func_801224E0.s,func_801224E0,0x801224E0,0x11
asm/non_matchings/code/z_path/func_80122524.s,func_80122524,0x80122524,0x2A
@@ -1746,7 +1746,7 @@ asm/non_matchings/code/z_player_lib/Player_ActionToExplosive.s,Player_ActionToEx
asm/non_matchings/code/z_player_lib/Player_GetExplosiveHeld.s,Player_GetExplosiveHeld,0x80124258,0x8
asm/non_matchings/code/z_player_lib/func_80124278.s,func_80124278,0x80124278,0xF
asm/non_matchings/code/z_player_lib/func_801242B4.s,func_801242B4,0x801242B4,0xA
asm/non_matchings/code/z_player_lib/func_801242DC.s,func_801242DC,0x801242DC,0x51
asm/non_matchings/code/z_player_lib/Player_GetEnvTimerType.s,Player_GetEnvTimerType,0x801242DC,0x51
asm/non_matchings/code/z_player_lib/func_80124420.s,func_80124420,0x80124420,0x7E
asm/non_matchings/code/z_player_lib/func_80124618.s,func_80124618,0x80124618,0x37
asm/non_matchings/code/z_player_lib/func_801246F4.s,func_801246F4,0x801246F4,0x5F
@@ -2009,8 +2009,8 @@ asm/non_matchings/code/z_scene_proc/Scene_DrawConfig5.s,Scene_DrawConfig5,0x8013
asm/non_matchings/code/z_scene_proc/Scene_DrawConfigMatAnimManualStep.s,Scene_DrawConfigMatAnimManualStep,0x80131F90,0xC
asm/non_matchings/code/z_scene_proc/Scene_DrawConfigGreatBayTemple.s,Scene_DrawConfigGreatBayTemple,0x80131FC0,0xC0
asm/non_matchings/code/z_scene_table/Entrance_GetTableEntry.s,Entrance_GetTableEntry,0x801322C0,0x13
asm/non_matchings/code/z_scene_table/Entrance_GetSceneNum.s,Entrance_GetSceneNum,0x8013230C,0xB
asm/non_matchings/code/z_scene_table/Entrance_GetSceneNumAbsolute.s,Entrance_GetSceneNumAbsolute,0x80132338,0xF
asm/non_matchings/code/z_scene_table/Entrance_GetSceneId.s,Entrance_GetSceneId,0x8013230C,0xB
asm/non_matchings/code/z_scene_table/Entrance_GetSceneIdAbsolute.s,Entrance_GetSceneIdAbsolute,0x80132338,0xF
asm/non_matchings/code/z_scene_table/Entrance_GetSpawnNum.s,Entrance_GetSpawnNum,0x80132374,0xB
asm/non_matchings/code/z_scene_table/Entrance_GetTransitionFlags.s,Entrance_GetTransitionFlags,0x801323A0,0xC
asm/non_matchings/code/code_801323D0/func_801323D0.s,func_801323D0,0x801323D0,0x16
@@ -2538,7 +2538,7 @@ asm/non_matchings/code/z_play/Play_GetCameraUID.s,Play_GetCameraUID,0x80169BC4,0
asm/non_matchings/code/z_play/func_80169BF8.s,func_80169BF8,0x80169BF8,0x1B
asm/non_matchings/code/z_play/Play_GetActorCsCamSetting.s,Play_GetActorCsCamSetting,0x80169C64,0x8
asm/non_matchings/code/z_play/Play_GetActorCsCamFuncData.s,Play_GetActorCsCamFuncData,0x80169C84,0xE
asm/non_matchings/code/z_play/Play_GetOriginalSceneNumber.s,Play_GetOriginalSceneNumber,0x80169CBC,0x21
asm/non_matchings/code/z_play/Play_GetOriginalSceneId.s,Play_GetOriginalSceneId,0x80169CBC,0x21
asm/non_matchings/code/z_play/Play_SaveCycleSceneFlags.s,Play_SaveCycleSceneFlags,0x80169D40,0x23
asm/non_matchings/code/z_play/Play_SetRespawnData.s,Play_SetRespawnData,0x80169DCC,0x28
asm/non_matchings/code/z_play/Play_SetupRespawnPoint.s,Play_SetupRespawnPoint,0x80169E6C,0x18
1 asm/non_matchings/code/z_en_a_keep/EnAObj_Init.s EnAObj_Init 0x800A5AC0 0x2B
1607 asm/non_matchings/code/z_parameter/func_8010DC58.s func_8010DC58 0x8010DC58 0x78
1608 asm/non_matchings/code/z_parameter/func_8010DE38.s func_8010DE38 0x8010DE38 0x7C
1609 asm/non_matchings/code/z_parameter/func_8010E028.s func_8010E028 0x8010E028 0x250
1610 asm/non_matchings/code/z_parameter/func_8010E968.s asm/non_matchings/code/z_parameter/Interface_PostmanTimerCallback.s func_8010E968 Interface_PostmanTimerCallback 0x8010E968 0x22
1611 asm/non_matchings/code/z_parameter/func_8010E9F0.s asm/non_matchings/code/z_parameter/Interface_StartTimer.s func_8010E9F0 Interface_StartTimer 0x8010E9F0 0x2B
1612 asm/non_matchings/code/z_parameter/func_8010EA9C.s asm/non_matchings/code/z_parameter/Interface_StartPostmanTimer.s func_8010EA9C Interface_StartPostmanTimer 0x8010EA9C 0x2D
1613 asm/non_matchings/code/z_parameter/func_8010EB50.s asm/non_matchings/code/z_parameter/Interface_StartGoronRaceTimer.s func_8010EB50 Interface_StartGoronRaceTimer 0x8010EB50 0x14
1614 asm/non_matchings/code/z_parameter/func_8010EBA0.s asm/non_matchings/code/z_parameter/Interface_StartBottleTimer.s func_8010EBA0 Interface_StartBottleTimer 0x8010EBA0 0x2D
1615 asm/non_matchings/code/z_parameter/func_8010EC54.s asm/non_matchings/code/z_parameter/Interface_GetCompressedTimerDigits.s func_8010EC54 Interface_GetCompressedTimerDigits 0x8010EC54 0x88
1616 asm/non_matchings/code/z_parameter/func_8010EE74.s func_8010EE74 0x8010EE74 0x3D
1617 asm/non_matchings/code/z_parameter/Interface_ChangeAlpha.s asm/non_matchings/code/z_parameter/Interface_SetHudVisibility.s Interface_ChangeAlpha Interface_SetHudVisibility 0x8010EF68 0xD
1618 asm/non_matchings/code/z_parameter/func_8010EF9C.s asm/non_matchings/code/z_parameter/Interface_UpdateButtonAlphasByStatus.s func_8010EF9C Interface_UpdateButtonAlphasByStatus 0x8010EF9C 0x4E
1619 asm/non_matchings/code/z_parameter/func_8010F0D4.s asm/non_matchings/code/z_parameter/Interface_UpdateButtonAlphas.s func_8010F0D4 Interface_UpdateButtonAlphas 0x8010F0D4 0x35
1620 asm/non_matchings/code/z_parameter/func_8010F1A8.s asm/non_matchings/code/z_parameter/Interface_UpdateHudAlphas.s func_8010F1A8 Interface_UpdateHudAlphas 0x8010F1A8 0x3A4
1621 asm/non_matchings/code/z_parameter/func_80110038.s func_80110038 0x80110038 0x71F
1622 asm/non_matchings/code/z_parameter/func_80111CB4.s func_80111CB4 0x80111CB4 0x34C
1623 asm/non_matchings/code/z_parameter/func_801129E4.s func_801129E4 0x801129E4 0x44
1670 asm/non_matchings/code/z_parameter/func_8011B9E0.s func_8011B9E0 0x8011B9E0 0x164
1671 asm/non_matchings/code/z_parameter/func_8011BF70.s func_8011BF70 0x8011BF70 0x155
1672 asm/non_matchings/code/z_parameter/func_8011C4C4.s func_8011C4C4 0x8011C4C4 0xD1
1673 asm/non_matchings/code/z_parameter/func_8011C808.s asm/non_matchings/code/z_parameter/Interface_StartMoonCrash.s func_8011C808 Interface_StartMoonCrash 0x8011C808 0x24
1674 asm/non_matchings/code/z_parameter/func_8011C898.s asm/non_matchings/code/z_parameter/Interface_GetTimerDigits.s func_8011C898 Interface_GetTimerDigits 0x8011C898 0x73
1675 asm/non_matchings/code/z_parameter/func_8011CA64.s asm/non_matchings/code/z_parameter/Interface_DrawTimers.s func_8011CA64 Interface_DrawTimers 0x8011CA64 0x654
1676 asm/non_matchings/code/z_parameter/func_8011E3B4.s asm/non_matchings/code/z_parameter/Interface_UpdateBottleTimers.s func_8011E3B4 Interface_UpdateBottleTimers 0x8011E3B4 0xDF
1677 asm/non_matchings/code/z_parameter/func_8011E730.s func_8011E730 0x8011E730 0x26C
1678 asm/non_matchings/code/z_parameter/Interface_Draw.s Interface_Draw 0x8011F0E0 0x7AC
1679 asm/non_matchings/code/z_parameter/func_80120F90.s func_80120F90 0x80120F90 0x35
1680 asm/non_matchings/code/z_parameter/func_80121064.s func_80121064 0x80121064 0x1F
1681 asm/non_matchings/code/z_parameter/Interface_Update.s Interface_Update 0x801210E0 0x3AD
1682 asm/non_matchings/code/z_parameter/func_80121F94.s asm/non_matchings/code/z_parameter/Interface_Destroy.s func_80121F94 Interface_Destroy 0x80121F94 0xC
1683 asm/non_matchings/code/z_parameter/func_80121FC4.s func_80121FC4 0x80121FC4 0x147
1684 asm/non_matchings/code/z_path/func_801224E0.s func_801224E0 0x801224E0 0x11
1685 asm/non_matchings/code/z_path/func_80122524.s func_80122524 0x80122524 0x2A
1746 asm/non_matchings/code/z_player_lib/Player_GetExplosiveHeld.s Player_GetExplosiveHeld 0x80124258 0x8
1747 asm/non_matchings/code/z_player_lib/func_80124278.s func_80124278 0x80124278 0xF
1748 asm/non_matchings/code/z_player_lib/func_801242B4.s func_801242B4 0x801242B4 0xA
1749 asm/non_matchings/code/z_player_lib/func_801242DC.s asm/non_matchings/code/z_player_lib/Player_GetEnvTimerType.s func_801242DC Player_GetEnvTimerType 0x801242DC 0x51
1750 asm/non_matchings/code/z_player_lib/func_80124420.s func_80124420 0x80124420 0x7E
1751 asm/non_matchings/code/z_player_lib/func_80124618.s func_80124618 0x80124618 0x37
1752 asm/non_matchings/code/z_player_lib/func_801246F4.s func_801246F4 0x801246F4 0x5F
2009 asm/non_matchings/code/z_scene_proc/Scene_DrawConfigMatAnimManualStep.s Scene_DrawConfigMatAnimManualStep 0x80131F90 0xC
2010 asm/non_matchings/code/z_scene_proc/Scene_DrawConfigGreatBayTemple.s Scene_DrawConfigGreatBayTemple 0x80131FC0 0xC0
2011 asm/non_matchings/code/z_scene_table/Entrance_GetTableEntry.s Entrance_GetTableEntry 0x801322C0 0x13
2012 asm/non_matchings/code/z_scene_table/Entrance_GetSceneNum.s asm/non_matchings/code/z_scene_table/Entrance_GetSceneId.s Entrance_GetSceneNum Entrance_GetSceneId 0x8013230C 0xB
2013 asm/non_matchings/code/z_scene_table/Entrance_GetSceneNumAbsolute.s asm/non_matchings/code/z_scene_table/Entrance_GetSceneIdAbsolute.s Entrance_GetSceneNumAbsolute Entrance_GetSceneIdAbsolute 0x80132338 0xF
2014 asm/non_matchings/code/z_scene_table/Entrance_GetSpawnNum.s Entrance_GetSpawnNum 0x80132374 0xB
2015 asm/non_matchings/code/z_scene_table/Entrance_GetTransitionFlags.s Entrance_GetTransitionFlags 0x801323A0 0xC
2016 asm/non_matchings/code/code_801323D0/func_801323D0.s func_801323D0 0x801323D0 0x16
2538 asm/non_matchings/code/z_play/func_80169BF8.s func_80169BF8 0x80169BF8 0x1B
2539 asm/non_matchings/code/z_play/Play_GetActorCsCamSetting.s Play_GetActorCsCamSetting 0x80169C64 0x8
2540 asm/non_matchings/code/z_play/Play_GetActorCsCamFuncData.s Play_GetActorCsCamFuncData 0x80169C84 0xE
2541 asm/non_matchings/code/z_play/Play_GetOriginalSceneNumber.s asm/non_matchings/code/z_play/Play_GetOriginalSceneId.s Play_GetOriginalSceneNumber Play_GetOriginalSceneId 0x80169CBC 0x21
2542 asm/non_matchings/code/z_play/Play_SaveCycleSceneFlags.s Play_SaveCycleSceneFlags 0x80169D40 0x23
2543 asm/non_matchings/code/z_play/Play_SetRespawnData.s Play_SetRespawnData 0x80169DCC 0x28
2544 asm/non_matchings/code/z_play/Play_SetupRespawnPoint.s Play_SetupRespawnPoint 0x80169E6C 0x18