mirror of
https://github.com/izzy2lost/2ship2harkinian-Android.git
synced 2026-06-19 01:20:08 -07:00
EnBigpo (Big Poh) (#250)
* EnBigpo: start * EnBigpo: uhh, this struct is weird * EnBigpo: progress * EnBigpo: so many of these functions are tiny * EnBigpo nasty four loop function * EnBigpo: hate draw functions * EnBigpo: all functions attempted * EnBigpo: data migrated, does not OK, 2 bytes off... * Multi: Attempting to OK, issues * EnBigpo: more docs * EnBigpo: more docs2 * EnBigpo: more docs and cleaning * EnBigpo: removed data to try to find the issues, matched a draw function thanks to Tharo * EnBigpo: progress? maybe not * EnBigpo: matched another function * EnBigpo: overwrite limbdraw matches now * EnBigpo: one more nonmatching rejected * EnBigPo: not actual progress, probably * Match Init, down to single stack pointer on second func * EnBigPo OK * EnBigpo: docs and cleaning * EnBigpo: more docs and cleaning * EnBigpo: back to OK with no warnings * EnBigpo: more docs and cleaning * EnBigpo: docs and cleaning * EnBigpo: hmm, rename_sym doesn't like renaming system functions but I'm 98% sure I know what these are * Multiple: changed some function names, maybe changed too much... hmm * EnBigpo: even more changes to docs * EnBigpo: formater pass * EnBigpo: small fixes * EnBigpo: c file description * Apply suggestions from code review Apply camera suggestions from eng124 Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * EnBigpo: updating all requested changes and reverting one incorrect macro * Apply suggestions from code review Some of eng124's recommendations, need to add the last by hand Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * EnBigpo: back to OK * EnBigpo: Minor cleanup changes * Functions fixed: added function changes to actorfixer and fixed dinofos * EnBigpo: BINANG_ROT180 * Apply suggestions from code review First batch of requested changes, the simpler ones that shouldn't require checking Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com> * EnBigpo: fixes to recommended changes, back to OK * EnBigpo: move idleTimer docs out of struct * Sprite: removed old commented out pragma, it matches, I still dont get it * EnBigpo: more changes I had to check first * EnBigpo: more requested changes, and some macro uses found * EnBigpo: forgot a requested change * Update src/overlays/actors/ovl_En_Bigpo/z_en_bigpo.c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Apply suggestions from code review Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * EnBigPo: missed a disphead array access * Apply suggestions from code review More requested changes Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * EnBigpo: more hex to dec * EnBigpo: more hex to dec 2 * Update src/overlays/actors/ovl_En_Bigpo/z_en_bigpo.c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Update include/functions.h Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * EnBigpo: build being weird * EnBigpo: weird, rename_sym didn't catch this earlier * Tools: fixed actorfixer to use Play_CameraSetAtEye forgot I blew this change away trying to get build again, * Update src/overlays/actors/ovl_En_Bigpo/z_en_bigpo.h Co-authored-by: Kenix3 <kenixwhisperwind@gmail.com> * EnBigpo: cutscene functions changed name to indicate they are stages * EnBigpo: Rename Particles to Effect * EnBigpo: changed draw function names, changed function comment format * EnBigpo: renamed limbdraw functions, formater pass Co-authored-by: isghj8 <isghj8@gmail.com> Co-authored-by: engineer124 <engineer124engineer124@gmail.com> Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com> Co-authored-by: Kenix3 <kenixwhisperwind@gmail.com>
This commit is contained in:
Isghj
co-authored by
isghj8
engineer124
engineer124
Anghelo Carvajal
Kenix3
isghj8
engineer124
engineer124
Anghelo Carvajal
Kenix3
parent
e1cb76c258
commit
f21f393fcc
@@ -16,6 +16,10 @@ animdict ={
|
||||
"func_8012404c": "Player_RemoveMask",
|
||||
"Actor_SpawnWithParentAndCutscene": "Actor_SpawnAsChildAndCutscene",
|
||||
"Actor_SpawnWithParent": "Actor_SpawnAsChild",
|
||||
"func_800BE22C": "Actor_ApplyDamage",
|
||||
"func_800F0568": "Audio_PlaySoundAtPosition",
|
||||
"func_8016970C": "Play_CameraSetAtEye",
|
||||
"func_800BBA88": "Enemy_StartFinishingBlow",
|
||||
}
|
||||
|
||||
def replace_anim(file):
|
||||
|
||||
+42
-42
@@ -843,7 +843,7 @@
|
||||
0x800BB59C:("func_800BB59C",),
|
||||
0x800BB604:("func_800BB604",),
|
||||
0x800BB8EC:("func_800BB8EC",),
|
||||
0x800BBA88:("func_800BBA88",),
|
||||
0x800BBA88:("Enemy_StartFinishingBlow",),
|
||||
0x800BBAC0:("func_800BBAC0",),
|
||||
0x800BBB74:("func_800BBB74",),
|
||||
0x800BBC20:("func_800BBC20",),
|
||||
@@ -884,7 +884,7 @@
|
||||
0x800BE03C:("func_800BE03C",),
|
||||
0x800BE0B8:("func_800BE0B8",),
|
||||
0x800BE184:("func_800BE184",),
|
||||
0x800BE22C:("func_800BE22C",),
|
||||
0x800BE22C:("Actor_ApplyDamage",),
|
||||
0x800BE258:("func_800BE258",),
|
||||
0x800BE2B8:("func_800BE2B8",),
|
||||
0x800BE33C:("func_800BE33C",),
|
||||
@@ -1613,7 +1613,7 @@
|
||||
0x800F0390:("func_800F0390",),
|
||||
0x800F03C0:("func_800F03C0",),
|
||||
0x800F048C:("func_800F048C",),
|
||||
0x800F0568:("func_800F0568",),
|
||||
0x800F0568:("Audio_PlaySoundAtPosition",),
|
||||
0x800F0590:("func_800F0590",),
|
||||
0x800F05C0:("func_800F05C0",),
|
||||
0x800F07C0:("func_800F07C0",),
|
||||
@@ -3012,7 +3012,7 @@
|
||||
0x80169600:("func_80169600",),
|
||||
0x80169668:("func_80169668",),
|
||||
0x801696D4:("Play_GetCamera",),
|
||||
0x8016970C:("func_8016970C",),
|
||||
0x8016970C:("Play_CameraSetAtEye",),
|
||||
0x8016981C:("func_8016981C",),
|
||||
0x80169940:("func_80169940",),
|
||||
0x80169988:("func_80169988",),
|
||||
@@ -14168,8 +14168,8 @@
|
||||
0x80B61914:("func_80B61914",),
|
||||
0x80B619B4:("func_80B619B4",),
|
||||
0x80B619FC:("func_80B619FC",),
|
||||
0x80B61AC8:("func_80B61AC8",),
|
||||
0x80B61AF8:("func_80B61AF8",),
|
||||
0x80B61AC8:("EnBigPo_InitWellBigPo",),
|
||||
0x80B61AF8:("EnBigPo_WellWaitForProximity",),
|
||||
0x80B61B38:("func_80B61B38",),
|
||||
0x80B61B70:("func_80B61B70",),
|
||||
0x80B61C04:("func_80B61C04",),
|
||||
@@ -14180,40 +14180,40 @@
|
||||
0x80B61F04:("func_80B61F04",),
|
||||
0x80B62034:("func_80B62034",),
|
||||
0x80B62084:("func_80B62084",),
|
||||
0x80B62154:("func_80B62154",),
|
||||
0x80B621CC:("func_80B621CC",),
|
||||
0x80B622E4:("func_80B622E4",),
|
||||
0x80B623BC:("func_80B623BC",),
|
||||
0x80B624F4:("func_80B624F4",),
|
||||
0x80B6259C:("func_80B6259C",),
|
||||
0x80B6275C:("func_80B6275C",),
|
||||
0x80B627B4:("func_80B627B4",),
|
||||
0x80B62814:("func_80B62814",),
|
||||
0x80B62830:("func_80B62830",),
|
||||
0x80B62900:("func_80B62900",),
|
||||
0x80B62920:("func_80B62920",),
|
||||
0x80B629E4:("func_80B629E4",),
|
||||
0x80B62A68:("func_80B62A68",),
|
||||
0x80B62AD4:("func_80B62AD4",),
|
||||
0x80B62B10:("func_80B62B10",),
|
||||
0x80B62E38:("func_80B62E38",),
|
||||
0x80B62F10:("func_80B62F10",),
|
||||
0x80B62FCC:("func_80B62FCC",),
|
||||
0x80B631F8:("func_80B631F8",),
|
||||
0x80B63264:("func_80B63264",),
|
||||
0x80B632BC:("func_80B632BC",),
|
||||
0x80B6330C:("func_80B6330C",),
|
||||
0x80B633E8:("func_80B633E8",),
|
||||
0x80B63410:("func_80B63410",),
|
||||
0x80B62154:("EnBigPo_SetupWarpOut",),
|
||||
0x80B621CC:("EnBigPo_WarpingOut",),
|
||||
0x80B622E4:("EnBigPo_SetupWarpIn",),
|
||||
0x80B623BC:("EnBigPo_WarpingIn",),
|
||||
0x80B624F4:("EnBigPo_SetupIdleFlying",),
|
||||
0x80B6259C:("EnBigPo_IdleFlying",),
|
||||
0x80B6275C:("EnBigPo_SetupSpinUp",),
|
||||
0x80B627B4:("EnBigPo_SpinningUp",),
|
||||
0x80B62814:("EnBigPo_SetupSpinAttack",),
|
||||
0x80B62830:("EnBigPo_SpinAttack",),
|
||||
0x80B62900:("EnBigPo_SetupSpinDown",),
|
||||
0x80B62920:("EnBigPo_SpinningDown",),
|
||||
0x80B629E4:("EnBigPo_HitStun",),
|
||||
0x80B62A68:("EnBigPo_CheckHealth",),
|
||||
0x80B62AD4:("EnBigPo_SetupDeath",),
|
||||
0x80B62B10:("EnBigPo_BurnAwayDeath",),
|
||||
0x80B62E38:("EnBigPo_SetupLanternDrop",),
|
||||
0x80B62F10:("EnBigPo_LanternFalling",),
|
||||
0x80B62FCC:("EnBigPo_AdjustPoAlpha",),
|
||||
0x80B631F8:("EnBigPo_SpawnScoopSoul",),
|
||||
0x80B63264:("EnBigPo_ScoopSoulAppearing",),
|
||||
0x80B632BC:("EnBigPo_SetupScoopSoulIdle",),
|
||||
0x80B6330C:("EnBigPo_ScoopSoulIdle",),
|
||||
0x80B633E8:("EnBigPo_ScoopSoulStartLeaving",),
|
||||
0x80B63410:("EnBigPo_ScoopSoulFadingAway",),
|
||||
0x80B63450:("func_80B63450",),
|
||||
0x80B63474:("func_80B63474",),
|
||||
0x80B636D0:("func_80B636D0",),
|
||||
0x80B636E4:("func_80B636E4",),
|
||||
0x80B63474:("EnBigPo_SelectRandomFireLocations",),
|
||||
0x80B636D0:("EnBigPo_ChangeToFireCounting",),
|
||||
0x80B636E4:("EnBigPo_FireCounting",),
|
||||
0x80B63758:("func_80B63758",),
|
||||
0x80B6382C:("func_80B6382C",),
|
||||
0x80B6383C:("func_80B6383C",),
|
||||
0x80B63854:("func_80B63854",),
|
||||
0x80B63888:("func_80B63888",),
|
||||
0x80B6382C:("EnBigpo_DoNothing",),
|
||||
0x80B6383C:("EnBigPo_InitHiddenFire",),
|
||||
0x80B63854:("EnBigPo_WaitingForDampe",),
|
||||
0x80B63888:("EnBigpo_Die",),
|
||||
0x80B638AC:("func_80B638AC",),
|
||||
0x80B638D4:("func_80B638D4",),
|
||||
0x80B63964:("func_80B63964",),
|
||||
@@ -14224,11 +14224,11 @@
|
||||
0x80B63D0C:("func_80B63D0C",),
|
||||
0x80B63D88:("func_80B63D88",),
|
||||
0x80B63ED4:("EnBigpo_Update",),
|
||||
0x80B64190:("func_80B64190",),
|
||||
0x80B641E8:("func_80B641E8",),
|
||||
0x80B64240:("func_80B64240",),
|
||||
0x80B64190:("EnBigPo_UpdateFire",),
|
||||
0x80B641E8:("EnBigPo_OverrideLimbDraw2",),
|
||||
0x80B64240:("EnBigPo_PostLimbDraw2",),
|
||||
0x80B64470:("func_80B64470",),
|
||||
0x80B6467C:("func_80B6467C",),
|
||||
0x80B6467C:("EnBigPo_DrawScoopSoul",),
|
||||
0x80B64880:("func_80B64880",),
|
||||
0x80B64B08:("func_80B64B08",),
|
||||
0x80B64DFC:("func_80B64DFC",),
|
||||
|
||||
Reference in New Issue
Block a user