mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot synced 2026-08-22 06:44:46 -04:00
Code Issues Packages Projects Releases Wiki Activity

PlayState Rename (#1231)

Browse Source 
* global context -> play

* fix PlayState* PlayState
This commit is contained in:
fig02
2022-05-21 14:23:43 -04:00
committed by GitHub
parent 154f44b6da
commit 2e6279bc8e
912 changed files with 40489 additions and 41078 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/bootstrap_actors.py
+4 -4
View File
@@ -146,13 +146,13 @@ def bootstrap(ovl_path, ovl_text):
decs = ""
if init_func != "0x00000000" and init_func != "Actor_Noop":
decs += "void " + init_func_name + "(" + struct_name + "* this, GlobalContext* globalCtx);\n"
decs += "void " + init_func_name + "(" + struct_name + "* this, PlayState* play);\n"
if destroy_func != "0x00000000" and destroy_func != "Actor_Noop":
decs += "void " + destroy_func_name + "(" + struct_name + "* this, GlobalContext* globalCtx);\n"
decs += "void " + destroy_func_name + "(" + struct_name + "* this, PlayState* play);\n"
if update_func != "0x00000000" and update_func != "Actor_Noop":
decs += "void " + update_func_name + "(" + struct_name + "* this, GlobalContext* globalCtx);\n"
decs += "void " + update_func_name + "(" + struct_name + "* this, PlayState* play);\n"
if draw_func != "0x00000000" and draw_func != "Actor_Noop":
decs += "void " + draw_func_name + "(" + struct_name + "* this, GlobalContext* globalCtx);\n"
decs += "void " + draw_func_name + "(" + struct_name + "* this, PlayState* play);\n"
init_vars = "const ActorInit " + init_vars_name + " =\n{\n"
init_vars += indent + actor_id_name + ",\n"
tools/bootstrap_fx.py
+3 -3
View File
@@ -114,13 +114,13 @@ def bootstrap(ovl_path, ovl_text):
",\n" + indent + init_func_name + ",\n};\n*/"
decs = "u32 " + init_func_name + \
"(GlobalContext* globalCtx, u32 index, EffectSs* this, void* initParamsx);\n"
"(PlayState* play, u32 index, EffectSs* this, void* initParamsx);\n"
decs += "void " + \
init_func_name[:-4] + \
"Draw(GlobalContext* globalCtx, u32 index, EffectSs* this);\n"
"Draw(PlayState* play, u32 index, EffectSs* this);\n"
decs += "void " + \
init_func_name[:-4] + \
"Update(GlobalContext* globalCtx, u32 index, EffectSs* this);\n"
"Update(PlayState* play, u32 index, EffectSs* this);\n"
insert_pos = ovl_text.find("global.h>\n")
tools/namefixer.py
+2 -2
View File
@@ -153,8 +153,8 @@ wordReplace = {
"func_800D20CC": "Matrix_MtxFToYXZRotS",
"func_800D2264": "Matrix_MtxFToZYXRotS",
"func_800D23FC": "Matrix_RotateAxis",
"PLAYER": ("GET_PLAYER(globalCtx)", {"ignore": (-1, '"PLAYER"')}), # ignore "PLAYER" in sSoundBankNames
"ACTIVE_CAM": "GET_ACTIVE_CAM(globalCtx)",
"PLAYER": ("GET_PLAYER(play)", {"ignore": (-1, '"PLAYER"')}), # ignore "PLAYER" in sSoundBankNames
"ACTIVE_CAM": "GET_ACTIVE_CAM(play)",
"SkinMatrix_SetRotateRPY": "SkinMatrix_SetRotateZYX",
"SkinMatrix_SetScaleRotateYRPTranslate": "SkinMatrix_SetScaleRotateYXZTranslate",
"SkinMatrix_SetScaleRotateYXZTranslate": "SkinMatrix_SetTranslateRotateYXZScale",