izzy/2ship2harkinian-Android
0
0
Fork 0
mirror of https://github.com/izzy2lost/2ship2harkinian-Android.git synced 2026-06-19 01:20:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'zret' of https://github.com/HarbourMasters/mm into zret

Browse Source
This commit is contained in:
RevoSucks
2023-10-31 19:09:25 -04:00
parent 203be59005 b151f6cf3a
commit 647bd6f342
3 changed files with 121 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/overlays/actors/ovl_En_Dt/z_en_dt.c
+114 -7
View File
@@ -42,6 +42,7 @@ extern s16 D_80BEB268[];
extern s16 D_80BEB26A[];
extern s32 D_80BEB2C8[];
extern u8 D_80BEB2E0[];
extern s32 D_80BEB2E8[];
extern s32 D_80BEB348[];
extern s32 D_80BEB35C[];
@@ -74,8 +75,8 @@ void EnDt_Init(Actor* thisx, PlayState* play) {
this->actor.colChkInfo.mass = 0xFF;
ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 19.0f);
SkelAnime_InitFlex(play, &this->skelanime, &object_dt_Skel_00B0CC, &object_dt_Anim_00112C, &this->unk_188,
&this->unk_1E2, 0xF);
SkelAnime_InitFlex(play, &this->skelanime, &object_dt_Skel_00B0CC, &object_dt_Anim_00112C, this->unk_188,
this->unk_1E2, 0xF);
this->actor.targetMode = 6;
this->unk_274 = 0;
this->unk_278 = 0;
@@ -132,7 +133,16 @@ void func_80BE9CE8(EnDt* this, s32 arg1) {
var_fv1);
}
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Dt/func_80BE9D9C.s")
void func_80BE9D9C(EnDt* this) {
s32 temp_v0 = this->unk_280 * 4;
temp_v0++;
func_80BE9CE8(this, D_80BEB2E8[temp_v0]);
temp_v0++;
this->unk_24C = D_80BEB2E8[temp_v0];
temp_v0++;
this->unk_248 = D_80BEB2E8[temp_v0];
}
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Dt/func_80BE9DF8.s")
@@ -237,7 +247,60 @@ void func_80BEA088(EnDt* this, PlayState* play) {
Actor_OfferTalk(&this->actor, play, 150.0f);
}
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Dt/func_80BEA254.s")
void func_80BEA254(EnDt* this, PlayState* play) {
EnMuto* sp1C;
EnBaisen* sp18;
s16* var_v0;
s32 i;
if (!(gSaveContext.save.saveInfo.weekEventReg[0x3F] & 0x80)) {
if (this->unk_274 != NULL) {
if (this->unk_278 != NULL) {
sp1C = this->unk_274;
sp18 = this->unk_278;
}
}
if ((this->unk_274 != NULL) && (this->unk_278 != NULL)) {
sp1C->cutsceneState = 1;
sp18->unk2AC = 1;
if (Player_GetMask(play) == 0xA) {
sp1C->textIdIndex = 4;
sp18->textIdIndex = 6;
this->unk_280 = 5;
if (gSaveContext.save.saveInfo.weekEventReg[0x3C] & 8) {
this->unk_280 = 4;
}
func_80BE9D9C(this);
}
}
}
this->unk_270 = 0;
#if 0
for (i = 0; i < 24; i++) {
if ((play->msgCtx.currentTextId == D_80BEB268[i]) || (this->actor.textId == D_80BEB268[i])) {
this->unk_270 = 1;
this->unk_26E = i;
}
}
#else
// clang-format off
var_v0 = D_80BEB268; i = 0; loop_11:
// clang-format on
if ((play->msgCtx.currentTextId == (*var_v0)) || (this->actor.textId == (*var_v0))) {
this->unk_270 = 1;
this->unk_26E = i;
} else {
i += 2;
var_v0 += 2;
if (i < 24) {
goto loop_11;
}
}
#endif
this->unk_254 = 2;
this->actionFunc = func_80BEA394;
}
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Dt/func_80BEA394.s")
@@ -294,7 +357,7 @@ void func_80BEA8F0(EnDt* this, PlayState* play) {
}
void func_80BEAAF8(EnDt* this, PlayState* play) {
Actor_OfferGetItem(this, play, GI_HEART_PIECE, 300.0f, 300.0f);
Actor_OfferGetItem(&this->actor, play, GI_HEART_PIECE, 300.0f, 300.0f);
this->unk_254 = 3;
this->actionFunc = func_80BEAB44;
}
@@ -342,7 +405,7 @@ void func_80BEAC84(EnDt* this, PlayState* play) {
void func_80BEAD2C(EnDt* this, PlayState* play) {
func_80BE9C74(this);
if (Actor_ProcessTalkRequest(&this->actor, play) != 0) {
if (Actor_ProcessTalkRequest(&this->actor, &play->state) != 0) {
func_80BEADB8(this);
return;
}
@@ -372,7 +435,51 @@ void func_80BEADD4(EnDt* this, PlayState* play) {
}
}
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Dt/EnDt_Update.s")
void EnDt_Update(Actor* thisx, PlayState* play) {
EnDt* this = THIS;
s32 pad;
SkelAnime_Update(&this->skelanime);
Actor_SetScale(&this->actor, 0.01f);
if ((this->unk_254 != 4) && (this->unk_254 != 5) && (gSaveContext.save.day == 3) &&
(gSaveContext.save.isNight != 0)) {
func_80BEAC84(this, play);
}
if (!(gSaveContext.save.saveInfo.weekEventReg[63] & 0x80) &&
((gSaveContext.save.day != 3) || ((gSaveContext.save.day == 3) && (gSaveContext.save.isNight == 0)))) {
Audio_PlaySequenceAtPos(3, &gSfxDefaultPos, 49, 1000.0f);
Actor_PlaySfx(&this->actor, NA_SE_EV_CROWD - SFX_FLAG);
}
if (this->unk_24A != 0) {
this->unk_24A--;
}
if (this->unk_244 != 0) {
this->unk_244--;
}
if (this->unk_290 != 0) {
func_80BE9C74(this);
}
if ((this->unk_248 == 0) && (this->unk_24A == 0)) {
this->unk_24C++;
if (this->unk_24C >= 3) {
this->unk_24C = 0;
this->unk_24A = (s32)Rand_ZeroFloat(60.0f) + 20;
}
}
this->actionFunc(this, play);
this->actor.shape.rot.y = this->actor.world.rot.y;
Math_SmoothStepToS(&this->unk_284.y, this->unk_28A.y, 1, 3000, 0);
Actor_SetFocus(&this->actor, 60.0f);
Actor_MoveWithGravity(&this->actor);
Collider_UpdateCylinder(&this->actor, &this->collider);
CollisionCheck_SetOC(play, &play->colChkCtx, &this->collider);
}
s32 EnDt_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, Actor* thisx) {
EnDt* this = THIS;
tools/m2ctx.py
+7 -2
View File
@@ -75,8 +75,13 @@ def custom_replacements(output):
def import_c_file(in_file) -> str:
in_file = os.path.relpath(in_file, root_dir)
cpp_command = ["gcc", "-E", "-P", "-Iinclude", "-Iassets", "-Isrc", "-undef", "-D__sgi", "-D_LANGUAGE_C",
"-DNON_MATCHING", "-DM2CTX", "-D_Static_assert(x, y)=", "-D__attribute__(x)=", in_file]
cpp_command = ["gcc", "-E", "-P", "-undef", "-dM", *CPP_FLAGS, in_file]
cpp_command2 = ["gcc", "-E", "-P", "-undef", *CPP_FLAGS, in_file]
with tempfile.NamedTemporaryFile(suffix=".c") as tmp:
stock_macros = subprocess.check_output(["gcc", "-E", "-P", "-undef", "-dM", tmp.name], cwd=root_dir, encoding="utf-8")
out_text = ""
try:
out_text += subprocess.check_output(cpp_command, cwd=root_dir, encoding="utf-8")
tools/m2ctx2.py
-129
View File
@@ -1,129 +0,0 @@
#!/usr/bin/env python3
import argparse
import os
import sys
import subprocess
import tempfile
from pathlib import Path
script_dir = Path(os.path.dirname(os.path.realpath(__file__)))
root_dir = script_dir / ".."
src_dir = root_dir / "src"
# Project-specific
CPP_FLAGS = [
"-Iinclude",
"-Isrc",
"-Iassets",
"-Ibuild",
"-I.",
"-D__sgi",
"-D_LANGUAGE_C",
"-DNON_MATCHING",
"-D_Static_assert(x, y)=",
"-D__attribute__(x)="
"-D_MIPS_SZLONG=32",
"-ffreestanding",
"-DM2CTX",
"-std=gnu89",
]
# Read through the processes context and replace whatever
def custom_replacements(output):
actorList = []
output = output.splitlines()
i = 0
while i < len(output):
line = output[i]
############### actorLists[2].first -> Player* ###############
if "typedef struct ActorListEntry " in line:
actorListText = ""
i += 1
while not output[i].startswith("}"):
actorListText += output[i]
i += 1
actorCats = [
"actorSwitch",
"bg",
"player",
"explosive",
"npc",
"enemy",
"prop",
"itemAction",
"misc",
"boss",
"door",
"chest",
]
for x in range(12):
actorList.append(actorListText.replace("first;", f"{actorCats[x]};") + "\n")
if x == 2:
actorList[x] = actorList[x].replace("Actor*", "struct Player*")
elif "ActorListEntry actorLists[ACTORCAT_MAX];" in line:
output[i] = "struct {\n" + "".join(actorList) + "};"
########################################################
i += 1
return "\n".join(output)
def import_c_file(in_file) -> str:
in_file = os.path.relpath(in_file, root_dir)
cpp_command = ["gcc", "-E", "-P", "-undef", "-dM", *CPP_FLAGS, in_file]
cpp_command2 = ["gcc", "-E", "-P", "-undef", *CPP_FLAGS, in_file]
with tempfile.NamedTemporaryFile(suffix=".c") as tmp:
stock_macros = subprocess.check_output(["gcc", "-E", "-P", "-undef", "-dM", tmp.name], cwd=root_dir, encoding="utf-8")
out_text = ""
try:
out_text += subprocess.check_output(cpp_command, cwd=root_dir, encoding="utf-8")
out_text += subprocess.check_output(cpp_command2, cwd=root_dir, encoding="utf-8")
except subprocess.CalledProcessError:
print(
"Failed to preprocess input file, when running command:\n"
+ " ".join(cpp_command),
file=sys.stderr,
)
sys.exit(1)
if not out_text:
print("Output is empty - aborting")
sys.exit(1)
for line in stock_macros.strip().splitlines():
out_text = out_text.replace(line + "\n", "")
return out_text
def main():
parser = argparse.ArgumentParser(usage="./m2ctx.py path/to/file.c or ./m2ctx.py (from an actor or gamestate's asm dir)",
description="Creates a ctx.c file for m2c or decomp.me. "
"Output will be saved as ctx.c")
parser.add_argument('filepath', help="path of c file to be processed")
parser.add_argument("--custom", "-c", dest="custom", action="store_true", default=False,
help="Apply custom replacements to the output to help aid m2c output")
args = parser.parse_args()
c_file_path = args.filepath
print("Using file: {}".format(c_file_path))
output = import_c_file(c_file_path)
if args.custom:
output = custom_replacements(output)
ctxPath = root_dir / "ctx.c"
with ctxPath.open("w", encoding="UTF-8") as f:
f.write(output)
if __name__ == "__main__":
main()