From 3bd5a9d91e4496405d2140fa3b92d663c40ec3c7 Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Thu, 20 Jan 2022 08:08:24 -0500 Subject: [PATCH] Goods and Services (misc decomp PR from eth number 335) (#629) * an end func * 2nd segment bss file added * hud_element work * some renaming, set_hud_element_scale * 2 hud_element funcz * remove more unneeded undefined_syms * bss 3, PR comments * fx_134 * func_80200080 * 4 funx * fix shtuff * a func * create_actor * func_80263064 * initialize_battle, some stuff, and cleanup * clean * NL --- include/common_structs.h | 68 +- include/effects.h | 21 +- include/functions.h | 3 + include/macros.h | 1 + include/variables.h | 1 + src/167570.c | 13 +- src/16F740.c | 23 +- src/16c8e0.c | 123 +++- src/182B30.c | 21 +- src/190B20.c | 462 ++++++++++++- src/1A5830.c | 47 +- src/316a70.c | 43 +- src/E20110.c | 44 +- src/battle/area_arn/actor/hyper_cleft.c | 2 +- src/battle/area_arn/actor/hyper_paragoomba.c | 8 +- src/battle/area_arn/actor/hypergoomba.c | 2 +- src/battle/area_arn/actor/tubba_blubba.c | 2 +- src/battle/area_arn/actor/tubbas_heart.c | 4 +- src/battle/area_dgb/actor/clubba.c | 3 +- src/battle/area_dgb/actor/tubba_blubba.c | 2 +- src/battle/area_hos/actor/ember.c | 15 +- src/battle/area_hos/actor/goombario_tutor.c | 2 +- src/battle/area_hos/actor/magikoopa.c | 15 +- .../area_isk_part_1/actor/buzzy_beetle.c | 3 +- .../area_isk_part_1/actor/pokey_mummy.c | 12 +- .../area_isk_part_1/actor/stone_chomp.c | 20 +- src/battle/area_isk_part_1/actor/swooper.c | 3 +- .../area_isk_part_2/actor/chain_chomp.c | 2 +- src/battle/area_isk_part_2/actor/tutankoopa.c | 3 +- src/battle/area_iwa/actor/buzzar.c | 10 +- src/battle/area_iwa/actor/cleft.c | 2 +- src/battle/area_iwa/actor/monty_mole.c | 8 +- src/battle/area_iwa/actor/whacka.c | 2 +- src/battle/area_iwa/stage/iwa_01.c | 2 +- src/battle/area_iwa/stage/iwa_02.c | 2 +- src/battle/area_jan/actor/hurt_plant.c | 3 +- src/battle/area_jan/actor/jungle_fuzzy.c | 2 +- src/battle/area_jan/actor/m_bush.c | 2 +- src/battle/area_jan/actor/spear_guy.c | 6 +- src/battle/area_kgr/actor/fuzzipede.c | 6 +- .../area_kmr_part_2/actor/blue_goomba.c | 2 +- .../area_kmr_part_2/actor/blue_goomba2.c | 2 +- .../area_kmr_part_2/actor/goomba_king.c | 4 +- .../area_kmr_part_2/actor/goomnut_tree.c | 10 +- src/battle/area_kmr_part_2/actor/red_goomba.c | 2 +- .../area_kmr_part_2/actor/red_goomba2.c | 2 +- .../area_kmr_part_3/actor/egg_jr_troopa.c | 3 +- .../area_kmr_part_3/actor/final_jr_troopa.c | 8 +- src/battle/area_kmr_part_3/actor/jr_troopa.c | 2 +- .../area_kmr_part_3/actor/mage_jr_troopa.c | 5 +- .../area_kmr_part_3/actor/para_jr_troopa.c | 4 +- src/battle/area_kmr_part_3/actor/paragoomba.c | 8 +- .../area_kmr_part_3/actor/spiked_goomba.c | 2 +- .../actor/spiked_para_jr_troopa.c | 4 +- src/battle/area_kzn/actor/lava_bubble.c | 15 +- src/battle/area_kzn/actor/red_magikoopa.c | 8 +- src/battle/area_mac/actor/chan.c | 3 +- src/battle/area_mac/actor/lee.c | 30 +- src/battle/area_mac/actor/master1.c | 3 +- src/battle/area_mac/actor/master2.c | 3 +- src/battle/area_mac/actor/master3.c | 5 +- src/battle/area_mim/actor/bzzap.c | 18 +- src/battle/area_mim/actor/forest_fuzzy.c | 2 +- src/battle/area_mim/actor/piranha_plant.c | 2 +- src/battle/area_nok/actor/fuzzy.c | 2 +- src/battle/area_nok/actor/kent_c_koopa.c | 18 +- src/battle/area_omo/actor/anti_guy.c | 3 +- src/battle/area_omo/actor/blue_shy_guy.c | 3 +- src/battle/area_omo/actor/green_shy_guy.c | 3 +- src/battle/area_omo/actor/groove_guy.c | 2 +- src/battle/area_omo/actor/pink_shy_guy.c | 3 +- src/battle/area_omo/actor/pyro_guy.c | 3 +- src/battle/area_omo/actor/red_shy_guy.c | 3 +- src/battle/area_omo/actor/sky_guy.c | 17 +- src/battle/area_omo/actor/spy_guy.c | 6 +- src/battle/area_omo/actor/yellow_shy_guy.c | 3 +- src/battle/area_sbk/actor/bandit.c | 6 +- src/battle/area_sbk/actor/pokey.c | 12 +- .../area_trd_part_1/actor/bill_blaster.c | 4 +- src/battle/area_trd_part_1/actor/bob_omb.c | 2 +- .../area_trd_part_1/actor/bullet_bill.c | 2 +- .../area_trd_part_2/actor/blue_ninja_koopa.c | 2 +- .../area_trd_part_2/actor/fake_bowser.c | 22 +- .../area_trd_part_2/actor/green_ninja_koopa.c | 2 +- .../area_trd_part_2/actor/red_ninja_koopa.c | 2 +- .../actor/yellow_ninja_koopa.c | 2 +- src/battle/area_trd_part_3/actor/eldstar.c | 6 +- src/battle/battle.h | 15 - src/battle/common/actor/goomba.inc.c | 2 +- src/battle/common/actor/koopa_troopa.inc.c | 2 +- src/battle/common/actor/medi_guy.inc.c | 3 +- src/battle/common/actor/paragoomba.inc.c | 8 +- src/battle/common/actor/paratroopa.inc.c | 7 +- src/battle/common/actor/putrid_piranha.inc.c | 3 +- src/battle/common/actor/spike_top.inc.c | 2 +- src/battle/common/actor/spiked_goomba.inc.c | 2 +- src/battle/common/actor/white_magikoopa.inc.c | 8 +- src/effects.c | 4 +- src/effects/effect_1.c | 2 +- src/effects/effect_10.c | 2 +- src/effects/effect_11.c | 2 +- src/effects/effect_12.c | 2 +- src/effects/effect_13.c | 2 +- src/effects/effect_134.c | 114 +++- src/effects/effect_14.c | 2 +- src/effects/effect_15.c | 4 +- src/effects/effect_16.c | 38 +- src/effects/effect_6.c | 2 +- src/effects/effect_7.c | 2 +- src/effects/effect_73.c | 2 +- src/effects/effect_75.c | 2 +- src/effects/effect_8.c | 2 +- src/effects/effect_9.c | 2 +- ver/us/asm/data/effects/415020.data.s | 9 - .../nonmatchings/167570/filemenu_yesno_init.s | 26 - .../nonmatchings/16c8e0/initialize_battle.s | 194 ------ ver/us/asm/nonmatchings/190B20/create_actor.s | 621 ------------------ .../asm/nonmatchings/190B20/func_80263064.s | 130 ---- .../asm/nonmatchings/190B20/func_802664DC.s | 60 -- .../asm/nonmatchings/190B20/func_80266978.s | 104 --- .../nonmatchings/190B20/show_damage_popup.s | 62 -- ver/us/asm/nonmatchings/1A5830/LandJumpPart.s | 93 --- .../asm/nonmatchings/316a70/func_80200080.s | 112 ---- .../E20110/func_802B75E8_E206F8.s | 87 --- .../effects/effect_134/fx_134_appendGfx.s | 172 ----- .../effects/effect_134/fx_134_main.s | 82 --- .../effects/effect_134/fx_134_update.s | 33 - ver/us/splat.yaml | 2 +- ver/us/undefined_syms.txt | 15 + 129 files changed, 1211 insertions(+), 2115 deletions(-) delete mode 100644 ver/us/asm/data/effects/415020.data.s delete mode 100644 ver/us/asm/nonmatchings/167570/filemenu_yesno_init.s delete mode 100644 ver/us/asm/nonmatchings/16c8e0/initialize_battle.s delete mode 100644 ver/us/asm/nonmatchings/190B20/create_actor.s delete mode 100644 ver/us/asm/nonmatchings/190B20/func_80263064.s delete mode 100644 ver/us/asm/nonmatchings/190B20/func_802664DC.s delete mode 100644 ver/us/asm/nonmatchings/190B20/func_80266978.s delete mode 100644 ver/us/asm/nonmatchings/190B20/show_damage_popup.s delete mode 100644 ver/us/asm/nonmatchings/1A5830/LandJumpPart.s delete mode 100644 ver/us/asm/nonmatchings/316a70/func_80200080.s delete mode 100644 ver/us/asm/nonmatchings/E20110/func_802B75E8_E206F8.s delete mode 100644 ver/us/asm/nonmatchings/effects/effect_134/fx_134_appendGfx.s delete mode 100644 ver/us/asm/nonmatchings/effects/effect_134/fx_134_main.s delete mode 100644 ver/us/asm/nonmatchings/effects/effect_134/fx_134_update.s diff --git a/include/common_structs.h b/include/common_structs.h index 4fc4ac9466..b55ed46788 100644 --- a/include/common_structs.h +++ b/include/common_structs.h @@ -256,7 +256,7 @@ typedef struct PlayerData { /* 0x29C */ s16 playerFirstStrikes; /* 0x29E */ s16 enemyFirstStrikes; /* 0x2A0 */ u16 powerBounces; - /* 0x2A2 */ s16 battlesCount; + /* 0x2A2 */ u16 battlesCount; /* 0x2A4 */ s16 unk_2A4[4]; /* 0x2AC */ s32 unk_2AC; /* 0x2B0 */ s32 unk_2B0; @@ -294,7 +294,7 @@ typedef struct Trigger { /* 0x08 */ union { s32 colliderID; Vec4f* position; - } location; + } location; /* 0x0C */ s32 (*onActivateFunc)(struct Trigger*); /* 0x10 */ EvtScript* onTriggerEvt; /* 0x14 */ struct Evt* runningScript; @@ -856,21 +856,9 @@ typedef struct BattleStatus { /* 0x008 */ s32 varTable[16]; /* 0x048 */ u8 currentSubmenu; /* 0x049 */ char unk_49[3]; - /* 0x04C */ s8 unk_4C; - /* 0x04D */ s8 unk_4D; - /* 0x04E */ s8 unk_4E; - /* 0x04F */ s8 unk_4F; - /* 0x050 */ s8 unk_50; - /* 0x051 */ s8 unk_51; - /* 0x052 */ s8 unk_52; - /* 0x053 */ s8 stratsLastCursorPos; - /* 0x054 */ char unk_54[8]; - /* 0x05C */ s8 unk_5C; - /* 0x05D */ s8 unk_5D; - /* 0x05E */ char unk_5E[4]; - /* 0x062 */ s8 unk_62; - /* 0x063 */ s8 unk_63; - /* 0x064 */ char unk_64[12]; + /* 0x04C */ s8 unk_4C[16]; + /* 0x05C */ s8 unk_5C[16]; + /* 0x06C */ char unk_6C[0x4]; /* 0x070 */ s16 menuDisableFlags; /* 1 = jump, 2 = hammer, 4 = items */ /* 0x072 */ char unk_72[2]; /* 0x074 */ s32 unk_74; @@ -985,8 +973,8 @@ typedef struct BattleStatus { /* 0x434 */ s32* unk_434; /* 0x438 */ FGModelData* foregroundModelData; /* 0x43C */ BattleStatusUnk* unk_43C; - /* 0x440 */ u8 tattleFlags[27]; - /* 0x45B */ char unk_45B[5]; + /* 0x440 */ u8 tattleFlags[28]; + /* 0x45C */ char unk_45C[4]; } BattleStatus; // size = 0x460 typedef struct TextureHeader { @@ -1482,26 +1470,51 @@ typedef struct SelectableTarget { /* 0x00 */ s16 actorID; /* 0x02 */ s16 partID; /* sometimes loaded as byte from 0x3 */ /* 0x04 */ Vec3s pos; - /* 0x0A */ char unk_0A[7]; + /* 0x0A */ s16 unk_0A; + /* 0x0C */ s16 unk_0C; + /* 0x0E */ s16 unk_0E; + /* 0x10 */ s8 unk_10; /* 0x11 */ u8 homeCol; /* from xpos --> 0-3 */ /* 0x12 */ u8 homeRow; /* from ypos --> 0-3 */ /* 0x13 */ u8 layer; /* from zpos? --> 0-1 */ } SelectableTarget; // size = 0x14 typedef struct ActorPartMovement { - /* 0x00 */ char unk_00[12]; + /* 0x00 */ Vec3f unk_00; /* 0x0C */ Vec3f goalPos; - /* 0x18 */ char unk_18[12]; + /* 0x18 */ Vec3f unk_18; /* 0x24 */ f32 jumpScale; /* 0x28 */ f32 moveSpeed; - /* 0x2C */ char unk_2C[32]; + /* 0x2C */ f32 unk_2C; + /* 0x30 */ f32 unk_30; + /* 0x34 */ f32 unk_34; + /* 0x38 */ s16 unk_38; + /* 0x3A */ s16 unk_3A; + /* 0x3C */ s32 unk_3C; + /* 0x40 */ char unk_40[0xC]; /* 0x4C */ s32 varTable[16]; } ActorPartMovement; // size = 0x8C +typedef struct ActorPartBlueprint { + /* 0x00 */ s32 flags; + /* 0x04 */ s8 index; + /* 0x05 */ Vec3b posOffset; + /* 0x08 */ Vec2b targetOffset; + /* 0x0A */ s16 opacity; + /* 0x0C */ s32* idleAnimations; + /* 0x10 */ s32* defenseTable; + /* 0x14 */ s32 eventFlags; + /* 0x18 */ s32 elementImmunityFlags; + /* 0x1C */ s8 unk_1C; + /* 0x1C */ s8 unk_1D; + /* 0x1E */ char unk_1E[2]; + /* 0x20 */ s32 unk_20; +} ActorPartBlueprint; // size = 0x24 + typedef struct ActorPart { /* 0x00 */ s32 flags; /* 0x04 */ s32 targetFlags; /* initialized to 0 */ - /* 0x08 */ struct ActorPartBlueprint* staticData; + /* 0x08 */ ActorPartBlueprint* staticData; /* 0x0C */ struct ActorPart* nextPart; /* 0x10 */ struct ActorPartMovement* movement; /* 0x14 */ Vec3s partOffset; @@ -1839,7 +1852,7 @@ typedef struct Actor { /* 0x1EC */ s32 onTurnChangeID; /* 0x1F0 */ s8 lastEventType; /* 0x1F1 */ s8 turnPriority; - /* 0x1F2 */ u8 enemyIndex; /* actorID = this | 200 */ + /* 0x1F2 */ s8 enemyIndex; /* actorID = this | 200 */ /* 0x1F3 */ s8 numParts; /* 0x1F4 */ struct ActorPart* partsTable; /* 0x1F8 */ s16 lastDamageTaken; @@ -1883,7 +1896,10 @@ typedef struct Actor { /* 0x427 */ char unk_427; /* 0x428 */ s16 targetActorID; /* 0x42A */ char unk_42A[2]; - /* 0x42C */ struct Shadow* shadow; /* might be shadow ID */ + /* 0x42C */ union { + /* */ struct Shadow* ptr; + /* */ s32 id; + /* 0x42C */ } shadow; /* 0x430 */ f32 shadowScale; /* = actor size / 24.0 */ /* 0x434 */ s16 renderMode; /* initially 0xD, set to 0x22 if any part is transparent */ /* 0x436 */ s16 hudElementDataIndex; diff --git a/include/effects.h b/include/effects.h index 4b458408f0..7ca105410d 100644 --- a/include/effects.h +++ b/include/effects.h @@ -454,6 +454,23 @@ typedef struct Effect75 { /* 0x20 */ s32 unk_20; } Effect75; // size = 0x24 +typedef struct Effect134 { + /* 0x00 */ s32 unk_00; + /* 0x04 */ f32 unk_04; + /* 0x08 */ f32 unk_08; + /* 0x0C */ f32 unk_0C; + /* 0x10 */ s32 unk_10; + /* 0x14 */ s32 unk_14; + /* 0x18 */ s32 unk_18; + /* 0x1C */ s32 unk_1C; + /* 0x20 */ s32 unk_20; + /* 0x24 */ s32 unk_24; + /* 0x28 */ s32 unk_28; + /* 0x2C */ s32 unk_2C; + /* 0x30 */ s32 unk_30; + /* 0x34 */ f32 unk_34; +} Effect134; // size = 0x38 + // TODO figure out what this actually is // playFX_4E invokes gEffectTable[78]'s entryPoint function // playFX_6F invokes gEffectTable[111]'s entryPoint function @@ -505,13 +522,13 @@ typedef struct EffectInstance { /* 0x00 */ s32 flags; /* 0x04 */ s32 effectIndex; /* 0x08 */ s32 numParts; - /* 0x0C */ Effect16* data; // often but not always EffectInstanceData + /* 0x0C */ void* data; // often but not always EffectInstanceData /* 0x10 */ struct EffectGraphics* graphics; } EffectInstance; // size = 0x14 typedef struct EffectBlueprint { /* 0x00 */ s32 unk_00; - /* 0x04 */ s32 effectIndex; + /* 0x04 */ s32 effectID; /* 0x08 */ void (*init)(EffectInstance* effectInst); /* 0x0C */ void (*update)(EffectInstance* effectInst); /* 0x10 */ void (*renderWorld)(EffectInstance* effectInst); diff --git a/include/functions.h b/include/functions.h index ffcada7694..32807c6f11 100644 --- a/include/functions.h +++ b/include/functions.h @@ -502,6 +502,7 @@ void func_802D74C0(f32 x, f32 y, f32 z, s32 arg3); void show_damage_popup(f32 x, f32 y, f32 z, s32 damageAmount, s32); void add_xz_vec3f(Vec3f* vector, f32 speed, f32 angleDeg); +void add_xz_vec3f_copy1(Vec3f* vector, f32 speed, f32 angleDeg); void play_movement_dust_effects(s32 var0, f32 xPos, f32 yPos, f32 zPos, f32 angleDeg); void func_80138D88(s32, s32, s32, s32, f32); @@ -710,6 +711,8 @@ s32 try_inflict_status(Actor*, s32, s32); void mdl_set_all_fog_mode(s32); void load_model_animator_tree(s32, StaticAnimatorNode**); +void func_8024EDC0(void); + void update_effects(void); void update_cameras(void); void clear_render_tasks(void); diff --git a/include/macros.h b/include/macros.h index edb4568123..adb5a81bfc 100644 --- a/include/macros.h +++ b/include/macros.h @@ -89,6 +89,7 @@ #define SPRITE_PIXEL_SCALE (5.0 / 7.0) #ifdef PERMUTER +#undef SCRIPT #define SCRIPT(...) {} #endif diff --git a/include/variables.h b/include/variables.h index 6abec3fcca..d2226842e7 100644 --- a/include/variables.h +++ b/include/variables.h @@ -84,6 +84,7 @@ extern s16 D_80151308; extern s32 D_80151310; extern s32 D_8010C92C; +extern s32 D_8010C950; extern s16 D_8010CD00; extern s16 D_8010CD10; extern s16 D_8010CD12; diff --git a/src/167570.c b/src/167570.c index 5cd9ea0097..a7b0941357 100644 --- a/src/167570.c +++ b/src/167570.c @@ -1,11 +1,22 @@ #include "common.h" #include "filemenu.h" +extern MenuWindowBP D_8024A0CC[2]; + INCLUDE_ASM(s32, "167570", filemenu_yesno_draw_options_contents); INCLUDE_ASM(s32, "167570", filemenu_yesno_draw_prompt_contents); -INCLUDE_ASM(s32, "167570", filemenu_yesno_init); +void filemenu_yesno_init(MenuPanel* tab) { + s32 i; + + for (i = 0; i < ARRAY_COUNT(D_8024A0CC); i++) { + D_8024A0CC[i].tab = tab; + } + + setup_pause_menu_tab(D_8024A0CC, ARRAY_COUNT(D_8024A0CC)); + tab->unk_00.c.initialized = TRUE; +} INCLUDE_ASM(s32, "167570", filemenu_yesno_handle_input); diff --git a/src/16F740.c b/src/16F740.c index 77c6df0cc6..5ae42b1913 100644 --- a/src/16F740.c +++ b/src/16F740.c @@ -189,16 +189,17 @@ void func_80243910(void) { void btl_state_update_prepare_menu(void) { BattleStatus* battleStatus = &gBattleStatus; - battleStatus->unk_4D = -1; - battleStatus->unk_4E = -1; - battleStatus->unk_4F = -1; - battleStatus->unk_50 = -1; - battleStatus->unk_51 = -1; - battleStatus->unk_52 = -1; - battleStatus->stratsLastCursorPos = -1; - battleStatus->unk_5D = -1; - battleStatus->unk_62 = -1; - battleStatus->unk_63 = -1; + battleStatus->unk_4C[1] = -1; + battleStatus->unk_4C[2] = -1; + battleStatus->unk_4C[3] = -1; + battleStatus->unk_4C[4] = -1; + battleStatus->unk_4C[5] = -1; + battleStatus->unk_4C[5] = -1; + battleStatus->unk_4C[6] = -1; + battleStatus->unk_4C[7] = -1; + battleStatus->unk_5C[1] = -1; + battleStatus->unk_5C[6] = -1; + battleStatus->unk_5C[7] = -1; dma_copy(_415D90_ROM_START, _415D90_ROM_END, _415D90_VRAM); @@ -588,7 +589,7 @@ void btl_state_update_change_partner(void) { } } - battleStatus->unk_5C = -1; + battleStatus->unk_5C[0] = -1; D_8029F248 = 0xA; gBattleState2 = BATTLE_STATES2_UNK_2; diff --git a/src/16c8e0.c b/src/16c8e0.c index a3e2a86076..10311ac582 100644 --- a/src/16c8e0.c +++ b/src/16c8e0.c @@ -29,12 +29,21 @@ void* bHPDigitHudScripts[] = { s32 D_80280A30 = 0xFF; +extern s32 D_8029DA30; extern s8 D_8029DA33; extern s32 D_8029DA34; extern Camera D_8029DA50[ARRAY_COUNT(gCameras)]; extern f32 D_8029EFB0; extern f32 D_8029EFB4; extern f32 D_8029EFB8; +extern s32 D_8029EFBC; +extern s32 D_8029EFC0[10]; +extern s32 D_8029EFE8[10]; +extern s32 D_8029F010[10]; +extern HudScript HudScript_HPBar; +extern HudScript HudScript_Item_SmallStarPoint; +extern HudScript HudScript_Item_StarPoint; +extern HudScript HudScript_StatusSPShine; EvtScript BtlPutPartnerAway = { EVT_CALL(DispatchEvent, 256, 62) @@ -82,17 +91,17 @@ EvtScript BtlBringPartnerOut = { EVT_END }; +void func_8023ED5C(void); +void func_8023F088(Camera*); +void func_8023FF84(Camera*); + void get_dpad_input_radial(f32* angle, f32* magnitude) { BattleStatus* battleStatus = &gBattleStatus; - u16 currentButtonsDown; - f32 stickX; - f32 stickY; - f32 mag; f32 maxMagnitude = 60.0f; - - stickX = battleStatus->stickX; - stickY = battleStatus->stickY; - currentButtonsDown = battleStatus->currentButtonsDown; + f32 stickX = battleStatus->stickX; + f32 stickY = battleStatus->stickY; + u16 currentButtonsDown = battleStatus->currentButtonsDown; + f32 mag; if (currentButtonsDown & 0xF00) { stickY = 0.0f; @@ -130,7 +139,89 @@ void func_8023E11C(void) { D_802809F5 = 0; } -INCLUDE_ASM(s32, "16c8e0", initialize_battle); +void initialize_battle(void) { + PlayerData* playerData = &gPlayerData; + BattleStatus* battleStatus = &gBattleStatus; + Camera* tattleCam = &gCameras[CAM_TATTLE]; + s32 hudElemID; + s32 i; + + gBattleStatus.flags1 = 0; + gBattleStatus.flags2 = 0; + gBattleStatus.flags1 = 0; + D_8029DA34 = gOverrideFlags; + gOverrideFlags &= ~0x80; + gBattleStatus.inputBitmask = -1; + gOverrideFlags &= ~0x80; + + for (i = 0; i < 16; i++) { + battleStatus->pushInputBuffer[i] = 0; // @bug? why just 16 + } + + battleStatus->inputBufferPos = 0; + battleStatus->holdInputBufferPos = 0; + battleStatus->unk_95 = 0; + + for (i = 0; i < ARRAY_COUNT(battleStatus->enemyActors); i++) { + battleStatus->enemyActors[i] = NULL; + } + + battleStatus->playerActor = NULL; + battleStatus->partnerActor = NULL; + + for (i = 0; i < ARRAY_COUNT(battleStatus->unk_4C); i++) { + battleStatus->unk_4C[i] = -1; + battleStatus->unk_5C[i] = -1; + } + + for (i = 0; i < ARRAY_COUNT(battleStatus->tattleFlags); i++) { + battleStatus->tattleFlags[i] = 0; + } + + if (gGameStatusPtr->peachFlags & 1) { + gBattleStatus.flags2 |= BS_FLAGS2_40; + increment_status_menu_disabled(); + } else { + gBattleStatus.flags2 &= ~BS_FLAGS2_40; + } + + create_generic_entity_world(NULL, func_8023ED5C); + func_8024EDC0(); + func_80268E88(); + set_windows_visible(1); + D_8029EFBC = create_hud_element(HudScript_HPBar); + set_hud_element_flags(D_8029EFBC, 0x80); + + for (i = 0; i < ARRAY_COUNT(D_8029EFC0); i++) { + hudElemID = D_8029EFC0[i] = create_hud_element(HudScript_Item_StarPoint); + set_hud_element_flags(hudElemID, 0x80 | 0x2); + set_hud_element_render_depth(hudElemID, 20); + } + + for (i = 0; i < ARRAY_COUNT(D_8029EFE8); i++) { + hudElemID = D_8029EFE8[i] = create_hud_element(HudScript_StatusSPShine); + set_hud_element_flags(hudElemID, 0x80 | 0x2); + set_hud_element_render_depth(hudElemID, 20); + } + + for (i = 0; i < ARRAY_COUNT(D_8029F010); i++) { + hudElemID = D_8029F010[i] = create_hud_element(HudScript_Item_SmallStarPoint); + set_hud_element_flags(hudElemID, 0x80 | 0x2); + set_hud_element_render_depth(hudElemID, 20); + } + + tattleCam->fpDoPreRender = func_8023F088; + tattleCam->fpDoPostRender = func_8023FF84; + + if (playerData->battlesCount < 9999) { + playerData->battlesCount++; + } + + D_8029DA30 = playerData->currentPartner; + if (gBattleStatus.flags2 & BS_FLAGS2_40) { + playerData->currentPartner = PARTNER_TWINK; + } +} void func_8023E3FC(void) { } @@ -151,7 +242,7 @@ void btl_update(void) { s32 cond; if (battleStatus->inputBitmask != -1) { - if (battleStatus->flags1 & 0x80000 && gGameStatusPtr->unk_81 != 0) { + if (battleStatus->flags1 & BS_FLAGS1_80000 && gGameStatusPtr->unk_81 != 0) { s32 inputBitmask = battleStatus->inputBitmask; battleStatus->currentButtonsDown = gGameStatusPtr->altCurrentButtons & inputBitmask; @@ -488,7 +579,7 @@ u16 func_8023F060(u16 arg0, s32 arg1, s32 arg2) { INCLUDE_ASM(s32, "16c8e0", func_8023F088); -void func_8023FF84(void) { +void func_8023FF84(Camera* camera) { show_foreground_models_unchecked(); } @@ -583,7 +674,7 @@ void btl_delete_actor(Actor* actor) { partsTable = actorPartTemp; } - delete_shadow(actor->shadow); + delete_shadow(actor->shadow.id); remove_all_status_icons(actor->hudElementDataIndex); remove_effect(actor->ptrDefuffIcon); // ??? @@ -603,9 +694,9 @@ void btl_delete_actor(Actor* actor) { } void btl_delete_player_actor(Actor* player) { - struct ActorPart* partsTable; - struct ActorPartMovement* movement; - struct DecorationTable* decorationTable; + ActorPart* partsTable; + ActorPartMovement* movement; + DecorationTable* decorationTable; s32 i; for (i = 0; i < 2; i++) { @@ -626,7 +717,7 @@ void btl_delete_player_actor(Actor* player) { decorationTable = partsTable->decorationTable; movement = partsTable->movement; - delete_shadow(player->shadow); + delete_shadow(player->shadow.id); remove_all_status_icons(player->hudElementDataIndex); remove_effect(player->ptrDefuffIcon); diff --git a/src/182B30.c b/src/182B30.c index 615169c063..6a10839318 100644 --- a/src/182B30.c +++ b/src/182B30.c @@ -553,7 +553,7 @@ void update_actor_shadow(s32 arg0, Actor* actor) { s32 i; if (actor != NULL) { - shadow = get_shadow_by_index((s32) actor->shadow); + shadow = get_shadow_by_index(actor->shadow.id); shadow->flags |= SHADOW_FLAGS_HIDDEN; if (!(actor->flags & ACTOR_FLAG_DISABLED)) { if (actor->flags & ACTOR_FLAG_10000000) { @@ -633,7 +633,7 @@ void update_actor_shadow(s32 arg0, Actor* actor) { actorPart = actorPart->nextPart; } - shadow = get_shadow_by_index((s32) actor->shadow); + shadow = get_shadow_by_index(actor->shadow.id); if (!(actor->flags & ACTOR_FLAG_NO_SHADOW)) { shadow->flags &= ~ACTOR_FLAG_DISABLED; } @@ -715,7 +715,7 @@ void update_player_actor_shadow(void) { func_802549F4(player); } - shadow = get_shadow_by_index((s32) player->shadow); + shadow = get_shadow_by_index(player->shadow.id); shadow->flags &= ~SHADOW_FLAGS_HIDDEN; if (!battleStatus->outtaSightActive) { @@ -911,7 +911,8 @@ void func_8025D158(ActorPart* part, s32 decorationIndex) { INCLUDE_ASM(s32, "182B30", func_8025D160); void func_8025D290(ActorPart* part, s32 decorationIndex) { - part->decorationTable->unk_8B0[decorationIndex]->data->unk_2C = 5; + // TODO cast to appropriate struct data type once we know what it is + ((s32*) part->decorationTable->unk_8B0[decorationIndex]->data)[11] = 5; } INCLUDE_ASM(s32, "182B30", func_8025D2B0); @@ -928,7 +929,8 @@ void func_8025D4A0(ActorPart* part, s32 decorationIndex) { INCLUDE_ASM(s32, "182B30", func_8025D4C8); void func_8025D620(ActorPart* part, s32 decorationIndex) { - part->decorationTable->unk_8B0[decorationIndex]->data->unk_2C = 5; + // TODO cast to appropriate struct data type once we know what it is + ((s32*) part->decorationTable->unk_8B0[decorationIndex]->data)[11] = 5; } INCLUDE_ASM(s32, "182B30", func_8025D640); @@ -961,12 +963,13 @@ void func_8025DBC8(ActorPart* part, s32 decorationIndex) { INCLUDE_ASM(s32, "182B30", func_8025DBD0); -void func_8025DD40(ActorPart* actorPart, s32 decorationIndex) { - actorPart->decorationTable->unk_8B0[decorationIndex]->data->unk_2C = 5; +void func_8025DD40(ActorPart* part, s32 decorationIndex) { + // TODO cast to appropriate struct data type once we know what it is + ((s32*) part->decorationTable->unk_8B0[decorationIndex]->data)[11] = 5; } INCLUDE_ASM(s32, "182B30", func_8025DD60); -void func_8025DE88(ActorPart* actorPart, s32 decorationIndex) { - actorPart->decorationTable->unk_8B0[decorationIndex]->flags |= 0x10; +void func_8025DE88(ActorPart* part, s32 decorationIndex) { + part->decorationTable->unk_8B0[decorationIndex]->flags |= 0x10; } diff --git a/src/190B20.c b/src/190B20.c index 1662f10290..4e3c5bf57f 100644 --- a/src/190B20.c +++ b/src/190B20.c @@ -1116,6 +1116,7 @@ s32 func_80265CE8(u32*, s32); void create_target_list(Actor* actor, s32 arg1); INCLUDE_ASM(s32, "190B20", create_target_list); + void func_80266DAC(Actor* actor, s32 arg1); void player_create_target_list(Actor* actor) { @@ -1126,14 +1127,81 @@ void enemy_create_target_list(Actor* actor) { create_target_list(actor, 1); } -void func_80263064(s32, s32, s32); -INCLUDE_ASM(s32, "190B20", func_80263064); +s32 func_80263064(Actor* actor0, Actor* actor1, s32 unused) { + s32 ret = 0; + SelectableTarget* target = actor0->targetData; + s32 numParts; + ActorPart* part; + s32 i; -void func_80263230(s32 arg0, s32 arg1) { + if (actor1 == NULL) { + return ret; + } + + numParts = actor1->numParts; + part = actor1->partsTable; + + for (i = 0; i < numParts; i++) { + if (!(part->flags & 0x20000)) { + if (!(part->flags & 0x800000)) { + continue; + } else { + ActorPartBlueprint* bp = part->staticData; + f32 x, y, z; + + if (!(part->flags & 0x100000)) { + x = actor1->currentPos.x; + y = actor1->currentPos.y; + z = actor1->currentPos.z; + + x += part->partOffset.x; + if (!(actor1->flags & 0x800)) { + y += part->partOffset.y; + } else { + y -= part->partOffset.y; + } + z += part->partOffset.z; + + x += part->targetOffset.x; + if (!(actor1->flags & 0x800)) { + y += part->targetOffset.y; + } else { + y -= part->targetOffset.y; + } + } else { + x = part->absolutePosition.x; + y = part->absolutePosition.y; + z = part->absolutePosition.z; + + x += part->targetOffset.x; + if (!(actor1->flags & 0x800)) { + y += part->targetOffset.y; + } else { + y -= part->targetOffset.y; + } + } + + actor0->targetActorID = target->actorID = actor1->actorID; + actor0->targetPartIndex = target->partID = bp->index; + target->pos.x = x; + target->pos.y = y; + target->pos.z = z; + target->unk_10 = 0; + target++; + ret++; + } + } + part = part->nextPart; + } + actor0->targetListLength = ret; + return ret; +} + +void func_80263230(Actor* arg0, Actor* arg1) { func_80263064(arg0, arg1, 0); } -void func_8026324C(s32 arg0, s32 arg1) { +void func_8026324C(Actor* arg0, Actor* arg1) { func_80263064(arg0, arg1, 1); } @@ -1993,7 +2061,7 @@ void load_player_actor(void) { ASSERT(partMovement != NULL); - player->shadow = create_shadow_type(0, player->currentPos.x, player->currentPos.y, player->currentPos.z); + player->shadow.id = create_shadow_type(0, player->currentPos.x, player->currentPos.y, player->currentPos.z); player->shadowScale = player->size.x / 24.0; player->hudElementDataIndex = create_status_icon_set(); player->ptrDefuffIcon = playFX_41(0, -142.0f, 34.0f, 1.0f, 0); @@ -2247,7 +2315,7 @@ void load_partner_actor(void) { part->nextPart = NULL; } - partnerActor->shadow = create_shadow_type(0, partnerActor->currentPos.x, partnerActor->currentPos.y, partnerActor->currentPos.z); + partnerActor->shadow.id = create_shadow_type(0, partnerActor->currentPos.x, partnerActor->currentPos.y, partnerActor->currentPos.z); partnerActor->shadowScale = partnerActor->size.x / 24.0; partnerActor->hudElementDataIndex = create_status_icon_set(); partnerActor->ptrDefuffIcon = playFX_41(0, -142.0f, 34.0f, 1.0f, 0); @@ -2259,7 +2327,273 @@ void load_partner_actor(void) { } } -INCLUDE_ASM(s32, "190B20", create_actor); +Actor* create_actor(Formation formation) { + BattleStatus* battleStatus = &gBattleStatus; + Actor* actor; + ActorBlueprint* formationActor; + ActorPart* part; + ActorPartBlueprint* partBP; + Evt* takeTurnScript; + s32 partCount; + f32 x, y, z; + DecorationTable* decorationTable; + s32 i, j, k; + + if (formation->home.index >= -270000000) { + x = btl_actorHomePositions[formation->home.index].x; + y = btl_actorHomePositions[formation->home.index].y; + z = btl_actorHomePositions[formation->home.index].z; + } else { + x = formation->home.vec->x; + y = formation->home.vec->y; + z = formation->home.vec->z; + } + + formationActor = formation->actor; + partCount = formationActor->partCount; + + for (i = 0; i < ARRAY_COUNT(battleStatus->enemyActors); i++) { + if (battleStatus->enemyActors[i] == NULL) { + break; + } + } + + battleStatus->enemyActors[i] = heap_malloc(sizeof(*actor)); + actor = battleStatus->enemyActors[i]; + ASSERT(actor != NULL); + + actor->unk_134 = battleStatus->unk_93++; + actor->footStepCounter = 0; + actor->actorBlueprint = formationActor; + actor->actorType = formationActor->type; + actor->flags = formationActor->flags; + actor->homePos.x = actor->currentPos.x = x; + actor->homePos.y = actor->currentPos.y = y; + actor->homePos.z = actor->currentPos.z = z; + actor->headOffset.x = 0; + actor->headOffset.y = 0; + actor->headOffset.z = 0; + actor->maxHP = actor->currentHP = formationActor->maxHP; + actor->numParts = partCount; + actor->idleScriptSource = NULL; + actor->takeTurnScriptSource = formationActor->script; + actor->onHitScriptSource = NULL; + actor->onTurnChanceScriptSource = NULL; + actor->idleScript = NULL; + actor->takeTurnScript = NULL; + actor->onHitScript = NULL; + actor->turnPriority = formation->priority; + actor->enemyIndex = i; + actor->yaw = 0.0f; + actor->rotation.x = 0.0f; + actor->rotation.y = 0.0f; + actor->rotation.z = 0.0f; + actor->rotationPivotOffset.x = 0; + actor->rotationPivotOffset.y = 0; + actor->rotationPivotOffset.z = 0; + actor->scale.x = 1.0f; + actor->scale.y = 1.0f; + actor->scale.z = 1.0f; + actor->scaleModifier.x = 1.0f; + actor->scaleModifier.y = 1.0f; + actor->scaleModifier.z = 1.0f; + actor->unk_19A = 0; + actor->extraCoinBonus = 0; + actor->size.x = formationActor->size.x; + actor->size.y = formationActor->size.y; + actor->scalingFactor = 1.0f; + actor->unk_194 = 0; + actor->unk_195 = 0; + actor->unk_196 = 0; + actor->unk_197 = 0; + actor->unk_198.x = 0; + actor->unk_198.y = 0; + actor->unk_206 = 0; + actor->unk_200 = NULL; + actor->unk_204 = 0; + actor->unk_205 = 0; + + actor->healthBarPosition.x = actor->currentPos.x + formationActor->hpBarOffset.x; + actor->healthBarPosition.y = actor->currentPos.y + formationActor->hpBarOffset.y; + actor->healthBarPosition.z = actor->currentPos.z; + if (actor->flags & ACTOR_FLAG_HP_OFFSET_BELOW) { + actor->healthBarPosition.y = actor->currentPos.y - actor->size.y - formationActor->hpBarOffset.y; + } + + actor->statusTable = formationActor->statusTable; + actor->debuff = 0; + actor->debuffDuration = 0; + actor->staticStatus = 0; + actor->staticDuration = 0; + actor->stoneStatus = 0; + actor->stoneDuration = 0; + actor->koStatus = 0; + actor->koDuration = 0; + actor->transStatus = 0; + actor->transDuration = 0; + actor->isGlowing = 0; + actor->unk_21E = 0; + actor->unk_21D = 0; + actor->attackBoost = 0; + actor->defenseBoost = 0; + actor->chillOutAmount = 0; + actor->chillOutTurns = 0; + actor->status = 0; + actor->actorTypeData1[0] = bActorSoundTable[actor->actorType].walk[0]; + actor->actorTypeData1[1] = bActorSoundTable[actor->actorType].walk[1]; + actor->actorTypeData1[2] = bActorSoundTable[actor->actorType].fly[0]; + actor->actorTypeData1[3] = bActorSoundTable[actor->actorType].fly[1]; + actor->actorTypeData1[4] = bActorSoundTable[actor->actorType].jump; + actor->actorTypeData1[5] = bActorSoundTable[actor->actorType].hurt; + actor->actorTypeData1b[0] = bActorSoundTable[actor->actorType].delay[0]; + actor->actorTypeData1b[1] = bActorSoundTable[actor->actorType].delay[1]; + + for (i = 0; i < ARRAY_COUNT(actor->unk_438); i++) { + actor->unk_438[i] = 0; + } + + actor->state.varTable[0] = formation->var0; + actor->state.varTable[1] = formation->var1; + actor->state.varTable[2] = formation->var2; + actor->state.varTable[3] = formation->var3; + actor->renderMode = RENDER_MODE_ALPHATEST; + actor->unk_208 = 0; + part = heap_malloc(sizeof(*part)); + actor->partsTable = part; + ASSERT(part != NULL); + + for (j = 0; j < partCount; j++) { + ActorPartBlueprint* actorPartBP = &formationActor->partsData[j]; + + part->decorationTable = NULL; + part->staticData = actorPartBP; + part->flags = actorPartBP->flags | ACTOR_PART_FLAG_4; + part->targetFlags = 0; + + part->partOffsetFloat.x = part->partOffset.x = actorPartBP->posOffset.x; + part->partOffsetFloat.y = part->partOffset.y = actorPartBP->posOffset.y; + part->partOffsetFloat.z = part->partOffset.z = actorPartBP->posOffset.z; + + part->visualOffset.x = 0; + part->visualOffset.y = 0; + part->visualOffset.z = 0; + + part->absolutePosition.x = actor->currentPos.x; + part->absolutePosition.y = actor->currentPos.y; + part->absolutePosition.z = actor->currentPos.z; + part->currentPos.x = actor->currentPos.x; + part->currentPos.y = actor->currentPos.y; + part->currentPos.z = actor->currentPos.z; + part->defenseTable = actorPartBP->defenseTable; + part->idleAnimations = actorPartBP->idleAnimations; + part->eventFlags = actorPartBP->eventFlags; + part->partFlags3 = actorPartBP->elementImmunityFlags; + part->opacity = actorPartBP->opacity; + if (part->opacity < 255) { + actor->renderMode = RENDER_MODE_SURFACE_XLU_LAYER3; + } + part->size.y = actor->size.y; + part->size.x = actor->size.x; + part->yaw = 0.0f; + part->targetOffset.x = actorPartBP->targetOffset.x; + part->targetOffset.y = actorPartBP->targetOffset.y; + part->unk_70 = 0; + part->unk_75 = actorPartBP->unk_1C; + part->unk_76 = actorPartBP->unk_1D; + part->rotation.x = 0.0f; + part->rotation.y = 0.0f; + part->rotation.z = 0.0f; + part->rotationPivotOffset.x = 0; + part->rotationPivotOffset.y = 0; + part->rotationPivotOffset.z = 0; + part->scale.x = 1.0f; + part->scale.y = 1.0f; + part->scale.z = 1.0f; + part->verticalStretch = 1; + part->unkOffset[0] = 0; + part->unkOffset[1] = 0; + part->partTypeData[0] = bActorSoundTable[actor->actorType].walk[0]; + part->partTypeData[1] = bActorSoundTable[actor->actorType].walk[1]; + part->partTypeData[2] = bActorSoundTable[actor->actorType].fly[0]; + part->partTypeData[3] = bActorSoundTable[actor->actorType].fly[1]; + part->partTypeData[4] = bActorSoundTable[actor->actorType].jump; + part->partTypeData[5] = bActorSoundTable[actor->actorType].hurt; + part->actorTypeData2b[0] = bActorSoundTable[actor->actorType].delay[0]; + part->actorTypeData2b[1] = bActorSoundTable[actor->actorType].delay[1]; + + if (part->idleAnimations != NULL && !(part->flags & ACTOR_PART_FLAG_2)) { + part->decorationTable = heap_malloc(sizeof(*decorationTable)); + decorationTable = part->decorationTable; + ASSERT(decorationTable != NULL); + + decorationTable->unk_6C0 = 0; + decorationTable->unk_750 = 0; + decorationTable->unk_764 = 0; + decorationTable->unk_768 = 0; + decorationTable->unk_7D8 = 0; + decorationTable->unk_7D9 = 0; + + for (k = 0; k < ARRAY_COUNT(decorationTable->posX); k++) { + decorationTable->posX[k] = actor->currentPos.x; + decorationTable->posY[k] = actor->currentPos.y; + decorationTable->posZ[k] = actor->currentPos.z; + } + + decorationTable->unk_7DA = 3; + decorationTable->unk_7DB = 0; + decorationTable->effectType = 0; + + for (k = 0; k < ARRAY_COUNT(decorationTable->unk_8B0); k++) { + decorationTable->unk_8B0[k] = NULL; + decorationTable->decorationType[k] = 0; + } + + } + + if (part->flags >= 0) { + part->movement = heap_malloc(sizeof(*part->movement)); + ASSERT(part->movement != NULL); + } + + if (actor->flags & 0x4000) { + part->flags |= 0x4000; + } + + part->animationRate = 1.0f; + part->currentAnimation = 0; + part->unk_84 = -1; + + if (part->idleAnimations != NULL) { + part->currentAnimation = func_80265CE8(part->idleAnimations, 1) & ~0x80000000; + part->unk_84 = spr_load_npc_sprite(part->currentAnimation, NULL); + } + + if (j + 1 >= partCount) { + part->nextPart = NULL; + continue; + } + + part->nextPart = heap_malloc(sizeof(*part->nextPart)); + part = part->nextPart; + if (part == NULL) { + PANIC(); + } + + part->nextPart = NULL; + } + + actor->hpFraction = 25; + actor->actorID = actor->enemyIndex | 0x200; + takeTurnScript = start_script(actor->takeTurnScriptSource, 0xA, 0); + actor->takeTurnID = takeTurnScript->id; + takeTurnScript->owner1.enemyID = actor->enemyIndex | 0x200; + actor->shadow.id = create_shadow_type(0, actor->currentPos.x, actor->currentPos.y, actor->currentPos.z); + actor->shadowScale = actor->size.x / 24.0; + actor->ptrDefuffIcon = playFX_41(0, -142.0f, 34.0f, 1.0f, 0); + actor->unk_228 = NULL; + actor->hudElementDataIndex = create_status_icon_set(); + return actor; +} s32 func_80265CE8(u32* anim, s32 arg1) { s32 ret; @@ -2629,9 +2963,57 @@ s32 get_defense(Actor* actor, s32* defenseTable, s32 elementFlags) { return minDefense; } -INCLUDE_ASM(s32, "190B20", func_802664DC); +void func_802664DC(f32 x, f32 y, f32 z, s32 attack, s32 a) { + s32 i; -INCLUDE_ASM(void, "190B20", show_damage_popup, f32 x, f32 y, f32 z, s32 damageAmount, s32 arg4); + for (i = 0; i < 1; i++) { + if (gDamageCountEffects[i] == NULL) { + break; + } + } + + if (i > 0) { + i = 0; + // TODO use actual effect instance struct when we know what it is + ((s32*)gDamageCountEffects[i]->data)[12] = 5; + gDamageCountEffects[i] = NULL; + } + + if (a == 0) { + a = -55; + } else { + a = 55; + } + + playFX_1E(0, x, y, z, 10.0f, a, attack, &gDamageCountEffects[i]); + gDamageCountTimers[i] = 40; +} + +void show_damage_popup(f32 x, f32 y, f32 z, s32 attack, s32 a) { + s32 i; + + for (i = 0; i < ARRAY_COUNT(gDamageCountEffects); i++) { + if (gDamageCountEffects[i] == NULL) { + break; + } + } + + if (i > ARRAY_COUNT(gDamageCountEffects) - 1) { + i = 0; + // TODO use actual effect instance struct when we know what it is + ((s32*)gDamageCountEffects[i]->data)[12] = 5; + gDamageCountEffects[i] = NULL; + } + + if (a == 0) { + a = -55; + } else { + a = 55; + } + + playFX_1E(0, x, y, z, 10.0f, a, attack, &gDamageCountEffects[i]); + gDamageCountTimers[i] = 40; +} void func_80266684(void) { s32 i; @@ -2656,7 +3038,67 @@ void func_80266970(Actor* target) { target->unk_204 = 0; } -INCLUDE_ASM(s32, "190B20", func_80266978); +void func_80266978(void) { + BattleStatus* battleStatus = &gBattleStatus; + Actor* actor; + s32 i; + + for (i = 0; i < ARRAY_COUNT(battleStatus->enemyActors); i++) { + actor = gBattleStatus.enemyActors[i]; + if (actor != NULL) { + if (actor->unk_205 == 0x3C) { + if (actor->unk_200 != 0) { + actor->unk_200[3][9] = 0; + } + } + if (actor->unk_205 == 5) { + if (actor->unk_200 != 0) { + actor->unk_200[3][6] = 0; + actor->unk_200 = NULL; + } + } + if (actor->unk_205 > 0) { + actor->unk_205--; + } + } + } + + actor = battleStatus->playerActor; + if (actor != NULL) { + if (actor->unk_205 == 60) { + if (actor->unk_200 != NULL) { + actor->unk_200[3][9] = 0; + } + } + if (actor->unk_205 == 5) { + if (actor->unk_200 != NULL) { + actor->unk_200[3][6] = 0; + actor->unk_200 = NULL; + } + } + if (actor->unk_205 > 0) { + actor->unk_205--; + } + } + + actor = battleStatus->partnerActor; + if (actor != NULL) { + if (actor->unk_205 == 60) { + if (actor->unk_200 != NULL) { + actor->unk_200[3][9] = 0; + } + } + if (actor->unk_205 == 5) { + if (actor->unk_200 != NULL) { + actor->unk_200[3][6] = 0; + actor->unk_200 = NULL; + } + } + if (actor->unk_205 > 0) { + actor->unk_205--; + } + } +} void func_80266ADC(Actor* target) { target->unk_206 = -1; diff --git a/src/1A5830.c b/src/1A5830.c index 260aacdb2b..2320e06e26 100644 --- a/src/1A5830.c +++ b/src/1A5830.c @@ -1066,7 +1066,52 @@ INCLUDE_ASM(s32, "1A5830", JumpPartTo); INCLUDE_ASM(s32, "1A5830", FallPartTo); -INCLUDE_ASM(s32, "1A5830", LandJumpPart); +s32 LandJumpPart(Evt* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + Actor* actor; + ActorPart* part; + ActorPartMovement* movement; + + if (isInitialCall) { + script->functionTemp[0] = 0; + } + + if (script->functionTemp[0] == 0) { + s32 actorID = evt_get_variable(script, *args++); + s32 partIndex = evt_get_variable(script, *args++); + + if (actorID == ACTOR_SELF) { + actorID = script->owner1.actorID; + } + + actor = get_actor(actorID); + part = get_actor_part(actor, partIndex); + script->functionTemp[1] = (s32) actor; + script->functionTemp[2] = (s32) part; + movement = part->movement; + movement->unk_00.x = part->absolutePosition.x; + movement->unk_00.y = part->absolutePosition.y; + movement->unk_00.z = part->absolutePosition.z; + script->functionTemp[0] = 1; + } + + part = script->functionTemp[2]; + movement = part->movement; + movement->unk_00.y += movement->unk_2C; + movement->unk_2C -= movement->jumpScale; + add_xz_vec3f_copy1(movement, movement->moveSpeed, movement->unk_30); + part->absolutePosition.x = movement->unk_00.x; + part->absolutePosition.y = movement->unk_00.y; + part->absolutePosition.z = movement->unk_00.z; + + if (part->absolutePosition.y < 0.0f) { + part->absolutePosition.y = 0.0f; + play_movement_dust_effects(2, part->absolutePosition.x, part->absolutePosition.y, part->absolutePosition.z, part->yaw); + return ApiStatus_DONE1; + } + + return ApiStatus_BLOCK; +} INCLUDE_ASM(s32, "1A5830", RunPartTo); diff --git a/src/316a70.c b/src/316a70.c index b38c89e36e..d6e847d533 100644 --- a/src/316a70.c +++ b/src/316a70.c @@ -1,3 +1,44 @@ #include "common.h" +#include "ld_addrs.h" +#include "mips.h" -INCLUDE_ASM(s32, "316a70", func_80200080); +extern s32 D_80026AC7[]; + +void func_80200080(void) { + s32 seed = 0x3C01A775; + u32 thisInsn = 0xB0018FFC; + HeapNode*(*load_engine_data)(s32) = D_80026AC7; // load_engine_data - ???????? + s32 hash = 0; + u32 prevInsn; + u32* it; + + while (IO_READ(PI_STATUS_REG) & (PI_STATUS_DMA_BUSY | PI_STATUS_IO_BUSY)); + seed -= IO_READ(thisInsn + 0xFFFE7508); + + prevInsn = 0; + + for (it = _3169F0_ROM_START; it < _3169F0_ROM_END; it++) { + while (IO_READ(PI_STATUS_REG) & (PI_STATUS_DMA_BUSY | PI_STATUS_IO_BUSY)); + thisInsn = IO_READ(it + 0x4000000); // ??? + + hash += LOWER(thisInsn) + UPPER(thisInsn); + + if (OPCODE(prevInsn) == LUI && + OPCODE(thisInsn) == ADDIU && + GET_RS(thisInsn) == GET_RT(prevInsn) && + GET_RS(thisInsn) == GET_RT(thisInsn)) + { + hash -= LOWER(thisInsn); + hash -= LOWER(prevInsn); + } + + if (OPCODE(thisInsn) == JAL) { + hash -= LOWER(thisInsn) + (UPPER(thisInsn) & 0xFC00); + } + + prevInsn = thisInsn; + } + + load_engine_data += seed + 0xDDD20 - hash; + load_engine_data(thisInsn); +} diff --git a/src/E20110.c b/src/E20110.c index 2398659f6d..501545b279 100644 --- a/src/E20110.c +++ b/src/E20110.c @@ -2,6 +2,16 @@ #define NAMESPACE E20110 +typedef struct TempE20110 { + /* 0x00 */ Vec3f unk_00; + /* 0x0C */ char unk_0C[0x14]; + /* 0x20 */ char unk_20[0x1]; + /* 0x21 */ s8 unk_21; + /* 0x22 */ s8 unk_22; +} TempE20110; + +extern TempE20110* D_802B7CB8_E20DC8; + #include "common/UnkAngleFunc1.inc.c" INCLUDE_ASM(s32, "E20110", func_802B70B4_E201C4); @@ -10,7 +20,39 @@ INCLUDE_ASM(s32, "E20110", func_802B71E8_E202F8); INCLUDE_ASM(s32, "E20110", func_802B7450_E20560); -INCLUDE_ASM(s32, "E20110", func_802B75E8_E206F8); +void func_802B75E8_E206F8(void) { + PlayerStatus* playerStatus = &gPlayerStatus; + f32 unk_21; + f32 yTemp; + f32 y; + f32 delta; + + D_802B7CB8_E20DC8->unk_21 += D_802B7CB8_E20DC8->unk_22; + + if (D_802B7CB8_E20DC8->unk_21 > 4) { + D_802B7CB8_E20DC8->unk_22 = -1; + D_802B7CB8_E20DC8->unk_21 = 4; + } + if (D_802B7CB8_E20DC8->unk_21 < -4) { + D_802B7CB8_E20DC8->unk_22 = 1; + D_802B7CB8_E20DC8->unk_21 = -4; + } + + delta = (playerStatus->position.x - D_802B7CB8_E20DC8->unk_00.x) * 0.666f; + D_802B7CB8_E20DC8->unk_00.x += delta; + delta = (playerStatus->position.z - D_802B7CB8_E20DC8->unk_00.z) * 0.666f; + D_802B7CB8_E20DC8->unk_00.z += delta; + + yTemp = playerStatus->position.y + playerStatus->colliderHeight; + unk_21 = D_802B7CB8_E20DC8->unk_21; + y = D_802B7CB8_E20DC8->unk_00.y; + if (!(playerStatus->animFlags & 0x1000)) { + delta = (yTemp + 8.0f + unk_21 - y) * 0.25f; + } else { + delta = (yTemp + 2.0f + unk_21 - y) * 0.25f; + } + D_802B7CB8_E20DC8->unk_00.y += delta; +} INCLUDE_ASM(s32, "E20110", func_802B7728_E20838); diff --git a/src/battle/area_arn/actor/hyper_cleft.c b/src/battle/area_arn/actor/hyper_cleft.c index fe663b6797..22590ed388 100644 --- a/src/battle/area_arn/actor/hyper_cleft.c +++ b/src/battle/area_arn/actor/hyper_cleft.c @@ -64,7 +64,7 @@ ActorPartBlueprint N(partsTable_80220C14)[] = { .defenseTable = N(defenseTable_80220B40), .eventFlags = ACTOR_EVENT_FLAG_SPIKY_TOP, .elementImmunityFlags = 0, - .unk_1C = 246, + .unk_1D = 246, }, }; diff --git a/src/battle/area_arn/actor/hyper_paragoomba.c b/src/battle/area_arn/actor/hyper_paragoomba.c index e7d56664c3..0f40626bfa 100644 --- a/src/battle/area_arn/actor/hyper_paragoomba.c +++ b/src/battle/area_arn/actor/hyper_paragoomba.c @@ -97,7 +97,7 @@ ActorPartBlueprint N(partsTable_8021B460)[] = { .defenseTable = N(defenseTable_8021B2F0), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 246, + .unk_1D = 246, }, { .flags = ACTOR_PART_FLAG_MULTI_TARGET, @@ -109,7 +109,7 @@ ActorPartBlueprint N(partsTable_8021B460)[] = { .defenseTable = N(defenseTable_8021B2FC), .eventFlags = ACTOR_EVENT_FLAG_GROUNDABLE, .elementImmunityFlags = 0, - .unk_1C = 246, + .unk_1D = 246, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET, @@ -121,7 +121,7 @@ ActorPartBlueprint N(partsTable_8021B460)[] = { .defenseTable = N(defenseTable_8021B2F0), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 246, + .unk_1D = 246, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET, @@ -133,7 +133,7 @@ ActorPartBlueprint N(partsTable_8021B460)[] = { .defenseTable = N(defenseTable_8021B2F0), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 246, + .unk_1D = 246, }, }; diff --git a/src/battle/area_arn/actor/hypergoomba.c b/src/battle/area_arn/actor/hypergoomba.c index 55b0f0dc0d..8c53941e12 100644 --- a/src/battle/area_arn/actor/hypergoomba.c +++ b/src/battle/area_arn/actor/hypergoomba.c @@ -55,7 +55,7 @@ ActorPartBlueprint N(partsTable_80218828)[] = { .defenseTable = N(defenseTable_80218770), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 246, + .unk_1D = 246, }, }; diff --git a/src/battle/area_arn/actor/tubba_blubba.c b/src/battle/area_arn/actor/tubba_blubba.c index 7a44df8cd6..6e8b301350 100644 --- a/src/battle/area_arn/actor/tubba_blubba.c +++ b/src/battle/area_arn/actor/tubba_blubba.c @@ -70,7 +70,7 @@ ActorPartBlueprint N(partsTable_80225D4C)[] = { .defenseTable = N(defenseTable_80225C94), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 246, + .unk_1D = 246, }, }; diff --git a/src/battle/area_arn/actor/tubbas_heart.c b/src/battle/area_arn/actor/tubbas_heart.c index e8ce98250e..d14dea6004 100644 --- a/src/battle/area_arn/actor/tubbas_heart.c +++ b/src/battle/area_arn/actor/tubbas_heart.c @@ -88,7 +88,7 @@ ActorPartBlueprint N(partsTable_80223D30)[] = { .defenseTable = N(defenseTable_80223C78), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 246, + .unk_1D = 246, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_MULTI_TARGET | ACTOR_PART_FLAG_80000000, @@ -100,7 +100,7 @@ ActorPartBlueprint N(partsTable_80223D30)[] = { .defenseTable = N(defenseTable_80223C78), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 246, + .unk_1D = 246, }, }; diff --git a/src/battle/area_dgb/actor/clubba.c b/src/battle/area_dgb/actor/clubba.c index 07c5444354..1efca9bc1b 100644 --- a/src/battle/area_dgb/actor/clubba.c +++ b/src/battle/area_dgb/actor/clubba.c @@ -64,7 +64,8 @@ ActorPartBlueprint N(partsTable_80218104)[] = { .defenseTable = N(defenseTable_8021804C), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 2301, + .unk_1C = 8, + .unk_1D = 0xFD, }, }; diff --git a/src/battle/area_dgb/actor/tubba_blubba.c b/src/battle/area_dgb/actor/tubba_blubba.c index 89ed10a57e..da27b44de8 100644 --- a/src/battle/area_dgb/actor/tubba_blubba.c +++ b/src/battle/area_dgb/actor/tubba_blubba.c @@ -71,7 +71,7 @@ ActorPartBlueprint N(partsTable_80218D24)[] = { .defenseTable = N(defenseTable_80218C6C), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 246, + .unk_1D = 246, }, }; diff --git a/src/battle/area_hos/actor/ember.c b/src/battle/area_hos/actor/ember.c index fb32a0d317..4ab88d5f74 100644 --- a/src/battle/area_hos/actor/ember.c +++ b/src/battle/area_hos/actor/ember.c @@ -52,7 +52,8 @@ ActorPartBlueprint N(partsTable_8021AD80)[] = { .defenseTable = N(defenseTable_8021ACB0), .eventFlags = ACTOR_EVENT_FLAG_FIREY, .elementImmunityFlags = 0, - .unk_1C = -522, + .unk_1C = 0xFD, + .unk_1D = 0xF6, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_100000, @@ -64,7 +65,8 @@ ActorPartBlueprint N(partsTable_8021AD80)[] = { .defenseTable = N(defenseTable_8021ACB0), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = -10, + .unk_1C = 0xFF, + .unk_1D = 0xF6, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_100000, @@ -76,7 +78,8 @@ ActorPartBlueprint N(partsTable_8021AD80)[] = { .defenseTable = N(defenseTable_8021ACB0), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = -10, + .unk_1C = 0xFF, + .unk_1D = 0xF6, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_100000, @@ -88,7 +91,8 @@ ActorPartBlueprint N(partsTable_8021AD80)[] = { .defenseTable = N(defenseTable_8021ACB0), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = -10, + .unk_1C = 0xFF, + .unk_1D = 0xF6, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_100000, @@ -100,7 +104,8 @@ ActorPartBlueprint N(partsTable_8021AD80)[] = { .defenseTable = N(defenseTable_8021ACB0), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = -10, + .unk_1C = 0xFF, + .unk_1D = 0xF6, }, }; diff --git a/src/battle/area_hos/actor/goombario_tutor.c b/src/battle/area_hos/actor/goombario_tutor.c index 044fa5ba13..f0c5134356 100644 --- a/src/battle/area_hos/actor/goombario_tutor.c +++ b/src/battle/area_hos/actor/goombario_tutor.c @@ -60,7 +60,7 @@ ActorPartBlueprint N(partsTable_80219114)[] = { .defenseTable = N(defenseTable_8021905C), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 0, + .unk_1D = 0, }, }; diff --git a/src/battle/area_hos/actor/magikoopa.c b/src/battle/area_hos/actor/magikoopa.c index 1e9a6a9f1a..4098c30ce5 100644 --- a/src/battle/area_hos/actor/magikoopa.c +++ b/src/battle/area_hos/actor/magikoopa.c @@ -79,7 +79,8 @@ ActorPartBlueprint N(partsTable_8021D5F0)[] = { .defenseTable = N(defenseTable_8021D480), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = -1036, + .unk_1C = 0xFB, + .unk_1D = 0xF4, }, }; @@ -97,7 +98,8 @@ ActorPartBlueprint N(partsTable_8021D614)[] = { .defenseTable = N(defenseTable_8021D48C), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = -1036, + .unk_1C = 0xFB, + .unk_1D = 0xF4, }, { .flags = ACTOR_PART_FLAG_MULTI_TARGET, @@ -109,7 +111,7 @@ ActorPartBlueprint N(partsTable_8021D614)[] = { .defenseTable = N(defenseTable_8021D48C), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 248, + .unk_1D = 248, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET, @@ -121,7 +123,7 @@ ActorPartBlueprint N(partsTable_8021D614)[] = { .defenseTable = N(defenseTable_8021D48C), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 0, + .unk_1D = 0, }, }; @@ -1275,7 +1277,8 @@ ActorPartBlueprint N(partsTable_80221624)[] = { .defenseTable = N(defenseTable_802214B4), .eventFlags = ACTOR_EVENT_FLAG_ILLUSORY, .elementImmunityFlags = 0, - .unk_1C = -1036, + .unk_1C = 0xFB, + .unk_1D = 0xF4, }, }; @@ -1290,7 +1293,7 @@ ActorPartBlueprint N(partsTable_80221648)[] = { .defenseTable = N(defenseTable_802214C0), .eventFlags = ACTOR_EVENT_FLAG_ILLUSORY, .elementImmunityFlags = 0, - .unk_1C = 248, + .unk_1D = 248, }, }; diff --git a/src/battle/area_isk_part_1/actor/buzzy_beetle.c b/src/battle/area_isk_part_1/actor/buzzy_beetle.c index fb3aaaefa6..628e2a3413 100644 --- a/src/battle/area_isk_part_1/actor/buzzy_beetle.c +++ b/src/battle/area_isk_part_1/actor/buzzy_beetle.c @@ -62,7 +62,8 @@ ActorPartBlueprint N(partsTable_8021E594)[] = { .defenseTable = N(defenseTable_8021E4C0), .eventFlags = ACTOR_EVENT_FLAG_FLIPABLE, .elementImmunityFlags = 0, - .unk_1C = 263, + .unk_1C = 1, + .unk_1D = 7, }, }; diff --git a/src/battle/area_isk_part_1/actor/pokey_mummy.c b/src/battle/area_isk_part_1/actor/pokey_mummy.c index 9440c9d40b..b3d2580044 100644 --- a/src/battle/area_isk_part_1/actor/pokey_mummy.c +++ b/src/battle/area_isk_part_1/actor/pokey_mummy.c @@ -60,7 +60,7 @@ ActorPartBlueprint N(partsTable_80218CC8)[] = { .defenseTable = N(defenseTable_80218C10), .eventFlags = ACTOR_EVENT_FLAG_SPIKY_TOP | ACTOR_EVENT_FLAG_200000, .elementImmunityFlags = 0, - .unk_1C = 0, + .unk_1D = 0, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_MULTI_TARGET, @@ -72,7 +72,7 @@ ActorPartBlueprint N(partsTable_80218CC8)[] = { .defenseTable = N(defenseTable_80218C10), .eventFlags = ACTOR_EVENT_FLAG_SPIKY_TOP | ACTOR_EVENT_FLAG_200000, .elementImmunityFlags = 0, - .unk_1C = 248, + .unk_1D = 248, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET, @@ -84,7 +84,7 @@ ActorPartBlueprint N(partsTable_80218CC8)[] = { .defenseTable = N(defenseTable_80218C10), .eventFlags = ACTOR_EVENT_FLAG_SPIKY_TOP | ACTOR_EVENT_FLAG_200000, .elementImmunityFlags = 0, - .unk_1C = 248, + .unk_1D = 248, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET, @@ -96,7 +96,7 @@ ActorPartBlueprint N(partsTable_80218CC8)[] = { .defenseTable = N(defenseTable_80218C10), .eventFlags = ACTOR_EVENT_FLAG_SPIKY_TOP | ACTOR_EVENT_FLAG_200000, .elementImmunityFlags = 0, - .unk_1C = 248, + .unk_1D = 248, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET, @@ -108,7 +108,7 @@ ActorPartBlueprint N(partsTable_80218CC8)[] = { .defenseTable = N(defenseTable_80218C10), .eventFlags = ACTOR_EVENT_FLAG_SPIKY_TOP | ACTOR_EVENT_FLAG_200000, .elementImmunityFlags = 0, - .unk_1C = 248, + .unk_1D = 248, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_100000, @@ -120,7 +120,7 @@ ActorPartBlueprint N(partsTable_80218CC8)[] = { .defenseTable = N(defenseTable_80218C10), .eventFlags = ACTOR_EVENT_FLAG_SPIKY_TOP | ACTOR_EVENT_FLAG_200000, .elementImmunityFlags = 0, - .unk_1C = 0, + .unk_1D = 0, }, }; diff --git a/src/battle/area_isk_part_1/actor/stone_chomp.c b/src/battle/area_isk_part_1/actor/stone_chomp.c index 2752a2f523..58752ea52b 100644 --- a/src/battle/area_isk_part_1/actor/stone_chomp.c +++ b/src/battle/area_isk_part_1/actor/stone_chomp.c @@ -102,7 +102,7 @@ ActorPartBlueprint N(partsTable_80221604)[] = { .defenseTable = N(defenseTable_8022154C), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 0, + .unk_1D = 0, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_100000 | ACTOR_PART_FLAG_MULTI_TARGET, @@ -114,7 +114,7 @@ ActorPartBlueprint N(partsTable_80221604)[] = { .defenseTable = N(defenseTable_8022154C), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 242, + .unk_1D = 242, }, { .flags = ACTOR_PART_FLAG_2 | ACTOR_PART_FLAG_4000 | ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_100000, @@ -126,7 +126,7 @@ ActorPartBlueprint N(partsTable_80221604)[] = { .defenseTable = N(defenseTable_8022154C), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 0, + .unk_1D = 0, }, { .flags = ACTOR_PART_FLAG_2 | ACTOR_PART_FLAG_4000 | ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_100000, @@ -138,7 +138,7 @@ ActorPartBlueprint N(partsTable_80221604)[] = { .defenseTable = N(defenseTable_8022154C), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 0, + .unk_1D = 0, }, { .flags = ACTOR_PART_FLAG_2 | ACTOR_PART_FLAG_4000 | ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_100000, @@ -150,7 +150,7 @@ ActorPartBlueprint N(partsTable_80221604)[] = { .defenseTable = N(defenseTable_8022154C), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 0, + .unk_1D = 0, }, { .flags = ACTOR_PART_FLAG_2 | ACTOR_PART_FLAG_4000 | ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_100000, @@ -162,7 +162,7 @@ ActorPartBlueprint N(partsTable_80221604)[] = { .defenseTable = N(defenseTable_8022154C), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 0, + .unk_1D = 0, }, { .flags = ACTOR_PART_FLAG_2 | ACTOR_PART_FLAG_4000 | ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_100000, @@ -174,7 +174,7 @@ ActorPartBlueprint N(partsTable_80221604)[] = { .defenseTable = N(defenseTable_8022154C), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 0, + .unk_1D = 0, }, { .flags = ACTOR_PART_FLAG_2 | ACTOR_PART_FLAG_4000 | ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_100000, @@ -186,7 +186,7 @@ ActorPartBlueprint N(partsTable_80221604)[] = { .defenseTable = N(defenseTable_8022154C), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 0, + .unk_1D = 0, }, { .flags = ACTOR_PART_FLAG_2 | ACTOR_PART_FLAG_4000 | ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_100000, @@ -198,7 +198,7 @@ ActorPartBlueprint N(partsTable_80221604)[] = { .defenseTable = N(defenseTable_8022154C), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 0, + .unk_1D = 0, }, { .flags = ACTOR_PART_FLAG_2 | ACTOR_PART_FLAG_4000 | ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_100000, @@ -210,7 +210,7 @@ ActorPartBlueprint N(partsTable_80221604)[] = { .defenseTable = N(defenseTable_8022154C), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 0, + .unk_1D = 0, }, }; diff --git a/src/battle/area_isk_part_1/actor/swooper.c b/src/battle/area_isk_part_1/actor/swooper.c index 1ef5386f62..6fd457038b 100644 --- a/src/battle/area_isk_part_1/actor/swooper.c +++ b/src/battle/area_isk_part_1/actor/swooper.c @@ -52,7 +52,8 @@ ActorPartBlueprint N(partsTable_8021C568)[] = { .defenseTable = N(defenseTable_8021C4B0), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 271, + .unk_1C = 1, + .unk_1D = 0xF, }, }; diff --git a/src/battle/area_isk_part_2/actor/chain_chomp.c b/src/battle/area_isk_part_2/actor/chain_chomp.c index adbc0aca81..cf4a335c87 100644 --- a/src/battle/area_isk_part_2/actor/chain_chomp.c +++ b/src/battle/area_isk_part_2/actor/chain_chomp.c @@ -125,7 +125,7 @@ ActorPartBlueprint N(partsTable_80218D34)[] = { .defenseTable = N(defenseTable_80218C5C), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 240, + .unk_1D = 240, }, { .flags = ACTOR_PART_FLAG_2 | ACTOR_PART_FLAG_4000 | ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_100000, diff --git a/src/battle/area_isk_part_2/actor/tutankoopa.c b/src/battle/area_isk_part_2/actor/tutankoopa.c index 68d825ab36..efd5778510 100644 --- a/src/battle/area_isk_part_2/actor/tutankoopa.c +++ b/src/battle/area_isk_part_2/actor/tutankoopa.c @@ -120,7 +120,8 @@ ActorPartBlueprint N(partsTable_8021BAD4)[] = { .defenseTable = N(defenseTable_8021BA1C), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = -1039, + .unk_1C = 0xFB, + .unk_1D = 0xF1, }, { .flags = ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_100000 | ACTOR_PART_FLAG_40000000, diff --git a/src/battle/area_iwa/actor/buzzar.c b/src/battle/area_iwa/actor/buzzar.c index e5ddd3c5f2..c29fdee2b4 100644 --- a/src/battle/area_iwa/actor/buzzar.c +++ b/src/battle/area_iwa/actor/buzzar.c @@ -82,7 +82,7 @@ ActorPartBlueprint N(partsTable_8021B708)[] = { .defenseTable = N(defenseTable_8021B650), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 0, + .unk_1D = 0, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_MULTI_TARGET, @@ -94,7 +94,7 @@ ActorPartBlueprint N(partsTable_8021B708)[] = { .defenseTable = N(defenseTable_8021B650), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 242, + .unk_1D = 242, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_100000, @@ -106,7 +106,7 @@ ActorPartBlueprint N(partsTable_8021B708)[] = { .defenseTable = N(defenseTable_8021B650), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 0, + .unk_1D = 0, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_100000, @@ -118,7 +118,7 @@ ActorPartBlueprint N(partsTable_8021B708)[] = { .defenseTable = N(defenseTable_8021B650), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 0, + .unk_1D = 0, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_100000, @@ -130,7 +130,7 @@ ActorPartBlueprint N(partsTable_8021B708)[] = { .defenseTable = N(defenseTable_8021B650), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 0, + .unk_1D = 0, }, }; diff --git a/src/battle/area_iwa/actor/cleft.c b/src/battle/area_iwa/actor/cleft.c index d617955cf1..ebc005104e 100644 --- a/src/battle/area_iwa/actor/cleft.c +++ b/src/battle/area_iwa/actor/cleft.c @@ -61,7 +61,7 @@ ActorPartBlueprint N(partsTable_802187EC)[] = { .defenseTable = N(defenseTable_80218710), .eventFlags = ACTOR_EVENT_FLAG_SPIKY_TOP, .elementImmunityFlags = 0, - .unk_1C = 246, + .unk_1D = 246, }, }; diff --git a/src/battle/area_iwa/actor/monty_mole.c b/src/battle/area_iwa/actor/monty_mole.c index db68404bee..dcc29b68ef 100644 --- a/src/battle/area_iwa/actor/monty_mole.c +++ b/src/battle/area_iwa/actor/monty_mole.c @@ -53,7 +53,7 @@ ActorPartBlueprint N(partsTable_8021A508)[] = { .defenseTable = N(defenseTable_8021A450), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 249, + .unk_1D = 249, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_MULTI_TARGET | ACTOR_PART_FLAG_80000000, @@ -65,7 +65,7 @@ ActorPartBlueprint N(partsTable_8021A508)[] = { .defenseTable = N(defenseTable_8021A450), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 249, + .unk_1D = 249, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_100000, @@ -77,7 +77,7 @@ ActorPartBlueprint N(partsTable_8021A508)[] = { .defenseTable = N(defenseTable_8021A450), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 0, + .unk_1D = 0, }, }; @@ -142,7 +142,7 @@ ActorPartBlueprint N(partsTable_8021A60C)[] = { .defenseTable = NULL, .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 0, + .unk_1D = 0, }, }; diff --git a/src/battle/area_iwa/actor/whacka.c b/src/battle/area_iwa/actor/whacka.c index 5dfc240e19..21dad98c7a 100644 --- a/src/battle/area_iwa/actor/whacka.c +++ b/src/battle/area_iwa/actor/whacka.c @@ -66,7 +66,7 @@ ActorPartBlueprint N(partsTable_8021FD54)[] = { .defenseTable = N(defenseTable_8021FC9C), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 251, + .unk_1D = 251, }, }; diff --git a/src/battle/area_iwa/stage/iwa_01.c b/src/battle/area_iwa/stage/iwa_01.c index f31bf13bd7..797602337e 100644 --- a/src/battle/area_iwa/stage/iwa_01.c +++ b/src/battle/area_iwa/stage/iwa_01.c @@ -103,7 +103,7 @@ ActorPartBlueprint N(partsTable_80220A04)[] = { .defenseTable = N(defenseTable_8022094C), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 251, + .unk_1D = 251, }, }; diff --git a/src/battle/area_iwa/stage/iwa_02.c b/src/battle/area_iwa/stage/iwa_02.c index 318175c7eb..c9427ebe7d 100644 --- a/src/battle/area_iwa/stage/iwa_02.c +++ b/src/battle/area_iwa/stage/iwa_02.c @@ -98,7 +98,7 @@ ActorPartBlueprint N(partsTable_80221720)[] = { .defenseTable = N(defenseTable_80221668), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 251, + .unk_1D = 251, }, }; diff --git a/src/battle/area_jan/actor/hurt_plant.c b/src/battle/area_jan/actor/hurt_plant.c index 557eef7fbc..69d32f2613 100644 --- a/src/battle/area_jan/actor/hurt_plant.c +++ b/src/battle/area_jan/actor/hurt_plant.c @@ -65,7 +65,8 @@ ActorPartBlueprint N(partsTable_8021DA4C)[] = { .defenseTable = N(defenseTable_8021D98C), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = -1797, + .unk_1C = 0xF8, + .unk_1D = 0xFB, }, }; diff --git a/src/battle/area_jan/actor/jungle_fuzzy.c b/src/battle/area_jan/actor/jungle_fuzzy.c index 567e6511ee..be710d4f55 100644 --- a/src/battle/area_jan/actor/jungle_fuzzy.c +++ b/src/battle/area_jan/actor/jungle_fuzzy.c @@ -56,7 +56,7 @@ ActorPartBlueprint N(partsTable_8021EA90)[] = { .defenseTable = N(defenseTable_8021E9D0), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 246, + .unk_1D = 246, }, }; diff --git a/src/battle/area_jan/actor/m_bush.c b/src/battle/area_jan/actor/m_bush.c index 3517f8148c..fc3ff89457 100644 --- a/src/battle/area_jan/actor/m_bush.c +++ b/src/battle/area_jan/actor/m_bush.c @@ -65,7 +65,7 @@ ActorPartBlueprint N(partsTable_8022193C)[] = { .defenseTable = N(defenseTable_8022187C), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 246, + .unk_1D = 246, }, }; diff --git a/src/battle/area_jan/actor/spear_guy.c b/src/battle/area_jan/actor/spear_guy.c index 79444eab30..e8e2d7539e 100644 --- a/src/battle/area_jan/actor/spear_guy.c +++ b/src/battle/area_jan/actor/spear_guy.c @@ -129,7 +129,8 @@ ActorPartBlueprint N(partsTable_802187F0)[] = { .defenseTable = N(defenseTable_80218670), .eventFlags = ACTOR_EVENT_FLAG_SPIKY_FRONT, .elementImmunityFlags = 0, - .unk_1C = -520, + .unk_1C = 0xFD, + .unk_1D = 0xF8, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_2000 | ACTOR_PART_FLAG_NO_TARGET, @@ -141,7 +142,8 @@ ActorPartBlueprint N(partsTable_802187F0)[] = { .defenseTable = N(defenseTable_80218684), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = -10, + .unk_1C = 0xFF, + .unk_1D = 0xF6, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_2000 | ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_100000, diff --git a/src/battle/area_kgr/actor/fuzzipede.c b/src/battle/area_kgr/actor/fuzzipede.c index 74fa730a2a..5cfcd8dd96 100644 --- a/src/battle/area_kgr/actor/fuzzipede.c +++ b/src/battle/area_kgr/actor/fuzzipede.c @@ -81,7 +81,8 @@ ActorPartBlueprint N(partsTable_80218B00)[] = { .defenseTable = N(defenseTable_80218A48), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = -266, + .unk_1C = 0xFE, + .unk_1D = 0xF6, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_MULTI_TARGET | ACTOR_PART_FLAG_80000000, @@ -93,7 +94,8 @@ ActorPartBlueprint N(partsTable_80218B00)[] = { .defenseTable = N(defenseTable_80218A48), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = -266, + .unk_1C = 0xFE, + .unk_1D = 0xF6, }, }; diff --git a/src/battle/area_kmr_part_2/actor/blue_goomba.c b/src/battle/area_kmr_part_2/actor/blue_goomba.c index ac3a3ad1f2..38a9e1ff34 100644 --- a/src/battle/area_kmr_part_2/actor/blue_goomba.c +++ b/src/battle/area_kmr_part_2/actor/blue_goomba.c @@ -54,7 +54,7 @@ ActorPartBlueprint N(partsTable_80219968)[] = { .defenseTable = N(defenseTable_802198B0), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 253, + .unk_1D = 253, }, }; diff --git a/src/battle/area_kmr_part_2/actor/blue_goomba2.c b/src/battle/area_kmr_part_2/actor/blue_goomba2.c index 61bf11c557..1d8be1a4bd 100644 --- a/src/battle/area_kmr_part_2/actor/blue_goomba2.c +++ b/src/battle/area_kmr_part_2/actor/blue_goomba2.c @@ -52,7 +52,7 @@ ActorPartBlueprint N(partsTable_8021D4B8)[] = { .defenseTable = N(defenseTable_8021D400), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1C = 253, + .unk_1D = 253, }, }; diff --git a/src/battle/area_kmr_part_2/actor/goomba_king.c b/src/battle/area_kmr_part_2/actor/goomba_king.c index ccc82b8e5d..c2f1f73d5c 100644 --- a/src/battle/area_kmr_part_2/actor/goomba_king.c +++ b/src/battle/area_kmr_part_2/actor/goomba_king.c @@ -95,7 +95,7 @@ ActorPartBlueprint N(partsTable_802209C8)[] = { .defenseTable = N(defenseTable_80220910), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1C = 0, + .unk_1D = 0, }, { .flags = ACTOR_PART_FLAG_20 | ACTOR_PART_FLAG_MULTI_TARGET, @@ -107,7 +107,7 @@ ActorPartBlueprint N(partsTable_802209C8)[] = { .defenseTable = N(defenseTable_80220910), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1C = 0, + .unk_1D = 0, }, }; diff --git a/src/battle/area_kmr_part_2/actor/goomnut_tree.c b/src/battle/area_kmr_part_2/actor/goomnut_tree.c index cd948dd8bd..63a7e033f3 100644 --- a/src/battle/area_kmr_part_2/actor/goomnut_tree.c +++ b/src/battle/area_kmr_part_2/actor/goomnut_tree.c @@ -59,7 +59,7 @@ ActorPartBlueprint N(partsTable_8022339C)[] = { .defenseTable = N(defenseTable_802232DC), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 0, + .unk_1D = 0, }, { .flags = ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_100000, @@ -71,7 +71,7 @@ ActorPartBlueprint N(partsTable_8022339C)[] = { .defenseTable = N(defenseTable_802232DC), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 0, + .unk_1D = 0, }, { .flags = ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_100000, @@ -83,7 +83,7 @@ ActorPartBlueprint N(partsTable_8022339C)[] = { .defenseTable = N(defenseTable_802232DC), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 0, + .unk_1D = 0, }, { .flags = ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_100000, @@ -95,7 +95,7 @@ ActorPartBlueprint N(partsTable_8022339C)[] = { .defenseTable = N(defenseTable_802232DC), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 0, + .unk_1D = 0, }, { .flags = ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_100000, @@ -107,7 +107,7 @@ ActorPartBlueprint N(partsTable_8022339C)[] = { .defenseTable = N(defenseTable_802232DC), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 0, + .unk_1D = 0, }, }; diff --git a/src/battle/area_kmr_part_2/actor/red_goomba.c b/src/battle/area_kmr_part_2/actor/red_goomba.c index 5fbe91b3b5..e7efffce44 100644 --- a/src/battle/area_kmr_part_2/actor/red_goomba.c +++ b/src/battle/area_kmr_part_2/actor/red_goomba.c @@ -54,7 +54,7 @@ ActorPartBlueprint N(partsTable_8021B778)[] = { .defenseTable = N(defenseTable_8021B6C0), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1C = 253, + .unk_1D = 253, }, }; diff --git a/src/battle/area_kmr_part_2/actor/red_goomba2.c b/src/battle/area_kmr_part_2/actor/red_goomba2.c index a9123bed3b..14b948f51b 100644 --- a/src/battle/area_kmr_part_2/actor/red_goomba2.c +++ b/src/battle/area_kmr_part_2/actor/red_goomba2.c @@ -52,7 +52,7 @@ ActorPartBlueprint N(partsTable_8021EEB8)[] = { .defenseTable = N(defenseTable_8021EE00), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1C = 253, + .unk_1D = 253, }, }; diff --git a/src/battle/area_kmr_part_3/actor/egg_jr_troopa.c b/src/battle/area_kmr_part_3/actor/egg_jr_troopa.c index 64adb1ec05..3a621e92e9 100644 --- a/src/battle/area_kmr_part_3/actor/egg_jr_troopa.c +++ b/src/battle/area_kmr_part_3/actor/egg_jr_troopa.c @@ -74,7 +74,8 @@ ActorPartBlueprint N(partsTable_802244C4)[] = { .defenseTable = N(defenseTable_8022440C), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 1532, + .unk_1C = 5, + .unk_1D = 0xFC, }, }; diff --git a/src/battle/area_kmr_part_3/actor/final_jr_troopa.c b/src/battle/area_kmr_part_3/actor/final_jr_troopa.c index e54879249a..568b689025 100644 --- a/src/battle/area_kmr_part_3/actor/final_jr_troopa.c +++ b/src/battle/area_kmr_part_3/actor/final_jr_troopa.c @@ -145,7 +145,8 @@ ActorPartBlueprint N(partsTable_8022C640)[] = { .defenseTable = N(defenseTable_8022C418), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = -262, + .unk_1C = 0xFE, + .unk_1D = 0xFA, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET, @@ -157,7 +158,7 @@ ActorPartBlueprint N(partsTable_8022C640)[] = { .defenseTable = N(defenseTable_8022C424), .eventFlags = ACTOR_EVENT_FLAG_SPIKY_TOP, .elementImmunityFlags = 0, - .unk_1C = 245, + .unk_1D = 245, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET, @@ -169,7 +170,8 @@ ActorPartBlueprint N(partsTable_8022C640)[] = { .defenseTable = N(defenseTable_8022C430), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = -263, + .unk_1C = 0xFE, + .unk_1D = 0xF9, }, }; diff --git a/src/battle/area_kmr_part_3/actor/jr_troopa.c b/src/battle/area_kmr_part_3/actor/jr_troopa.c index 44d1cd224b..ae9a133634 100644 --- a/src/battle/area_kmr_part_3/actor/jr_troopa.c +++ b/src/battle/area_kmr_part_3/actor/jr_troopa.c @@ -58,7 +58,7 @@ ActorPartBlueprint N(partsTable_80222AE4)[] = { .defenseTable = N(defenseTable_80222A2C), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 0, + .unk_1D = 0, }, }; diff --git a/src/battle/area_kmr_part_3/actor/mage_jr_troopa.c b/src/battle/area_kmr_part_3/actor/mage_jr_troopa.c index a7df8ce34a..e4d6e86095 100644 --- a/src/battle/area_kmr_part_3/actor/mage_jr_troopa.c +++ b/src/battle/area_kmr_part_3/actor/mage_jr_troopa.c @@ -89,7 +89,8 @@ ActorPartBlueprint N(partsTable_8022A6E0)[] = { .defenseTable = N(defenseTable_8022A628), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = -263, + .unk_1C = 0xFE, + .unk_1D = 0xF9, }, { .flags = ACTOR_PART_FLAG_NO_TARGET, @@ -101,7 +102,7 @@ ActorPartBlueprint N(partsTable_8022A6E0)[] = { .defenseTable = N(defenseTable_8022A628), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 0, + .unk_1D = 0, }, }; diff --git a/src/battle/area_kmr_part_3/actor/para_jr_troopa.c b/src/battle/area_kmr_part_3/actor/para_jr_troopa.c index 367dbc994a..0b1df6b1ef 100644 --- a/src/battle/area_kmr_part_3/actor/para_jr_troopa.c +++ b/src/battle/area_kmr_part_3/actor/para_jr_troopa.c @@ -76,7 +76,7 @@ ActorPartBlueprint N(partsTable_80225F0C)[] = { .defenseTable = N(defenseTable_80225E54), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 250, + .unk_1D = 250, }, { .flags = ACTOR_PART_FLAG_NO_TARGET, @@ -88,7 +88,7 @@ ActorPartBlueprint N(partsTable_80225F0C)[] = { .defenseTable = N(defenseTable_80225E54), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 0, + .unk_1D = 0, }, }; diff --git a/src/battle/area_kmr_part_3/actor/paragoomba.c b/src/battle/area_kmr_part_3/actor/paragoomba.c index 6005288c3d..acd42f0ceb 100644 --- a/src/battle/area_kmr_part_3/actor/paragoomba.c +++ b/src/battle/area_kmr_part_3/actor/paragoomba.c @@ -86,7 +86,7 @@ ActorPartBlueprint N(partsTable)[] = { .defenseTable = N(defenseTable_8021C1B0), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 246, + .unk_1D = 246, }, { .flags = ACTOR_PART_FLAG_MULTI_TARGET, @@ -98,7 +98,7 @@ ActorPartBlueprint N(partsTable)[] = { .defenseTable = N(defenseTable_8021C1BC), .eventFlags = ACTOR_EVENT_FLAG_GROUNDABLE, .elementImmunityFlags = 0, - .unk_1C = 246, + .unk_1D = 246, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET, @@ -110,7 +110,7 @@ ActorPartBlueprint N(partsTable)[] = { .defenseTable = N(defenseTable_8021C1B0), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 246, + .unk_1D = 246, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET, @@ -122,7 +122,7 @@ ActorPartBlueprint N(partsTable)[] = { .defenseTable = N(defenseTable_8021C1B0), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 246, + .unk_1D = 246, }, }; diff --git a/src/battle/area_kmr_part_3/actor/spiked_goomba.c b/src/battle/area_kmr_part_3/actor/spiked_goomba.c index e64e96f879..5ba0bf61d2 100644 --- a/src/battle/area_kmr_part_3/actor/spiked_goomba.c +++ b/src/battle/area_kmr_part_3/actor/spiked_goomba.c @@ -52,7 +52,7 @@ ActorPartBlueprint N(partsTable_8021A448)[] = { .defenseTable = N(defenseTable_8021A390), .eventFlags = ACTOR_EVENT_FLAG_SPIKY_TOP, .elementImmunityFlags = 0, - .unk_1C = 244, + .unk_1D = 244, }, }; diff --git a/src/battle/area_kmr_part_3/actor/spiked_para_jr_troopa.c b/src/battle/area_kmr_part_3/actor/spiked_para_jr_troopa.c index e0191d251c..b79fa76bdf 100644 --- a/src/battle/area_kmr_part_3/actor/spiked_para_jr_troopa.c +++ b/src/battle/area_kmr_part_3/actor/spiked_para_jr_troopa.c @@ -70,7 +70,7 @@ ActorPartBlueprint N(partsTable_80228014)[] = { .defenseTable = N(defenseTable_80227F5C), .eventFlags = ACTOR_EVENT_FLAG_SPIKY_TOP, .elementImmunityFlags = 0, - .unk_1C = 245, + .unk_1D = 245, }, { .flags = ACTOR_PART_FLAG_NO_TARGET, @@ -82,7 +82,7 @@ ActorPartBlueprint N(partsTable_80228014)[] = { .defenseTable = N(defenseTable_80227F5C), .eventFlags = ACTOR_EVENT_FLAG_SPIKY_TOP, .elementImmunityFlags = 0, - .unk_1C = 0, + .unk_1D = 0, }, }; diff --git a/src/battle/area_kzn/actor/lava_bubble.c b/src/battle/area_kzn/actor/lava_bubble.c index 0d9cb8546a..9848faa6ab 100644 --- a/src/battle/area_kzn/actor/lava_bubble.c +++ b/src/battle/area_kzn/actor/lava_bubble.c @@ -57,7 +57,8 @@ ActorPartBlueprint N(partsTable_80218EE8)[] = { .defenseTable = N(defenseTable_80218E10), .eventFlags = ACTOR_EVENT_FLAG_FIREY, .elementImmunityFlags = ELEMENT_IMMUNITY_FLAGS_2, - .unk_1C = -522, + .unk_1C = 0xFD, + .unk_1D = 0xF6, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_100000, @@ -69,7 +70,8 @@ ActorPartBlueprint N(partsTable_80218EE8)[] = { .defenseTable = N(defenseTable_80218E10), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = -10, + .unk_1C = 0xFF, + .unk_1D = 0xF6, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_100000, @@ -81,7 +83,8 @@ ActorPartBlueprint N(partsTable_80218EE8)[] = { .defenseTable = N(defenseTable_80218E10), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = -10, + .unk_1C = 0xFF, + .unk_1D = 0xF6, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_100000, @@ -93,7 +96,8 @@ ActorPartBlueprint N(partsTable_80218EE8)[] = { .defenseTable = N(defenseTable_80218E10), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = -10, + .unk_1C = 0xFF, + .unk_1D = 0xF6, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_100000, @@ -105,7 +109,8 @@ ActorPartBlueprint N(partsTable_80218EE8)[] = { .defenseTable = N(defenseTable_80218E10), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = -10, + .unk_1C = 0xFF, + .unk_1D = 0xF6, }, }; diff --git a/src/battle/area_kzn/actor/red_magikoopa.c b/src/battle/area_kzn/actor/red_magikoopa.c index 8b32c6bf2f..6a9dfb1ec6 100644 --- a/src/battle/area_kzn/actor/red_magikoopa.c +++ b/src/battle/area_kzn/actor/red_magikoopa.c @@ -86,7 +86,8 @@ ActorPartBlueprint N(partsTable_80220FD0)[] = { .defenseTable = N(defenseTable_80220E60), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = -1036, + .unk_1C = 0xFB, + .unk_1D = 0xF4, }, }; @@ -101,7 +102,8 @@ ActorPartBlueprint N(partsTable_80220FF4)[] = { .defenseTable = N(defenseTable_80220E6C), .eventFlags = ACTOR_EVENT_FLAG_800000, .elementImmunityFlags = 0, - .unk_1C = -1036, + .unk_1C = 0xFB, + .unk_1D = 0xF4, }, { .flags = ACTOR_PART_FLAG_MULTI_TARGET, @@ -113,7 +115,7 @@ ActorPartBlueprint N(partsTable_80220FF4)[] = { .defenseTable = N(defenseTable_80220E6C), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 248, + .unk_1D = 248, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET, diff --git a/src/battle/area_mac/actor/chan.c b/src/battle/area_mac/actor/chan.c index 1d6e4fa628..09fb414388 100644 --- a/src/battle/area_mac/actor/chan.c +++ b/src/battle/area_mac/actor/chan.c @@ -56,7 +56,8 @@ ActorPartBlueprint N(partsTable_80219E24)[] = { .defenseTable = N(defenseTable_80219D50), .eventFlags = ACTOR_EVENT_FLAG_FLIPABLE, .elementImmunityFlags = 0, - .unk_1C = 263, + .unk_1C = 1, + .unk_1D = 263, }, }; diff --git a/src/battle/area_mac/actor/lee.c b/src/battle/area_mac/actor/lee.c index bdd3d98a26..1a92c0f571 100644 --- a/src/battle/area_mac/actor/lee.c +++ b/src/battle/area_mac/actor/lee.c @@ -76,7 +76,8 @@ ActorPartBlueprint N(partsTable_8021D47C)[] = { .defenseTable = N(defenseTable_8021D3C4), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = -266, + .unk_1C = 0xFE, + .unk_1D = 0xF6, }, }; @@ -504,7 +505,8 @@ ActorPartBlueprint N(partsTable_8021EA50)[] = { .defenseTable = N(defenseTable_8021E998), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = -9, + .unk_1C = 0xFF, + .unk_1D = 0xF7, }, }; @@ -1082,7 +1084,7 @@ ActorPartBlueprint N(partsTable_8022069C)[] = { .defenseTable = N(defenseTable_802205D8), .eventFlags = ACTOR_EVENT_FLAG_FLIPABLE, .elementImmunityFlags = 0, - .unk_1C = 240, + .unk_1D = 240, }, }; @@ -1593,7 +1595,8 @@ ActorPartBlueprint N(partsTable_80222394)[] = { .defenseTable = N(defenseTable_802222DC), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = -263, + .unk_1C = 0xFE, + .unk_1D = 0xF9, }, }; @@ -1947,7 +1950,7 @@ ActorPartBlueprint N(partsTable_8022348C)[] = { .defenseTable = N(defenseTable_802233D4), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 240, + .unk_1D = 240, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_MULTI_TARGET, @@ -1959,7 +1962,7 @@ ActorPartBlueprint N(partsTable_8022348C)[] = { .defenseTable = N(defenseTable_802233D4), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 240, + .unk_1D = 240, }, }; @@ -2309,7 +2312,7 @@ ActorPartBlueprint N(partsTable_80224514)[] = { .defenseTable = N(defenseTable_8022445C), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 246, + .unk_1D = 246, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_MULTI_TARGET, @@ -2321,7 +2324,7 @@ ActorPartBlueprint N(partsTable_80224514)[] = { .defenseTable = N(defenseTable_8022445C), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 246, + .unk_1D = 246, }, }; @@ -2761,7 +2764,7 @@ ActorPartBlueprint N(partsTable_80225A80)[] = { .defenseTable = N(defenseTable_802259C0), .eventFlags = ACTOR_EVENT_FLAG_ELECTRIFIED, .elementImmunityFlags = 0, - .unk_1C = 248, + .unk_1D = 248, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_MULTI_TARGET, @@ -2773,7 +2776,7 @@ ActorPartBlueprint N(partsTable_80225A80)[] = { .defenseTable = N(defenseTable_802259C0), .eventFlags = ACTOR_EVENT_FLAG_ELECTRIFIED, .elementImmunityFlags = 0, - .unk_1C = 248, + .unk_1D = 248, }, }; @@ -3157,7 +3160,7 @@ ActorPartBlueprint N(partsTable_80226A80)[] = { .defenseTable = N(defenseTable_802269C8), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 244, + .unk_1D = 244, }, }; @@ -3636,7 +3639,8 @@ ActorPartBlueprint N(partsTable_8022851C)[] = { .defenseTable = N(defenseTable_80228464), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = -266, + .unk_1C = 0xFE, + .unk_1D = 0xF6, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_100000, @@ -3648,7 +3652,7 @@ ActorPartBlueprint N(partsTable_8022851C)[] = { .defenseTable = N(defenseTable_80228464), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 0, + .unk_1D = 0, }, }; diff --git a/src/battle/area_mac/actor/master1.c b/src/battle/area_mac/actor/master1.c index 40c0000b84..f28dad50a0 100644 --- a/src/battle/area_mac/actor/master1.c +++ b/src/battle/area_mac/actor/master1.c @@ -59,7 +59,8 @@ ActorPartBlueprint N(partsTable_8022A364)[] = { .defenseTable = N(defenseTable_8022A2AC), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 761, + .unk_1C = 2, + .unk_1D = 0xF9, }, }; diff --git a/src/battle/area_mac/actor/master2.c b/src/battle/area_mac/actor/master2.c index ced454fc62..374ef68659 100644 --- a/src/battle/area_mac/actor/master2.c +++ b/src/battle/area_mac/actor/master2.c @@ -72,7 +72,8 @@ ActorPartBlueprint N(partsTable_8022B790)[] = { .defenseTable = N(defenseTable_8022B6D8), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 761, + .unk_1C = 2, + .unk_1D = 0xF9, }, }; diff --git a/src/battle/area_mac/actor/master3.c b/src/battle/area_mac/actor/master3.c index ea33500ec7..f23ae1e73b 100644 --- a/src/battle/area_mac/actor/master3.c +++ b/src/battle/area_mac/actor/master3.c @@ -72,7 +72,8 @@ ActorPartBlueprint N(partsTable_8022DAF0)[] = { .defenseTable = N(defenseTable_8022DA38), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 761, + .unk_1C = 2, + .unk_1D = 0xF9, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_100000, @@ -84,7 +85,7 @@ ActorPartBlueprint N(partsTable_8022DAF0)[] = { .defenseTable = N(defenseTable_8022DA38), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 0, + .unk_1D = 0, }, }; diff --git a/src/battle/area_mim/actor/bzzap.c b/src/battle/area_mim/actor/bzzap.c index 1f91a86d0c..f283e126a5 100644 --- a/src/battle/area_mim/actor/bzzap.c +++ b/src/battle/area_mim/actor/bzzap.c @@ -64,7 +64,8 @@ ActorPartBlueprint N(partsTable_8021A924)[] = { .defenseTable = N(defenseTable_8021A86C), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 758, + .unk_1C = 2, + .unk_1D = 0xF6, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_100000, @@ -76,7 +77,8 @@ ActorPartBlueprint N(partsTable_8021A924)[] = { .defenseTable = N(defenseTable_8021A86C), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = -5, + .unk_1C = 255, + .unk_1D = -5, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_100000, @@ -88,7 +90,8 @@ ActorPartBlueprint N(partsTable_8021A924)[] = { .defenseTable = N(defenseTable_8021A86C), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = -5, + .unk_1C = 255, + .unk_1D = -5, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_100000, @@ -100,7 +103,8 @@ ActorPartBlueprint N(partsTable_8021A924)[] = { .defenseTable = N(defenseTable_8021A86C), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = -5, + .unk_1C = 255, + .unk_1D = -5, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_100000, @@ -112,7 +116,8 @@ ActorPartBlueprint N(partsTable_8021A924)[] = { .defenseTable = N(defenseTable_8021A86C), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = -5, + .unk_1C = 255, + .unk_1D = -5, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_100000, @@ -124,7 +129,8 @@ ActorPartBlueprint N(partsTable_8021A924)[] = { .defenseTable = N(defenseTable_8021A86C), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = -5, + .unk_1C = 255, + .unk_1D = -5, }, }; diff --git a/src/battle/area_mim/actor/forest_fuzzy.c b/src/battle/area_mim/actor/forest_fuzzy.c index 05d483d229..118b90be68 100644 --- a/src/battle/area_mim/actor/forest_fuzzy.c +++ b/src/battle/area_mim/actor/forest_fuzzy.c @@ -54,7 +54,7 @@ ActorPartBlueprint N(partsTable_80218478)[] = { .defenseTable = N(defenseTable_802183C0), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 246, + .unk_1D = 246, }, }; diff --git a/src/battle/area_mim/actor/piranha_plant.c b/src/battle/area_mim/actor/piranha_plant.c index 34adb8f0a4..5cfc841e6e 100644 --- a/src/battle/area_mim/actor/piranha_plant.c +++ b/src/battle/area_mim/actor/piranha_plant.c @@ -75,7 +75,7 @@ ActorPartBlueprint N(partsTable_8021D44C)[] = { .defenseTable = N(defenseTable_8021D394), .eventFlags = ACTOR_EVENT_FLAG_SPIKY_TOP, .elementImmunityFlags = 0, - .unk_1C = 246, + .unk_1D = 246, }, }; diff --git a/src/battle/area_nok/actor/fuzzy.c b/src/battle/area_nok/actor/fuzzy.c index dc1f4eb41a..5bf16a37e5 100644 --- a/src/battle/area_nok/actor/fuzzy.c +++ b/src/battle/area_nok/actor/fuzzy.c @@ -48,7 +48,7 @@ ActorPartBlueprint N(partsTable_80222108)[] = { .defenseTable = N(defenseTable_80222050), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 246, + .unk_1D = 246, }, }; diff --git a/src/battle/area_nok/actor/kent_c_koopa.c b/src/battle/area_nok/actor/kent_c_koopa.c index 38780bc1f5..59684f4489 100644 --- a/src/battle/area_nok/actor/kent_c_koopa.c +++ b/src/battle/area_nok/actor/kent_c_koopa.c @@ -89,7 +89,7 @@ ActorPartBlueprint N(partsTable_80227AB4)[] = { .defenseTable = N(defenseTable_802279DC), .eventFlags = ACTOR_EVENT_FLAG_FLIPABLE, .elementImmunityFlags = 0, - .unk_1C = 0, + .unk_1D = 0, }, { .flags = ACTOR_PART_FLAG_NO_TARGET, @@ -101,7 +101,7 @@ ActorPartBlueprint N(partsTable_80227AB4)[] = { .defenseTable = N(defenseTable_802279F0), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 0, + .unk_1D = 0, }, { .flags = ACTOR_PART_FLAG_NO_TARGET, @@ -113,7 +113,7 @@ ActorPartBlueprint N(partsTable_80227AB4)[] = { .defenseTable = N(defenseTable_802279FC), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 0, + .unk_1D = 0, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_2 | ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_100000, @@ -125,7 +125,7 @@ ActorPartBlueprint N(partsTable_80227AB4)[] = { .defenseTable = N(defenseTable_802279FC), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 0, + .unk_1D = 0, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_2 | ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_100000, @@ -137,7 +137,7 @@ ActorPartBlueprint N(partsTable_80227AB4)[] = { .defenseTable = N(defenseTable_802279FC), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 0, + .unk_1D = 0, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_2 | ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_100000, @@ -149,7 +149,7 @@ ActorPartBlueprint N(partsTable_80227AB4)[] = { .defenseTable = N(defenseTable_802279FC), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 0, + .unk_1D = 0, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_2 | ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_100000, @@ -161,7 +161,7 @@ ActorPartBlueprint N(partsTable_80227AB4)[] = { .defenseTable = N(defenseTable_802279FC), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 0, + .unk_1D = 0, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_2 | ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_100000, @@ -173,7 +173,7 @@ ActorPartBlueprint N(partsTable_80227AB4)[] = { .defenseTable = N(defenseTable_802279FC), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 0, + .unk_1D = 0, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_2 | ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_100000, @@ -185,7 +185,7 @@ ActorPartBlueprint N(partsTable_80227AB4)[] = { .defenseTable = N(defenseTable_802279FC), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 0, + .unk_1D = 0, }, }; diff --git a/src/battle/area_omo/actor/anti_guy.c b/src/battle/area_omo/actor/anti_guy.c index 69b2b11649..616b3cb850 100644 --- a/src/battle/area_omo/actor/anti_guy.c +++ b/src/battle/area_omo/actor/anti_guy.c @@ -52,7 +52,8 @@ ActorPartBlueprint N(partsTable_802219C8)[] = { .defenseTable = N(defenseTable_80221910), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = -10, + .unk_1C = 0xFF, + .unk_1D = 0xF6, }, }; diff --git a/src/battle/area_omo/actor/blue_shy_guy.c b/src/battle/area_omo/actor/blue_shy_guy.c index 1b014c9e76..4d753b59c0 100644 --- a/src/battle/area_omo/actor/blue_shy_guy.c +++ b/src/battle/area_omo/actor/blue_shy_guy.c @@ -53,7 +53,8 @@ ActorPartBlueprint N(partsTable_8021ADD0)[] = { .defenseTable = N(defenseTable_8021AD10), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = -10, + .unk_1C = 0xFF, + .unk_1D = 0xF6, }, }; diff --git a/src/battle/area_omo/actor/green_shy_guy.c b/src/battle/area_omo/actor/green_shy_guy.c index 79fe12b4cc..30b6c27ef4 100644 --- a/src/battle/area_omo/actor/green_shy_guy.c +++ b/src/battle/area_omo/actor/green_shy_guy.c @@ -53,7 +53,8 @@ ActorPartBlueprint N(partsTable_8021FED0)[] = { .defenseTable = N(defenseTable_8021FE10), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = -10, + .unk_1C = 0xFF, + .unk_1D = 0xF6, }, }; diff --git a/src/battle/area_omo/actor/groove_guy.c b/src/battle/area_omo/actor/groove_guy.c index 3e68989eb3..0e2c190b4b 100644 --- a/src/battle/area_omo/actor/groove_guy.c +++ b/src/battle/area_omo/actor/groove_guy.c @@ -76,7 +76,7 @@ ActorPartBlueprint N(partsTable_80224AEC)[] = { .defenseTable = N(defenseTable_80224A2C), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 246, + .unk_1D = 246, }, }; diff --git a/src/battle/area_omo/actor/pink_shy_guy.c b/src/battle/area_omo/actor/pink_shy_guy.c index 5b41d391c8..2ff3c63013 100644 --- a/src/battle/area_omo/actor/pink_shy_guy.c +++ b/src/battle/area_omo/actor/pink_shy_guy.c @@ -53,7 +53,8 @@ ActorPartBlueprint N(partsTable_8021E3D0)[] = { .defenseTable = N(defenseTable_8021E310), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = -10, + .unk_1C = 0xFF, + .unk_1D = 0xF6, }, }; diff --git a/src/battle/area_omo/actor/pyro_guy.c b/src/battle/area_omo/actor/pyro_guy.c index 978e6a702d..cfacd3f0ad 100644 --- a/src/battle/area_omo/actor/pyro_guy.c +++ b/src/battle/area_omo/actor/pyro_guy.c @@ -71,7 +71,8 @@ ActorPartBlueprint N(partsTable_8022CC34)[] = { .defenseTable = N(defenseTable_8022CB4C), .eventFlags = ACTOR_EVENT_FLAG_FIREY, .elementImmunityFlags = 0, - .unk_1C = -10, + .unk_1C = 0xFF, + .unk_1D = 0xF6, }, }; diff --git a/src/battle/area_omo/actor/red_shy_guy.c b/src/battle/area_omo/actor/red_shy_guy.c index 2810705ad2..3032437f6b 100644 --- a/src/battle/area_omo/actor/red_shy_guy.c +++ b/src/battle/area_omo/actor/red_shy_guy.c @@ -53,7 +53,8 @@ ActorPartBlueprint N(partsTable_802192D0)[] = { .defenseTable = N(defenseTable_80219210), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = -10, + .unk_1C = 0xFF, + .unk_1D = 0xF6, }, }; diff --git a/src/battle/area_omo/actor/sky_guy.c b/src/battle/area_omo/actor/sky_guy.c index 1c03d92fac..3ca49bc717 100644 --- a/src/battle/area_omo/actor/sky_guy.c +++ b/src/battle/area_omo/actor/sky_guy.c @@ -146,7 +146,7 @@ ActorPartBlueprint N(partsTable_8022977C)[] = { .defenseTable = N(defenseTable_80229610), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 246, + .unk_1D = 246, }, { .flags = ACTOR_PART_FLAG_MULTI_TARGET, @@ -158,7 +158,8 @@ ActorPartBlueprint N(partsTable_8022977C)[] = { .defenseTable = N(defenseTable_802295FC), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = -10, + .unk_1C = 0xFF, + .unk_1D = 0xF6, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_2 | ACTOR_PART_FLAG_100000, @@ -170,7 +171,8 @@ ActorPartBlueprint N(partsTable_8022977C)[] = { .defenseTable = N(defenseTable_802295FC), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = -10, + .unk_1C = 0xFF, + .unk_1D = 0xF6, .unk_20 = 0x29007E, }, { @@ -183,7 +185,8 @@ ActorPartBlueprint N(partsTable_8022977C)[] = { .defenseTable = N(defenseTable_802295FC), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = -10, + .unk_1C = 0xFF, + .unk_1D = 0xF6, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_2 | ACTOR_PART_FLAG_2000 | ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_100000, @@ -195,7 +198,8 @@ ActorPartBlueprint N(partsTable_8022977C)[] = { .defenseTable = N(defenseTable_802295FC), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = -10, + .unk_1C = 0xFF, + .unk_1D = 0xF6, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_100000, @@ -207,7 +211,8 @@ ActorPartBlueprint N(partsTable_8022977C)[] = { .defenseTable = N(defenseTable_802295FC), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = -10, + .unk_1C = 0xFF, + .unk_1D = 0xF6, }, }; diff --git a/src/battle/area_omo/actor/spy_guy.c b/src/battle/area_omo/actor/spy_guy.c index e6bd5284c0..0828c93987 100644 --- a/src/battle/area_omo/actor/spy_guy.c +++ b/src/battle/area_omo/actor/spy_guy.c @@ -84,7 +84,8 @@ ActorPartBlueprint N(partsTable_80227564)[] = { .defenseTable = N(defenseTable_802274A4), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = -13, + .unk_1C = 0xFF, + .unk_1D = 0xF3, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_100000, @@ -96,7 +97,8 @@ ActorPartBlueprint N(partsTable_80227564)[] = { .defenseTable = N(defenseTable_802274A4), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = -10, + .unk_1C = 0xFF, + .unk_1D = 0xF6, }, }; diff --git a/src/battle/area_omo/actor/yellow_shy_guy.c b/src/battle/area_omo/actor/yellow_shy_guy.c index 2cdfe7a5aa..6d02995462 100644 --- a/src/battle/area_omo/actor/yellow_shy_guy.c +++ b/src/battle/area_omo/actor/yellow_shy_guy.c @@ -53,7 +53,8 @@ ActorPartBlueprint N(partsTable_8021C8D0)[] = { .defenseTable = N(defenseTable_8021C810), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = -10, + .unk_1C = 0xFF, + .unk_1D = 0xF6, }, }; diff --git a/src/battle/area_sbk/actor/bandit.c b/src/battle/area_sbk/actor/bandit.c index 7957e35b6e..0b1eeb60f3 100644 --- a/src/battle/area_sbk/actor/bandit.c +++ b/src/battle/area_sbk/actor/bandit.c @@ -87,7 +87,7 @@ ActorPartBlueprint N(partsTable_8021D66C)[] = { .defenseTable = N(defenseTable_8021D5B4), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 244, + .unk_1D = 244, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET, @@ -99,7 +99,7 @@ ActorPartBlueprint N(partsTable_8021D66C)[] = { .defenseTable = N(defenseTable_8021D5B4), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 0, + .unk_1D = 0, }, }; @@ -114,7 +114,7 @@ ActorPartBlueprint N(partsTable_8021D6B4)[] = { .defenseTable = N(defenseTable_8021D5B4), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 0, + .unk_1D = 0, }, }; diff --git a/src/battle/area_sbk/actor/pokey.c b/src/battle/area_sbk/actor/pokey.c index 9ed57d8251..87dc7120ab 100644 --- a/src/battle/area_sbk/actor/pokey.c +++ b/src/battle/area_sbk/actor/pokey.c @@ -62,7 +62,7 @@ ActorPartBlueprint N(partsTable_80218338)[] = { .defenseTable = N(defenseTable_80218280), .eventFlags = ACTOR_EVENT_FLAG_SPIKY_TOP | ACTOR_EVENT_FLAG_200000, .elementImmunityFlags = 0, - .unk_1C = 0, + .unk_1D = 0, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_MULTI_TARGET, @@ -74,7 +74,7 @@ ActorPartBlueprint N(partsTable_80218338)[] = { .defenseTable = N(defenseTable_80218280), .eventFlags = ACTOR_EVENT_FLAG_SPIKY_TOP | ACTOR_EVENT_FLAG_200000, .elementImmunityFlags = 0, - .unk_1C = 248, + .unk_1D = 248, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET, @@ -86,7 +86,7 @@ ActorPartBlueprint N(partsTable_80218338)[] = { .defenseTable = N(defenseTable_80218280), .eventFlags = ACTOR_EVENT_FLAG_SPIKY_TOP | ACTOR_EVENT_FLAG_200000, .elementImmunityFlags = 0, - .unk_1C = 248, + .unk_1D = 248, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET, @@ -98,7 +98,7 @@ ActorPartBlueprint N(partsTable_80218338)[] = { .defenseTable = N(defenseTable_80218280), .eventFlags = ACTOR_EVENT_FLAG_SPIKY_TOP | ACTOR_EVENT_FLAG_200000, .elementImmunityFlags = 0, - .unk_1C = 248, + .unk_1D = 248, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET, @@ -110,7 +110,7 @@ ActorPartBlueprint N(partsTable_80218338)[] = { .defenseTable = N(defenseTable_80218280), .eventFlags = ACTOR_EVENT_FLAG_SPIKY_TOP | ACTOR_EVENT_FLAG_200000, .elementImmunityFlags = 0, - .unk_1C = 248, + .unk_1D = 248, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_100000, @@ -122,7 +122,7 @@ ActorPartBlueprint N(partsTable_80218338)[] = { .defenseTable = N(defenseTable_80218280), .eventFlags = ACTOR_EVENT_FLAG_SPIKY_TOP | ACTOR_EVENT_FLAG_200000, .elementImmunityFlags = 0, - .unk_1C = 0, + .unk_1D = 0, }, }; diff --git a/src/battle/area_trd_part_1/actor/bill_blaster.c b/src/battle/area_trd_part_1/actor/bill_blaster.c index b7d51565f6..810a7a48b0 100644 --- a/src/battle/area_trd_part_1/actor/bill_blaster.c +++ b/src/battle/area_trd_part_1/actor/bill_blaster.c @@ -52,7 +52,7 @@ ActorPartBlueprint N(partsTable_80219DD8)[] = { .defenseTable = N(defenseTable_80219D20), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 247, + .unk_1D = 247, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_MULTI_TARGET | ACTOR_PART_FLAG_80000000, @@ -64,7 +64,7 @@ ActorPartBlueprint N(partsTable_80219DD8)[] = { .defenseTable = N(defenseTable_80219D20), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 247, + .unk_1D = 247, }, }; diff --git a/src/battle/area_trd_part_1/actor/bob_omb.c b/src/battle/area_trd_part_1/actor/bob_omb.c index e691db2375..eac03fbbec 100644 --- a/src/battle/area_trd_part_1/actor/bob_omb.c +++ b/src/battle/area_trd_part_1/actor/bob_omb.c @@ -98,7 +98,7 @@ ActorPartBlueprint N(partsTable_8021A70C)[] = { .defenseTable = N(defenseTable_8021A5A8), .eventFlags = ACTOR_EVENT_FLAG_EXPLOSIVE, .elementImmunityFlags = 0, - .unk_1C = 247, + .unk_1D = 247, }, }; diff --git a/src/battle/area_trd_part_1/actor/bullet_bill.c b/src/battle/area_trd_part_1/actor/bullet_bill.c index 677b14afe0..d70d78467f 100644 --- a/src/battle/area_trd_part_1/actor/bullet_bill.c +++ b/src/battle/area_trd_part_1/actor/bullet_bill.c @@ -50,7 +50,7 @@ ActorPartBlueprint N(partsTable_80219018)[] = { .defenseTable = N(defenseTable_80218F60), .eventFlags = ACTOR_EVENT_FLAG_400, .elementImmunityFlags = 0, - .unk_1C = 250, + .unk_1D = 250, }, }; diff --git a/src/battle/area_trd_part_2/actor/blue_ninja_koopa.c b/src/battle/area_trd_part_2/actor/blue_ninja_koopa.c index caa0f22c9b..05cfa4eb23 100644 --- a/src/battle/area_trd_part_2/actor/blue_ninja_koopa.c +++ b/src/battle/area_trd_part_2/actor/blue_ninja_koopa.c @@ -59,7 +59,7 @@ ActorPartBlueprint N(partsTable_8022B564)[] = { .defenseTable = N(defenseTable_8022B4A0), .eventFlags = ACTOR_EVENT_FLAG_FLIPABLE, .elementImmunityFlags = 0, - .unk_1C = 0, + .unk_1D = 0, }, }; diff --git a/src/battle/area_trd_part_2/actor/fake_bowser.c b/src/battle/area_trd_part_2/actor/fake_bowser.c index eb48dec31b..2be0815f58 100644 --- a/src/battle/area_trd_part_2/actor/fake_bowser.c +++ b/src/battle/area_trd_part_2/actor/fake_bowser.c @@ -87,7 +87,7 @@ ActorPartBlueprint N(partsTable_8021A748)[] = { .defenseTable = N(defenseTable_8021A670), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 0, + .unk_1D = 0, }, { .flags = ACTOR_PART_FLAG_NO_TARGET, @@ -99,7 +99,7 @@ ActorPartBlueprint N(partsTable_8021A748)[] = { .defenseTable = N(defenseTable_8021A684), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 0, + .unk_1D = 0, }, { .flags = ACTOR_PART_FLAG_NO_TARGET, @@ -111,7 +111,7 @@ ActorPartBlueprint N(partsTable_8021A748)[] = { .defenseTable = N(defenseTable_8021A670), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 0, + .unk_1D = 0, }, { .flags = ACTOR_PART_FLAG_NO_TARGET, @@ -123,7 +123,7 @@ ActorPartBlueprint N(partsTable_8021A748)[] = { .defenseTable = N(defenseTable_8021A670), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 0, + .unk_1D = 0, }, { .flags = ACTOR_PART_FLAG_NO_TARGET, @@ -135,7 +135,7 @@ ActorPartBlueprint N(partsTable_8021A748)[] = { .defenseTable = N(defenseTable_8021A670), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 0, + .unk_1D = 0, }, { .flags = ACTOR_PART_FLAG_NO_TARGET, @@ -147,7 +147,7 @@ ActorPartBlueprint N(partsTable_8021A748)[] = { .defenseTable = N(defenseTable_8021A670), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 0, + .unk_1D = 0, }, { .flags = ACTOR_PART_FLAG_NO_TARGET, @@ -159,7 +159,7 @@ ActorPartBlueprint N(partsTable_8021A748)[] = { .defenseTable = N(defenseTable_8021A670), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 0, + .unk_1D = 0, }, { .flags = ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_100000, @@ -171,7 +171,7 @@ ActorPartBlueprint N(partsTable_8021A748)[] = { .defenseTable = N(defenseTable_8021A670), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 0, + .unk_1D = 0, }, { .flags = ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_100000, @@ -183,7 +183,7 @@ ActorPartBlueprint N(partsTable_8021A748)[] = { .defenseTable = N(defenseTable_8021A670), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 0, + .unk_1D = 0, }, { .flags = ACTOR_PART_FLAG_NO_TARGET, @@ -195,7 +195,7 @@ ActorPartBlueprint N(partsTable_8021A748)[] = { .defenseTable = N(defenseTable_8021A670), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 0, + .unk_1D = 0, }, { .flags = ACTOR_PART_FLAG_NO_TARGET, @@ -207,7 +207,7 @@ ActorPartBlueprint N(partsTable_8021A748)[] = { .defenseTable = N(defenseTable_8021A670), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 0, + .unk_1D = 0, }, }; diff --git a/src/battle/area_trd_part_2/actor/green_ninja_koopa.c b/src/battle/area_trd_part_2/actor/green_ninja_koopa.c index 167daf3530..78e8f15292 100644 --- a/src/battle/area_trd_part_2/actor/green_ninja_koopa.c +++ b/src/battle/area_trd_part_2/actor/green_ninja_koopa.c @@ -59,7 +59,7 @@ ActorPartBlueprint N(partsTable_80225624)[] = { .defenseTable = N(defenseTable_80225560), .eventFlags = ACTOR_EVENT_FLAG_FLIPABLE, .elementImmunityFlags = 0, - .unk_1C = 0, + .unk_1D = 0, }, }; diff --git a/src/battle/area_trd_part_2/actor/red_ninja_koopa.c b/src/battle/area_trd_part_2/actor/red_ninja_koopa.c index 5f3b49ef6d..559fec03d6 100644 --- a/src/battle/area_trd_part_2/actor/red_ninja_koopa.c +++ b/src/battle/area_trd_part_2/actor/red_ninja_koopa.c @@ -59,7 +59,7 @@ ActorPartBlueprint N(partsTable_802285C4)[] = { .defenseTable = N(defenseTable_80228500), .eventFlags = ACTOR_EVENT_FLAG_FLIPABLE, .elementImmunityFlags = 0, - .unk_1C = 0, + .unk_1D = 0, }, }; diff --git a/src/battle/area_trd_part_2/actor/yellow_ninja_koopa.c b/src/battle/area_trd_part_2/actor/yellow_ninja_koopa.c index bf3a1cb296..8f301f8610 100644 --- a/src/battle/area_trd_part_2/actor/yellow_ninja_koopa.c +++ b/src/battle/area_trd_part_2/actor/yellow_ninja_koopa.c @@ -59,7 +59,7 @@ ActorPartBlueprint N(partsTable_8022E504)[] = { .defenseTable = N(defenseTable_8022E440), .eventFlags = ACTOR_EVENT_FLAG_FLIPABLE, .elementImmunityFlags = 0, - .unk_1C = 0, + .unk_1D = 0, }, }; diff --git a/src/battle/area_trd_part_3/actor/eldstar.c b/src/battle/area_trd_part_3/actor/eldstar.c index 1d1a920af0..4e4b6f383d 100644 --- a/src/battle/area_trd_part_3/actor/eldstar.c +++ b/src/battle/area_trd_part_3/actor/eldstar.c @@ -60,7 +60,7 @@ ActorPartBlueprint N(partsTable_80218344)[] = { .defenseTable = N(defenseTable_8021828C), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 0, + .unk_1D = 0, }, }; @@ -137,8 +137,8 @@ ApiStatus func_80218130_4CF2E0(Evt* script, s32 isInitialCall) { ApiStatus func_80218158_4CF308(Evt* script, s32 isInitialCall) { BattleStatus* battleStatus = &gBattleStatus; - battleStatus->unk_4C = 0; - battleStatus->unk_5C = 0; + battleStatus->unk_4C[0] = 0; + battleStatus->unk_5C[0] = 0; return ApiStatus_DONE2; } diff --git a/src/battle/battle.h b/src/battle/battle.h index e3ad32141c..badcd18a6f 100644 --- a/src/battle/battle.h +++ b/src/battle/battle.h @@ -230,21 +230,6 @@ typedef enum ActorType { .dmaEnd = battle_##id##_ROM_END, \ .dmaDest = battle_##id##_VRAM -typedef struct ActorPartBlueprint { - /* 0x00 */ s32 flags; - /* 0x04 */ s8 index; - /* 0x05 */ Vec3b posOffset; - /* 0x08 */ Vec2b targetOffset; - /* 0x0A */ s16 opacity; - /* 0x0C */ s32* idleAnimations; - /* 0x10 */ s32* defenseTable; - /* 0x14 */ s32 eventFlags; - /* 0x18 */ s32 elementImmunityFlags; - /* 0x1C */ s16 unk_1C; - /* 0x1E */ char unk_1E[2]; - /* 0x20 */ s32 unk_20; -} ActorPartBlueprint; // size = 0x24 - typedef struct ActorBlueprint { /* 0x00 */ s32 flags; /* 0x04 */ char unk_04; diff --git a/src/battle/common/actor/goomba.inc.c b/src/battle/common/actor/goomba.inc.c index 917752a359..5345f22b78 100644 --- a/src/battle/common/actor/goomba.inc.c +++ b/src/battle/common/actor/goomba.inc.c @@ -47,7 +47,7 @@ ActorPartBlueprint N(partsTable_80219808)[] = { .defenseTable = N(defenseTable_80219750), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 246, + .unk_1D = 246, }, }; diff --git a/src/battle/common/actor/koopa_troopa.inc.c b/src/battle/common/actor/koopa_troopa.inc.c index 00e00e3c80..3bcdcd8f35 100644 --- a/src/battle/common/actor/koopa_troopa.inc.c +++ b/src/battle/common/actor/koopa_troopa.inc.c @@ -57,7 +57,7 @@ ActorPartBlueprint N(partsTable_8021CA44)[] = { .defenseTable = N(defenseTable_8021C960), .eventFlags = ACTOR_EVENT_FLAG_FLIPABLE, .elementImmunityFlags = 0, - .unk_1C = 249, + .unk_1D = 249, }, }; diff --git a/src/battle/common/actor/medi_guy.inc.c b/src/battle/common/actor/medi_guy.inc.c index 2b2855a818..a8489bd4ac 100644 --- a/src/battle/common/actor/medi_guy.inc.c +++ b/src/battle/common/actor/medi_guy.inc.c @@ -68,7 +68,8 @@ ActorPartBlueprint N(partsTable_8021F99C)[] = { .defenseTable = N(defenseTable_8021F8DC), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = -5, + .unk_1C = 0xFF, + .unk_1D = 0xFB, }, }; diff --git a/src/battle/common/actor/paragoomba.inc.c b/src/battle/common/actor/paragoomba.inc.c index 15d281e266..cf729aefd0 100644 --- a/src/battle/common/actor/paragoomba.inc.c +++ b/src/battle/common/actor/paragoomba.inc.c @@ -82,7 +82,7 @@ ActorPartBlueprint N(partsTable_8021B280)[] = { .defenseTable = N(defenseTable_8021B110), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 246, + .unk_1D = 246, }, { .flags = ACTOR_PART_FLAG_MULTI_TARGET, @@ -94,7 +94,7 @@ ActorPartBlueprint N(partsTable_8021B280)[] = { .defenseTable = N(defenseTable_8021B11C), .eventFlags = ACTOR_EVENT_FLAG_GROUNDABLE, .elementImmunityFlags = 0, - .unk_1C = 246, + .unk_1D = 246, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET, @@ -106,7 +106,7 @@ ActorPartBlueprint N(partsTable_8021B280)[] = { .defenseTable = N(defenseTable_8021B110), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 246, + .unk_1D = 246, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET, @@ -118,7 +118,7 @@ ActorPartBlueprint N(partsTable_8021B280)[] = { .defenseTable = N(defenseTable_8021B110), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 246, + .unk_1D = 246, }, }; diff --git a/src/battle/common/actor/paratroopa.inc.c b/src/battle/common/actor/paratroopa.inc.c index 740fbd591f..fcf4d2cc60 100644 --- a/src/battle/common/actor/paratroopa.inc.c +++ b/src/battle/common/actor/paratroopa.inc.c @@ -90,7 +90,7 @@ ActorPartBlueprint N(partsTable_8021EC6C)[] = { .defenseTable = N(defenseTable_8021EAD0), .eventFlags = ACTOR_EVENT_FLAG_FLIPABLE, .elementImmunityFlags = 0, - .unk_1C = 249, + .unk_1D = 249, }, { .flags = ACTOR_PART_FLAG_MULTI_TARGET, @@ -102,7 +102,8 @@ ActorPartBlueprint N(partsTable_8021EC6C)[] = { .defenseTable = N(defenseTable_8021EAFC), .eventFlags = ACTOR_EVENT_FLAG_GROUNDABLE, .elementImmunityFlags = 0, - .unk_1C = 754, + .unk_1C = 2, + .unk_1D = 0xF2, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET, @@ -114,7 +115,7 @@ ActorPartBlueprint N(partsTable_8021EC6C)[] = { .defenseTable = N(defenseTable_8021EAD0), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 246, + .unk_1D = 246, }, }; diff --git a/src/battle/common/actor/putrid_piranha.inc.c b/src/battle/common/actor/putrid_piranha.inc.c index af94cbaf56..aa4e89d22a 100644 --- a/src/battle/common/actor/putrid_piranha.inc.c +++ b/src/battle/common/actor/putrid_piranha.inc.c @@ -65,7 +65,8 @@ ActorPartBlueprint N(partsTable_8021B1AC)[] = { .defenseTable = N(defenseTable_8021B0EC), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 1010, + .unk_1C = 3, + .unk_1D = 0xF2, }, }; diff --git a/src/battle/common/actor/spike_top.inc.c b/src/battle/common/actor/spike_top.inc.c index 3cf11f8d36..80832ec324 100644 --- a/src/battle/common/actor/spike_top.inc.c +++ b/src/battle/common/actor/spike_top.inc.c @@ -60,7 +60,7 @@ ActorPartBlueprint N(partsTable_8021C984)[] = { .defenseTable = N(defenseTable_8021C8B0), .eventFlags = ACTOR_EVENT_FLAG_SPIKY_TOP | ACTOR_EVENT_FLAG_FLIPABLE, .elementImmunityFlags = 0, - .unk_1C = 14, + .unk_1D = 14, }, }; diff --git a/src/battle/common/actor/spiked_goomba.inc.c b/src/battle/common/actor/spiked_goomba.inc.c index e256806f37..35829197e3 100644 --- a/src/battle/common/actor/spiked_goomba.inc.c +++ b/src/battle/common/actor/spiked_goomba.inc.c @@ -48,7 +48,7 @@ ActorPartBlueprint N(partsTable_8021E468)[] = { .defenseTable = N(defenseTable_8021E3B0), .eventFlags = ACTOR_EVENT_FLAG_SPIKY_TOP, .elementImmunityFlags = 0, - .unk_1C = 244, + .unk_1D = 244, }, }; diff --git a/src/battle/common/actor/white_magikoopa.inc.c b/src/battle/common/actor/white_magikoopa.inc.c index b8382870ff..d0e5a40e13 100644 --- a/src/battle/common/actor/white_magikoopa.inc.c +++ b/src/battle/common/actor/white_magikoopa.inc.c @@ -83,7 +83,8 @@ ActorPartBlueprint N(partsTable_80223C90)[] = { .defenseTable = N(defenseTable_80223B20), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = -1036, + .unk_1C = 0xFB, + .unk_1D = 0xF4, }, }; @@ -98,7 +99,8 @@ ActorPartBlueprint N(partsTable_80223CB4)[] = { .defenseTable = N(defenseTable_80223B2C), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = -1036, + .unk_1C = 0xFB, + .unk_1D = 0xF4, }, { .flags = ACTOR_PART_FLAG_MULTI_TARGET, @@ -110,7 +112,7 @@ ActorPartBlueprint N(partsTable_80223CB4)[] = { .defenseTable = N(defenseTable_80223B2C), .eventFlags = ACTOR_EVENT_FLAG_800000, .elementImmunityFlags = 0, - .unk_1C = 248, + .unk_1D = 248, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET, diff --git a/src/effects.c b/src/effects.c index d7a392f43d..1ece64c606 100644 --- a/src/effects.c +++ b/src/effects.c @@ -466,12 +466,12 @@ EffectInstance* create_effect_instance(EffectBlueprint* effectBp) { ASSERT(newEffectInst != NULL); curEffect = &gEffectGraphicsData[0]; - newEffectInst->effectIndex = effectBp->effectIndex; + newEffectInst->effectIndex = effectBp->effectID; newEffectInst->flags = 1; // Look for a loaded effect of the proper index for (i = 0; i < ARRAY_COUNT(gEffectGraphicsData); i++) { - if ((curEffect->flags & EFFECT_LOADED) && (curEffect->effectIndex == effectBp->effectIndex)) { + if ((curEffect->flags & EFFECT_LOADED) && (curEffect->effectIndex == effectBp->effectID)) { break; } curEffect++; diff --git a/src/effects/effect_1.c b/src/effects/effect_1.c index 4aa09925ef..c585edcf28 100644 --- a/src/effects/effect_1.c +++ b/src/effects/effect_1.c @@ -39,7 +39,7 @@ void fx_1_main(f32 x, f32 y, f32 z) { bp.update = fx_1_update; bp.renderWorld = fx_1_render; bp.unk_14 = NULL; - bp.effectIndex = 1; + bp.effectID = EFFECT_ID_01; effect = shim_create_effect_instance(&bp); effect->numParts = numParts; diff --git a/src/effects/effect_10.c b/src/effects/effect_10.c index 88cd276319..da6ef8041a 100644 --- a/src/effects/effect_10.c +++ b/src/effects/effect_10.c @@ -22,7 +22,7 @@ void fx_10_main(f32 arg0, f32 arg1, f32 arg2, f32 arg3) { bp.update = fx_10_update; bp.renderWorld = fx_10_render; bp.unk_14 = NULL; - bp.effectIndex = 10; + bp.effectID = EFFECT_ID_0A; effect = shim_create_effect_instance(&bp); effect->numParts = numParts; diff --git a/src/effects/effect_11.c b/src/effects/effect_11.c index 16055f84db..917831d281 100644 --- a/src/effects/effect_11.c +++ b/src/effects/effect_11.c @@ -21,7 +21,7 @@ void fx_11_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3) { bp.update = fx_11_update; bp.renderWorld = fx_11_render; bp.unk_14 = 0; - bp.effectIndex = 11; + bp.effectID = EFFECT_ID_0B; effect = shim_create_effect_instance(&bp); effect->numParts = 1; diff --git a/src/effects/effect_12.c b/src/effects/effect_12.c index fe6d86dd6d..ef090e5d1c 100644 --- a/src/effects/effect_12.c +++ b/src/effects/effect_12.c @@ -33,7 +33,7 @@ void fx_12_main(f32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, f32 bp.update = fx_12_update; bp.renderWorld = fx_12_render; bp.unk_14 = 0; - bp.effectIndex = 12; + bp.effectID = EFFECT_ID_0C; effect = shim_create_effect_instance(&bp); effect->numParts = 1; diff --git a/src/effects/effect_13.c b/src/effects/effect_13.c index 86ba9b8e5a..9f750f3cbb 100644 --- a/src/effects/effect_13.c +++ b/src/effects/effect_13.c @@ -22,7 +22,7 @@ void fx_13_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3, s32 arg4) { bp.update = fx_13_update; bp.renderWorld = fx_13_render; bp.unk_14 = 0; - bp.effectIndex = 13; + bp.effectID = EFFECT_ID_0D; effect = shim_create_effect_instance(&bp); effect->numParts = 1; diff --git a/src/effects/effect_134.c b/src/effects/effect_134.c index c48a238d8d..c13b85ce9f 100644 --- a/src/effects/effect_134.c +++ b/src/effects/effect_134.c @@ -1,14 +1,97 @@ #include "common.h" #include "effects_internal.h" +extern Gfx D_09000800[]; +extern Gfx D_09000BA8[]; +extern Gfx D_09000BC8[]; +extern Gfx D_09000BE8[]; +extern Gfx D_09000C08[]; +extern Gfx D_09000C28[]; +extern Gfx D_09000C48[]; +extern Gfx D_09000C68[]; +extern Gfx D_09000C88[]; +extern Gfx D_09000CA8[]; +extern Gfx D_09000CC8[]; +extern Gfx D_09000CE8[]; +extern Gfx D_09000D08[]; + +Gfx* D_E0128480[12] = { + D_09000BA8, D_09000BC8, D_09000BE8, D_09000C08, D_09000C28, D_09000C48, D_09000C68, D_09000C88, D_09000CA8, + D_09000CC8, D_09000CE8, D_09000D08 +}; + +Gfx* D_E01284B0[] = { D_09000800 }; + +void fx_134_init(EffectInstance* effect); +void fx_134_update(EffectInstance* effect); +void fx_134_render(EffectInstance* effect); void fx_134_appendGfx(void* effect); -INCLUDE_ASM(s32, "effects/effect_134", fx_134_main); +EffectInstance* fx_134_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, s32 arg5) { + EffectBlueprint bp; + EffectInstance* effect; + Effect134* data; + Effect134* part; + s32 numParts = 1; -void fx_134_init(void) { + bp.init = fx_134_init; + bp.update = fx_134_update; + bp.renderWorld = fx_134_render; + bp.unk_00 = 0; + bp.unk_14 = NULL; + bp.effectID = EFFECT_ID_86; + + effect = shim_create_effect_instance(&bp); + effect->numParts = numParts; + + data = shim_general_heap_malloc(numParts * sizeof(*data)); + effect->data = data; + part = data; + + ASSERT(data != NULL); + + part->unk_00 = arg0; + part->unk_14 = 0; + if (arg5 <= 0) { + part->unk_10 = 1000; + } else { + part->unk_10 = arg5; + } + part->unk_24 = 255; + part->unk_04 = arg1; + part->unk_08 = arg2; + part->unk_0C = arg3; + part->unk_34 = arg4; + part->unk_18 = 70; + part->unk_1C = 180; + part->unk_20 = 120; + part->unk_28 = 20; + part->unk_2C = 230; + part->unk_30 = 50; + + return effect; } -INCLUDE_ASM(s32, "effects/effect_134", fx_134_update); +void fx_134_init(EffectInstance* effect) { +} + +void fx_134_update(EffectInstance* effect) { + Effect134* data = effect->data; + + if (effect->flags & 0x10) { + effect->flags &= ~0x10; + data->unk_10 = 0x10; + } + + if (data->unk_10 < 1000) { + data->unk_10--; + } + + data->unk_14++; + if (data->unk_10 < 0) { + shim_remove_effect(effect); + } +} void fx_134_render(EffectInstance* effect) { RenderTask renderTask; @@ -23,4 +106,27 @@ void fx_134_render(EffectInstance* effect) { retTask->renderMode |= RENDER_MODE_2; } -INCLUDE_ASM(s32, "effects/effect_134", fx_134_appendGfx); +void fx_134_appendGfx(void* effect) { + Matrix4f sp10; + Matrix4f sp50; + Effect134* part = ((EffectInstance*)effect)->data; + Camera* camera = &gCameras[gCurrentCameraID]; + s32 primAlpha = part->unk_24; + s32 dlistIdx = part->unk_00; + + gDPPipeSync(gMasterGfxPos++); + gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); + + shim_guTranslateF(sp10, part->unk_04, part->unk_08, part->unk_0C); + shim_guScaleF(sp50, part->unk_34, part->unk_34, part->unk_34); + shim_guMtxCatF(sp50, sp10, sp10); + shim_guMtxF2L(sp10, &gDisplayContext->matrixStack[gMatrixListPos]); + + gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPMatrix(gMasterGfxPos++, camera->unkMatrix, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gDPSetPrimColor(gMasterGfxPos++, 0, 0, part->unk_18, part->unk_1C, part->unk_20, primAlpha); + gDPSetEnvColor(gMasterGfxPos++, part->unk_28, part->unk_2C, part->unk_30, 0); + gSPDisplayList(gMasterGfxPos++, D_E01284B0[0]); + gSPDisplayList(gMasterGfxPos++, D_E0128480[dlistIdx % ARRAY_COUNT(D_E0128480)]); + gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); +} diff --git a/src/effects/effect_14.c b/src/effects/effect_14.c index d1bebe7567..94d8984510 100644 --- a/src/effects/effect_14.c +++ b/src/effects/effect_14.c @@ -23,7 +23,7 @@ void fx_14_main(f32 arg0, f32 arg1, f32 arg2, s32 arg3, s32 arg4) { bp.update = fx_14_update; bp.renderWorld = fx_14_render; bp.unk_14 = 0; - bp.effectIndex = 14; + bp.effectID = EFFECT_ID_0E; effect = shim_create_effect_instance(&bp); effect->numParts = 1; diff --git a/src/effects/effect_15.c b/src/effects/effect_15.c index dc4a398665..fc9191cc02 100644 --- a/src/effects/effect_15.c +++ b/src/effects/effect_15.c @@ -36,7 +36,7 @@ EffectInstance* fx_15_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 bp.update = fx_15_update; bp.renderWorld = fx_15_render; bp.unk_14 = 0; - bp.effectIndex = 15; + bp.effectID = EFFECT_ID_0F; effect = shim_create_effect_instance(&bp); effect->numParts = 1; @@ -56,7 +56,7 @@ EffectInstance* fx_15_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 part->unk_240 = 0.2f; part->unk_244 = shim_rand_int(255); part->unk_248 = shim_rand_int(255 - part->unk_244); - temp_s0 = (255 - part->unk_248); + temp_s0 = 255 - part->unk_248; part->unk_24C = temp_s0 - part->unk_244; } else { part->unk_244 = 210; diff --git a/src/effects/effect_16.c b/src/effects/effect_16.c index 355f47ab49..2be5349065 100644 --- a/src/effects/effect_16.c +++ b/src/effects/effect_16.c @@ -16,32 +16,32 @@ Gfx* D_E0020C90[] = { D_090022E0, NULL, D_090023B0, D_09002480, D_09002550 }; Gfx* D_E0020CA4[] = { D_09002238, NULL, D_09002308, D_090023D8, D_090024A8 }; -s8 D_E0020CB8[40] = { - 0, 0, 1, 2, 3, 5, 4, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, - -1, 0 +s8 D_E0020CB8[40] = { + 0, 0, 1, 2, 3, 5, 4, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, + -1, 0 }; -s8 D_E0020CE0[28] = { - 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, -1, 0, 0, 0 +s8 D_E0020CE0[28] = { + 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, -1, 0, 0, 0 }; -s8 D_E0020CFC[40] = { - 0, 0, 2, 1, 3, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, -1, - 0, 0 +s8 D_E0020CFC[40] = { + 0, 0, 2, 1, 3, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, -1, + 0, 0 }; s8 D_E0020D24[12] = { 0, 0, 1, 1, 2, 2, 3, 3, -13, 0, 0, 0 }; -s8 D_E0020D30[80] = { - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, - 3, 3, -1, 0 +s8 D_E0020D30[80] = { + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, + 3, 3, -1, 0 }; s8* D_E0020D80[5] = { D_E0020CB8, D_E0020CE0, D_E0020CFC, D_E0020D24, D_E0020D30 }; -s8 D_E0020D94[] = { - 64, 0, 0, 32, 0, 32, 0, 0, 64, 0, 32, 32, 0, 64, 0, 32, 32, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +s8 D_E0020D94[] = { + 64, 0, 0, 32, 0, 32, 0, 0, 64, 0, 32, 32, 0, 64, 0, 32, 32, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, }; void func_E0020000(Effect16* part, s32 arg1); @@ -58,7 +58,7 @@ void fx_16_main(s32 arg0, s32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, f32 Effect16* part; EffectInstance* effect; s32 numParts; - + if (arg0 == 1) { numParts = 3; } else { @@ -70,7 +70,7 @@ void fx_16_main(s32 arg0, s32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, f32 bp.update = fx_16_update; bp.renderWorld = fx_16_render; bp.unk_14 = 0; - bp.effectIndex = 16; + bp.effectID = EFFECT_ID_10; effect = shim_create_effect_instance(bpPtr); effect->numParts = numParts; @@ -86,7 +86,7 @@ void fx_16_main(s32 arg0, s32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, f32 } part->unk_2C = arg7; part->unk_34 = 0; - + if (arg0 == 1) { s32 i; @@ -118,7 +118,7 @@ void fx_16_update(EffectInstance* effect) { Effect16* part = effect->data; s32 temp_a0 = D_E0020D80[part->unk_30][part->unk_34]; s32 type = part->unk_00; - + part->unk_34++; part->unk_38 = temp_a0; if (part->unk_38 < 0) { @@ -211,7 +211,7 @@ void fx_16_appendGfx(void* effect) { } else { if (part->unk_38 == 0) { s32 i; - + for (i = 0; i < 3; i++, part++) { shim_guTranslateF(sp18, part->unk_04, part->unk_08, part->unk_0C); shim_guRotateF(sp58, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); diff --git a/src/effects/effect_6.c b/src/effects/effect_6.c index fccadb739c..db68be7cc3 100644 --- a/src/effects/effect_6.c +++ b/src/effects/effect_6.c @@ -99,7 +99,7 @@ void fx_6_main(s32 type, f32 x, f32 y, f32 z, f32 arg4) { bpPtr->renderWorld = fx_6_render; bpPtr->unk_00 = 0; bpPtr->unk_14 = NULL; - bpPtr->effectIndex = 6; + bpPtr->effectID = EFFECT_ID_06; effect = shim_create_effect_instance(bpPtr); effect->numParts = numParts; diff --git a/src/effects/effect_7.c b/src/effects/effect_7.c index 16de59354e..2f8ec752d5 100644 --- a/src/effects/effect_7.c +++ b/src/effects/effect_7.c @@ -30,7 +30,7 @@ void fx_7_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5) { bp.update = fx_7_update; bp.renderWorld = fx_7_render; bp.unk_14 = NULL; - bp.effectIndex = 7; + bp.effectID = EFFECT_ID_07; effect = shim_create_effect_instance(&bp); effect->numParts = numParts; diff --git a/src/effects/effect_73.c b/src/effects/effect_73.c index 4505f7ff83..3b1538021b 100644 --- a/src/effects/effect_73.c +++ b/src/effects/effect_73.c @@ -36,7 +36,7 @@ EffectInstance* fx_73_main(EffectInstanceDataThing* arg0, f32 arg1, f32 arg2, f3 bp.renderWorld = fx_73_render; bp.unk_00 = 0; bp.unk_14 = NULL; - bp.effectIndex = 73; + bp.effectID = EFFECT_ID_49; effect = shim_create_effect_instance(&bp); effect->numParts = numParts; diff --git a/src/effects/effect_75.c b/src/effects/effect_75.c index 5176881e82..004d5f538c 100644 --- a/src/effects/effect_75.c +++ b/src/effects/effect_75.c @@ -25,7 +25,7 @@ EffectInstance* fx_75_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, s32 bp.renderWorld = fx_75_render; bp.unk_00 = 0; bp.unk_14 = NULL; - bp.effectIndex = 75; + bp.effectID = EFFECT_ID_4B; effect = shim_create_effect_instance(&bp); effect->numParts = numParts; diff --git a/src/effects/effect_8.c b/src/effects/effect_8.c index b9db050222..444a5db3d2 100644 --- a/src/effects/effect_8.c +++ b/src/effects/effect_8.c @@ -56,7 +56,7 @@ void fx_8_main(f32 arg0, f32 arg1, f32 arg2, f32 arg3) { bp.renderWorld = fx_8_render; bp.unk_00 = 0; bp.unk_14 = NULL; - bp.effectIndex = 8; + bp.effectID = EFFECT_ID_08; effect = shim_create_effect_instance(&bp); effect->numParts = numParts; diff --git a/src/effects/effect_9.c b/src/effects/effect_9.c index 295e07fb75..63c0529289 100644 --- a/src/effects/effect_9.c +++ b/src/effects/effect_9.c @@ -58,7 +58,7 @@ void fx_9_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5) { bp.renderWorld = fx_9_render; bp.unk_00 = 0; bp.unk_14 = NULL; - bp.effectIndex = 9; + bp.effectID = EFFECT_ID_09; effect = shim_create_effect_instance(&bp); effect->numParts = numParts; diff --git a/ver/us/asm/data/effects/415020.data.s b/ver/us/asm/data/effects/415020.data.s deleted file mode 100644 index a62dfc3bf7..0000000000 --- a/ver/us/asm/data/effects/415020.data.s +++ /dev/null @@ -1,9 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_E0128480 -.word 0x09000BA8, 0x09000BC8, 0x09000BE8, 0x09000C08, 0x09000C28, 0x09000C48, 0x09000C68, 0x09000C88, 0x09000CA8, 0x09000CC8, 0x09000CE8, 0x09000D08 - -dlabel D_E01284B0 -.word 0x09000800, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/nonmatchings/167570/filemenu_yesno_init.s b/ver/us/asm/nonmatchings/167570/filemenu_yesno_init.s deleted file mode 100644 index b1bcef675c..0000000000 --- a/ver/us/asm/nonmatchings/167570/filemenu_yesno_init.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel filemenu_yesno_init -/* 1679F8 80247198 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 1679FC 8024719C AFB00010 */ sw $s0, 0x10($sp) -/* 167A00 802471A0 0080802D */ daddu $s0, $a0, $zero -/* 167A04 802471A4 24030001 */ addiu $v1, $zero, 1 -/* 167A08 802471A8 3C028025 */ lui $v0, %hi(D_8024A0F0) -/* 167A0C 802471AC 2442A0F0 */ addiu $v0, $v0, %lo(D_8024A0F0) -/* 167A10 802471B0 AFBF0014 */ sw $ra, 0x14($sp) -.L802471B4: -/* 167A14 802471B4 AC500010 */ sw $s0, 0x10($v0) -/* 167A18 802471B8 2463FFFF */ addiu $v1, $v1, -1 -/* 167A1C 802471BC 0461FFFD */ bgez $v1, .L802471B4 -/* 167A20 802471C0 2442FFDC */ addiu $v0, $v0, -0x24 -/* 167A24 802471C4 3C048025 */ lui $a0, %hi(D_8024A0CC) -/* 167A28 802471C8 2484A0CC */ addiu $a0, $a0, %lo(D_8024A0CC) -/* 167A2C 802471CC 0C051FCC */ jal setup_pause_menu_tab -/* 167A30 802471D0 24050002 */ addiu $a1, $zero, 2 -/* 167A34 802471D4 24020001 */ addiu $v0, $zero, 1 -/* 167A38 802471D8 A2020000 */ sb $v0, ($s0) -/* 167A3C 802471DC 8FBF0014 */ lw $ra, 0x14($sp) -/* 167A40 802471E0 8FB00010 */ lw $s0, 0x10($sp) -/* 167A44 802471E4 03E00008 */ jr $ra -/* 167A48 802471E8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/16c8e0/initialize_battle.s b/ver/us/asm/nonmatchings/16c8e0/initialize_battle.s deleted file mode 100644 index 1d5d50b33e..0000000000 --- a/ver/us/asm/nonmatchings/16c8e0/initialize_battle.s +++ /dev/null @@ -1,194 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel initialize_battle -/* 16CA10 8023E130 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 16CA14 8023E134 AFB3001C */ sw $s3, 0x1c($sp) -/* 16CA18 8023E138 3C138011 */ lui $s3, %hi(gPlayerData) -/* 16CA1C 8023E13C 2673F290 */ addiu $s3, $s3, %lo(gPlayerData) -/* 16CA20 8023E140 AFB40020 */ sw $s4, 0x20($sp) -/* 16CA24 8023E144 3C14800B */ lui $s4, %hi(gCameras+0xAB0) -/* 16CA28 8023E148 26942830 */ addiu $s4, $s4, %lo(gCameras+0xAB0) -/* 16CA2C 8023E14C AFB10014 */ sw $s1, 0x14($sp) -/* 16CA30 8023E150 2411000F */ addiu $s1, $zero, 0xf -/* 16CA34 8023E154 3C06800E */ lui $a2, %hi(gBattleStatus) -/* 16CA38 8023E158 24C6C070 */ addiu $a2, $a2, %lo(gBattleStatus) -/* 16CA3C 8023E15C 24C5003C */ addiu $a1, $a2, 0x3c -/* 16CA40 8023E160 3C04800A */ lui $a0, %hi(gOverrideFlags) -/* 16CA44 8023E164 2484A650 */ addiu $a0, $a0, %lo(gOverrideFlags) -/* 16CA48 8023E168 AFBF0024 */ sw $ra, 0x24($sp) -/* 16CA4C 8023E16C AFB20018 */ sw $s2, 0x18($sp) -/* 16CA50 8023E170 AFB00010 */ sw $s0, 0x10($sp) -/* 16CA54 8023E174 ACC00000 */ sw $zero, ($a2) -/* 16CA58 8023E178 ACC00004 */ sw $zero, 4($a2) -/* 16CA5C 8023E17C ACC00000 */ sw $zero, ($a2) -/* 16CA60 8023E180 8C820000 */ lw $v0, ($a0) -/* 16CA64 8023E184 2403FFFF */ addiu $v1, $zero, -1 -/* 16CA68 8023E188 ACC30224 */ sw $v1, 0x224($a2) -/* 16CA6C 8023E18C 2403FF7F */ addiu $v1, $zero, -0x81 -/* 16CA70 8023E190 3C01802A */ lui $at, %hi(D_8029DA34) -/* 16CA74 8023E194 AC22DA34 */ sw $v0, %lo(D_8029DA34)($at) -/* 16CA78 8023E198 00431024 */ and $v0, $v0, $v1 -/* 16CA7C 8023E19C AC820000 */ sw $v0, ($a0) -/* 16CA80 8023E1A0 00431024 */ and $v0, $v0, $v1 -/* 16CA84 8023E1A4 AC820000 */ sw $v0, ($a0) -.L8023E1A8: -/* 16CA88 8023E1A8 ACA00330 */ sw $zero, 0x330($a1) -/* 16CA8C 8023E1AC 2631FFFF */ addiu $s1, $s1, -1 -/* 16CA90 8023E1B0 0621FFFD */ bgez $s1, .L8023E1A8 -/* 16CA94 8023E1B4 24A5FFFC */ addiu $a1, $a1, -4 -/* 16CA98 8023E1B8 24110017 */ addiu $s1, $zero, 0x17 -/* 16CA9C 8023E1BC 24C2005C */ addiu $v0, $a2, 0x5c -/* 16CAA0 8023E1C0 A0C00431 */ sb $zero, 0x431($a2) -/* 16CAA4 8023E1C4 A0C00430 */ sb $zero, 0x430($a2) -/* 16CAA8 8023E1C8 A0C00095 */ sb $zero, 0x95($a2) -.L8023E1CC: -/* 16CAAC 8023E1CC AC4000E0 */ sw $zero, 0xe0($v0) -/* 16CAB0 8023E1D0 2631FFFF */ addiu $s1, $s1, -1 -/* 16CAB4 8023E1D4 0621FFFD */ bgez $s1, .L8023E1CC -/* 16CAB8 8023E1D8 2442FFFC */ addiu $v0, $v0, -4 -/* 16CABC 8023E1DC 0000882D */ daddu $s1, $zero, $zero -/* 16CAC0 8023E1E0 2403FFFF */ addiu $v1, $zero, -1 -/* 16CAC4 8023E1E4 ACC000D8 */ sw $zero, 0xd8($a2) -/* 16CAC8 8023E1E8 ACC000DC */ sw $zero, 0xdc($a2) -/* 16CACC 8023E1EC 00D11021 */ addu $v0, $a2, $s1 -.L8023E1F0: -/* 16CAD0 8023E1F0 26310001 */ addiu $s1, $s1, 1 -/* 16CAD4 8023E1F4 A043004C */ sb $v1, 0x4c($v0) -/* 16CAD8 8023E1F8 A043005C */ sb $v1, 0x5c($v0) -/* 16CADC 8023E1FC 2A220010 */ slti $v0, $s1, 0x10 -/* 16CAE0 8023E200 5440FFFB */ bnel $v0, $zero, .L8023E1F0 -/* 16CAE4 8023E204 00D11021 */ addu $v0, $a2, $s1 -/* 16CAE8 8023E208 2411001B */ addiu $s1, $zero, 0x1b -/* 16CAEC 8023E20C 00D11021 */ addu $v0, $a2, $s1 -.L8023E210: -/* 16CAF0 8023E210 A0400440 */ sb $zero, 0x440($v0) -/* 16CAF4 8023E214 2631FFFF */ addiu $s1, $s1, -1 -/* 16CAF8 8023E218 0621FFFD */ bgez $s1, .L8023E210 -/* 16CAFC 8023E21C 2442FFFF */ addiu $v0, $v0, -1 -/* 16CB00 8023E220 3C028007 */ lui $v0, %hi(gGameStatusPtr) -/* 16CB04 8023E224 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) -/* 16CB08 8023E228 9042007E */ lbu $v0, 0x7e($v0) -/* 16CB0C 8023E22C 30420001 */ andi $v0, $v0, 1 -/* 16CB10 8023E230 10400009 */ beqz $v0, .L8023E258 -/* 16CB14 8023E234 2404FFBF */ addiu $a0, $zero, -0x41 -/* 16CB18 8023E238 3C03800E */ lui $v1, %hi(gBattleStatus) -/* 16CB1C 8023E23C 2463C070 */ addiu $v1, $v1, %lo(gBattleStatus) -/* 16CB20 8023E240 8C620004 */ lw $v0, 4($v1) -/* 16CB24 8023E244 34420040 */ ori $v0, $v0, 0x40 -/* 16CB28 8023E248 0C03A6D5 */ jal increment_status_menu_disabled -/* 16CB2C 8023E24C AC620004 */ sw $v0, 4($v1) -/* 16CB30 8023E250 0808F89B */ j .L8023E26C -/* 16CB34 8023E254 00000000 */ nop -.L8023E258: -/* 16CB38 8023E258 3C02800E */ lui $v0, %hi(gBattleStatus) -/* 16CB3C 8023E25C 2442C070 */ addiu $v0, $v0, %lo(gBattleStatus) -/* 16CB40 8023E260 8C430004 */ lw $v1, 4($v0) -/* 16CB44 8023E264 00641824 */ and $v1, $v1, $a0 -/* 16CB48 8023E268 AC430004 */ sw $v1, 4($v0) -.L8023E26C: -/* 16CB4C 8023E26C 3C058024 */ lui $a1, %hi(func_8023ED5C) -/* 16CB50 8023E270 24A5ED5C */ addiu $a1, $a1, %lo(func_8023ED5C) -/* 16CB54 8023E274 0C048C56 */ jal create_generic_entity_world -/* 16CB58 8023E278 0000202D */ daddu $a0, $zero, $zero -/* 16CB5C 8023E27C 0C093B70 */ jal func_8024EDC0 -/* 16CB60 8023E280 0000882D */ daddu $s1, $zero, $zero -/* 16CB64 8023E284 0C09A3A2 */ jal func_80268E88 -/* 16CB68 8023E288 00000000 */ nop -/* 16CB6C 8023E28C 0C051FB1 */ jal set_windows_visible -/* 16CB70 8023E290 24040001 */ addiu $a0, $zero, 1 -/* 16CB74 8023E294 3C048029 */ lui $a0, %hi(HudScript_HPBar) -/* 16CB78 8023E298 24841F80 */ addiu $a0, $a0, %lo(HudScript_HPBar) -/* 16CB7C 8023E29C 0C050529 */ jal create_hud_element -/* 16CB80 8023E2A0 00000000 */ nop -/* 16CB84 8023E2A4 3C01802A */ lui $at, %hi(D_8029EFBC) -/* 16CB88 8023E2A8 AC22EFBC */ sw $v0, %lo(D_8029EFBC)($at) -/* 16CB8C 8023E2AC 0040202D */ daddu $a0, $v0, $zero -/* 16CB90 8023E2B0 0C051280 */ jal set_hud_element_flags -/* 16CB94 8023E2B4 24050080 */ addiu $a1, $zero, 0x80 -/* 16CB98 8023E2B8 3C12802A */ lui $s2, %hi(D_8029EFC0) -/* 16CB9C 8023E2BC 2652EFC0 */ addiu $s2, $s2, %lo(D_8029EFC0) -.L8023E2C0: -/* 16CBA0 8023E2C0 3C048008 */ lui $a0, %hi(HudScript_Item_StarPoint) -/* 16CBA4 8023E2C4 24840FF0 */ addiu $a0, $a0, %lo(HudScript_Item_StarPoint) -/* 16CBA8 8023E2C8 0C050529 */ jal create_hud_element -/* 16CBAC 8023E2CC 26310001 */ addiu $s1, $s1, 1 -/* 16CBB0 8023E2D0 AE420000 */ sw $v0, ($s2) -/* 16CBB4 8023E2D4 0040802D */ daddu $s0, $v0, $zero -/* 16CBB8 8023E2D8 0200202D */ daddu $a0, $s0, $zero -/* 16CBBC 8023E2DC 0C051280 */ jal set_hud_element_flags -/* 16CBC0 8023E2E0 24050082 */ addiu $a1, $zero, 0x82 -/* 16CBC4 8023E2E4 0200202D */ daddu $a0, $s0, $zero -/* 16CBC8 8023E2E8 0C051277 */ jal set_hud_element_render_depth -/* 16CBCC 8023E2EC 24050014 */ addiu $a1, $zero, 0x14 -/* 16CBD0 8023E2F0 2A22000A */ slti $v0, $s1, 0xa -/* 16CBD4 8023E2F4 1440FFF2 */ bnez $v0, .L8023E2C0 -/* 16CBD8 8023E2F8 26520004 */ addiu $s2, $s2, 4 -/* 16CBDC 8023E2FC 0000882D */ daddu $s1, $zero, $zero -/* 16CBE0 8023E300 3C12802A */ lui $s2, %hi(D_8029EFE8) -/* 16CBE4 8023E304 2652EFE8 */ addiu $s2, $s2, %lo(D_8029EFE8) -.L8023E308: -/* 16CBE8 8023E308 3C048010 */ lui $a0, %hi(HudScript_StatusSPShine) -/* 16CBEC 8023E30C 24844BEC */ addiu $a0, $a0, %lo(HudScript_StatusSPShine) -/* 16CBF0 8023E310 0C050529 */ jal create_hud_element -/* 16CBF4 8023E314 26310001 */ addiu $s1, $s1, 1 -/* 16CBF8 8023E318 AE420000 */ sw $v0, ($s2) -/* 16CBFC 8023E31C 0040802D */ daddu $s0, $v0, $zero -/* 16CC00 8023E320 0200202D */ daddu $a0, $s0, $zero -/* 16CC04 8023E324 0C051280 */ jal set_hud_element_flags -/* 16CC08 8023E328 24050082 */ addiu $a1, $zero, 0x82 -/* 16CC0C 8023E32C 0200202D */ daddu $a0, $s0, $zero -/* 16CC10 8023E330 0C051277 */ jal set_hud_element_render_depth -/* 16CC14 8023E334 24050014 */ addiu $a1, $zero, 0x14 -/* 16CC18 8023E338 2A22000A */ slti $v0, $s1, 0xa -/* 16CC1C 8023E33C 1440FFF2 */ bnez $v0, .L8023E308 -/* 16CC20 8023E340 26520004 */ addiu $s2, $s2, 4 -/* 16CC24 8023E344 0000882D */ daddu $s1, $zero, $zero -/* 16CC28 8023E348 3C12802A */ lui $s2, %hi(D_8029F010) -/* 16CC2C 8023E34C 2652F010 */ addiu $s2, $s2, %lo(D_8029F010) -.L8023E350: -/* 16CC30 8023E350 3C048008 */ lui $a0, %hi(HudScript_Item_SmallStarPoint) -/* 16CC34 8023E354 248410C8 */ addiu $a0, $a0, %lo(HudScript_Item_SmallStarPoint) -/* 16CC38 8023E358 0C050529 */ jal create_hud_element -/* 16CC3C 8023E35C 26310001 */ addiu $s1, $s1, 1 -/* 16CC40 8023E360 AE420000 */ sw $v0, ($s2) -/* 16CC44 8023E364 0040802D */ daddu $s0, $v0, $zero -/* 16CC48 8023E368 0200202D */ daddu $a0, $s0, $zero -/* 16CC4C 8023E36C 0C051280 */ jal set_hud_element_flags -/* 16CC50 8023E370 24050082 */ addiu $a1, $zero, 0x82 -/* 16CC54 8023E374 0200202D */ daddu $a0, $s0, $zero -/* 16CC58 8023E378 0C051277 */ jal set_hud_element_render_depth -/* 16CC5C 8023E37C 24050014 */ addiu $a1, $zero, 0x14 -/* 16CC60 8023E380 2A22000A */ slti $v0, $s1, 0xa -/* 16CC64 8023E384 1440FFF2 */ bnez $v0, .L8023E350 -/* 16CC68 8023E388 26520004 */ addiu $s2, $s2, 4 -/* 16CC6C 8023E38C 3C028024 */ lui $v0, %hi(func_8023F088) -/* 16CC70 8023E390 2442F088 */ addiu $v0, $v0, %lo(func_8023F088) -/* 16CC74 8023E394 AE8201FC */ sw $v0, 0x1fc($s4) -/* 16CC78 8023E398 966302A2 */ lhu $v1, 0x2a2($s3) -/* 16CC7C 8023E39C 3C028024 */ lui $v0, %hi(func_8023FF84) -/* 16CC80 8023E3A0 2442FF84 */ addiu $v0, $v0, %lo(func_8023FF84) -/* 16CC84 8023E3A4 AE820200 */ sw $v0, 0x200($s4) -/* 16CC88 8023E3A8 2C62270F */ sltiu $v0, $v1, 0x270f -/* 16CC8C 8023E3AC 10400002 */ beqz $v0, .L8023E3B8 -/* 16CC90 8023E3B0 24620001 */ addiu $v0, $v1, 1 -/* 16CC94 8023E3B4 A66202A2 */ sh $v0, 0x2a2($s3) -.L8023E3B8: -/* 16CC98 8023E3B8 3C02800E */ lui $v0, %hi(gBattleStatus+0x4) -/* 16CC9C 8023E3BC 8C42C074 */ lw $v0, %lo(gBattleStatus+0x4)($v0) -/* 16CCA0 8023E3C0 82630012 */ lb $v1, 0x12($s3) -/* 16CCA4 8023E3C4 30420040 */ andi $v0, $v0, 0x40 -/* 16CCA8 8023E3C8 3C01802A */ lui $at, %hi(D_8029DA30) -/* 16CCAC 8023E3CC AC23DA30 */ sw $v1, %lo(D_8029DA30)($at) -/* 16CCB0 8023E3D0 10400002 */ beqz $v0, .L8023E3DC -/* 16CCB4 8023E3D4 2402000B */ addiu $v0, $zero, 0xb -/* 16CCB8 8023E3D8 A2620012 */ sb $v0, 0x12($s3) -.L8023E3DC: -/* 16CCBC 8023E3DC 8FBF0024 */ lw $ra, 0x24($sp) -/* 16CCC0 8023E3E0 8FB40020 */ lw $s4, 0x20($sp) -/* 16CCC4 8023E3E4 8FB3001C */ lw $s3, 0x1c($sp) -/* 16CCC8 8023E3E8 8FB20018 */ lw $s2, 0x18($sp) -/* 16CCCC 8023E3EC 8FB10014 */ lw $s1, 0x14($sp) -/* 16CCD0 8023E3F0 8FB00010 */ lw $s0, 0x10($sp) -/* 16CCD4 8023E3F4 03E00008 */ jr $ra -/* 16CCD8 8023E3F8 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/190B20/create_actor.s b/ver/us/asm/nonmatchings/190B20/create_actor.s deleted file mode 100644 index 9ccb26d800..0000000000 --- a/ver/us/asm/nonmatchings/190B20/create_actor.s +++ /dev/null @@ -1,621 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel create_actor -/* 193C84 802653A4 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* 193C88 802653A8 AFB30024 */ sw $s3, 0x24($sp) -/* 193C8C 802653AC 0080982D */ daddu $s3, $a0, $zero -/* 193C90 802653B0 3C02EFE8 */ lui $v0, 0xefe8 -/* 193C94 802653B4 34422080 */ ori $v0, $v0, 0x2080 -/* 193C98 802653B8 AFBF0034 */ sw $ra, 0x34($sp) -/* 193C9C 802653BC AFB60030 */ sw $s6, 0x30($sp) -/* 193CA0 802653C0 AFB5002C */ sw $s5, 0x2c($sp) -/* 193CA4 802653C4 AFB40028 */ sw $s4, 0x28($sp) -/* 193CA8 802653C8 AFB20020 */ sw $s2, 0x20($sp) -/* 193CAC 802653CC AFB1001C */ sw $s1, 0x1c($sp) -/* 193CB0 802653D0 AFB00018 */ sw $s0, 0x18($sp) -/* 193CB4 802653D4 F7B80048 */ sdc1 $f24, 0x48($sp) -/* 193CB8 802653D8 F7B60040 */ sdc1 $f22, 0x40($sp) -/* 193CBC 802653DC F7B40038 */ sdc1 $f20, 0x38($sp) -/* 193CC0 802653E0 8E640004 */ lw $a0, 4($s3) -/* 193CC4 802653E4 3C12800E */ lui $s2, %hi(gBattleStatus) -/* 193CC8 802653E8 2652C070 */ addiu $s2, $s2, %lo(gBattleStatus) -/* 193CCC 802653EC 0082102A */ slt $v0, $a0, $v0 -/* 193CD0 802653F0 14400014 */ bnez $v0, .L80265444 -/* 193CD4 802653F4 0000802D */ daddu $s0, $zero, $zero -/* 193CD8 802653F8 3C038028 */ lui $v1, %hi(btl_actorHomePositions) -/* 193CDC 802653FC 24633524 */ addiu $v1, $v1, %lo(btl_actorHomePositions) -/* 193CE0 80265400 00041040 */ sll $v0, $a0, 1 -/* 193CE4 80265404 00441021 */ addu $v0, $v0, $a0 -/* 193CE8 80265408 00021040 */ sll $v0, $v0, 1 -/* 193CEC 8026540C 00431021 */ addu $v0, $v0, $v1 -/* 193CF0 80265410 84430000 */ lh $v1, ($v0) -/* 193CF4 80265414 4483C000 */ mtc1 $v1, $f24 -/* 193CF8 80265418 00000000 */ nop -/* 193CFC 8026541C 4680C620 */ cvt.s.w $f24, $f24 -/* 193D00 80265420 84430002 */ lh $v1, 2($v0) -/* 193D04 80265424 84420004 */ lh $v0, 4($v0) -/* 193D08 80265428 4483A000 */ mtc1 $v1, $f20 -/* 193D0C 8026542C 00000000 */ nop -/* 193D10 80265430 4680A520 */ cvt.s.w $f20, $f20 -/* 193D14 80265434 4482B000 */ mtc1 $v0, $f22 -/* 193D18 80265438 00000000 */ nop -/* 193D1C 8026543C 08099517 */ j .L8026545C -/* 193D20 80265440 4680B5A0 */ cvt.s.w $f22, $f22 -.L80265444: -/* 193D24 80265444 C4980000 */ lwc1 $f24, ($a0) -/* 193D28 80265448 4680C620 */ cvt.s.w $f24, $f24 -/* 193D2C 8026544C C4940004 */ lwc1 $f20, 4($a0) -/* 193D30 80265450 4680A520 */ cvt.s.w $f20, $f20 -/* 193D34 80265454 C4960008 */ lwc1 $f22, 8($a0) -/* 193D38 80265458 4680B5A0 */ cvt.s.w $f22, $f22 -.L8026545C: -/* 193D3C 8026545C 8E740000 */ lw $s4, ($s3) -/* 193D40 80265460 0240182D */ daddu $v1, $s2, $zero -/* 193D44 80265464 86960008 */ lh $s6, 8($s4) -.L80265468: -/* 193D48 80265468 8C6200E0 */ lw $v0, 0xe0($v1) -/* 193D4C 8026546C 10400005 */ beqz $v0, .L80265484 -/* 193D50 80265470 00000000 */ nop -/* 193D54 80265474 26100001 */ addiu $s0, $s0, 1 -/* 193D58 80265478 2A020018 */ slti $v0, $s0, 0x18 -/* 193D5C 8026547C 1440FFFA */ bnez $v0, .L80265468 -/* 193D60 80265480 24630004 */ addiu $v1, $v1, 4 -.L80265484: -/* 193D64 80265484 0C00AB39 */ jal heap_malloc -/* 193D68 80265488 24040444 */ addiu $a0, $zero, 0x444 -/* 193D6C 8026548C 00101880 */ sll $v1, $s0, 2 -/* 193D70 80265490 02431821 */ addu $v1, $s2, $v1 -/* 193D74 80265494 0040882D */ daddu $s1, $v0, $zero -/* 193D78 80265498 16200003 */ bnez $s1, .L802654A8 -/* 193D7C 8026549C AC6200E0 */ sw $v0, 0xe0($v1) -.L802654A0: -/* 193D80 802654A0 08099528 */ j .L802654A0 -/* 193D84 802654A4 00000000 */ nop -.L802654A8: -/* 193D88 802654A8 92430093 */ lbu $v1, 0x93($s2) -/* 193D8C 802654AC 3C013F80 */ lui $at, 0x3f80 -/* 193D90 802654B0 44810000 */ mtc1 $at, $f0 -/* 193D94 802654B4 24620001 */ addiu $v0, $v1, 1 -/* 193D98 802654B8 A2420093 */ sb $v0, 0x93($s2) -/* 193D9C 802654BC A2230134 */ sb $v1, 0x134($s1) -/* 193DA0 802654C0 A2200135 */ sb $zero, 0x135($s1) -/* 193DA4 802654C4 AE340008 */ sw $s4, 8($s1) -/* 193DA8 802654C8 92820005 */ lbu $v0, 5($s4) -/* 193DAC 802654CC A2220136 */ sb $v0, 0x136($s1) -/* 193DB0 802654D0 8E820000 */ lw $v0, ($s4) -/* 193DB4 802654D4 E6380144 */ swc1 $f24, 0x144($s1) -/* 193DB8 802654D8 E6380138 */ swc1 $f24, 0x138($s1) -/* 193DBC 802654DC E6340148 */ swc1 $f20, 0x148($s1) -/* 193DC0 802654E0 E634013C */ swc1 $f20, 0x13c($s1) -/* 193DC4 802654E4 E636014C */ swc1 $f22, 0x14c($s1) -/* 193DC8 802654E8 E6360140 */ swc1 $f22, 0x140($s1) -/* 193DCC 802654EC A6200150 */ sh $zero, 0x150($s1) -/* 193DD0 802654F0 A6200152 */ sh $zero, 0x152($s1) -/* 193DD4 802654F4 A6200154 */ sh $zero, 0x154($s1) -/* 193DD8 802654F8 AE220000 */ sw $v0, ($s1) -/* 193DDC 802654FC 92820007 */ lbu $v0, 7($s4) -/* 193DE0 80265500 A23601F3 */ sb $s6, 0x1f3($s1) -/* 193DE4 80265504 AE2001C0 */ sw $zero, 0x1c0($s1) -/* 193DE8 80265508 A22201B8 */ sb $v0, 0x1b8($s1) -/* 193DEC 8026550C A22201B9 */ sb $v0, 0x1b9($s1) -/* 193DF0 80265510 8E820010 */ lw $v0, 0x10($s4) -/* 193DF4 80265514 AE2001C8 */ sw $zero, 0x1c8($s1) -/* 193DF8 80265518 AE2001CC */ sw $zero, 0x1cc($s1) -/* 193DFC 8026551C AE2001D0 */ sw $zero, 0x1d0($s1) -/* 193E00 80265520 AE2001D4 */ sw $zero, 0x1d4($s1) -/* 193E04 80265524 AE2001D8 */ sw $zero, 0x1d8($s1) -/* 193E08 80265528 AE2201C4 */ sw $v0, 0x1c4($s1) -/* 193E0C 8026552C 9262000B */ lbu $v0, 0xb($s3) -/* 193E10 80265530 A23001F2 */ sb $s0, 0x1f2($s1) -/* 193E14 80265534 A22201F1 */ sb $v0, 0x1f1($s1) -/* 193E18 80265538 AE20018C */ sw $zero, 0x18c($s1) -/* 193E1C 8026553C AE20015C */ sw $zero, 0x15c($s1) -/* 193E20 80265540 AE200160 */ sw $zero, 0x160($s1) -/* 193E24 80265544 AE200164 */ sw $zero, 0x164($s1) -/* 193E28 80265548 A6200168 */ sh $zero, 0x168($s1) -/* 193E2C 8026554C A620016A */ sh $zero, 0x16a($s1) -/* 193E30 80265550 A620016C */ sh $zero, 0x16c($s1) -/* 193E34 80265554 E6200170 */ swc1 $f0, 0x170($s1) -/* 193E38 80265558 E6200174 */ swc1 $f0, 0x174($s1) -/* 193E3C 8026555C E6200178 */ swc1 $f0, 0x178($s1) -/* 193E40 80265560 E620017C */ swc1 $f0, 0x17c($s1) -/* 193E44 80265564 E6200180 */ swc1 $f0, 0x180($s1) -/* 193E48 80265568 E6200184 */ swc1 $f0, 0x184($s1) -/* 193E4C 8026556C A220019A */ sb $zero, 0x19a($s1) -/* 193E50 80265570 A2200207 */ sb $zero, 0x207($s1) -/* 193E54 80265574 92820020 */ lbu $v0, 0x20($s4) -/* 193E58 80265578 A2220190 */ sb $v0, 0x190($s1) -/* 193E5C 8026557C 92820021 */ lbu $v0, 0x21($s4) -/* 193E60 80265580 E6200188 */ swc1 $f0, 0x188($s1) -/* 193E64 80265584 A2200194 */ sb $zero, 0x194($s1) -/* 193E68 80265588 A2200195 */ sb $zero, 0x195($s1) -/* 193E6C 8026558C A2200196 */ sb $zero, 0x196($s1) -/* 193E70 80265590 A2200197 */ sb $zero, 0x197($s1) -/* 193E74 80265594 A2200198 */ sb $zero, 0x198($s1) -/* 193E78 80265598 A2200199 */ sb $zero, 0x199($s1) -/* 193E7C 8026559C A2200206 */ sb $zero, 0x206($s1) -/* 193E80 802655A0 AE200200 */ sw $zero, 0x200($s1) -/* 193E84 802655A4 A2200204 */ sb $zero, 0x204($s1) -/* 193E88 802655A8 A2200205 */ sb $zero, 0x205($s1) -/* 193E8C 802655AC A2220191 */ sb $v0, 0x191($s1) -/* 193E90 802655B0 82820022 */ lb $v0, 0x22($s4) -/* 193E94 802655B4 4600C006 */ mov.s $f0, $f24 -/* 193E98 802655B8 44821000 */ mtc1 $v0, $f2 -/* 193E9C 802655BC 00000000 */ nop -/* 193EA0 802655C0 468010A0 */ cvt.s.w $f2, $f2 -/* 193EA4 802655C4 46020000 */ add.s $f0, $f0, $f2 -/* 193EA8 802655C8 4600010D */ trunc.w.s $f4, $f0 -/* 193EAC 802655CC 44022000 */ mfc1 $v0, $f4 -/* 193EB0 802655D0 00000000 */ nop -/* 193EB4 802655D4 A6220156 */ sh $v0, 0x156($s1) -/* 193EB8 802655D8 82820023 */ lb $v0, 0x23($s4) -/* 193EBC 802655DC 4600A006 */ mov.s $f0, $f20 -/* 193EC0 802655E0 44821000 */ mtc1 $v0, $f2 -/* 193EC4 802655E4 00000000 */ nop -/* 193EC8 802655E8 468010A0 */ cvt.s.w $f2, $f2 -/* 193ECC 802655EC 46020000 */ add.s $f0, $f0, $f2 -/* 193ED0 802655F0 4600010D */ trunc.w.s $f4, $f0 -/* 193ED4 802655F4 44022000 */ mfc1 $v0, $f4 -/* 193ED8 802655F8 00000000 */ nop -/* 193EDC 802655FC A6220158 */ sh $v0, 0x158($s1) -/* 193EE0 80265600 4600B006 */ mov.s $f0, $f22 -/* 193EE4 80265604 8E220000 */ lw $v0, ($s1) -/* 193EE8 80265608 4600010D */ trunc.w.s $f4, $f0 -/* 193EEC 8026560C 44032000 */ mfc1 $v1, $f4 -/* 193EF0 80265610 30420800 */ andi $v0, $v0, 0x800 -/* 193EF4 80265614 10400010 */ beqz $v0, .L80265658 -/* 193EF8 80265618 A623015A */ sh $v1, 0x15a($s1) -/* 193EFC 8026561C 92220191 */ lbu $v0, 0x191($s1) -/* 193F00 80265620 4600A006 */ mov.s $f0, $f20 -/* 193F04 80265624 44821000 */ mtc1 $v0, $f2 -/* 193F08 80265628 00000000 */ nop -/* 193F0C 8026562C 468010A0 */ cvt.s.w $f2, $f2 -/* 193F10 80265630 82820023 */ lb $v0, 0x23($s4) -/* 193F14 80265634 46020001 */ sub.s $f0, $f0, $f2 -/* 193F18 80265638 44821000 */ mtc1 $v0, $f2 -/* 193F1C 8026563C 00000000 */ nop -/* 193F20 80265640 468010A0 */ cvt.s.w $f2, $f2 -/* 193F24 80265644 46020001 */ sub.s $f0, $f0, $f2 -/* 193F28 80265648 4600010D */ trunc.w.s $f4, $f0 -/* 193F2C 8026564C 44022000 */ mfc1 $v0, $f4 -/* 193F30 80265650 00000000 */ nop -/* 193F34 80265654 A6220158 */ sh $v0, 0x158($s1) -.L80265658: -/* 193F38 80265658 8E820014 */ lw $v0, 0x14($s4) -/* 193F3C 8026565C 92230136 */ lbu $v1, 0x136($s1) -/* 193F40 80265660 A2200210 */ sb $zero, 0x210($s1) -/* 193F44 80265664 A2200211 */ sb $zero, 0x211($s1) -/* 193F48 80265668 A2200212 */ sb $zero, 0x212($s1) -/* 193F4C 8026566C A2200213 */ sb $zero, 0x213($s1) -/* 193F50 80265670 A2200214 */ sb $zero, 0x214($s1) -/* 193F54 80265674 A2200215 */ sb $zero, 0x215($s1) -/* 193F58 80265678 A2200216 */ sb $zero, 0x216($s1) -/* 193F5C 8026567C A2200217 */ sb $zero, 0x217($s1) -/* 193F60 80265680 A2200218 */ sb $zero, 0x218($s1) -/* 193F64 80265684 A2200219 */ sb $zero, 0x219($s1) -/* 193F68 80265688 A2200220 */ sb $zero, 0x220($s1) -/* 193F6C 8026568C A620021E */ sh $zero, 0x21e($s1) -/* 193F70 80265690 A220021D */ sb $zero, 0x21d($s1) -/* 193F74 80265694 A2200221 */ sb $zero, 0x221($s1) -/* 193F78 80265698 A2200222 */ sb $zero, 0x222($s1) -/* 193F7C 8026569C A2200223 */ sb $zero, 0x223($s1) -/* 193F80 802656A0 A2200224 */ sb $zero, 0x224($s1) -/* 193F84 802656A4 A220021C */ sb $zero, 0x21c($s1) -/* 193F88 802656A8 AE22020C */ sw $v0, 0x20c($s1) -/* 193F8C 802656AC 000310C0 */ sll $v0, $v1, 3 -/* 193F90 802656B0 00431023 */ subu $v0, $v0, $v1 -/* 193F94 802656B4 00021080 */ sll $v0, $v0, 2 -/* 193F98 802656B8 3C018028 */ lui $at, %hi(bActorSoundTable) -/* 193F9C 802656BC 00220821 */ addu $at, $at, $v0 -/* 193FA0 802656C0 8C221468 */ lw $v0, %lo(bActorSoundTable)($at) -/* 193FA4 802656C4 AE22019C */ sw $v0, 0x19c($s1) -/* 193FA8 802656C8 000310C0 */ sll $v0, $v1, 3 -/* 193FAC 802656CC 00431023 */ subu $v0, $v0, $v1 -/* 193FB0 802656D0 00021080 */ sll $v0, $v0, 2 -/* 193FB4 802656D4 3C018028 */ lui $at, %hi(bActorSoundTable+0x4) -/* 193FB8 802656D8 00220821 */ addu $at, $at, $v0 -/* 193FBC 802656DC 8C22146C */ lw $v0, %lo(bActorSoundTable+0x4)($at) -/* 193FC0 802656E0 AE2201A0 */ sw $v0, 0x1a0($s1) -/* 193FC4 802656E4 000310C0 */ sll $v0, $v1, 3 -/* 193FC8 802656E8 00431023 */ subu $v0, $v0, $v1 -/* 193FCC 802656EC 00021080 */ sll $v0, $v0, 2 -/* 193FD0 802656F0 3C018028 */ lui $at, %hi(bActorSoundTable+0x8) -/* 193FD4 802656F4 00220821 */ addu $at, $at, $v0 -/* 193FD8 802656F8 8C221470 */ lw $v0, %lo(bActorSoundTable+0x8)($at) -/* 193FDC 802656FC AE2201A4 */ sw $v0, 0x1a4($s1) -/* 193FE0 80265700 000310C0 */ sll $v0, $v1, 3 -/* 193FE4 80265704 00431023 */ subu $v0, $v0, $v1 -/* 193FE8 80265708 00021080 */ sll $v0, $v0, 2 -/* 193FEC 8026570C 3C018028 */ lui $at, %hi(bActorSoundTable+0xC) -/* 193FF0 80265710 00220821 */ addu $at, $at, $v0 -/* 193FF4 80265714 8C221474 */ lw $v0, %lo(bActorSoundTable+0xC)($at) -/* 193FF8 80265718 AE2201A8 */ sw $v0, 0x1a8($s1) -/* 193FFC 8026571C 000310C0 */ sll $v0, $v1, 3 -/* 194000 80265720 00431023 */ subu $v0, $v0, $v1 -/* 194004 80265724 00021080 */ sll $v0, $v0, 2 -/* 194008 80265728 3C018028 */ lui $at, %hi(bActorSoundTable+0x10) -/* 19400C 8026572C 00220821 */ addu $at, $at, $v0 -/* 194010 80265730 8C221478 */ lw $v0, %lo(bActorSoundTable+0x10)($at) -/* 194014 80265734 AE2201AC */ sw $v0, 0x1ac($s1) -/* 194018 80265738 000310C0 */ sll $v0, $v1, 3 -/* 19401C 8026573C 00431023 */ subu $v0, $v0, $v1 -/* 194020 80265740 00021080 */ sll $v0, $v0, 2 -/* 194024 80265744 3C018028 */ lui $at, %hi(bActorSoundTable+0x14) -/* 194028 80265748 00220821 */ addu $at, $at, $v0 -/* 19402C 8026574C 8C22147C */ lw $v0, %lo(bActorSoundTable+0x14)($at) -/* 194030 80265750 AE2201B0 */ sw $v0, 0x1b0($s1) -/* 194034 80265754 000310C0 */ sll $v0, $v1, 3 -/* 194038 80265758 00431023 */ subu $v0, $v0, $v1 -/* 19403C 8026575C 00021080 */ sll $v0, $v0, 2 -/* 194040 80265760 3C018028 */ lui $at, %hi(bActorSoundTable+0x18) -/* 194044 80265764 00220821 */ addu $at, $at, $v0 -/* 194048 80265768 94221480 */ lhu $v0, %lo(bActorSoundTable+0x18)($at) -/* 19404C 8026576C 24100001 */ addiu $s0, $zero, 1 -/* 194050 80265770 A62201B4 */ sh $v0, 0x1b4($s1) -/* 194054 80265774 000310C0 */ sll $v0, $v1, 3 -/* 194058 80265778 00431023 */ subu $v0, $v0, $v1 -/* 19405C 8026577C 00021080 */ sll $v0, $v0, 2 -/* 194060 80265780 3C018028 */ lui $at, %hi(bActorSoundTable+0x1A) -/* 194064 80265784 00220821 */ addu $at, $at, $v0 -/* 194068 80265788 94221482 */ lhu $v0, %lo(bActorSoundTable+0x1A)($at) -/* 19406C 8026578C 26230004 */ addiu $v1, $s1, 4 -/* 194070 80265790 A62201B6 */ sh $v0, 0x1b6($s1) -.L80265794: -/* 194074 80265794 AC600438 */ sw $zero, 0x438($v1) -/* 194078 80265798 2610FFFF */ addiu $s0, $s0, -1 -/* 19407C 8026579C 0601FFFD */ bgez $s0, .L80265794 -/* 194080 802657A0 2463FFFC */ addiu $v1, $v1, -4 -/* 194084 802657A4 8E62000C */ lw $v0, 0xc($s3) -/* 194088 802657A8 AE220088 */ sw $v0, 0x88($s1) -/* 19408C 802657AC 8E620010 */ lw $v0, 0x10($s3) -/* 194090 802657B0 AE22008C */ sw $v0, 0x8c($s1) -/* 194094 802657B4 8E620014 */ lw $v0, 0x14($s3) -/* 194098 802657B8 240400C4 */ addiu $a0, $zero, 0xc4 -/* 19409C 802657BC AE220090 */ sw $v0, 0x90($s1) -/* 1940A0 802657C0 8E630018 */ lw $v1, 0x18($s3) -/* 1940A4 802657C4 2402000D */ addiu $v0, $zero, 0xd -/* 1940A8 802657C8 A6220434 */ sh $v0, 0x434($s1) -/* 1940AC 802657CC A2200208 */ sb $zero, 0x208($s1) -/* 1940B0 802657D0 0C00AB39 */ jal heap_malloc -/* 1940B4 802657D4 AE230094 */ sw $v1, 0x94($s1) -/* 1940B8 802657D8 0040802D */ daddu $s0, $v0, $zero -/* 1940BC 802657DC 16000003 */ bnez $s0, .L802657EC -/* 1940C0 802657E0 AE3001F4 */ sw $s0, 0x1f4($s1) -.L802657E4: -/* 1940C4 802657E4 080995F9 */ j .L802657E4 -/* 1940C8 802657E8 00000000 */ nop -.L802657EC: -/* 1940CC 802657EC 1AC00106 */ blez $s6, .L80265C08 -/* 1940D0 802657F0 0000982D */ daddu $s3, $zero, $zero -/* 1940D4 802657F4 3C013F80 */ lui $at, 0x3f80 -/* 1940D8 802657F8 4481A000 */ mtc1 $at, $f20 -/* 1940DC 802657FC 3C128028 */ lui $s2, %hi(bActorSoundTable) -/* 1940E0 80265800 26521468 */ addiu $s2, $s2, %lo(bActorSoundTable) -/* 1940E4 80265804 0260A82D */ daddu $s5, $s3, $zero -.L80265808: -/* 1940E8 80265808 8E82000C */ lw $v0, 0xc($s4) -/* 1940EC 8026580C AE0000C0 */ sw $zero, 0xc0($s0) -/* 1940F0 80265810 00551821 */ addu $v1, $v0, $s5 -/* 1940F4 80265814 AE030008 */ sw $v1, 8($s0) -/* 1940F8 80265818 8C620000 */ lw $v0, ($v1) -/* 1940FC 8026581C AE000004 */ sw $zero, 4($s0) -/* 194100 80265820 34420004 */ ori $v0, $v0, 4 -/* 194104 80265824 AE020000 */ sw $v0, ($s0) -/* 194108 80265828 90620005 */ lbu $v0, 5($v1) -/* 19410C 8026582C 00021600 */ sll $v0, $v0, 0x18 -/* 194110 80265830 00021603 */ sra $v0, $v0, 0x18 -/* 194114 80265834 A6020014 */ sh $v0, 0x14($s0) -/* 194118 80265838 00021400 */ sll $v0, $v0, 0x10 -/* 19411C 8026583C 00021403 */ sra $v0, $v0, 0x10 -/* 194120 80265840 44820000 */ mtc1 $v0, $f0 -/* 194124 80265844 00000000 */ nop -/* 194128 80265848 46800020 */ cvt.s.w $f0, $f0 -/* 19412C 8026584C E6000020 */ swc1 $f0, 0x20($s0) -/* 194130 80265850 90620006 */ lbu $v0, 6($v1) -/* 194134 80265854 00021600 */ sll $v0, $v0, 0x18 -/* 194138 80265858 00021603 */ sra $v0, $v0, 0x18 -/* 19413C 8026585C A6020016 */ sh $v0, 0x16($s0) -/* 194140 80265860 00021400 */ sll $v0, $v0, 0x10 -/* 194144 80265864 00021403 */ sra $v0, $v0, 0x10 -/* 194148 80265868 44820000 */ mtc1 $v0, $f0 -/* 19414C 8026586C 00000000 */ nop -/* 194150 80265870 46800020 */ cvt.s.w $f0, $f0 -/* 194154 80265874 E6000024 */ swc1 $f0, 0x24($s0) -/* 194158 80265878 90620007 */ lbu $v0, 7($v1) -/* 19415C 8026587C A600001A */ sh $zero, 0x1a($s0) -/* 194160 80265880 A600001C */ sh $zero, 0x1c($s0) -/* 194164 80265884 A600001E */ sh $zero, 0x1e($s0) -/* 194168 80265888 00021600 */ sll $v0, $v0, 0x18 -/* 19416C 8026588C 00021603 */ sra $v0, $v0, 0x18 -/* 194170 80265890 A6020018 */ sh $v0, 0x18($s0) -/* 194174 80265894 00021400 */ sll $v0, $v0, 0x10 -/* 194178 80265898 00021403 */ sra $v0, $v0, 0x10 -/* 19417C 8026589C 44820000 */ mtc1 $v0, $f0 -/* 194180 802658A0 00000000 */ nop -/* 194184 802658A4 46800020 */ cvt.s.w $f0, $f0 -/* 194188 802658A8 E6000028 */ swc1 $f0, 0x28($s0) -/* 19418C 802658AC C6200144 */ lwc1 $f0, 0x144($s1) -/* 194190 802658B0 E600002C */ swc1 $f0, 0x2c($s0) -/* 194194 802658B4 C6200148 */ lwc1 $f0, 0x148($s1) -/* 194198 802658B8 E6000030 */ swc1 $f0, 0x30($s0) -/* 19419C 802658BC C620014C */ lwc1 $f0, 0x14c($s1) -/* 1941A0 802658C0 E6000034 */ swc1 $f0, 0x34($s0) -/* 1941A4 802658C4 C6200144 */ lwc1 $f0, 0x144($s1) -/* 1941A8 802658C8 E6000058 */ swc1 $f0, 0x58($s0) -/* 1941AC 802658CC C6200148 */ lwc1 $f0, 0x148($s1) -/* 1941B0 802658D0 E600005C */ swc1 $f0, 0x5c($s0) -/* 1941B4 802658D4 C620014C */ lwc1 $f0, 0x14c($s1) -/* 1941B8 802658D8 E6000060 */ swc1 $f0, 0x60($s0) -/* 1941BC 802658DC 8C620010 */ lw $v0, 0x10($v1) -/* 1941C0 802658E0 AE020078 */ sw $v0, 0x78($s0) -/* 1941C4 802658E4 8C62000C */ lw $v0, 0xc($v1) -/* 1941C8 802658E8 AE020094 */ sw $v0, 0x94($s0) -/* 1941CC 802658EC 8C620014 */ lw $v0, 0x14($v1) -/* 1941D0 802658F0 AE02007C */ sw $v0, 0x7c($s0) -/* 1941D4 802658F4 8C620018 */ lw $v0, 0x18($v1) -/* 1941D8 802658F8 AE020080 */ sw $v0, 0x80($s0) -/* 1941DC 802658FC 9462000A */ lhu $v0, 0xa($v1) -/* 1941E0 80265900 A6020098 */ sh $v0, 0x98($s0) -/* 1941E4 80265904 00021400 */ sll $v0, $v0, 0x10 -/* 1941E8 80265908 00021403 */ sra $v0, $v0, 0x10 -/* 1941EC 8026590C 284200FF */ slti $v0, $v0, 0xff -/* 1941F0 80265910 10400002 */ beqz $v0, .L8026591C -/* 1941F4 80265914 24020022 */ addiu $v0, $zero, 0x22 -/* 1941F8 80265918 A6220434 */ sh $v0, 0x434($s1) -.L8026591C: -/* 1941FC 8026591C 92220191 */ lbu $v0, 0x191($s1) -/* 194200 80265920 A2020073 */ sb $v0, 0x73($s0) -/* 194204 80265924 92220190 */ lbu $v0, 0x190($s1) -/* 194208 80265928 AE000064 */ sw $zero, 0x64($s0) -/* 19420C 8026592C A2020072 */ sb $v0, 0x72($s0) -/* 194210 80265930 90620008 */ lbu $v0, 8($v1) -/* 194214 80265934 00021600 */ sll $v0, $v0, 0x18 -/* 194218 80265938 00021603 */ sra $v0, $v0, 0x18 -/* 19421C 8026593C A602006C */ sh $v0, 0x6c($s0) -/* 194220 80265940 90620009 */ lbu $v0, 9($v1) -/* 194224 80265944 A6000070 */ sh $zero, 0x70($s0) -/* 194228 80265948 00021600 */ sll $v0, $v0, 0x18 -/* 19422C 8026594C 00021603 */ sra $v0, $v0, 0x18 -/* 194230 80265950 A602006E */ sh $v0, 0x6e($s0) -/* 194234 80265954 9062001C */ lbu $v0, 0x1c($v1) -/* 194238 80265958 A2020075 */ sb $v0, 0x75($s0) -/* 19423C 8026595C 9063001D */ lbu $v1, 0x1d($v1) -/* 194240 80265960 24020001 */ addiu $v0, $zero, 1 -/* 194244 80265964 AE000038 */ sw $zero, 0x38($s0) -/* 194248 80265968 AE00003C */ sw $zero, 0x3c($s0) -/* 19424C 8026596C AE000040 */ sw $zero, 0x40($s0) -/* 194250 80265970 A6000044 */ sh $zero, 0x44($s0) -/* 194254 80265974 A6000046 */ sh $zero, 0x46($s0) -/* 194258 80265978 A6000048 */ sh $zero, 0x48($s0) -/* 19425C 8026597C E614004C */ swc1 $f20, 0x4c($s0) -/* 194260 80265980 E6140050 */ swc1 $f20, 0x50($s0) -/* 194264 80265984 E6140054 */ swc1 $f20, 0x54($s0) -/* 194268 80265988 A2020074 */ sb $v0, 0x74($s0) -/* 19426C 8026598C A6000068 */ sh $zero, 0x68($s0) -/* 194270 80265990 A600006A */ sh $zero, 0x6a($s0) -/* 194274 80265994 A2030076 */ sb $v1, 0x76($s0) -/* 194278 80265998 92230136 */ lbu $v1, 0x136($s1) -/* 19427C 8026599C 000310C0 */ sll $v0, $v1, 3 -/* 194280 802659A0 00431023 */ subu $v0, $v0, $v1 -/* 194284 802659A4 00021080 */ sll $v0, $v0, 2 -/* 194288 802659A8 00521021 */ addu $v0, $v0, $s2 -/* 19428C 802659AC 8C420000 */ lw $v0, ($v0) -/* 194290 802659B0 AE0200A4 */ sw $v0, 0xa4($s0) -/* 194294 802659B4 92230136 */ lbu $v1, 0x136($s1) -/* 194298 802659B8 000310C0 */ sll $v0, $v1, 3 -/* 19429C 802659BC 00431023 */ subu $v0, $v0, $v1 -/* 1942A0 802659C0 00021080 */ sll $v0, $v0, 2 -/* 1942A4 802659C4 00521021 */ addu $v0, $v0, $s2 -/* 1942A8 802659C8 8C420004 */ lw $v0, 4($v0) -/* 1942AC 802659CC AE0200A8 */ sw $v0, 0xa8($s0) -/* 1942B0 802659D0 92230136 */ lbu $v1, 0x136($s1) -/* 1942B4 802659D4 000310C0 */ sll $v0, $v1, 3 -/* 1942B8 802659D8 00431023 */ subu $v0, $v0, $v1 -/* 1942BC 802659DC 00021080 */ sll $v0, $v0, 2 -/* 1942C0 802659E0 00521021 */ addu $v0, $v0, $s2 -/* 1942C4 802659E4 8C420008 */ lw $v0, 8($v0) -/* 1942C8 802659E8 AE0200AC */ sw $v0, 0xac($s0) -/* 1942CC 802659EC 92230136 */ lbu $v1, 0x136($s1) -/* 1942D0 802659F0 000310C0 */ sll $v0, $v1, 3 -/* 1942D4 802659F4 00431023 */ subu $v0, $v0, $v1 -/* 1942D8 802659F8 00021080 */ sll $v0, $v0, 2 -/* 1942DC 802659FC 00521021 */ addu $v0, $v0, $s2 -/* 1942E0 80265A00 8C42000C */ lw $v0, 0xc($v0) -/* 1942E4 80265A04 AE0200B0 */ sw $v0, 0xb0($s0) -/* 1942E8 80265A08 92230136 */ lbu $v1, 0x136($s1) -/* 1942EC 80265A0C 000310C0 */ sll $v0, $v1, 3 -/* 1942F0 80265A10 00431023 */ subu $v0, $v0, $v1 -/* 1942F4 80265A14 00021080 */ sll $v0, $v0, 2 -/* 1942F8 80265A18 00521021 */ addu $v0, $v0, $s2 -/* 1942FC 80265A1C 8C420010 */ lw $v0, 0x10($v0) -/* 194300 80265A20 AE0200B4 */ sw $v0, 0xb4($s0) -/* 194304 80265A24 92230136 */ lbu $v1, 0x136($s1) -/* 194308 80265A28 000310C0 */ sll $v0, $v1, 3 -/* 19430C 80265A2C 00431023 */ subu $v0, $v0, $v1 -/* 194310 80265A30 00021080 */ sll $v0, $v0, 2 -/* 194314 80265A34 00521021 */ addu $v0, $v0, $s2 -/* 194318 80265A38 8C420014 */ lw $v0, 0x14($v0) -/* 19431C 80265A3C AE0200B8 */ sw $v0, 0xb8($s0) -/* 194320 80265A40 92230136 */ lbu $v1, 0x136($s1) -/* 194324 80265A44 000310C0 */ sll $v0, $v1, 3 -/* 194328 80265A48 00431023 */ subu $v0, $v0, $v1 -/* 19432C 80265A4C 00021080 */ sll $v0, $v0, 2 -/* 194330 80265A50 00521021 */ addu $v0, $v0, $s2 -/* 194334 80265A54 94420018 */ lhu $v0, 0x18($v0) -/* 194338 80265A58 A60200BC */ sh $v0, 0xbc($s0) -/* 19433C 80265A5C 92230136 */ lbu $v1, 0x136($s1) -/* 194340 80265A60 000310C0 */ sll $v0, $v1, 3 -/* 194344 80265A64 00431023 */ subu $v0, $v0, $v1 -/* 194348 80265A68 00021080 */ sll $v0, $v0, 2 -/* 19434C 80265A6C 00521021 */ addu $v0, $v0, $s2 -/* 194350 80265A70 9442001A */ lhu $v0, 0x1a($v0) -/* 194354 80265A74 8E030094 */ lw $v1, 0x94($s0) -/* 194358 80265A78 10600034 */ beqz $v1, .L80265B4C -/* 19435C 80265A7C A60200BE */ sh $v0, 0xbe($s0) -/* 194360 80265A80 8E020000 */ lw $v0, ($s0) -/* 194364 80265A84 30420002 */ andi $v0, $v0, 2 -/* 194368 80265A88 14400030 */ bnez $v0, .L80265B4C -/* 19436C 80265A8C 00000000 */ nop -/* 194370 80265A90 0C00AB39 */ jal heap_malloc -/* 194374 80265A94 240408E8 */ addiu $a0, $zero, 0x8e8 -/* 194378 80265A98 0040202D */ daddu $a0, $v0, $zero -/* 19437C 80265A9C 14800003 */ bnez $a0, .L80265AAC -/* 194380 80265AA0 AE0200C0 */ sw $v0, 0xc0($s0) -.L80265AA4: -/* 194384 80265AA4 080996A9 */ j .L80265AA4 -/* 194388 80265AA8 00000000 */ nop -.L80265AAC: -/* 19438C 80265AAC 0000282D */ daddu $a1, $zero, $zero -/* 194390 80265AB0 0080182D */ daddu $v1, $a0, $zero -/* 194394 80265AB4 A08006C0 */ sb $zero, 0x6c0($a0) -/* 194398 80265AB8 A0800750 */ sb $zero, 0x750($a0) -/* 19439C 80265ABC A0800764 */ sb $zero, 0x764($a0) -/* 1943A0 80265AC0 A0800768 */ sb $zero, 0x768($a0) -/* 1943A4 80265AC4 A08007D8 */ sb $zero, 0x7d8($a0) -/* 1943A8 80265AC8 A08007D9 */ sb $zero, 0x7d9($a0) -.L80265ACC: -/* 1943AC 80265ACC C6200144 */ lwc1 $f0, 0x144($s1) -/* 1943B0 80265AD0 4600010D */ trunc.w.s $f4, $f0 -/* 1943B4 80265AD4 44022000 */ mfc1 $v0, $f4 -/* 1943B8 80265AD8 00000000 */ nop -/* 1943BC 80265ADC A46207FC */ sh $v0, 0x7fc($v1) -/* 1943C0 80265AE0 C6200148 */ lwc1 $f0, 0x148($s1) -/* 1943C4 80265AE4 4600010D */ trunc.w.s $f4, $f0 -/* 1943C8 80265AE8 44022000 */ mfc1 $v0, $f4 -/* 1943CC 80265AEC 00000000 */ nop -/* 1943D0 80265AF0 A462081C */ sh $v0, 0x81c($v1) -/* 1943D4 80265AF4 C620014C */ lwc1 $f0, 0x14c($s1) -/* 1943D8 80265AF8 24A50001 */ addiu $a1, $a1, 1 -/* 1943DC 80265AFC 4600010D */ trunc.w.s $f4, $f0 -/* 1943E0 80265B00 44022000 */ mfc1 $v0, $f4 -/* 1943E4 80265B04 00000000 */ nop -/* 1943E8 80265B08 A462083C */ sh $v0, 0x83c($v1) -/* 1943EC 80265B0C 28A20010 */ slti $v0, $a1, 0x10 -/* 1943F0 80265B10 1440FFEE */ bnez $v0, .L80265ACC -/* 1943F4 80265B14 24630002 */ addiu $v1, $v1, 2 -/* 1943F8 80265B18 0000282D */ daddu $a1, $zero, $zero -/* 1943FC 80265B1C 0080182D */ daddu $v1, $a0, $zero -/* 194400 80265B20 24020003 */ addiu $v0, $zero, 3 -/* 194404 80265B24 A08207DA */ sb $v0, 0x7da($a0) -/* 194408 80265B28 A08007DB */ sb $zero, 0x7db($a0) -/* 19440C 80265B2C A08008AC */ sb $zero, 0x8ac($a0) -.L80265B30: -/* 194410 80265B30 AC6008B0 */ sw $zero, 0x8b0($v1) -/* 194414 80265B34 00851021 */ addu $v0, $a0, $a1 -/* 194418 80265B38 24A50001 */ addiu $a1, $a1, 1 -/* 19441C 80265B3C A04008B8 */ sb $zero, 0x8b8($v0) -/* 194420 80265B40 28A20002 */ slti $v0, $a1, 2 -/* 194424 80265B44 1440FFFA */ bnez $v0, .L80265B30 -/* 194428 80265B48 24630004 */ addiu $v1, $v1, 4 -.L80265B4C: -/* 19442C 80265B4C 8E020000 */ lw $v0, ($s0) -/* 194430 80265B50 04400007 */ bltz $v0, .L80265B70 -/* 194434 80265B54 00000000 */ nop -/* 194438 80265B58 0C00AB39 */ jal heap_malloc -/* 19443C 80265B5C 2404008C */ addiu $a0, $zero, 0x8c -/* 194440 80265B60 14400003 */ bnez $v0, .L80265B70 -/* 194444 80265B64 AE020010 */ sw $v0, 0x10($s0) -.L80265B68: -/* 194448 80265B68 080996DA */ j .L80265B68 -/* 19444C 80265B6C 00000000 */ nop -.L80265B70: -/* 194450 80265B70 8E220000 */ lw $v0, ($s1) -/* 194454 80265B74 30424000 */ andi $v0, $v0, 0x4000 -/* 194458 80265B78 10400004 */ beqz $v0, .L80265B8C -/* 19445C 80265B7C 00000000 */ nop -/* 194460 80265B80 8E020000 */ lw $v0, ($s0) -/* 194464 80265B84 34424000 */ ori $v0, $v0, 0x4000 -/* 194468 80265B88 AE020000 */ sw $v0, ($s0) -.L80265B8C: -/* 19446C 80265B8C 8E040094 */ lw $a0, 0x94($s0) -/* 194470 80265B90 2402FFFF */ addiu $v0, $zero, -1 -/* 194474 80265B94 E6140090 */ swc1 $f20, 0x90($s0) -/* 194478 80265B98 AE000088 */ sw $zero, 0x88($s0) -/* 19447C 80265B9C 1080000A */ beqz $a0, .L80265BC8 -/* 194480 80265BA0 AE020084 */ sw $v0, 0x84($s0) -/* 194484 80265BA4 0C09973A */ jal func_80265CE8 -/* 194488 80265BA8 24050001 */ addiu $a1, $zero, 1 -/* 19448C 80265BAC 3C037FFF */ lui $v1, 0x7fff -/* 194490 80265BB0 3463FFFF */ ori $v1, $v1, 0xffff -/* 194494 80265BB4 00432024 */ and $a0, $v0, $v1 -/* 194498 80265BB8 0000282D */ daddu $a1, $zero, $zero -/* 19449C 80265BBC 0C0B783B */ jal spr_load_npc_sprite -/* 1944A0 80265BC0 AE040088 */ sw $a0, 0x88($s0) -/* 1944A4 80265BC4 AE020084 */ sw $v0, 0x84($s0) -.L80265BC8: -/* 1944A8 80265BC8 26620001 */ addiu $v0, $s3, 1 -/* 1944AC 80265BCC 0056102A */ slt $v0, $v0, $s6 -/* 1944B0 80265BD0 50400009 */ beql $v0, $zero, .L80265BF8 -/* 1944B4 80265BD4 AE00000C */ sw $zero, 0xc($s0) -/* 1944B8 80265BD8 0C00AB39 */ jal heap_malloc -/* 1944BC 80265BDC 240400C4 */ addiu $a0, $zero, 0xc4 -/* 1944C0 80265BE0 AE02000C */ sw $v0, 0xc($s0) -/* 1944C4 80265BE4 0040802D */ daddu $s0, $v0, $zero -/* 1944C8 80265BE8 56000003 */ bnel $s0, $zero, .L80265BF8 -/* 1944CC 80265BEC AE00000C */ sw $zero, 0xc($s0) -.L80265BF0: -/* 1944D0 80265BF0 080996FC */ j .L80265BF0 -/* 1944D4 80265BF4 00000000 */ nop -.L80265BF8: -/* 1944D8 80265BF8 26730001 */ addiu $s3, $s3, 1 -/* 1944DC 80265BFC 0276102A */ slt $v0, $s3, $s6 -/* 1944E0 80265C00 1440FF01 */ bnez $v0, .L80265808 -/* 1944E4 80265C04 26B50024 */ addiu $s5, $s5, 0x24 -.L80265C08: -/* 1944E8 80265C08 2405000A */ addiu $a1, $zero, 0xa -/* 1944EC 80265C0C 0000302D */ daddu $a2, $zero, $zero -/* 1944F0 80265C10 8E2401C4 */ lw $a0, 0x1c4($s1) -/* 1944F4 80265C14 922201F2 */ lbu $v0, 0x1f2($s1) -/* 1944F8 80265C18 24030019 */ addiu $v1, $zero, 0x19 -/* 1944FC 80265C1C A22301BC */ sb $v1, 0x1bc($s1) -/* 194500 80265C20 00021600 */ sll $v0, $v0, 0x18 -/* 194504 80265C24 00021603 */ sra $v0, $v0, 0x18 -/* 194508 80265C28 34420200 */ ori $v0, $v0, 0x200 -/* 19450C 80265C2C 0C0B0CF8 */ jal start_script -/* 194510 80265C30 A6220192 */ sh $v0, 0x192($s1) -/* 194514 80265C34 822301F2 */ lb $v1, 0x1f2($s1) -/* 194518 80265C38 8C440144 */ lw $a0, 0x144($v0) -/* 19451C 80265C3C 34630200 */ ori $v1, $v1, 0x200 -/* 194520 80265C40 AE2401E4 */ sw $a0, 0x1e4($s1) -/* 194524 80265C44 AC430148 */ sw $v1, 0x148($v0) -/* 194528 80265C48 8E250144 */ lw $a1, 0x144($s1) -/* 19452C 80265C4C 8E260148 */ lw $a2, 0x148($s1) -/* 194530 80265C50 8E27014C */ lw $a3, 0x14c($s1) -/* 194534 80265C54 0C044898 */ jal create_shadow_type -/* 194538 80265C58 0000202D */ daddu $a0, $zero, $zero -/* 19453C 80265C5C 3C05C30E */ lui $a1, 0xc30e -/* 194540 80265C60 3C064208 */ lui $a2, 0x4208 -/* 194544 80265C64 3C073F80 */ lui $a3, 0x3f80 -/* 194548 80265C68 0000202D */ daddu $a0, $zero, $zero -/* 19454C 80265C6C AE22042C */ sw $v0, 0x42c($s1) -/* 194550 80265C70 92220190 */ lbu $v0, 0x190($s1) -/* 194554 80265C74 3C014038 */ lui $at, 0x4038 -/* 194558 80265C78 44811800 */ mtc1 $at, $f3 -/* 19455C 80265C7C 44801000 */ mtc1 $zero, $f2 -/* 194560 80265C80 44820000 */ mtc1 $v0, $f0 -/* 194564 80265C84 00000000 */ nop -/* 194568 80265C88 46800021 */ cvt.d.w $f0, $f0 -/* 19456C 80265C8C 46220003 */ div.d $f0, $f0, $f2 -/* 194570 80265C90 46200020 */ cvt.s.d $f0, $f0 -/* 194574 80265C94 E6200430 */ swc1 $f0, 0x430($s1) -/* 194578 80265C98 0C01C43C */ jal playFX_41 -/* 19457C 80265C9C AFA00010 */ sw $zero, 0x10($sp) -/* 194580 80265CA0 AE220440 */ sw $v0, 0x440($s1) -/* 194584 80265CA4 0C011D82 */ jal create_status_icon_set -/* 194588 80265CA8 AE200228 */ sw $zero, 0x228($s1) -/* 19458C 80265CAC A6220436 */ sh $v0, 0x436($s1) -/* 194590 80265CB0 0220102D */ daddu $v0, $s1, $zero -/* 194594 80265CB4 8FBF0034 */ lw $ra, 0x34($sp) -/* 194598 80265CB8 8FB60030 */ lw $s6, 0x30($sp) -/* 19459C 80265CBC 8FB5002C */ lw $s5, 0x2c($sp) -/* 1945A0 80265CC0 8FB40028 */ lw $s4, 0x28($sp) -/* 1945A4 80265CC4 8FB30024 */ lw $s3, 0x24($sp) -/* 1945A8 80265CC8 8FB20020 */ lw $s2, 0x20($sp) -/* 1945AC 80265CCC 8FB1001C */ lw $s1, 0x1c($sp) -/* 1945B0 80265CD0 8FB00018 */ lw $s0, 0x18($sp) -/* 1945B4 80265CD4 D7B80048 */ ldc1 $f24, 0x48($sp) -/* 1945B8 80265CD8 D7B60040 */ ldc1 $f22, 0x40($sp) -/* 1945BC 80265CDC D7B40038 */ ldc1 $f20, 0x38($sp) -/* 1945C0 80265CE0 03E00008 */ jr $ra -/* 1945C4 80265CE4 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/ver/us/asm/nonmatchings/190B20/func_80263064.s b/ver/us/asm/nonmatchings/190B20/func_80263064.s deleted file mode 100644 index 56d6a8a111..0000000000 --- a/ver/us/asm/nonmatchings/190B20/func_80263064.s +++ /dev/null @@ -1,130 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80263064 -/* 191944 80263064 0000402D */ daddu $t0, $zero, $zero -/* 191948 80263068 14A00003 */ bnez $a1, .L80263078 -/* 19194C 8026306C 248A022C */ addiu $t2, $a0, 0x22c -/* 191950 80263070 03E00008 */ jr $ra -/* 191954 80263074 0100102D */ daddu $v0, $t0, $zero -.L80263078: -/* 191958 80263078 80AC01F3 */ lb $t4, 0x1f3($a1) -/* 19195C 8026307C 8CA601F4 */ lw $a2, 0x1f4($a1) -/* 191960 80263080 010C102A */ slt $v0, $t0, $t4 -/* 191964 80263084 10400067 */ beqz $v0, .L80263224 -/* 191968 80263088 0000482D */ daddu $t1, $zero, $zero -/* 19196C 8026308C 3C0F0002 */ lui $t7, 2 -/* 191970 80263090 3C0E0080 */ lui $t6, 0x80 -/* 191974 80263094 3C0D0010 */ lui $t5, 0x10 -/* 191978 80263098 2487023C */ addiu $a3, $a0, 0x23c -.L8026309C: -/* 19197C 8026309C 8CC30000 */ lw $v1, ($a2) -/* 191980 802630A0 006F1024 */ and $v0, $v1, $t7 -/* 191984 802630A4 1440005A */ bnez $v0, .L80263210 -/* 191988 802630A8 006E1024 */ and $v0, $v1, $t6 -/* 19198C 802630AC 5040005A */ beql $v0, $zero, .L80263218 -/* 191990 802630B0 25290001 */ addiu $t1, $t1, 1 -/* 191994 802630B4 8CCB0008 */ lw $t3, 8($a2) -/* 191998 802630B8 006D1024 */ and $v0, $v1, $t5 -/* 19199C 802630BC 14400026 */ bnez $v0, .L80263158 -/* 1919A0 802630C0 00000000 */ nop -/* 1919A4 802630C4 C4A40144 */ lwc1 $f4, 0x144($a1) -/* 1919A8 802630C8 C4A20148 */ lwc1 $f2, 0x148($a1) -/* 1919AC 802630CC 84C20014 */ lh $v0, 0x14($a2) -/* 1919B0 802630D0 C4A6014C */ lwc1 $f6, 0x14c($a1) -/* 1919B4 802630D4 44820000 */ mtc1 $v0, $f0 -/* 1919B8 802630D8 00000000 */ nop -/* 1919BC 802630DC 46800020 */ cvt.s.w $f0, $f0 -/* 1919C0 802630E0 8CA20000 */ lw $v0, ($a1) -/* 1919C4 802630E4 30420800 */ andi $v0, $v0, 0x800 -/* 1919C8 802630E8 14400007 */ bnez $v0, .L80263108 -/* 1919CC 802630EC 46002100 */ add.s $f4, $f4, $f0 -/* 1919D0 802630F0 84C20016 */ lh $v0, 0x16($a2) -/* 1919D4 802630F4 44820000 */ mtc1 $v0, $f0 -/* 1919D8 802630F8 00000000 */ nop -/* 1919DC 802630FC 46800020 */ cvt.s.w $f0, $f0 -/* 1919E0 80263100 08098C47 */ j .L8026311C -/* 1919E4 80263104 46001080 */ add.s $f2, $f2, $f0 -.L80263108: -/* 1919E8 80263108 84C20016 */ lh $v0, 0x16($a2) -/* 1919EC 8026310C 44820000 */ mtc1 $v0, $f0 -/* 1919F0 80263110 00000000 */ nop -/* 1919F4 80263114 46800020 */ cvt.s.w $f0, $f0 -/* 1919F8 80263118 46001081 */ sub.s $f2, $f2, $f0 -.L8026311C: -/* 1919FC 8026311C 84C20018 */ lh $v0, 0x18($a2) -/* 191A00 80263120 44820000 */ mtc1 $v0, $f0 -/* 191A04 80263124 00000000 */ nop -/* 191A08 80263128 46800020 */ cvt.s.w $f0, $f0 -/* 191A0C 8026312C 84C2006C */ lh $v0, 0x6c($a2) -/* 191A10 80263130 46003180 */ add.s $f6, $f6, $f0 -/* 191A14 80263134 44820000 */ mtc1 $v0, $f0 -/* 191A18 80263138 00000000 */ nop -/* 191A1C 8026313C 46800020 */ cvt.s.w $f0, $f0 -/* 191A20 80263140 8CA20000 */ lw $v0, ($a1) -/* 191A24 80263144 30420800 */ andi $v0, $v0, 0x800 -/* 191A28 80263148 1040000E */ beqz $v0, .L80263184 -/* 191A2C 8026314C 46002100 */ add.s $f4, $f4, $f0 -/* 191A30 80263150 08098C67 */ j .L8026319C -/* 191A34 80263154 00000000 */ nop -.L80263158: -/* 191A38 80263158 C4C4002C */ lwc1 $f4, 0x2c($a2) -/* 191A3C 8026315C C4C20030 */ lwc1 $f2, 0x30($a2) -/* 191A40 80263160 84C2006C */ lh $v0, 0x6c($a2) -/* 191A44 80263164 C4C60034 */ lwc1 $f6, 0x34($a2) -/* 191A48 80263168 44820000 */ mtc1 $v0, $f0 -/* 191A4C 8026316C 00000000 */ nop -/* 191A50 80263170 46800020 */ cvt.s.w $f0, $f0 -/* 191A54 80263174 8CA20000 */ lw $v0, ($a1) -/* 191A58 80263178 30420800 */ andi $v0, $v0, 0x800 -/* 191A5C 8026317C 14400007 */ bnez $v0, .L8026319C -/* 191A60 80263180 46002100 */ add.s $f4, $f4, $f0 -.L80263184: -/* 191A64 80263184 84C2006E */ lh $v0, 0x6e($a2) -/* 191A68 80263188 44820000 */ mtc1 $v0, $f0 -/* 191A6C 8026318C 00000000 */ nop -/* 191A70 80263190 46800020 */ cvt.s.w $f0, $f0 -/* 191A74 80263194 08098C6C */ j .L802631B0 -/* 191A78 80263198 46001080 */ add.s $f2, $f2, $f0 -.L8026319C: -/* 191A7C 8026319C 84C2006E */ lh $v0, 0x6e($a2) -/* 191A80 802631A0 44820000 */ mtc1 $v0, $f0 -/* 191A84 802631A4 00000000 */ nop -/* 191A88 802631A8 46800020 */ cvt.s.w $f0, $f0 -/* 191A8C 802631AC 46001081 */ sub.s $f2, $f2, $f0 -.L802631B0: -/* 191A90 802631B0 94A20192 */ lhu $v0, 0x192($a1) -/* 191A94 802631B4 25080001 */ addiu $t0, $t0, 1 -/* 191A98 802631B8 A5420000 */ sh $v0, ($t2) -/* 191A9C 802631BC A4820428 */ sh $v0, 0x428($a0) -/* 191AA0 802631C0 91620004 */ lbu $v0, 4($t3) -/* 191AA4 802631C4 254A0014 */ addiu $t2, $t2, 0x14 -/* 191AA8 802631C8 00021600 */ sll $v0, $v0, 0x18 -/* 191AAC 802631CC 00021603 */ sra $v0, $v0, 0x18 -/* 191AB0 802631D0 A4E2FFF2 */ sh $v0, -0xe($a3) -/* 191AB4 802631D4 A0820426 */ sb $v0, 0x426($a0) -/* 191AB8 802631D8 4600220D */ trunc.w.s $f8, $f4 -/* 191ABC 802631DC 44024000 */ mfc1 $v0, $f8 -/* 191AC0 802631E0 00000000 */ nop -/* 191AC4 802631E4 A4E2FFF4 */ sh $v0, -0xc($a3) -/* 191AC8 802631E8 4600120D */ trunc.w.s $f8, $f2 -/* 191ACC 802631EC 44024000 */ mfc1 $v0, $f8 -/* 191AD0 802631F0 00000000 */ nop -/* 191AD4 802631F4 A4E2FFF6 */ sh $v0, -0xa($a3) -/* 191AD8 802631F8 4600320D */ trunc.w.s $f8, $f6 -/* 191ADC 802631FC 44024000 */ mfc1 $v0, $f8 -/* 191AE0 80263200 00000000 */ nop -/* 191AE4 80263204 A4E2FFF8 */ sh $v0, -8($a3) -/* 191AE8 80263208 A0E00000 */ sb $zero, ($a3) -/* 191AEC 8026320C 24E70014 */ addiu $a3, $a3, 0x14 -.L80263210: -/* 191AF0 80263210 8CC6000C */ lw $a2, 0xc($a2) -/* 191AF4 80263214 25290001 */ addiu $t1, $t1, 1 -.L80263218: -/* 191AF8 80263218 012C102A */ slt $v0, $t1, $t4 -/* 191AFC 8026321C 1440FF9F */ bnez $v0, .L8026309C -/* 191B00 80263220 00000000 */ nop -.L80263224: -/* 191B04 80263224 A088040C */ sb $t0, 0x40c($a0) -/* 191B08 80263228 03E00008 */ jr $ra -/* 191B0C 8026322C 0100102D */ daddu $v0, $t0, $zero diff --git a/ver/us/asm/nonmatchings/190B20/func_802664DC.s b/ver/us/asm/nonmatchings/190B20/func_802664DC.s deleted file mode 100644 index dcb77e78eb..0000000000 --- a/ver/us/asm/nonmatchings/190B20/func_802664DC.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802664DC -/* 194DBC 802664DC 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 194DC0 802664E0 AFB00020 */ sw $s0, 0x20($sp) -/* 194DC4 802664E4 0000802D */ daddu $s0, $zero, $zero -/* 194DC8 802664E8 3C058029 */ lui $a1, %hi(gDamageCountEffects) -/* 194DCC 802664EC 24A538AC */ addiu $a1, $a1, %lo(gDamageCountEffects) -/* 194DD0 802664F0 44861000 */ mtc1 $a2, $f2 -/* 194DD4 802664F4 8FA40038 */ lw $a0, 0x38($sp) -/* 194DD8 802664F8 00A0182D */ daddu $v1, $a1, $zero -/* 194DDC 802664FC AFBF0024 */ sw $ra, 0x24($sp) -.L80266500: -/* 194DE0 80266500 8C620000 */ lw $v0, ($v1) -/* 194DE4 80266504 10400004 */ beqz $v0, .L80266518 -/* 194DE8 80266508 00000000 */ nop -/* 194DEC 8026650C 26100001 */ addiu $s0, $s0, 1 -/* 194DF0 80266510 1A00FFFB */ blez $s0, .L80266500 -/* 194DF4 80266514 24630004 */ addiu $v1, $v1, 4 -.L80266518: -/* 194DF8 80266518 1A000007 */ blez $s0, .L80266538 -/* 194DFC 8026651C 00000000 */ nop -/* 194E00 80266520 8CA20000 */ lw $v0, ($a1) -/* 194E04 80266524 0000802D */ daddu $s0, $zero, $zero -/* 194E08 80266528 8C43000C */ lw $v1, 0xc($v0) -/* 194E0C 8026652C 24020005 */ addiu $v0, $zero, 5 -/* 194E10 80266530 AC620030 */ sw $v0, 0x30($v1) -/* 194E14 80266534 ACA00000 */ sw $zero, ($a1) -.L80266538: -/* 194E18 80266538 14800002 */ bnez $a0, .L80266544 -/* 194E1C 8026653C 24040037 */ addiu $a0, $zero, 0x37 -/* 194E20 80266540 2404FFC9 */ addiu $a0, $zero, -0x37 -.L80266544: -/* 194E24 80266544 44840000 */ mtc1 $a0, $f0 -/* 194E28 80266548 00000000 */ nop -/* 194E2C 8026654C 46800020 */ cvt.s.w $f0, $f0 -/* 194E30 80266550 3C028029 */ lui $v0, %hi(gDamageCountEffects) -/* 194E34 80266554 244238AC */ addiu $v0, $v0, %lo(gDamageCountEffects) -/* 194E38 80266558 00108080 */ sll $s0, $s0, 2 -/* 194E3C 8026655C E7A00014 */ swc1 $f0, 0x14($sp) -/* 194E40 80266560 3C014120 */ lui $at, 0x4120 -/* 194E44 80266564 44810000 */ mtc1 $at, $f0 -/* 194E48 80266568 44056000 */ mfc1 $a1, $f12 -/* 194E4C 8026656C 44067000 */ mfc1 $a2, $f14 -/* 194E50 80266570 02021021 */ addu $v0, $s0, $v0 -/* 194E54 80266574 AFA70018 */ sw $a3, 0x18($sp) -/* 194E58 80266578 44071000 */ mfc1 $a3, $f2 -/* 194E5C 8026657C 0000202D */ daddu $a0, $zero, $zero -/* 194E60 80266580 AFA2001C */ sw $v0, 0x1c($sp) -/* 194E64 80266584 0C01C0F4 */ jal playFX_1E -/* 194E68 80266588 E7A00010 */ swc1 $f0, 0x10($sp) -/* 194E6C 8026658C 24020028 */ addiu $v0, $zero, 0x28 -/* 194E70 80266590 3C018029 */ lui $at, %hi(gDamageCountTimers) -/* 194E74 80266594 00300821 */ addu $at, $at, $s0 -/* 194E78 80266598 AC22390C */ sw $v0, %lo(gDamageCountTimers)($at) -/* 194E7C 8026659C 8FBF0024 */ lw $ra, 0x24($sp) -/* 194E80 802665A0 8FB00020 */ lw $s0, 0x20($sp) -/* 194E84 802665A4 03E00008 */ jr $ra -/* 194E88 802665A8 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/190B20/func_80266978.s b/ver/us/asm/nonmatchings/190B20/func_80266978.s deleted file mode 100644 index 549c602b30..0000000000 --- a/ver/us/asm/nonmatchings/190B20/func_80266978.s +++ /dev/null @@ -1,104 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80266978 -/* 195258 80266978 0000302D */ daddu $a2, $zero, $zero -/* 19525C 8026697C 2409003C */ addiu $t1, $zero, 0x3c -/* 195260 80266980 24080005 */ addiu $t0, $zero, 5 -/* 195264 80266984 3C07800E */ lui $a3, %hi(gBattleStatus) -/* 195268 80266988 24E7C070 */ addiu $a3, $a3, %lo(gBattleStatus) -/* 19526C 8026698C 00E0282D */ daddu $a1, $a3, $zero -.L80266990: -/* 195270 80266990 8CA400E0 */ lw $a0, 0xe0($a1) -/* 195274 80266994 50800018 */ beql $a0, $zero, .L802669F8 -/* 195278 80266998 24C60001 */ addiu $a2, $a2, 1 -/* 19527C 8026699C 80820205 */ lb $v0, 0x205($a0) -/* 195280 802669A0 14490007 */ bne $v0, $t1, .L802669C0 -/* 195284 802669A4 00000000 */ nop -/* 195288 802669A8 8C820200 */ lw $v0, 0x200($a0) -/* 19528C 802669AC 10400003 */ beqz $v0, .L802669BC -/* 195290 802669B0 00000000 */ nop -/* 195294 802669B4 8C42000C */ lw $v0, 0xc($v0) -/* 195298 802669B8 AC400024 */ sw $zero, 0x24($v0) -.L802669BC: -/* 19529C 802669BC 80820205 */ lb $v0, 0x205($a0) -.L802669C0: -/* 1952A0 802669C0 14480007 */ bne $v0, $t0, .L802669E0 -/* 1952A4 802669C4 00000000 */ nop -/* 1952A8 802669C8 8C820200 */ lw $v0, 0x200($a0) -/* 1952AC 802669CC 10400004 */ beqz $v0, .L802669E0 -/* 1952B0 802669D0 00000000 */ nop -/* 1952B4 802669D4 8C42000C */ lw $v0, 0xc($v0) -/* 1952B8 802669D8 AC400018 */ sw $zero, 0x18($v0) -/* 1952BC 802669DC AC800200 */ sw $zero, 0x200($a0) -.L802669E0: -/* 1952C0 802669E0 80820205 */ lb $v0, 0x205($a0) -/* 1952C4 802669E4 90830205 */ lbu $v1, 0x205($a0) -/* 1952C8 802669E8 18400003 */ blez $v0, .L802669F8 -/* 1952CC 802669EC 24C60001 */ addiu $a2, $a2, 1 -/* 1952D0 802669F0 2462FFFF */ addiu $v0, $v1, -1 -/* 1952D4 802669F4 A0820205 */ sb $v0, 0x205($a0) -.L802669F8: -/* 1952D8 802669F8 28C20018 */ slti $v0, $a2, 0x18 -/* 1952DC 802669FC 1440FFE4 */ bnez $v0, .L80266990 -/* 1952E0 80266A00 24A50004 */ addiu $a1, $a1, 4 -/* 1952E4 80266A04 8CE400D8 */ lw $a0, 0xd8($a3) -/* 1952E8 80266A08 10800018 */ beqz $a0, .L80266A6C -/* 1952EC 80266A0C 2402003C */ addiu $v0, $zero, 0x3c -/* 1952F0 80266A10 80830205 */ lb $v1, 0x205($a0) -/* 1952F4 80266A14 14620008 */ bne $v1, $v0, .L80266A38 -/* 1952F8 80266A18 24020005 */ addiu $v0, $zero, 5 -/* 1952FC 80266A1C 8C820200 */ lw $v0, 0x200($a0) -/* 195300 80266A20 50400005 */ beql $v0, $zero, .L80266A38 -/* 195304 80266A24 24020005 */ addiu $v0, $zero, 5 -/* 195308 80266A28 8C42000C */ lw $v0, 0xc($v0) -/* 19530C 80266A2C AC400024 */ sw $zero, 0x24($v0) -/* 195310 80266A30 80830205 */ lb $v1, 0x205($a0) -/* 195314 80266A34 24020005 */ addiu $v0, $zero, 5 -.L80266A38: -/* 195318 80266A38 14620007 */ bne $v1, $v0, .L80266A58 -/* 19531C 80266A3C 00000000 */ nop -/* 195320 80266A40 8C820200 */ lw $v0, 0x200($a0) -/* 195324 80266A44 10400004 */ beqz $v0, .L80266A58 -/* 195328 80266A48 00000000 */ nop -/* 19532C 80266A4C 8C42000C */ lw $v0, 0xc($v0) -/* 195330 80266A50 AC400018 */ sw $zero, 0x18($v0) -/* 195334 80266A54 AC800200 */ sw $zero, 0x200($a0) -.L80266A58: -/* 195338 80266A58 80820205 */ lb $v0, 0x205($a0) -/* 19533C 80266A5C 90830205 */ lbu $v1, 0x205($a0) -/* 195340 80266A60 18400002 */ blez $v0, .L80266A6C -/* 195344 80266A64 2462FFFF */ addiu $v0, $v1, -1 -/* 195348 80266A68 A0820205 */ sb $v0, 0x205($a0) -.L80266A6C: -/* 19534C 80266A6C 8CE400DC */ lw $a0, 0xdc($a3) -/* 195350 80266A70 10800018 */ beqz $a0, .L80266AD4 -/* 195354 80266A74 2402003C */ addiu $v0, $zero, 0x3c -/* 195358 80266A78 80830205 */ lb $v1, 0x205($a0) -/* 19535C 80266A7C 14620008 */ bne $v1, $v0, .L80266AA0 -/* 195360 80266A80 24020005 */ addiu $v0, $zero, 5 -/* 195364 80266A84 8C820200 */ lw $v0, 0x200($a0) -/* 195368 80266A88 50400005 */ beql $v0, $zero, .L80266AA0 -/* 19536C 80266A8C 24020005 */ addiu $v0, $zero, 5 -/* 195370 80266A90 8C42000C */ lw $v0, 0xc($v0) -/* 195374 80266A94 AC400024 */ sw $zero, 0x24($v0) -/* 195378 80266A98 80830205 */ lb $v1, 0x205($a0) -/* 19537C 80266A9C 24020005 */ addiu $v0, $zero, 5 -.L80266AA0: -/* 195380 80266AA0 14620007 */ bne $v1, $v0, .L80266AC0 -/* 195384 80266AA4 00000000 */ nop -/* 195388 80266AA8 8C820200 */ lw $v0, 0x200($a0) -/* 19538C 80266AAC 10400004 */ beqz $v0, .L80266AC0 -/* 195390 80266AB0 00000000 */ nop -/* 195394 80266AB4 8C42000C */ lw $v0, 0xc($v0) -/* 195398 80266AB8 AC400018 */ sw $zero, 0x18($v0) -/* 19539C 80266ABC AC800200 */ sw $zero, 0x200($a0) -.L80266AC0: -/* 1953A0 80266AC0 80820205 */ lb $v0, 0x205($a0) -/* 1953A4 80266AC4 90830205 */ lbu $v1, 0x205($a0) -/* 1953A8 80266AC8 18400002 */ blez $v0, .L80266AD4 -/* 1953AC 80266ACC 2462FFFF */ addiu $v0, $v1, -1 -/* 1953B0 80266AD0 A0820205 */ sb $v0, 0x205($a0) -.L80266AD4: -/* 1953B4 80266AD4 03E00008 */ jr $ra -/* 1953B8 80266AD8 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/190B20/show_damage_popup.s b/ver/us/asm/nonmatchings/190B20/show_damage_popup.s deleted file mode 100644 index 4c03aff19a..0000000000 --- a/ver/us/asm/nonmatchings/190B20/show_damage_popup.s +++ /dev/null @@ -1,62 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel show_damage_popup -/* 194E8C 802665AC 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 194E90 802665B0 AFB00020 */ sw $s0, 0x20($sp) -/* 194E94 802665B4 0000802D */ daddu $s0, $zero, $zero -/* 194E98 802665B8 3C058029 */ lui $a1, %hi(gDamageCountEffects) -/* 194E9C 802665BC 24A538AC */ addiu $a1, $a1, %lo(gDamageCountEffects) -/* 194EA0 802665C0 44861000 */ mtc1 $a2, $f2 -/* 194EA4 802665C4 8FA40038 */ lw $a0, 0x38($sp) -/* 194EA8 802665C8 00A0182D */ daddu $v1, $a1, $zero -/* 194EAC 802665CC AFBF0024 */ sw $ra, 0x24($sp) -.L802665D0: -/* 194EB0 802665D0 8C620000 */ lw $v0, ($v1) -/* 194EB4 802665D4 10400006 */ beqz $v0, .L802665F0 -/* 194EB8 802665D8 2A020018 */ slti $v0, $s0, 0x18 -/* 194EBC 802665DC 26100001 */ addiu $s0, $s0, 1 -/* 194EC0 802665E0 2A020018 */ slti $v0, $s0, 0x18 -/* 194EC4 802665E4 1440FFFA */ bnez $v0, .L802665D0 -/* 194EC8 802665E8 24630004 */ addiu $v1, $v1, 4 -/* 194ECC 802665EC 2A020018 */ slti $v0, $s0, 0x18 -.L802665F0: -/* 194ED0 802665F0 14400007 */ bnez $v0, .L80266610 -/* 194ED4 802665F4 00000000 */ nop -/* 194ED8 802665F8 8CA20000 */ lw $v0, ($a1) -/* 194EDC 802665FC 0000802D */ daddu $s0, $zero, $zero -/* 194EE0 80266600 8C43000C */ lw $v1, 0xc($v0) -/* 194EE4 80266604 24020005 */ addiu $v0, $zero, 5 -/* 194EE8 80266608 AC620030 */ sw $v0, 0x30($v1) -/* 194EEC 8026660C ACA00000 */ sw $zero, ($a1) -.L80266610: -/* 194EF0 80266610 14800002 */ bnez $a0, .L8026661C -/* 194EF4 80266614 24040037 */ addiu $a0, $zero, 0x37 -/* 194EF8 80266618 2404FFC9 */ addiu $a0, $zero, -0x37 -.L8026661C: -/* 194EFC 8026661C 44840000 */ mtc1 $a0, $f0 -/* 194F00 80266620 00000000 */ nop -/* 194F04 80266624 46800020 */ cvt.s.w $f0, $f0 -/* 194F08 80266628 3C028029 */ lui $v0, %hi(gDamageCountEffects) -/* 194F0C 8026662C 244238AC */ addiu $v0, $v0, %lo(gDamageCountEffects) -/* 194F10 80266630 00108080 */ sll $s0, $s0, 2 -/* 194F14 80266634 E7A00014 */ swc1 $f0, 0x14($sp) -/* 194F18 80266638 3C014120 */ lui $at, 0x4120 -/* 194F1C 8026663C 44810000 */ mtc1 $at, $f0 -/* 194F20 80266640 44056000 */ mfc1 $a1, $f12 -/* 194F24 80266644 44067000 */ mfc1 $a2, $f14 -/* 194F28 80266648 02021021 */ addu $v0, $s0, $v0 -/* 194F2C 8026664C AFA70018 */ sw $a3, 0x18($sp) -/* 194F30 80266650 44071000 */ mfc1 $a3, $f2 -/* 194F34 80266654 0000202D */ daddu $a0, $zero, $zero -/* 194F38 80266658 AFA2001C */ sw $v0, 0x1c($sp) -/* 194F3C 8026665C 0C01C0F4 */ jal playFX_1E -/* 194F40 80266660 E7A00010 */ swc1 $f0, 0x10($sp) -/* 194F44 80266664 24020028 */ addiu $v0, $zero, 0x28 -/* 194F48 80266668 3C018029 */ lui $at, %hi(gDamageCountTimers) -/* 194F4C 8026666C 00300821 */ addu $at, $at, $s0 -/* 194F50 80266670 AC22390C */ sw $v0, %lo(gDamageCountTimers)($at) -/* 194F54 80266674 8FBF0024 */ lw $ra, 0x24($sp) -/* 194F58 80266678 8FB00020 */ lw $s0, 0x20($sp) -/* 194F5C 8026667C 03E00008 */ jr $ra -/* 194F60 80266680 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/1A5830/LandJumpPart.s b/ver/us/asm/nonmatchings/1A5830/LandJumpPart.s deleted file mode 100644 index 6ae84165d7..0000000000 --- a/ver/us/asm/nonmatchings/1A5830/LandJumpPart.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel LandJumpPart -/* 1A943C 8027AB5C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 1A9440 8027AB60 AFB20020 */ sw $s2, 0x20($sp) -/* 1A9444 8027AB64 0080902D */ daddu $s2, $a0, $zero -/* 1A9448 8027AB68 AFBF0024 */ sw $ra, 0x24($sp) -/* 1A944C 8027AB6C AFB1001C */ sw $s1, 0x1c($sp) -/* 1A9450 8027AB70 AFB00018 */ sw $s0, 0x18($sp) -/* 1A9454 8027AB74 8E51000C */ lw $s1, 0xc($s2) -/* 1A9458 8027AB78 54A00001 */ bnel $a1, $zero, .L8027AB80 -/* 1A945C 8027AB7C AE400070 */ sw $zero, 0x70($s2) -.L8027AB80: -/* 1A9460 8027AB80 8E420070 */ lw $v0, 0x70($s2) -/* 1A9464 8027AB84 14400020 */ bnez $v0, .L8027AC08 -/* 1A9468 8027AB88 00000000 */ nop -/* 1A946C 8027AB8C 8E250000 */ lw $a1, ($s1) -/* 1A9470 8027AB90 26310004 */ addiu $s1, $s1, 4 -/* 1A9474 8027AB94 0C0B1EAF */ jal evt_get_variable -/* 1A9478 8027AB98 0240202D */ daddu $a0, $s2, $zero -/* 1A947C 8027AB9C 0040802D */ daddu $s0, $v0, $zero -/* 1A9480 8027ABA0 8E250000 */ lw $a1, ($s1) -/* 1A9484 8027ABA4 0C0B1EAF */ jal evt_get_variable -/* 1A9488 8027ABA8 0240202D */ daddu $a0, $s2, $zero -/* 1A948C 8027ABAC 0040882D */ daddu $s1, $v0, $zero -/* 1A9490 8027ABB0 2402FF81 */ addiu $v0, $zero, -0x7f -/* 1A9494 8027ABB4 16020002 */ bne $s0, $v0, .L8027ABC0 -/* 1A9498 8027ABB8 00000000 */ nop -/* 1A949C 8027ABBC 8E500148 */ lw $s0, 0x148($s2) -.L8027ABC0: -/* 1A94A0 8027ABC0 0C09A75B */ jal get_actor -/* 1A94A4 8027ABC4 0200202D */ daddu $a0, $s0, $zero -/* 1A94A8 8027ABC8 0040802D */ daddu $s0, $v0, $zero -/* 1A94AC 8027ABCC 0200202D */ daddu $a0, $s0, $zero -/* 1A94B0 8027ABD0 0C099117 */ jal get_actor_part -/* 1A94B4 8027ABD4 0220282D */ daddu $a1, $s1, $zero -/* 1A94B8 8027ABD8 0040882D */ daddu $s1, $v0, $zero -/* 1A94BC 8027ABDC AE500074 */ sw $s0, 0x74($s2) -/* 1A94C0 8027ABE0 AE510078 */ sw $s1, 0x78($s2) -/* 1A94C4 8027ABE4 8E300010 */ lw $s0, 0x10($s1) -/* 1A94C8 8027ABE8 C620002C */ lwc1 $f0, 0x2c($s1) -/* 1A94CC 8027ABEC E6000000 */ swc1 $f0, ($s0) -/* 1A94D0 8027ABF0 C6200030 */ lwc1 $f0, 0x30($s1) -/* 1A94D4 8027ABF4 E6000004 */ swc1 $f0, 4($s0) -/* 1A94D8 8027ABF8 C6200034 */ lwc1 $f0, 0x34($s1) -/* 1A94DC 8027ABFC 24020001 */ addiu $v0, $zero, 1 -/* 1A94E0 8027AC00 E6000008 */ swc1 $f0, 8($s0) -/* 1A94E4 8027AC04 AE420070 */ sw $v0, 0x70($s2) -.L8027AC08: -/* 1A94E8 8027AC08 8E510078 */ lw $s1, 0x78($s2) -/* 1A94EC 8027AC0C 8E300010 */ lw $s0, 0x10($s1) -/* 1A94F0 8027AC10 C6040004 */ lwc1 $f4, 4($s0) -/* 1A94F4 8027AC14 C600002C */ lwc1 $f0, 0x2c($s0) -/* 1A94F8 8027AC18 8E050028 */ lw $a1, 0x28($s0) -/* 1A94FC 8027AC1C 46002100 */ add.s $f4, $f4, $f0 -/* 1A9500 8027AC20 C6020024 */ lwc1 $f2, 0x24($s0) -/* 1A9504 8027AC24 8E060030 */ lw $a2, 0x30($s0) -/* 1A9508 8027AC28 46020001 */ sub.s $f0, $f0, $f2 -/* 1A950C 8027AC2C 0200202D */ daddu $a0, $s0, $zero -/* 1A9510 8027AC30 E6040004 */ swc1 $f4, 4($s0) -/* 1A9514 8027AC34 0C099070 */ jal add_xz_vec3f_copy1 -/* 1A9518 8027AC38 E600002C */ swc1 $f0, 0x2c($s0) -/* 1A951C 8027AC3C C6000000 */ lwc1 $f0, ($s0) -/* 1A9520 8027AC40 44802000 */ mtc1 $zero, $f4 -/* 1A9524 8027AC44 E620002C */ swc1 $f0, 0x2c($s1) -/* 1A9528 8027AC48 C6000004 */ lwc1 $f0, 4($s0) -/* 1A952C 8027AC4C E6200030 */ swc1 $f0, 0x30($s1) -/* 1A9530 8027AC50 C6220030 */ lwc1 $f2, 0x30($s1) -/* 1A9534 8027AC54 C6000008 */ lwc1 $f0, 8($s0) -/* 1A9538 8027AC58 4604103C */ c.lt.s $f2, $f4 -/* 1A953C 8027AC5C 00000000 */ nop -/* 1A9540 8027AC60 45010003 */ bc1t .L8027AC70 -/* 1A9544 8027AC64 E6200034 */ swc1 $f0, 0x34($s1) -/* 1A9548 8027AC68 0809EB25 */ j .L8027AC94 -/* 1A954C 8027AC6C 0000102D */ daddu $v0, $zero, $zero -.L8027AC70: -/* 1A9550 8027AC70 C6200064 */ lwc1 $f0, 0x64($s1) -/* 1A9554 8027AC74 E6240030 */ swc1 $f4, 0x30($s1) -/* 1A9558 8027AC78 E7A00010 */ swc1 $f0, 0x10($sp) -/* 1A955C 8027AC7C 8E25002C */ lw $a1, 0x2c($s1) -/* 1A9560 8027AC80 8E260030 */ lw $a2, 0x30($s1) -/* 1A9564 8027AC84 8E270034 */ lw $a3, 0x34($s1) -/* 1A9568 8027AC88 0C0990BC */ jal play_movement_dust_effects -/* 1A956C 8027AC8C 24040002 */ addiu $a0, $zero, 2 -/* 1A9570 8027AC90 24020001 */ addiu $v0, $zero, 1 -.L8027AC94: -/* 1A9574 8027AC94 8FBF0024 */ lw $ra, 0x24($sp) -/* 1A9578 8027AC98 8FB20020 */ lw $s2, 0x20($sp) -/* 1A957C 8027AC9C 8FB1001C */ lw $s1, 0x1c($sp) -/* 1A9580 8027ACA0 8FB00018 */ lw $s0, 0x18($sp) -/* 1A9584 8027ACA4 03E00008 */ jr $ra -/* 1A9588 8027ACA8 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/316a70/func_80200080.s b/ver/us/asm/nonmatchings/316a70/func_80200080.s deleted file mode 100644 index ff98eb98f2..0000000000 --- a/ver/us/asm/nonmatchings/316a70/func_80200080.s +++ /dev/null @@ -1,112 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80200080 -/* 316A70 80200080 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 316A74 80200084 3C0B3C01 */ lui $t3, 0x3c01 -/* 316A78 80200088 356BA775 */ ori $t3, $t3, 0xa775 -/* 316A7C 8020008C 3C04B001 */ lui $a0, 0xb001 -/* 316A80 80200090 34848FFC */ ori $a0, $a0, 0x8ffc -/* 316A84 80200094 3C0A8002 */ lui $t2, %hi(D_80026AC7) -/* 316A88 80200098 254A6AC7 */ addiu $t2, $t2, %lo(D_80026AC7) -/* 316A8C 8020009C 3C02A460 */ lui $v0, 0xa460 -/* 316A90 802000A0 34420010 */ ori $v0, $v0, 0x10 -/* 316A94 802000A4 AFBF0014 */ sw $ra, 0x14($sp) -/* 316A98 802000A8 AFB00010 */ sw $s0, 0x10($sp) -/* 316A9C 802000AC 8C420000 */ lw $v0, ($v0) -/* 316AA0 802000B0 30420003 */ andi $v0, $v0, 3 -/* 316AA4 802000B4 10400007 */ beqz $v0, .L802000D4 -/* 316AA8 802000B8 0000282D */ daddu $a1, $zero, $zero -/* 316AAC 802000BC 3C03A460 */ lui $v1, 0xa460 -/* 316AB0 802000C0 34630010 */ ori $v1, $v1, 0x10 -.L802000C4: -/* 316AB4 802000C4 8C620000 */ lw $v0, ($v1) -/* 316AB8 802000C8 30420003 */ andi $v0, $v0, 3 -/* 316ABC 802000CC 1440FFFD */ bnez $v0, .L802000C4 -/* 316AC0 802000D0 00000000 */ nop -.L802000D4: -/* 316AC4 802000D4 3C02FFFE */ lui $v0, 0xfffe -/* 316AC8 802000D8 34427508 */ ori $v0, $v0, 0x7508 -/* 316ACC 802000DC 0000482D */ daddu $t1, $zero, $zero -/* 316AD0 802000E0 00821021 */ addu $v0, $a0, $v0 -/* 316AD4 802000E4 3C03A000 */ lui $v1, 0xa000 -/* 316AD8 802000E8 00431025 */ or $v0, $v0, $v1 -/* 316ADC 802000EC 8C420000 */ lw $v0, ($v0) -/* 316AE0 802000F0 3C080031 */ lui $t0, 0x31 -/* 316AE4 802000F4 250869F0 */ addiu $t0, $t0, 0x69f0 -/* 316AE8 802000F8 3C030031 */ lui $v1, 0x31 -/* 316AEC 802000FC 24636A70 */ addiu $v1, $v1, 0x6a70 -/* 316AF0 80200100 01625823 */ subu $t3, $t3, $v0 -/* 316AF4 80200104 0103102B */ sltu $v0, $t0, $v1 -/* 316AF8 80200108 10400034 */ beqz $v0, .L802001DC -/* 316AFC 8020010C 3C0CA460 */ lui $t4, 0xa460 -/* 316B00 80200110 358C0010 */ ori $t4, $t4, 0x10 -/* 316B04 80200114 3C101000 */ lui $s0, 0x1000 -/* 316B08 80200118 3C19A000 */ lui $t9, 0xa000 -/* 316B0C 8020011C 2418000F */ addiu $t8, $zero, 0xf -/* 316B10 80200120 240F0009 */ addiu $t7, $zero, 9 -/* 316B14 80200124 240E0003 */ addiu $t6, $zero, 3 -/* 316B18 80200128 0060682D */ daddu $t5, $v1, $zero -.L8020012C: -/* 316B1C 8020012C 8D820000 */ lw $v0, ($t4) -/* 316B20 80200130 30420003 */ andi $v0, $v0, 3 -/* 316B24 80200134 10400007 */ beqz $v0, .L80200154 -/* 316B28 80200138 01101021 */ addu $v0, $t0, $s0 -/* 316B2C 8020013C 3C03A460 */ lui $v1, 0xa460 -/* 316B30 80200140 34630010 */ ori $v1, $v1, 0x10 -.L80200144: -/* 316B34 80200144 8C620000 */ lw $v0, ($v1) -/* 316B38 80200148 30420003 */ andi $v0, $v0, 3 -/* 316B3C 8020014C 1440FFFD */ bnez $v0, .L80200144 -/* 316B40 80200150 01101021 */ addu $v0, $t0, $s0 -.L80200154: -/* 316B44 80200154 00591025 */ or $v0, $v0, $t9 -/* 316B48 80200158 8C440000 */ lw $a0, ($v0) -/* 316B4C 8020015C 3087FFFF */ andi $a3, $a0, 0xffff -/* 316B50 80200160 00043402 */ srl $a2, $a0, 0x10 -/* 316B54 80200164 00E61021 */ addu $v0, $a3, $a2 -/* 316B58 80200168 00A22821 */ addu $a1, $a1, $v0 -/* 316B5C 8020016C 00091682 */ srl $v0, $t1, 0x1a -/* 316B60 80200170 14580010 */ bne $v0, $t8, .L802001B4 -/* 316B64 80200174 00041682 */ srl $v0, $a0, 0x1a -/* 316B68 80200178 144F000E */ bne $v0, $t7, .L802001B4 -/* 316B6C 8020017C 00000000 */ nop -/* 316B70 80200180 00041542 */ srl $v0, $a0, 0x15 -/* 316B74 80200184 3043001F */ andi $v1, $v0, 0x1f -/* 316B78 80200188 00091402 */ srl $v0, $t1, 0x10 -/* 316B7C 8020018C 3042001F */ andi $v0, $v0, 0x1f -/* 316B80 80200190 14620008 */ bne $v1, $v0, .L802001B4 -/* 316B84 80200194 00041682 */ srl $v0, $a0, 0x1a -/* 316B88 80200198 30C2001F */ andi $v0, $a2, 0x1f -/* 316B8C 8020019C 14620005 */ bne $v1, $v0, .L802001B4 -/* 316B90 802001A0 00041682 */ srl $v0, $a0, 0x1a -/* 316B94 802001A4 00A72823 */ subu $a1, $a1, $a3 -/* 316B98 802001A8 3122FFFF */ andi $v0, $t1, 0xffff -/* 316B9C 802001AC 00A22823 */ subu $a1, $a1, $v0 -/* 316BA0 802001B0 00041682 */ srl $v0, $a0, 0x1a -.L802001B4: -/* 316BA4 802001B4 144E0006 */ bne $v0, $t6, .L802001D0 -/* 316BA8 802001B8 25080004 */ addiu $t0, $t0, 4 -/* 316BAC 802001BC 3083FFFF */ andi $v1, $a0, 0xffff -/* 316BB0 802001C0 00041402 */ srl $v0, $a0, 0x10 -/* 316BB4 802001C4 3042FC00 */ andi $v0, $v0, 0xfc00 -/* 316BB8 802001C8 00621821 */ addu $v1, $v1, $v0 -/* 316BBC 802001CC 00A32823 */ subu $a1, $a1, $v1 -.L802001D0: -/* 316BC0 802001D0 010D102B */ sltu $v0, $t0, $t5 -/* 316BC4 802001D4 1440FFD5 */ bnez $v0, .L8020012C -/* 316BC8 802001D8 0080482D */ daddu $t1, $a0, $zero -.L802001DC: -/* 316BCC 802001DC 3C02FFF2 */ lui $v0, 0xfff2 -/* 316BD0 802001E0 344222E0 */ ori $v0, $v0, 0x22e0 -/* 316BD4 802001E4 00A21021 */ addu $v0, $a1, $v0 -/* 316BD8 802001E8 01621023 */ subu $v0, $t3, $v0 -/* 316BDC 802001EC 01425021 */ addu $t2, $t2, $v0 -/* 316BE0 802001F0 0140F809 */ jalr $t2 -/* 316BE4 802001F4 00000000 */ nop -/* 316BE8 802001F8 8FBF0014 */ lw $ra, 0x14($sp) -/* 316BEC 802001FC 8FB00010 */ lw $s0, 0x10($sp) -/* 316BF0 80200200 03E00008 */ jr $ra -/* 316BF4 80200204 27BD0018 */ addiu $sp, $sp, 0x18 -/* 316BF8 80200208 00000000 */ nop -/* 316BFC 8020020C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/E20110/func_802B75E8_E206F8.s b/ver/us/asm/nonmatchings/E20110/func_802B75E8_E206F8.s deleted file mode 100644 index a995109b9f..0000000000 --- a/ver/us/asm/nonmatchings/E20110/func_802B75E8_E206F8.s +++ /dev/null @@ -1,87 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802B75E8_E206F8 -/* E206F8 802B75E8 3C05802B */ lui $a1, %hi(D_802B7CB8_E20DC8) -/* E206FC 802B75EC 24A57CB8 */ addiu $a1, $a1, %lo(D_802B7CB8_E20DC8) -/* E20700 802B75F0 8CA30000 */ lw $v1, ($a1) -/* E20704 802B75F4 90620021 */ lbu $v0, 0x21($v1) -/* E20708 802B75F8 90640022 */ lbu $a0, 0x22($v1) -/* E2070C 802B75FC 00441021 */ addu $v0, $v0, $a0 -/* E20710 802B7600 A0620021 */ sb $v0, 0x21($v1) -/* E20714 802B7604 8CA30000 */ lw $v1, ($a1) -/* E20718 802B7608 80620021 */ lb $v0, 0x21($v1) -/* E2071C 802B760C 3C068011 */ lui $a2, %hi(gPlayerStatus) -/* E20720 802B7610 24C6EFC8 */ addiu $a2, $a2, %lo(gPlayerStatus) -/* E20724 802B7614 28420005 */ slti $v0, $v0, 5 -/* E20728 802B7618 14400006 */ bnez $v0, .L802B7634 -/* E2072C 802B761C 2402FFFF */ addiu $v0, $zero, -1 -/* E20730 802B7620 A0620022 */ sb $v0, 0x22($v1) -/* E20734 802B7624 8CA30000 */ lw $v1, ($a1) -/* E20738 802B7628 24020004 */ addiu $v0, $zero, 4 -/* E2073C 802B762C A0620021 */ sb $v0, 0x21($v1) -/* E20740 802B7630 8CA30000 */ lw $v1, ($a1) -.L802B7634: -/* E20744 802B7634 80620021 */ lb $v0, 0x21($v1) -/* E20748 802B7638 2842FFFC */ slti $v0, $v0, -4 -/* E2074C 802B763C 10400005 */ beqz $v0, .L802B7654 -/* E20750 802B7640 24020001 */ addiu $v0, $zero, 1 -/* E20754 802B7644 A0620022 */ sb $v0, 0x22($v1) -/* E20758 802B7648 8CA30000 */ lw $v1, ($a1) -/* E2075C 802B764C 2402FFFC */ addiu $v0, $zero, -4 -/* E20760 802B7650 A0620021 */ sb $v0, 0x21($v1) -.L802B7654: -/* E20764 802B7654 8CA40000 */ lw $a0, ($a1) -/* E20768 802B7658 C4C00028 */ lwc1 $f0, 0x28($a2) -/* E2076C 802B765C C4820000 */ lwc1 $f2, ($a0) -/* E20770 802B7660 46020001 */ sub.s $f0, $f0, $f2 -/* E20774 802B7664 3C013F2A */ lui $at, 0x3f2a -/* E20778 802B7668 34217EFA */ ori $at, $at, 0x7efa -/* E2077C 802B766C 44812000 */ mtc1 $at, $f4 -/* E20780 802B7670 00000000 */ nop -/* E20784 802B7674 46040182 */ mul.s $f6, $f0, $f4 -/* E20788 802B7678 00000000 */ nop -/* E2078C 802B767C 46061080 */ add.s $f2, $f2, $f6 -/* E20790 802B7680 E4820000 */ swc1 $f2, ($a0) -/* E20794 802B7684 C4C00030 */ lwc1 $f0, 0x30($a2) -/* E20798 802B7688 C4820008 */ lwc1 $f2, 8($a0) -/* E2079C 802B768C 46020001 */ sub.s $f0, $f0, $f2 -/* E207A0 802B7690 46040182 */ mul.s $f6, $f0, $f4 -/* E207A4 802B7694 00000000 */ nop -/* E207A8 802B7698 80830021 */ lb $v1, 0x21($a0) -/* E207AC 802B769C 46061080 */ add.s $f2, $f2, $f6 -/* E207B0 802B76A0 C4840004 */ lwc1 $f4, 4($a0) -/* E207B4 802B76A4 44833000 */ mtc1 $v1, $f6 -/* E207B8 802B76A8 00000000 */ nop -/* E207BC 802B76AC 468031A0 */ cvt.s.w $f6, $f6 -/* E207C0 802B76B0 E4820008 */ swc1 $f2, 8($a0) -/* E207C4 802B76B4 84C200B0 */ lh $v0, 0xb0($a2) -/* E207C8 802B76B8 C4C0002C */ lwc1 $f0, 0x2c($a2) -/* E207CC 802B76BC 44821000 */ mtc1 $v0, $f2 -/* E207D0 802B76C0 00000000 */ nop -/* E207D4 802B76C4 468010A0 */ cvt.s.w $f2, $f2 -/* E207D8 802B76C8 8CC20004 */ lw $v0, 4($a2) -/* E207DC 802B76CC 46020080 */ add.s $f2, $f0, $f2 -/* E207E0 802B76D0 30421000 */ andi $v0, $v0, 0x1000 -/* E207E4 802B76D4 3C014000 */ lui $at, 0x4000 -/* E207E8 802B76D8 44810000 */ mtc1 $at, $f0 -/* E207EC 802B76DC 54400005 */ bnel $v0, $zero, .L802B76F4 -/* E207F0 802B76E0 46001000 */ add.s $f0, $f2, $f0 -/* E207F4 802B76E4 3C014100 */ lui $at, 0x4100 -/* E207F8 802B76E8 44810000 */ mtc1 $at, $f0 -/* E207FC 802B76EC 00000000 */ nop -/* E20800 802B76F0 46001000 */ add.s $f0, $f2, $f0 -.L802B76F4: -/* E20804 802B76F4 46060000 */ add.s $f0, $f0, $f6 -/* E20808 802B76F8 46040001 */ sub.s $f0, $f0, $f4 -/* E2080C 802B76FC 3C013E80 */ lui $at, 0x3e80 -/* E20810 802B7700 44811000 */ mtc1 $at, $f2 -/* E20814 802B7704 00000000 */ nop -/* E20818 802B7708 46020182 */ mul.s $f6, $f0, $f2 -/* E2081C 802B770C 00000000 */ nop -/* E20820 802B7710 3C02802B */ lui $v0, %hi(D_802B7CB8_E20DC8) -/* E20824 802B7714 8C427CB8 */ lw $v0, %lo(D_802B7CB8_E20DC8)($v0) -/* E20828 802B7718 C4400004 */ lwc1 $f0, 4($v0) -/* E2082C 802B771C 46060000 */ add.s $f0, $f0, $f6 -/* E20830 802B7720 03E00008 */ jr $ra -/* E20834 802B7724 E4400004 */ swc1 $f0, 4($v0) diff --git a/ver/us/asm/nonmatchings/effects/effect_134/fx_134_appendGfx.s b/ver/us/asm/nonmatchings/effects/effect_134/fx_134_appendGfx.s deleted file mode 100644 index 3c04042198..0000000000 --- a/ver/us/asm/nonmatchings/effects/effect_134/fx_134_appendGfx.s +++ /dev/null @@ -1,172 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel fx_134_appendGfx -/* 414D80 E01281E0 27BDFF48 */ addiu $sp, $sp, -0xb8 -/* 414D84 E01281E4 0080302D */ daddu $a2, $a0, $zero -/* 414D88 E01281E8 3C07DB06 */ lui $a3, 0xdb06 -/* 414D8C E01281EC 34E70024 */ ori $a3, $a3, 0x24 -/* 414D90 E01281F0 27A40010 */ addiu $a0, $sp, 0x10 -/* 414D94 E01281F4 AFB700AC */ sw $s7, 0xac($sp) -/* 414D98 E01281F8 3C170001 */ lui $s7, 1 -/* 414D9C E01281FC AFB3009C */ sw $s3, 0x9c($sp) -/* 414DA0 E0128200 3C13800A */ lui $s3, %hi(gMasterGfxPos) -/* 414DA4 E0128204 2673A66C */ addiu $s3, $s3, %lo(gMasterGfxPos) -/* 414DA8 E0128208 36F71630 */ ori $s7, $s7, 0x1630 -/* 414DAC E012820C AFBF00B0 */ sw $ra, 0xb0($sp) -/* 414DB0 E0128210 AFB600A8 */ sw $s6, 0xa8($sp) -/* 414DB4 E0128214 AFB500A4 */ sw $s5, 0xa4($sp) -/* 414DB8 E0128218 AFB400A0 */ sw $s4, 0xa0($sp) -/* 414DBC E012821C AFB20098 */ sw $s2, 0x98($sp) -/* 414DC0 E0128220 AFB10094 */ sw $s1, 0x94($sp) -/* 414DC4 E0128224 AFB00090 */ sw $s0, 0x90($sp) -/* 414DC8 E0128228 8E650000 */ lw $a1, ($s3) -/* 414DCC E012822C 8CD2000C */ lw $s2, 0xc($a2) -/* 414DD0 E0128230 00A0182D */ daddu $v1, $a1, $zero -/* 414DD4 E0128234 24A50008 */ addiu $a1, $a1, 8 -/* 414DD8 E0128238 AE650000 */ sw $a1, ($s3) -/* 414DDC E012823C 8E560024 */ lw $s6, 0x24($s2) -/* 414DE0 E0128240 8E540000 */ lw $s4, ($s2) -/* 414DE4 E0128244 3C02E700 */ lui $v0, 0xe700 -/* 414DE8 E0128248 AC620000 */ sw $v0, ($v1) -/* 414DEC E012824C AC600004 */ sw $zero, 4($v1) -/* 414DF0 E0128250 ACA70000 */ sw $a3, ($a1) -/* 414DF4 E0128254 8CC30010 */ lw $v1, 0x10($a2) -/* 414DF8 E0128258 24A20008 */ addiu $v0, $a1, 8 -/* 414DFC E012825C AE620000 */ sw $v0, ($s3) -/* 414E00 E0128260 8C62001C */ lw $v0, 0x1c($v1) -/* 414E04 E0128264 3C038000 */ lui $v1, 0x8000 -/* 414E08 E0128268 00431021 */ addu $v0, $v0, $v1 -/* 414E0C E012826C 3C03800B */ lui $v1, %hi(gCameras) -/* 414E10 E0128270 24631D80 */ addiu $v1, $v1, %lo(gCameras) -/* 414E14 E0128274 ACA20004 */ sw $v0, 4($a1) -/* 414E18 E0128278 8E450004 */ lw $a1, 4($s2) -/* 414E1C E012827C 8E460008 */ lw $a2, 8($s2) -/* 414E20 E0128280 3C028007 */ lui $v0, %hi(gCurrentCameraID) -/* 414E24 E0128284 8C427410 */ lw $v0, %lo(gCurrentCameraID)($v0) -/* 414E28 E0128288 8E47000C */ lw $a3, 0xc($s2) -/* 414E2C E012828C 00028080 */ sll $s0, $v0, 2 -/* 414E30 E0128290 02028021 */ addu $s0, $s0, $v0 -/* 414E34 E0128294 00108080 */ sll $s0, $s0, 2 -/* 414E38 E0128298 02028023 */ subu $s0, $s0, $v0 -/* 414E3C E012829C 001010C0 */ sll $v0, $s0, 3 -/* 414E40 E01282A0 02028021 */ addu $s0, $s0, $v0 -/* 414E44 E01282A4 001080C0 */ sll $s0, $s0, 3 -/* 414E48 E01282A8 0C080108 */ jal shim_guTranslateF -/* 414E4C E01282AC 02038021 */ addu $s0, $s0, $v1 -/* 414E50 E01282B0 27B10050 */ addiu $s1, $sp, 0x50 -/* 414E54 E01282B4 8E450034 */ lw $a1, 0x34($s2) -/* 414E58 E01282B8 0220202D */ daddu $a0, $s1, $zero -/* 414E5C E01282BC 00A0302D */ daddu $a2, $a1, $zero -/* 414E60 E01282C0 0C080110 */ jal shim_guScaleF -/* 414E64 E01282C4 00A0382D */ daddu $a3, $a1, $zero -/* 414E68 E01282C8 0220202D */ daddu $a0, $s1, $zero -/* 414E6C E01282CC 27A50010 */ addiu $a1, $sp, 0x10 -/* 414E70 E01282D0 0C080114 */ jal shim_guMtxCatF -/* 414E74 E01282D4 00A0302D */ daddu $a2, $a1, $zero -/* 414E78 E01282D8 27A40010 */ addiu $a0, $sp, 0x10 -/* 414E7C E01282DC 3C118007 */ lui $s1, %hi(gMatrixListPos) -/* 414E80 E01282E0 263141F0 */ addiu $s1, $s1, %lo(gMatrixListPos) -/* 414E84 E01282E4 3C15800A */ lui $s5, %hi(gDisplayContext) -/* 414E88 E01282E8 26B5A674 */ addiu $s5, $s5, %lo(gDisplayContext) -/* 414E8C E01282EC 96250000 */ lhu $a1, ($s1) -/* 414E90 E01282F0 8EA20000 */ lw $v0, ($s5) -/* 414E94 E01282F4 00052980 */ sll $a1, $a1, 6 -/* 414E98 E01282F8 00B72821 */ addu $a1, $a1, $s7 -/* 414E9C E01282FC 0C080118 */ jal shim_guMtxF2L -/* 414EA0 E0128300 00452821 */ addu $a1, $v0, $a1 -/* 414EA4 E0128304 3C03DA38 */ lui $v1, 0xda38 -/* 414EA8 E0128308 34630002 */ ori $v1, $v1, 2 -/* 414EAC E012830C 3C06DA38 */ lui $a2, 0xda38 -/* 414EB0 E0128310 34C60001 */ ori $a2, $a2, 1 -/* 414EB4 E0128314 3C082AAA */ lui $t0, 0x2aaa -/* 414EB8 E0128318 3508AAAB */ ori $t0, $t0, 0xaaab -/* 414EBC E012831C 3C09D838 */ lui $t1, 0xd838 -/* 414EC0 E0128320 35290002 */ ori $t1, $t1, 2 -/* 414EC4 E0128324 32D600FF */ andi $s6, $s6, 0xff -/* 414EC8 E0128328 3C07DE00 */ lui $a3, 0xde00 -/* 414ECC E012832C 02880018 */ mult $s4, $t0 -/* 414ED0 E0128330 8E640000 */ lw $a0, ($s3) -/* 414ED4 E0128334 96220000 */ lhu $v0, ($s1) -/* 414ED8 E0128338 0080282D */ daddu $a1, $a0, $zero -/* 414EDC E012833C 24840008 */ addiu $a0, $a0, 8 -/* 414EE0 E0128340 AE640000 */ sw $a0, ($s3) -/* 414EE4 E0128344 ACA30000 */ sw $v1, ($a1) -/* 414EE8 E0128348 24430001 */ addiu $v1, $v0, 1 -/* 414EEC E012834C 3042FFFF */ andi $v0, $v0, 0xffff -/* 414EF0 E0128350 00021180 */ sll $v0, $v0, 6 -/* 414EF4 E0128354 A6230000 */ sh $v1, ($s1) -/* 414EF8 E0128358 8EA30000 */ lw $v1, ($s5) -/* 414EFC E012835C 00571021 */ addu $v0, $v0, $s7 -/* 414F00 E0128360 00621821 */ addu $v1, $v1, $v0 -/* 414F04 E0128364 24820008 */ addiu $v0, $a0, 8 -/* 414F08 E0128368 ACA30004 */ sw $v1, 4($a1) -/* 414F0C E012836C AE620000 */ sw $v0, ($s3) -/* 414F10 E0128370 24820010 */ addiu $v0, $a0, 0x10 -/* 414F14 E0128374 AC860000 */ sw $a2, ($a0) -/* 414F18 E0128378 AE620000 */ sw $v0, ($s3) -/* 414F1C E012837C 8E030204 */ lw $v1, 0x204($s0) -/* 414F20 E0128380 3C02FA00 */ lui $v0, 0xfa00 -/* 414F24 E0128384 AC820008 */ sw $v0, 8($a0) -/* 414F28 E0128388 AC830004 */ sw $v1, 4($a0) -/* 414F2C E012838C 9242001B */ lbu $v0, 0x1b($s2) -/* 414F30 E0128390 9245001F */ lbu $a1, 0x1f($s2) -/* 414F34 E0128394 92460023 */ lbu $a2, 0x23($s2) -/* 414F38 E0128398 24830018 */ addiu $v1, $a0, 0x18 -/* 414F3C E012839C AE630000 */ sw $v1, ($s3) -/* 414F40 E01283A0 3C03FB00 */ lui $v1, 0xfb00 -/* 414F44 E01283A4 AC830010 */ sw $v1, 0x10($a0) -/* 414F48 E01283A8 24830020 */ addiu $v1, $a0, 0x20 -/* 414F4C E01283AC 00021600 */ sll $v0, $v0, 0x18 -/* 414F50 E01283B0 00052C00 */ sll $a1, $a1, 0x10 -/* 414F54 E01283B4 00451025 */ or $v0, $v0, $a1 -/* 414F58 E01283B8 00063200 */ sll $a2, $a2, 8 -/* 414F5C E01283BC 00461025 */ or $v0, $v0, $a2 -/* 414F60 E01283C0 00561025 */ or $v0, $v0, $s6 -/* 414F64 E01283C4 AC82000C */ sw $v0, 0xc($a0) -/* 414F68 E01283C8 9242002B */ lbu $v0, 0x2b($s2) -/* 414F6C E01283CC 9245002F */ lbu $a1, 0x2f($s2) -/* 414F70 E01283D0 92460033 */ lbu $a2, 0x33($s2) -/* 414F74 E01283D4 00005010 */ mfhi $t2 -/* 414F78 E01283D8 AE630000 */ sw $v1, ($s3) -/* 414F7C E01283DC AC870018 */ sw $a3, 0x18($a0) -/* 414F80 E01283E0 00021600 */ sll $v0, $v0, 0x18 -/* 414F84 E01283E4 00052C00 */ sll $a1, $a1, 0x10 -/* 414F88 E01283E8 00451025 */ or $v0, $v0, $a1 -/* 414F8C E01283EC 00063200 */ sll $a2, $a2, 8 -/* 414F90 E01283F0 00461025 */ or $v0, $v0, $a2 -/* 414F94 E01283F4 AC820014 */ sw $v0, 0x14($a0) -/* 414F98 E01283F8 3C03E013 */ lui $v1, %hi(D_E01284B0) -/* 414F9C E01283FC 8C6384B0 */ lw $v1, %lo(D_E01284B0)($v1) -/* 414FA0 E0128400 24820028 */ addiu $v0, $a0, 0x28 -/* 414FA4 E0128404 AE620000 */ sw $v0, ($s3) -/* 414FA8 E0128408 001417C3 */ sra $v0, $s4, 0x1f -/* 414FAC E012840C AC870020 */ sw $a3, 0x20($a0) -/* 414FB0 E0128410 AC83001C */ sw $v1, 0x1c($a0) -/* 414FB4 E0128414 000A1843 */ sra $v1, $t2, 1 -/* 414FB8 E0128418 00621823 */ subu $v1, $v1, $v0 -/* 414FBC E012841C 00031040 */ sll $v0, $v1, 1 -/* 414FC0 E0128420 00431021 */ addu $v0, $v0, $v1 -/* 414FC4 E0128424 00021080 */ sll $v0, $v0, 2 -/* 414FC8 E0128428 0282A023 */ subu $s4, $s4, $v0 -/* 414FCC E012842C 0014A080 */ sll $s4, $s4, 2 -/* 414FD0 E0128430 3C03E013 */ lui $v1, %hi(D_E0128480) -/* 414FD4 E0128434 00741821 */ addu $v1, $v1, $s4 -/* 414FD8 E0128438 8C638480 */ lw $v1, %lo(D_E0128480)($v1) -/* 414FDC E012843C 24820030 */ addiu $v0, $a0, 0x30 -/* 414FE0 E0128440 AE620000 */ sw $v0, ($s3) -/* 414FE4 E0128444 24020040 */ addiu $v0, $zero, 0x40 -/* 414FE8 E0128448 AC890028 */ sw $t1, 0x28($a0) -/* 414FEC E012844C AC830024 */ sw $v1, 0x24($a0) -/* 414FF0 E0128450 AC82002C */ sw $v0, 0x2c($a0) -/* 414FF4 E0128454 8FBF00B0 */ lw $ra, 0xb0($sp) -/* 414FF8 E0128458 8FB700AC */ lw $s7, 0xac($sp) -/* 414FFC E012845C 8FB600A8 */ lw $s6, 0xa8($sp) -/* 415000 E0128460 8FB500A4 */ lw $s5, 0xa4($sp) -/* 415004 E0128464 8FB400A0 */ lw $s4, 0xa0($sp) -/* 415008 E0128468 8FB3009C */ lw $s3, 0x9c($sp) -/* 41500C E012846C 8FB20098 */ lw $s2, 0x98($sp) -/* 415010 E0128470 8FB10094 */ lw $s1, 0x94($sp) -/* 415014 E0128474 8FB00090 */ lw $s0, 0x90($sp) -/* 415018 E0128478 03E00008 */ jr $ra -/* 41501C E012847C 27BD00B8 */ addiu $sp, $sp, 0xb8 diff --git a/ver/us/asm/nonmatchings/effects/effect_134/fx_134_main.s b/ver/us/asm/nonmatchings/effects/effect_134/fx_134_main.s deleted file mode 100644 index 11b1362ed5..0000000000 --- a/ver/us/asm/nonmatchings/effects/effect_134/fx_134_main.s +++ /dev/null @@ -1,82 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel fx_134_main -/* 414BA0 E0128000 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* 414BA4 E0128004 F7B40038 */ sdc1 $f20, 0x38($sp) -/* 414BA8 E0128008 4485A000 */ mtc1 $a1, $f20 -/* 414BAC E012800C F7B60040 */ sdc1 $f22, 0x40($sp) -/* 414BB0 E0128010 4486B000 */ mtc1 $a2, $f22 -/* 414BB4 E0128014 AFB20030 */ sw $s2, 0x30($sp) -/* 414BB8 E0128018 0080902D */ daddu $s2, $a0, $zero -/* 414BBC E012801C F7B80048 */ sdc1 $f24, 0x48($sp) -/* 414BC0 E0128020 4487C000 */ mtc1 $a3, $f24 -/* 414BC4 E0128024 27A40010 */ addiu $a0, $sp, 0x10 -/* 414BC8 E0128028 AFB1002C */ sw $s1, 0x2c($sp) -/* 414BCC E012802C 8FB10064 */ lw $s1, 0x64($sp) -/* 414BD0 E0128030 3C02E013 */ lui $v0, %hi(fx_134_init) -/* 414BD4 E0128034 24428128 */ addiu $v0, $v0, %lo(fx_134_init) -/* 414BD8 E0128038 AFA20018 */ sw $v0, 0x18($sp) -/* 414BDC E012803C 3C02E013 */ lui $v0, %hi(fx_134_update) -/* 414BE0 E0128040 24428130 */ addiu $v0, $v0, %lo(fx_134_update) -/* 414BE4 E0128044 AFA2001C */ sw $v0, 0x1c($sp) -/* 414BE8 E0128048 3C02E013 */ lui $v0, %hi(fx_134_render) -/* 414BEC E012804C 24428198 */ addiu $v0, $v0, %lo(fx_134_render) -/* 414BF0 E0128050 AFA20020 */ sw $v0, 0x20($sp) -/* 414BF4 E0128054 24020086 */ addiu $v0, $zero, 0x86 -/* 414BF8 E0128058 AFBF0034 */ sw $ra, 0x34($sp) -/* 414BFC E012805C AFB00028 */ sw $s0, 0x28($sp) -/* 414C00 E0128060 AFA00010 */ sw $zero, 0x10($sp) -/* 414C04 E0128064 AFA00024 */ sw $zero, 0x24($sp) -/* 414C08 E0128068 0C080124 */ jal shim_create_effect_instance -/* 414C0C E012806C AFA20014 */ sw $v0, 0x14($sp) -/* 414C10 E0128070 24040038 */ addiu $a0, $zero, 0x38 -/* 414C14 E0128074 24030001 */ addiu $v1, $zero, 1 -/* 414C18 E0128078 0040802D */ daddu $s0, $v0, $zero -/* 414C1C E012807C 0C08012C */ jal shim_general_heap_malloc -/* 414C20 E0128080 AE030008 */ sw $v1, 8($s0) -/* 414C24 E0128084 0040202D */ daddu $a0, $v0, $zero -/* 414C28 E0128088 14800003 */ bnez $a0, .LE0128098 -/* 414C2C E012808C AE02000C */ sw $v0, 0xc($s0) -.LE0128090: -/* 414C30 E0128090 0804A024 */ j .LE0128090 -/* 414C34 E0128094 00000000 */ nop -.LE0128098: -/* 414C38 E0128098 AC920000 */ sw $s2, ($a0) -/* 414C3C E012809C 1E200004 */ bgtz $s1, .LE01280B0 -/* 414C40 E01280A0 AC800014 */ sw $zero, 0x14($a0) -/* 414C44 E01280A4 240203E8 */ addiu $v0, $zero, 0x3e8 -/* 414C48 E01280A8 0804A02D */ j .LE01280B4 -/* 414C4C E01280AC AC820010 */ sw $v0, 0x10($a0) -.LE01280B0: -/* 414C50 E01280B0 AC910010 */ sw $s1, 0x10($a0) -.LE01280B4: -/* 414C54 E01280B4 0200102D */ daddu $v0, $s0, $zero -/* 414C58 E01280B8 240300FF */ addiu $v1, $zero, 0xff -/* 414C5C E01280BC AC830024 */ sw $v1, 0x24($a0) -/* 414C60 E01280C0 E4940004 */ swc1 $f20, 4($a0) -/* 414C64 E01280C4 E4960008 */ swc1 $f22, 8($a0) -/* 414C68 E01280C8 E498000C */ swc1 $f24, 0xc($a0) -/* 414C6C E01280CC C7A00060 */ lwc1 $f0, 0x60($sp) -/* 414C70 E01280D0 24030046 */ addiu $v1, $zero, 0x46 -/* 414C74 E01280D4 AC830018 */ sw $v1, 0x18($a0) -/* 414C78 E01280D8 240300B4 */ addiu $v1, $zero, 0xb4 -/* 414C7C E01280DC AC83001C */ sw $v1, 0x1c($a0) -/* 414C80 E01280E0 24030078 */ addiu $v1, $zero, 0x78 -/* 414C84 E01280E4 AC830020 */ sw $v1, 0x20($a0) -/* 414C88 E01280E8 24030014 */ addiu $v1, $zero, 0x14 -/* 414C8C E01280EC AC830028 */ sw $v1, 0x28($a0) -/* 414C90 E01280F0 240300E6 */ addiu $v1, $zero, 0xe6 -/* 414C94 E01280F4 AC83002C */ sw $v1, 0x2c($a0) -/* 414C98 E01280F8 24030032 */ addiu $v1, $zero, 0x32 -/* 414C9C E01280FC AC830030 */ sw $v1, 0x30($a0) -/* 414CA0 E0128100 E4800034 */ swc1 $f0, 0x34($a0) -/* 414CA4 E0128104 8FBF0034 */ lw $ra, 0x34($sp) -/* 414CA8 E0128108 8FB20030 */ lw $s2, 0x30($sp) -/* 414CAC E012810C 8FB1002C */ lw $s1, 0x2c($sp) -/* 414CB0 E0128110 8FB00028 */ lw $s0, 0x28($sp) -/* 414CB4 E0128114 D7B80048 */ ldc1 $f24, 0x48($sp) -/* 414CB8 E0128118 D7B60040 */ ldc1 $f22, 0x40($sp) -/* 414CBC E012811C D7B40038 */ ldc1 $f20, 0x38($sp) -/* 414CC0 E0128120 03E00008 */ jr $ra -/* 414CC4 E0128124 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/ver/us/asm/nonmatchings/effects/effect_134/fx_134_update.s b/ver/us/asm/nonmatchings/effects/effect_134/fx_134_update.s deleted file mode 100644 index 96dd8cedc3..0000000000 --- a/ver/us/asm/nonmatchings/effects/effect_134/fx_134_update.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel fx_134_update -/* 414CD0 E0128130 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 414CD4 E0128134 AFBF0010 */ sw $ra, 0x10($sp) -/* 414CD8 E0128138 8C830000 */ lw $v1, ($a0) -/* 414CDC E012813C 8C85000C */ lw $a1, 0xc($a0) -/* 414CE0 E0128140 30620010 */ andi $v0, $v1, 0x10 -/* 414CE4 E0128144 10400005 */ beqz $v0, .LE012815C -/* 414CE8 E0128148 2402FFEF */ addiu $v0, $zero, -0x11 -/* 414CEC E012814C 00621024 */ and $v0, $v1, $v0 -/* 414CF0 E0128150 AC820000 */ sw $v0, ($a0) -/* 414CF4 E0128154 24020010 */ addiu $v0, $zero, 0x10 -/* 414CF8 E0128158 ACA20010 */ sw $v0, 0x10($a1) -.LE012815C: -/* 414CFC E012815C 8CA30010 */ lw $v1, 0x10($a1) -/* 414D00 E0128160 286203E8 */ slti $v0, $v1, 0x3e8 -/* 414D04 E0128164 10400002 */ beqz $v0, .LE0128170 -/* 414D08 E0128168 2462FFFF */ addiu $v0, $v1, -1 -/* 414D0C E012816C ACA20010 */ sw $v0, 0x10($a1) -.LE0128170: -/* 414D10 E0128170 8CA20014 */ lw $v0, 0x14($a1) -/* 414D14 E0128174 8CA30010 */ lw $v1, 0x10($a1) -/* 414D18 E0128178 24420001 */ addiu $v0, $v0, 1 -/* 414D1C E012817C 04610003 */ bgez $v1, .LE012818C -/* 414D20 E0128180 ACA20014 */ sw $v0, 0x14($a1) -/* 414D24 E0128184 0C080128 */ jal shim_remove_effect -/* 414D28 E0128188 00000000 */ nop -.LE012818C: -/* 414D2C E012818C 8FBF0010 */ lw $ra, 0x10($sp) -/* 414D30 E0128190 03E00008 */ jr $ra -/* 414D34 E0128194 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/splat.yaml b/ver/us/splat.yaml index 5bf66cdd32..255ffe108e 100644 --- a/ver/us/splat.yaml +++ b/ver/us/splat.yaml @@ -3437,7 +3437,7 @@ segments: vram: 0xE0128000 subsegments: - [0x414BA0, c, effect_134] - - [0x415020, data] + - [0x415020] - [0x415060, bin] # effect 134 gfx - type: code start: 0x415D90 diff --git a/ver/us/undefined_syms.txt b/ver/us/undefined_syms.txt index 25c7811ba4..3c346e8bbe 100644 --- a/ver/us/undefined_syms.txt +++ b/ver/us/undefined_syms.txt @@ -1040,6 +1040,21 @@ D_09001358 = 0x09001358; D_09001430 = 0x09001430; D_09001508 = 0x09001508; +// effect_134 +D_09000800 = 0x09000800; +D_09000BA8 = 0x09000BA8; +D_09000BC8 = 0x09000BC8; +D_09000BE8 = 0x09000BE8; +D_09000C08 = 0x09000C08; +D_09000C28 = 0x09000C28; +D_09000C48 = 0x09000C48; +D_09000C68 = 0x09000C68; +D_09000C88 = 0x09000C88; +D_09000CA8 = 0x09000CA8; +D_09000CC8 = 0x09000CC8; +D_09000CE8 = 0x09000CE8; +D_09000D08 = 0x09000D08; + // Invalid pointers from dead code dead_atan2 = 0x8002AF70; dead_gCurrentCamID = 0x800A158C;