SceneNum -> SceneId (#1036)

* sceneNum -> sceneId

* horse data scene -> sceneId

* Clean up scene table

* format

* PR comments

* Some more

* It helps if you actually save the file

* PR

* Remove comment

* Format

* Conflicts
This commit is contained in:
Derek Hensley
2022-09-29 19:22:59 -07:00
committed by GitHub
parent 08be0b3bd4
commit 3a723efb15
90 changed files with 975 additions and 964 deletions
+3 -3
View File
@@ -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
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