Port Proposed OoT Object Docs (#1361)

* port docs in z_scene

* undo accidental ctrl-f

* another fix

* expose Object_SpawnPersistent

---------

Co-authored-by: engineer124 <engineer124engineer124@gmail.com>
This commit is contained in:
fig02
2023-10-04 14:01:04 +11:00
committed by GitHub
co-authored by engineer124
parent d635b81ee6
commit f4a490bb6a
68 changed files with 279 additions and 269 deletions
+4 -4
View File
@@ -2415,10 +2415,10 @@
0x8012F1BC:("Inventory_IncrementSkullTokenCount",),
0x8012F22C:("Inventory_GetSkullTokenCount",),
0x8012F278:("Inventory_SaveLotteryCodeGuess",),
0x8012F2E0:("Object_Spawn",),
0x8012F3D0:("Object_InitBank",),
0x8012F4FC:("Object_UpdateBank",),
0x8012F608:("Object_GetIndex",),
0x8012F2E0:("Object_SpawnPersistent",),
0x8012F3D0:("Object_InitContext",),
0x8012F4FC:("Object_UpdateEntries",),
0x8012F608:("Object_GetSlot",),
0x8012F668:("Object_IsLoaded",),
0x8012F698:("Object_LoadAll",),
0x8012F73C:("func_8012F73C",),
+4
View File
@@ -774,6 +774,9 @@ wordReplace = {
"func_80133038": "Schedule_RunScript",
"Object_GetIndex": "Object_GetSlot",
"Object_Spawn": "Object_SpawnPersistent",
"EffectSsKiraKira_SpawnSmallYellow": "EffectSsKirakira_SpawnSmallYellow",
"EffectSsKiraKira_SpawnSmall": "EffectSsKirakira_SpawnSmall",
"EffectSsKiraKira_SpawnDispersed": "EffectSsKirakira_SpawnDispersed",
@@ -1156,6 +1159,7 @@ wordReplace = {
"play->roomCtx.curRoom.unk3": "play->roomCtx.curRoom.behaviorType1",
"play->roomCtx.curRoom.unk2": "play->roomCtx.curRoom.behaviorType2",
"play->roomCtx.unk31": "play->roomCtx.status",
"play->objectCtx.status": "play->objectCtx.slots",
"actorCtx.unkC": "actorCtx.halfDaysBit",
"actorCtx.unk1F4": "actorCtx.playerImpact.type",
+4 -4
View File
@@ -1929,10 +1929,10 @@ asm/non_matchings/code/code_8012EC80/Inventory_SaveDekuPlaygroundHighScore.s,Inv
asm/non_matchings/code/code_8012EC80/Inventory_IncrementSkullTokenCount.s,Inventory_IncrementSkullTokenCount,0x8012F1BC,0x1C
asm/non_matchings/code/code_8012EC80/Inventory_GetSkullTokenCount.s,Inventory_GetSkullTokenCount,0x8012F22C,0x13
asm/non_matchings/code/code_8012EC80/Inventory_SaveLotteryCodeGuess.s,Inventory_SaveLotteryCodeGuess,0x8012F278,0x16
asm/non_matchings/code/z_scene/Object_Spawn.s,Object_Spawn,0x8012F2E0,0x3C
asm/non_matchings/code/z_scene/Object_InitBank.s,Object_InitBank,0x8012F3D0,0x4B
asm/non_matchings/code/z_scene/Object_UpdateBank.s,Object_UpdateBank,0x8012F4FC,0x43
asm/non_matchings/code/z_scene/Object_GetIndex.s,Object_GetIndex,0x8012F608,0x18
asm/non_matchings/code/z_scene/Object_SpawnPersistent.s,Object_SpawnPersistent,0x8012F2E0,0x3C
asm/non_matchings/code/z_scene/Object_InitContext.s,Object_InitContext,0x8012F3D0,0x4B
asm/non_matchings/code/z_scene/Object_UpdateEntries.s,Object_UpdateEntries,0x8012F4FC,0x43
asm/non_matchings/code/z_scene/Object_GetSlot.s,Object_GetSlot,0x8012F608,0x18
asm/non_matchings/code/z_scene/Object_IsLoaded.s,Object_IsLoaded,0x8012F668,0xC
asm/non_matchings/code/z_scene/Object_LoadAll.s,Object_LoadAll,0x8012F698,0x29
asm/non_matchings/code/z_scene/func_8012F73C.s,func_8012F73C,0x8012F73C,0x18
1 asm/non_matchings/code/z_en_a_keep/EnAObj_Init.s EnAObj_Init 0x800A5AC0 0x2B
1929 asm/non_matchings/code/code_8012EC80/Inventory_IncrementSkullTokenCount.s Inventory_IncrementSkullTokenCount 0x8012F1BC 0x1C
1930 asm/non_matchings/code/code_8012EC80/Inventory_GetSkullTokenCount.s Inventory_GetSkullTokenCount 0x8012F22C 0x13
1931 asm/non_matchings/code/code_8012EC80/Inventory_SaveLotteryCodeGuess.s Inventory_SaveLotteryCodeGuess 0x8012F278 0x16
1932 asm/non_matchings/code/z_scene/Object_Spawn.s asm/non_matchings/code/z_scene/Object_SpawnPersistent.s Object_Spawn Object_SpawnPersistent 0x8012F2E0 0x3C
1933 asm/non_matchings/code/z_scene/Object_InitBank.s asm/non_matchings/code/z_scene/Object_InitContext.s Object_InitBank Object_InitContext 0x8012F3D0 0x4B
1934 asm/non_matchings/code/z_scene/Object_UpdateBank.s asm/non_matchings/code/z_scene/Object_UpdateEntries.s Object_UpdateBank Object_UpdateEntries 0x8012F4FC 0x43
1935 asm/non_matchings/code/z_scene/Object_GetIndex.s asm/non_matchings/code/z_scene/Object_GetSlot.s Object_GetIndex Object_GetSlot 0x8012F608 0x18
1936 asm/non_matchings/code/z_scene/Object_IsLoaded.s Object_IsLoaded 0x8012F668 0xC
1937 asm/non_matchings/code/z_scene/Object_LoadAll.s Object_LoadAll 0x8012F698 0x29
1938 asm/non_matchings/code/z_scene/func_8012F73C.s func_8012F73C 0x8012F73C 0x18