mirror of https://github.com/zeldaret/mm.git
Ovl_En_Pametfrog OK with partial documentation (#165)
* Init, 14 of 70 decompiled * En_Pametfrog 26/70 functions decompiled * 35/70 funcs * Fully Matching! * Documentation * Fix merge from master * PR suggestions * minor improvements * Fix functions.h * Oopsie * Oopsie Part 2 * Remove Pametfrog from split_asm.py rodata_excluded * Better use of MACROS + animation docs Co-authored-by: engineer124 <engineer124enginer124@gmail.com>
This commit is contained in:
engineer124
GitHub
parent
e9eb4d4e0a
commit
ae2073e119
|
|
@ -187,7 +187,7 @@ s32 func_80086620(OSMesgQueue* param_1, PadmgrThreadStruct* param_2, OSContStatu
|
|||
// void func_80086AF0(void);
|
||||
// void func_80086B30(void);
|
||||
// void func_80086C18(void);
|
||||
// void func_80086C48(void);
|
||||
f32 func_80086C48(f32 param_1);
|
||||
// void func_80086C70(void);
|
||||
f64 func_80086C7C(f64 param_1);
|
||||
s32 func_80086C88(f32 param_1);
|
||||
|
|
@ -597,25 +597,35 @@ s16 func_800B09D0(s16 a0, s16 a1, f32 a2);
|
|||
u8 func_800B0A24(u8 a0, u8 a1, f32 a2);
|
||||
void EffectSs_DrawGEffect(GlobalContext* globalCtx, EffectSs* this, void* texture);
|
||||
void EffectSsDust_Spawn(GlobalContext* globalCtx, u16 drawFlags, Vec3f* pos, Vec3f* velocity, Vec3f* accel, Color_RGBA8* primColor, Color_RGBA8* envColor, s16 scale, s16 scaleStep, s16 life, u8 updateMode);
|
||||
// void func_800B0DE0(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE4 param_5, UNK_TYPE4 param_6, UNK_TYPE2 param_7, UNK_TYPE2 param_8);
|
||||
// void func_800B0E48(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE4 param_5, UNK_TYPE4 param_6, UNK_TYPE2 param_7, UNK_TYPE2 param_8);
|
||||
// void func_800B0EB0(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE4 param_5, UNK_TYPE4 param_6, UNK_TYPE2 param_7, UNK_TYPE2 param_8, UNK_TYPE2 param_9);
|
||||
// void func_800B0F18(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE4 param_5, UNK_TYPE4 param_6, UNK_TYPE2 param_7, UNK_TYPE2 param_8, UNK_TYPE2 param_9);
|
||||
void func_800B0DE0(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel, Color_RGBA8* primColor,
|
||||
Color_RGBA8* envColor, s16 scale, s16 scaleStep);
|
||||
void func_800B0E48(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel, Color_RGBA8* primColor,
|
||||
Color_RGBA8* envColor, s16 scale, s16 scaleStep);
|
||||
void func_800B0EB0(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel, Color_RGBA8* primColor,
|
||||
Color_RGBA8* envColor, s16 scale, s16 scaleStep, s16 life);
|
||||
void func_800B0F18(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel, Color_RGBA8* primColor,
|
||||
Color_RGBA8* envColor, s16 scale, s16 scaleStep, s16 life);
|
||||
void func_800B0F80(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel, Color_RGBA8* primColor,
|
||||
Color_RGBA8* envColor, s16 scale, s16 scaleStep, s16 life);
|
||||
// void func_800B0FE8(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE4 param_5, UNK_TYPE4 param_6, UNK_TYPE2 param_7, UNK_TYPE2 param_8);
|
||||
// void func_800B1054(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE4 param_5, UNK_TYPE4 param_6, UNK_TYPE2 param_7, UNK_TYPE2 param_8);
|
||||
// void func_800B10C0(void);
|
||||
// void func_800B1130(void);
|
||||
// void func_800B11A0(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE2 param_5, UNK_TYPE2 param_6);
|
||||
// void func_800B1210(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE2 param_5, UNK_TYPE2 param_6);
|
||||
// void func_800B1280(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE2 param_5, UNK_TYPE2 param_6, UNK_TYPE2 param_7);
|
||||
// void func_800B12F0(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE2 param_5, UNK_TYPE2 param_6, UNK_TYPE2 param_7);
|
||||
// void func_800B1360(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE4 param_5, UNK_TYPE4 param_6);
|
||||
// void func_800B139C(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE4 param_5, UNK_TYPE4 param_6);
|
||||
// void func_800B13D8(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE4 param_5);
|
||||
// void func_800B14D4(void);
|
||||
// void func_800B1598(void);
|
||||
void func_800B0FE8(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel, Color_RGBA8* primColor,
|
||||
Color_RGBA8* envColor, s16 scale, s16 scaleStep);
|
||||
void func_800B1054(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel, Color_RGBA8* primColor,
|
||||
Color_RGBA8* envColor, s16 scale, s16 scaleStep);
|
||||
void func_800B10C0(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel);
|
||||
void func_800B1130(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel);
|
||||
void func_800B11A0(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel, s16 scale, s16 scaleStep);
|
||||
void func_800B1210(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel, s16 scale, s16 scaleStep);
|
||||
void func_800B1280(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel, s16 scale, s16 scaleStep,
|
||||
s16 life);
|
||||
void func_800B12F0(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel, s16 scale, s16 scaleStep,
|
||||
s16 life);
|
||||
void func_800B1360(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel, Color_RGBA8* primColor,
|
||||
Color_RGBA8* envColor);
|
||||
void func_800B139C(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel, Color_RGBA8* primColor,
|
||||
Color_RGBA8* envColor);
|
||||
void func_800B13D8(Vec3f* srcPos, f32 randScale, Vec3f* newPos, Vec3f* velocity, Vec3f* accel);
|
||||
void func_800B14D4(GlobalContext* globalCtx, f32 randScale, Vec3f* srcPos);
|
||||
void func_800B1598(GlobalContext* globalCtx, f32 randScale, Vec3f* srcPos);
|
||||
void EffectSsKiraKira_SpawnSmallYellow (GlobalContext * globalCtx, Vec3f * pos, Vec3f * velocity, Vec3f * accel);
|
||||
void EffectSsGSpk_SpawnSmall(GlobalContext* globalCtx, Actor* actor, Vec3f* pos, Vec3f* velocity, Vec3f* accel,
|
||||
Color_RGBA8* primColor, Color_RGBA8* envColor);
|
||||
|
|
@ -770,7 +780,7 @@ float func_800B6FC8(ActorPlayer* player);
|
|||
// void func_800B71DC(void);
|
||||
u32 func_800B7200(s32 param_1);
|
||||
// void func_800B722C(void);
|
||||
// UNK_TYPE4 func_800B724C(GlobalContext* globalCtx, UNK_TYPE4 param_2, u8 param_3);
|
||||
void func_800B724C(GlobalContext* globalCtx, Actor* actor, u8 param_3);
|
||||
u32 func_800B7298(GlobalContext* globalCtx, UNK_TYPE4 param_2, u8 param_3);
|
||||
void func_800B72E0(s32 param_1);
|
||||
void func_800B72F8(DynaPolyActor* dpactor, f32 a1, s16 a2);
|
||||
|
|
@ -858,14 +868,14 @@ void Actor_FreeOverlay(ActorOverlay* entry);
|
|||
Actor* Actor_Spawn(ActorContext* actCtxt, GlobalContext* globalCtx, s16 index, f32 x, f32 y, f32 z, s16 rotX, s16 rotY, s16 rotZ, s16 sParm10);
|
||||
ActorInit* Actor_LoadOverlay(ActorContext* actCtxt, s16 index);
|
||||
Actor* Actor_SpawnWithParentAndCutscene(ActorContext* actCtxt, GlobalContext* globalCtx, s16 index, f32 x, f32 y, f32 z, s16 rotX, s16 rotY, s16 rotZ, s16 variable, u32 cutscene, s32 param_12, Actor* parent);
|
||||
void Actor_SpawnWithParent(ActorContext* actCtxt, Actor* parent, GlobalContext* globalCtx, s16 index, f32 x, f32 y, f32 z, s16 rotX, s16 rotY, s16 rotZ, s16 variable);
|
||||
Actor* Actor_SpawnWithParent(ActorContext* actCtxt, Actor* parent, GlobalContext* globalCtx, s16 index, f32 x, f32 y, f32 z, s16 rotX, s16 rotY, s16 rotZ, s16 variable);
|
||||
void Actor_SpawnTransitionActors(GlobalContext* globalCtx, ActorContext* actCtxt);
|
||||
void func_800BB2D0(ActorContext* aCtxt, u16* param_2, GlobalContext* globalCtx);
|
||||
Actor* func_800BB498(ActorContext* actCtxt, Actor* actor, GlobalContext* globalCtx);
|
||||
// void func_800BB59C(void);
|
||||
// void func_800BB604(void);
|
||||
// void func_800BB8EC(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE4 param_5);
|
||||
void func_800BBA88(GlobalContext* globalCtx, Actor* iParm2);
|
||||
void func_800BBA88(GlobalContext* globalCtx, Actor* actor);
|
||||
// void func_800BBAC0(void);
|
||||
void func_800BBB74(s16* arg1, UNK_TYPE1 arg2, UNK_TYPE1 arg3, UNK_TYPE4 arg4);
|
||||
// void func_800BBC20(void);
|
||||
|
|
@ -875,7 +885,7 @@ void func_800BBFB0(GlobalContext* globalCtx, Vec3f* position, f32 param3, s32 pa
|
|||
void func_800BC154(GlobalContext* globalCtx, ActorContext* actorCtx, Actor* actor, u8 actorCategory);
|
||||
// void func_800BC188(void);
|
||||
// void func_800BC1B4(void);
|
||||
// void func_800BC270(void);
|
||||
Actor* func_800BC270(GlobalContext* globalCtx, Actor* actor, f32 arg2, UNK_TYPE4 arg3);
|
||||
// void func_800BC444(void);
|
||||
// void func_800BC4EC(void);
|
||||
// void func_800BC5B8(void);
|
||||
|
|
@ -886,7 +896,7 @@ void func_800BC154(GlobalContext* globalCtx, ActorContext* actorCtx, Actor* acto
|
|||
// void func_800BC848(void);
|
||||
// void func_800BC8B8(void);
|
||||
// void func_800BCB50(void);
|
||||
// void func_800BCB70(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE2 param_5);
|
||||
void func_800BCB70(Actor* actor, s16 arg1, u8 arg2, u8 arg3, u8 arg4);
|
||||
void func_800BCBF4(Vec3f* uParm1, GlobalContext* globalCtx);
|
||||
void func_800BCC68(Vec3f* param_1, GlobalContext* globalCtx);
|
||||
// void func_800BCCDC(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE4 param_5);
|
||||
|
|
@ -905,17 +915,17 @@ void func_800BDFC0(GlobalContext* globalCtx, Gfx* dl);
|
|||
void func_800BE03C(GlobalContext* globalCtx, Gfx* dl);
|
||||
// void func_800BE0B8(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE4 param_5);
|
||||
// void func_800BE184(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE2 param_5, UNK_TYPE2 param_6);
|
||||
// void func_800BE22C(void);
|
||||
u8 func_800BE22C(Actor* actor);
|
||||
// void func_800BE258(void);
|
||||
// void func_800BE2B8(void);
|
||||
// void func_800BE33C(void);
|
||||
// void func_800BE3D0(void);
|
||||
// void func_800BE504(void);
|
||||
// void func_800BE568(void);
|
||||
// void func_800BE5CC(void);
|
||||
void func_800BE5CC(Actor* actor, ColliderJntSph* collider, UNK_TYPE1 arg2);
|
||||
// void func_800BE63C(void);
|
||||
// void func_800BE680(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE4 param_5, UNK_TYPE4 param_6, UNK_TYPE4 param_7, UNK_TYPE1 param_8);
|
||||
// void func_800BF7CC(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE4 param_5, UNK_TYPE4 param_6, UNK_TYPE4 param_7);
|
||||
void func_800BE680(GlobalContext* globalCtx, Actor* actor, Vec3f* param_3, s32 param_4, f32 param_5, f32 param_6, f32 param_7, u8 mode);
|
||||
void func_800BF7CC(GlobalContext* globalCtx, Actor* actor, Vec3f* arg2, s32 arg3, s32 arg4, f32 arg5, f32 arg6);
|
||||
void ActorOverlayTable_FaultPrint(void* arg0, void* arg1); // ActorOverlayTable_FaultPrint
|
||||
void* ActorOverlayTable_FaultAddrConv(void* arg0, void* arg1); // ActorOverlayTable_FaultAddrConv
|
||||
void ActorOverlayTable_Init(void); // ActorOverlayTable_Init
|
||||
|
|
@ -3029,7 +3039,7 @@ void func_80169590(GlobalContext* globalCtx, s16 param_2, s16 param_3);
|
|||
void func_80169600(GlobalContext* globalCtx, s16 param_2);
|
||||
// void func_80169668(void);
|
||||
Camera* Play_GetCamera(GlobalContext* globalCtx, s16 index);
|
||||
// void func_8016970C(void);
|
||||
s32 func_8016970C(GlobalContext* globalCtx, s16 camId, Vec3f* focalPoint, Vec3f* eye);
|
||||
// void func_8016981C(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE4 param_5);
|
||||
// void func_80169940(void);
|
||||
// void func_80169988(void);
|
||||
|
|
@ -3912,8 +3922,8 @@ void func_801A246C(u8 param_1, u8 param_2);
|
|||
// void func_801A2C88(void);
|
||||
// void func_801A2D54(void);
|
||||
s32 func_801A2DE0(UNK_TYPE4 arg1);
|
||||
// void func_801A2E54(void);
|
||||
// void func_801A2ED8(void);
|
||||
void func_801A2E54(s32 param_1);
|
||||
void func_801A2ED8(void);
|
||||
// void func_801A2F88(void);
|
||||
// void func_801A3000(void);
|
||||
// void func_801A3038(void);
|
||||
|
|
|
|||
|
|
@ -913,9 +913,9 @@ SECTIONS
|
|||
ovl_En_Pametfrog : AT(RomLocation)
|
||||
{
|
||||
build/src/overlays/actors/ovl_En_Pametfrog/z_en_pametfrog.o(.text)
|
||||
build/asm/overlays/ovl_En_Pametfrog_data.o(.data)
|
||||
build/src/overlays/actors/ovl_En_Pametfrog/z_en_pametfrog.o(.data)
|
||||
build/src/overlays/actors/ovl_En_Pametfrog/z_en_pametfrog.o(.rodata)
|
||||
build/asm/overlays/ovl_En_Pametfrog_rodata.o(.rodata)
|
||||
build/src/overlays/actors/ovl_En_Pametfrog/z_en_pametfrog_overlay.o(.ovl)
|
||||
}
|
||||
SegmentEnd = .;
|
||||
SegmentSize = SegmentEnd - SegmentStart;
|
||||
|
|
|
|||
|
|
@ -158,6 +158,29 @@ D_06000E50 = 0x06000E50;
|
|||
D_06007908 = 0x06007908;
|
||||
D_060011C0 = 0x060011C0;
|
||||
|
||||
/* en_pametfrog */
|
||||
D_06000994 = 0x06000994;
|
||||
D_06001B08 = 0x06001B08;
|
||||
D_06001E14 = 0x06001E14;
|
||||
D_06001F20 = 0x06001F20;
|
||||
D_060030E4 = 0x060030E4;
|
||||
D_0600347C = 0x0600347C;
|
||||
D_060039C4 = 0x060039C4;
|
||||
D_06003F28 = 0x06003F28;
|
||||
D_06004298 = 0x06004298;
|
||||
D_06004680 = 0x06004680;
|
||||
D_06004894 = 0x06004894;
|
||||
D_06004D50 = 0x06004D50;
|
||||
D_060050B8 = 0x060050B8;
|
||||
D_060052EC = 0x060052EC;
|
||||
D_06005694 = 0x06005694;
|
||||
D_06005D54 = 0x06005D54;
|
||||
D_060066B4 = 0x060066B4;
|
||||
D_060070C4 = 0x060070C4;
|
||||
D_0600DF98 = 0x0600DF98;
|
||||
D_0600F990 = 0x0600F990;
|
||||
D_0600F048 = 0x0600F048;
|
||||
|
||||
/* z_en_dy_extra */
|
||||
D_0600DD40 = 0x0600DD40;
|
||||
D_0600DEF0 = 0x0600DEF0;
|
||||
|
|
|
|||
|
|
@ -7,7 +7,9 @@ struct EnBigpamet;
|
|||
|
||||
typedef struct EnBigpamet {
|
||||
/* 0x000 */ Actor actor;
|
||||
/* 0x144 */ char unk_144[0x488];
|
||||
/* 0x144 */ char unk_144[0x168];
|
||||
/* 0x2AC */ f32 unk_2AC;
|
||||
/* 0x2B0 */ char unk_2B0[0x31C];
|
||||
} EnBigpamet; // size = 0x5CC
|
||||
|
||||
extern const ActorInit En_Bigpamet_InitVars;
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -5,9 +5,47 @@
|
|||
|
||||
struct EnPametfrog;
|
||||
|
||||
typedef void (*EnPametfrogActionFunc)(struct EnPametfrog*, GlobalContext*);
|
||||
|
||||
typedef enum {
|
||||
/* 0x0 */ ENPAMETFROG_PRE_SNAPPER,
|
||||
/* 0x1 */ ENPAMETFROG_GET_SNAPPER,
|
||||
/* 0x2 */ ENPAMETFROG_INIT_SNAPPER,
|
||||
/* 0x3 */ ENPAMETFROG_ON_SNAPPER,
|
||||
/* 0x4 */ ENPAMETFROG_REAR_ON_SNAPPER,
|
||||
/* 0x5 */ ENPAMETFROG_CUTSCENE,
|
||||
/* 0x6 */ ENPAMETFROG_FALL_OFF_SNAPPER,
|
||||
/* 0x7 */ ENPAMETFROG_RETURN_TO_SNAPPER,
|
||||
/* 0x8 */ ENPAMETFROG_JUMP_ON_SNAPPER,
|
||||
/* 0x9 */ ENPAMETFROG_DEFEAT,
|
||||
} EnPametfrogState;
|
||||
|
||||
typedef struct EnPametfrog {
|
||||
/* 0x000 */ Actor actor;
|
||||
/* 0x144 */ char unk_144[0x2E0];
|
||||
/* 0x144 */ SkelAnime skelAnime;
|
||||
/* 0x188 */ Vec3s limbDrawTable[24];
|
||||
/* 0x218 */ Vec3s transitionDrawTable[24];
|
||||
/* 0x2A8 */ EnPametfrogActionFunc actionFunc;
|
||||
/* 0x2AC */ u8 mode; // 0/10/20/30
|
||||
/* 0x2AD */ u8 wallPauseTimer; // Gekko stops 10 times along wall/ceiling after being blown off of Snapper
|
||||
/* 0x2AE */ u8 unk_2AE; // True/False
|
||||
/* 0x2B0 */ s16 cutscene;
|
||||
/* 0x2B2 */ s16 params;
|
||||
/* 0x2B4 */ s16 quake;
|
||||
/* 0x2B6 */ s16 timer;
|
||||
/* 0x2B8 */ s16 yaw;
|
||||
/* 0x2BA */ s16 camId;
|
||||
/* 0x2BC */ s16 freezeTimer;
|
||||
/* 0x2C0 */ f32 wallRotation;
|
||||
/* 0x2C4 */ f32 unk_2C4;
|
||||
/* 0x2C8 */ f32 unk_2C8;
|
||||
/* 0x2CC */ f32 unk_2CC;
|
||||
/* 0x2D0 */ Vec3f unk_2D0; // MtxF zx/zy/zz
|
||||
/* 0x2DC */ Vec3f unk_2DC; // MtxF yx/yy/yz: wallNorm/floorNorm/Base of Gekko walking???
|
||||
/* 0x2E8 */ Vec3f unk_2E8; // MtxF xx/xy/xz
|
||||
/* 0x2F4 */ Vec3f unk_2F4[12];
|
||||
/* 0x384 */ ColliderJntSph collider;
|
||||
/* 0x3A4 */ ColliderJntSphElement colElement[2];
|
||||
} EnPametfrog; // size = 0x424
|
||||
|
||||
extern const ActorInit En_Pametfrog_InitVars;
|
||||
|
|
|
|||
|
|
@ -5003,73 +5003,73 @@
|
|||
0x808698F4:("EnBox_Draw",),
|
||||
0x80869D90:("EnPametfrog_Init",),
|
||||
0x80869F90:("EnPametfrog_Destroy",),
|
||||
0x80869FBC:("func_80869FBC",),
|
||||
0x80869FBC:("EnPametfrog_Vec3fNormalize",),
|
||||
0x8086A024:("func_8086A024",),
|
||||
0x8086A068:("func_8086A068",),
|
||||
0x8086A0F4:("func_8086A0F4",),
|
||||
0x8086A1A0:("func_8086A1A0",),
|
||||
0x8086A0F4:("EnPametfrog_JumpWaterEffects",),
|
||||
0x8086A1A0:("EnPametfrog_IdleWaterEffects",),
|
||||
0x8086A238:("func_8086A238",),
|
||||
0x8086A2CC:("func_8086A2CC",),
|
||||
0x8086A428:("func_8086A428",),
|
||||
0x8086A4E4:("func_8086A4E4",),
|
||||
0x8086A554:("func_8086A554",),
|
||||
0x8086A6B0:("func_8086A6B0",),
|
||||
0x8086A428:("EnPametfrog_ShakeCamera",),
|
||||
0x8086A4E4:("EnPametfrog_StopCutscene",),
|
||||
0x8086A554:("EnPametfrog_PlaceSnapper",),
|
||||
0x8086A6B0:("EnPametfrog_JumpOnGround",),
|
||||
0x8086A724:("func_8086A724",),
|
||||
0x8086A80C:("func_8086A80C",),
|
||||
0x8086A878:("func_8086A878",),
|
||||
0x8086A8C0:("func_8086A8C0",),
|
||||
0x8086A964:("func_8086A964",),
|
||||
0x8086AA60:("func_8086AA60",),
|
||||
0x8086AAA8:("func_8086AAA8",),
|
||||
0x8086AB04:("func_8086AB04",),
|
||||
0x8086AB68:("func_8086AB68",),
|
||||
0x8086AC0C:("func_8086AC0C",),
|
||||
0x8086AD34:("func_8086AD34",),
|
||||
0x8086AE48:("func_8086AE48",),
|
||||
0x8086AEC8:("func_8086AEC8",),
|
||||
0x8086AFC8:("func_8086AFC8",),
|
||||
0x8086B140:("func_8086B140",),
|
||||
0x8086B478:("func_8086B478",),
|
||||
0x8086B570:("func_8086B570",),
|
||||
0x8086B66C:("func_8086B66C",),
|
||||
0x8086B794:("func_8086B794",),
|
||||
0x8086B864:("func_8086B864",),
|
||||
0x8086B8CC:("func_8086B8CC",),
|
||||
0x8086B9D0:("func_8086B9D0",),
|
||||
0x8086BA6C:("func_8086BA6C",),
|
||||
0x8086BB4C:("func_8086BB4C",),
|
||||
0x8086BB9C:("func_8086BB9C",),
|
||||
0x8086BBE0:("func_8086BBE0",),
|
||||
0x8086BDA8:("func_8086BDA8",),
|
||||
0x8086BE60:("func_8086BE60",),
|
||||
0x8086BEEC:("func_8086BEEC",),
|
||||
0x8086BF90:("func_8086BF90",),
|
||||
0x8086C088:("func_8086C088",),
|
||||
0x8086C0CC:("func_8086C0CC",),
|
||||
0x8086C1AC:("func_8086C1AC",),
|
||||
0x8086C274:("func_8086C274",),
|
||||
0x8086C4B8:("func_8086C4B8",),
|
||||
0x8086C5A8:("func_8086C5A8",),
|
||||
0x8086C618:("func_8086C618",),
|
||||
0x8086C6D0:("func_8086C6D0",),
|
||||
0x8086C72C:("func_8086C72C",),
|
||||
0x8086C7C8:("func_8086C7C8",),
|
||||
0x8086C81C:("func_8086C81C",),
|
||||
0x8086C94C:("func_8086C94C",),
|
||||
0x8086C99C:("func_8086C99C",),
|
||||
0x8086A8C0:("EnPametfrog_SetupRearOnSnapper",),
|
||||
0x8086A964:("EnPametfrog_RearOnSnapper",),
|
||||
0x8086AA60:("EnPametfrog_SetupRearOnSnapperWave",),
|
||||
0x8086AAA8:("EnPametfrog_RearOnSnapperWave",),
|
||||
0x8086AB04:("EnPametfrog_SetupRearOnSnapperRise",),
|
||||
0x8086AB68:("EnPametfrog_RearOnSnapperRise",),
|
||||
0x8086AC0C:("EnPametfrog_SetupFallOffSnapper",),
|
||||
0x8086AD34:("EnPametfrog_FallOffSnapper",),
|
||||
0x8086AE48:("EnPametfrog_SetupJumpToWall",),
|
||||
0x8086AEC8:("EnPametfrog_JumpToWall",),
|
||||
0x8086AFC8:("EnPametfrog_SetupWallCrawl",),
|
||||
0x8086B140:("EnPametfrog_WallCrawl",),
|
||||
0x8086B478:("EnPametfrog_SetupWallPause",),
|
||||
0x8086B570:("EnPametfrog_WallPause",),
|
||||
0x8086B66C:("EnPametfrog_SetupClimbDownWall",),
|
||||
0x8086B794:("EnPametfrog_ClimbDownWall",),
|
||||
0x8086B864:("EnPametfrog_SetupRunToSnapper",),
|
||||
0x8086B8CC:("EnPametfrog_RunToSnapper",),
|
||||
0x8086B9D0:("EnPametfrog_SetupJumpOnSnapper",),
|
||||
0x8086BA6C:("EnPametfrog_JumpOnSnapper",),
|
||||
0x8086BB4C:("EnPametfrog_SetupLandOnSnapper",),
|
||||
0x8086BB9C:("EnPametfrog_LandOnSnapper",),
|
||||
0x8086BBE0:("EnPametfrog_SetupFallInAir",),
|
||||
0x8086BDA8:("EnPametfrog_FallInAir",),
|
||||
0x8086BE60:("EnPametfrog_SetupFallOnGround",),
|
||||
0x8086BEEC:("EnPametfrog_FallOnGround",),
|
||||
0x8086BF90:("EnPametfrog_SetupDefeatGekko",),
|
||||
0x8086C088:("EnPametfrog_DefeatGekko",),
|
||||
0x8086C0CC:("EnPametfrog_SetupDefeatSnapper",),
|
||||
0x8086C1AC:("EnPametfrog_DefeatSnapper",),
|
||||
0x8086C274:("EnPametfrog_SetupSpawnFrog",),
|
||||
0x8086C4B8:("EnPametfrog_SpawnFrog",),
|
||||
0x8086C5A8:("EnPametfrog_SetupCutscene",),
|
||||
0x8086C618:("EnPametfrog_PlayCutscene",),
|
||||
0x8086C6D0:("EnPametfrog_SetupLookAround",),
|
||||
0x8086C72C:("EnPametfrog_LookAround",),
|
||||
0x8086C7C8:("EnPametfrog_SetupJumpToLink",),
|
||||
0x8086C81C:("EnPametfrog_JumpToLink",),
|
||||
0x8086C94C:("EnPametfrog_SetupMeleeAttack",),
|
||||
0x8086C99C:("EnPametfrog_MeleeAttack",),
|
||||
0x8086CB4C:("func_8086CB4C",),
|
||||
0x8086CC04:("func_8086CC04",),
|
||||
0x8086CC84:("func_8086CC84",),
|
||||
0x8086CD04:("func_8086CD04",),
|
||||
0x8086CD6C:("func_8086CD6C",),
|
||||
0x8086CEB4:("func_8086CEB4",),
|
||||
0x8086CEF0:("func_8086CEF0",),
|
||||
0x8086D084:("func_8086D084",),
|
||||
0x8086D140:("func_8086D140",),
|
||||
0x8086D1E8:("func_8086D1E8",),
|
||||
0x8086D230:("func_8086D230",),
|
||||
0x8086CD6C:("EnPametfrog_SetupCallSnapper",),
|
||||
0x8086CEB4:("EnPametfrog_CallSnapper",),
|
||||
0x8086CEF0:("EnPametfrog_SetupSnapperSpawn",),
|
||||
0x8086D084:("EnPametfrog_SnapperSpawn",),
|
||||
0x8086D140:("EnPametfrog_SetupTransitionGekkoSnapper",),
|
||||
0x8086D1E8:("EnPametfrog_TransitionGekkoSnapper",),
|
||||
0x8086D230:("EnPametfrog_ApplyDamage",),
|
||||
0x8086D4C0:("EnPametfrog_Update",),
|
||||
0x8086D730:("func_8086D730",),
|
||||
0x8086D730:("EnPametfrog_PostLimbDraw",),
|
||||
0x8086D898:("EnPametfrog_Draw",),
|
||||
0x8086DE20:("EnOkuta_Init",),
|
||||
0x8086E058:("EnOkuta_Destroy",),
|
||||
|
|
|
|||
|
|
@ -5895,7 +5895,6 @@
|
|||
0x8086D9C8:("D_8086D9C8","UNK_TYPE1","",0x1),
|
||||
0x8086D9D8:("D_8086D9D8","UNK_TYPE1","",0x1),
|
||||
0x8086D9E0:("D_8086D9E0","UNK_TYPE1","",0x1),
|
||||
0x8086D9F0:("D_8086D9F0","UNK_TYPE1","",0x1),
|
||||
0x8086DA04:("D_8086DA04","UNK_TYPE1","",0x1),
|
||||
0x8086DA10:("D_8086DA10","UNK_TYPE1","",0x1),
|
||||
0x8086DA14:("D_8086DA14","UNK_TYPE1","",0x1),
|
||||
|
|
|
|||
|
|
@ -172,7 +172,7 @@ def split_asm_and_rodata():
|
|||
for name in file_names:
|
||||
f.write('\n#pragma GLOBAL_ASM("{}")\n'.format(name))
|
||||
|
||||
rodata_excluded = ["ovl_Bg_Dkjail_Ivy", "ovl_Bg_Ikana_Mirror", "ovl_Boss_02", "ovl_Boss_07", "ovl_Boss_Hakugin", "ovl_Elf_Msg", "ovl_Elf_Msg2", "ovl_Elf_Msg3", "ovl_Elf_Msg4", "ovl_Elf_Msg5", "ovl_En_Az", "ovl_En_Bigokuta", "ovl_En_Bigpamet", "ovl_En_Bigpo", "ovl_En_Bigslime", "ovl_En_Box", "ovl_En_Butte", "ovl_En_Col_Man", "ovl_En_Crow", "ovl_En_Death", "ovl_En_Elf", "ovl_En_Elforg", "ovl_En_Encount3", "ovl_En_Encount4", "ovl_En_Fish", "ovl_En_Fish2", "ovl_En_Fsn", "ovl_En_Honotrap", "ovl_En_Horse", "ovl_En_Horse_Game", "ovl_En_Invadepoh", "ovl_En_Ishi", "ovl_En_Kame", "ovl_En_Kanban", "ovl_En_Kusa2", "ovl_En_M_Thunder", "ovl_En_Maruta", "ovl_En_Mushi2", "ovl_En_Okuta", "ovl_En_Ossan", "ovl_En_Pametfrog", "ovl_En_Peehat", "ovl_En_Rg", "ovl_En_Ruppecrow", "ovl_En_Slime", "ovl_En_Sob1", "ovl_En_Syateki_Man", "ovl_En_Test7", "ovl_En_Trt", "ovl_En_Wiz_Fire", "ovl_Mir_Ray", "ovl_Obj_Bombiwa", "ovl_Obj_Driftice", "ovl_Obj_Hariko", "ovl_Obj_Iceblock", "ovl_Obj_Mure", "ovl_Obj_Snowball2", "ovl_Obj_Toudai", "ovl_select"]
|
||||
rodata_excluded = ["ovl_Bg_Dkjail_Ivy", "ovl_Bg_Ikana_Mirror", "ovl_Boss_02", "ovl_Boss_07", "ovl_Boss_Hakugin", "ovl_Elf_Msg", "ovl_Elf_Msg2", "ovl_Elf_Msg3", "ovl_Elf_Msg4", "ovl_Elf_Msg5", "ovl_En_Az", "ovl_En_Bigokuta", "ovl_En_Bigpamet", "ovl_En_Bigpo", "ovl_En_Bigslime", "ovl_En_Box", "ovl_En_Butte", "ovl_En_Col_Man", "ovl_En_Crow", "ovl_En_Death", "ovl_En_Elf", "ovl_En_Elforg", "ovl_En_Encount3", "ovl_En_Encount4", "ovl_En_Fish", "ovl_En_Fish2", "ovl_En_Fsn", "ovl_En_Honotrap", "ovl_En_Horse", "ovl_En_Horse_Game", "ovl_En_Invadepoh", "ovl_En_Ishi", "ovl_En_Kame", "ovl_En_Kanban", "ovl_En_Kusa2", "ovl_En_M_Thunder", "ovl_En_Maruta", "ovl_En_Mushi2", "ovl_En_Okuta", "ovl_En_Ossan", "ovl_En_Peehat", "ovl_En_Rg", "ovl_En_Ruppecrow", "ovl_En_Slime", "ovl_En_Sob1", "ovl_En_Syateki_Man", "ovl_En_Test7", "ovl_En_Trt", "ovl_En_Wiz_Fire", "ovl_Mir_Ray", "ovl_Obj_Bombiwa", "ovl_Obj_Driftice", "ovl_Obj_Hariko", "ovl_Obj_Iceblock", "ovl_Obj_Mure", "ovl_Obj_Snowball2", "ovl_Obj_Toudai", "ovl_select"]
|
||||
rodata_included = ["z_en_item00"]
|
||||
|
||||
if __name__ == '__main__':
|
||||
|
|
|
|||
Loading…
Reference in New Issue