diff --git a/.vscode/settings.json b/.vscode/settings.json index 51cbb37d50..3d5fb61363 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -21,6 +21,9 @@ "docs/doxygen": true, "ctx.c": true, "ver/current": true, + "ver/us/build": true, + "ver/jp/build": true, + "expected": true }, "python.autoComplete.extraPaths": [ "./tools" @@ -39,6 +42,6 @@ "**/.git": true, "**/.splat_cache": true, ".ninja*": true, - "ver/current": true, + "ver/current": true } } diff --git a/include/functions.h b/include/functions.h index ecf7b58c34..7a0b2d05fd 100644 --- a/include/functions.h +++ b/include/functions.h @@ -70,6 +70,8 @@ void entity_init_BlueSwitch(Entity* entity); void entity_init_HugeBlueSwitch(Entity* entity); UNK_TYPE func_80072230(s32, f32, f32, f32, f32, s32); +UNK_TYPE func_80072350(s32, f32, f32, f32, f32, f32, f32, s32, s32); +void func_800706D0(s32, f32, f32, f32); // Text PrintContext* load_string(s32 stringID, s32* a1); diff --git a/include/variables.h b/include/variables.h index 656fd3d038..bff5195ff6 100644 --- a/include/variables.h +++ b/include/variables.h @@ -98,9 +98,6 @@ extern PrintContext* D_802EB398; extern PrintContext* D_802EB39C; extern s32 D_802E99DC; -extern f64 D_802EB000; -extern f64 D_802EB008; - extern Entity* D_802EB3A0; extern s32 D_8015C7D0[3]; @@ -149,6 +146,8 @@ extern s16 D_800A0BB8; extern UIPanel gUIPanels[64]; +extern s32 D_802A3838; + // Pause extern s32 gPauseMenuHeldButtons; extern s32 gPauseMenuPressedButtons; @@ -305,7 +304,6 @@ extern u16 gCurrentDisplayContextIndex; extern UNK_TYPE D_0A004350; extern UNK_TYPE D_0A0026F0; extern UNK_TYPE D_802EAE7C; -extern f64 D_802EB370; extern s32 D_80291FA8[]; extern s32 D_80291FD0[]; diff --git a/src/battle/item/electro_pop_7305A0.c b/src/battle/item/electro_pop_7305A0.c index d231ea2a08..e675397c13 100644 --- a/src/battle/item/electro_pop_7305A0.c +++ b/src/battle/item/electro_pop_7305A0.c @@ -1,5 +1,7 @@ #include "common.h" +#define NAMESPACE battle_item_electro_pop + INCLUDE_ASM(s32, "battle/item/electro_pop_7305A0", func_802A1000_7305A0); INCLUDE_ASM(s32, "battle/item/electro_pop_7305A0", func_802A11D4_730774); @@ -10,7 +12,7 @@ INCLUDE_ASM(s32, "battle/item/electro_pop_7305A0", func_802A127C_73081C); INCLUDE_ASM(s32, "battle/item/electro_pop_7305A0", func_802A133C_7308DC); -INCLUDE_ASM(s32, "battle/item/electro_pop_7305A0", func_802A13FC_73099C); +#include "common/AddHP.inc.c" INCLUDE_ASM(s32, "battle/item/electro_pop_7305A0", func_802A1450_7309F0); diff --git a/src/battle/item/food_7330D0.c b/src/battle/item/food_7330D0.c index a96003a768..97b7ce769e 100644 --- a/src/battle/item/food_7330D0.c +++ b/src/battle/item/food_7330D0.c @@ -1,5 +1,7 @@ #include "common.h" +#define NAMESPACE battle_item_food + INCLUDE_ASM(s32, "battle/item/food_7330D0", func_802A1000_7330D0); INCLUDE_ASM(s32, "battle/item/food_7330D0", func_802A11D4_7332A4); @@ -12,8 +14,8 @@ INCLUDE_ASM(s32, "battle/item/food_7330D0", func_802A1378_733448); INCLUDE_ASM(s32, "battle/item/food_7330D0", func_802A1438_733508); -INCLUDE_ASM(s32, "battle/item/food_7330D0", func_802A14F8_7335C8); +#include "common/AddHP.inc.c" -INCLUDE_ASM(s32, "battle/item/food_7330D0", func_802A154C_73361C); +#include "common/AddFP.inc.c" INCLUDE_ASM(s32, "battle/item/food_7330D0", func_802A15A0_733670); diff --git a/src/battle/item/mushroom_715850.c b/src/battle/item/mushroom_715850.c index b544bdde5c..75deebaa88 100644 --- a/src/battle/item/mushroom_715850.c +++ b/src/battle/item/mushroom_715850.c @@ -1,5 +1,7 @@ #include "common.h" +#define NAMESPACE battle_item_mushroom + INCLUDE_ASM(s32, "battle/item/mushroom_715850", func_802A1000_715850); INCLUDE_ASM(s32, "battle/item/mushroom_715850", func_802A11D4_715A24); @@ -12,8 +14,8 @@ INCLUDE_ASM(s32, "battle/item/mushroom_715850", func_802A1378_715BC8); INCLUDE_ASM(s32, "battle/item/mushroom_715850", func_802A1438_715C88); -INCLUDE_ASM(s32, "battle/item/mushroom_715850", func_802A14F8_715D48); +#include "common/AddHP.inc.c" -INCLUDE_ASM(s32, "battle/item/mushroom_715850", func_802A154C_715D9C); +#include "common/AddFP.inc.c" INCLUDE_ASM(s32, "battle/item/mushroom_715850", func_802A15A0_715DF0); diff --git a/src/battle/item/strange_cake_731300.c b/src/battle/item/strange_cake_731300.c index 955b5811de..c3988727b8 100644 --- a/src/battle/item/strange_cake_731300.c +++ b/src/battle/item/strange_cake_731300.c @@ -1,5 +1,7 @@ #include "common.h" +#define NAMESPACE battle_item_strange_cake + INCLUDE_ASM(s32, "battle/item/strange_cake_731300", func_802A1000_731300); INCLUDE_ASM(s32, "battle/item/strange_cake_731300", func_802A11D4_7314D4); @@ -12,9 +14,9 @@ INCLUDE_ASM(s32, "battle/item/strange_cake_731300", func_802A1818_731B18); INCLUDE_ASM(s32, "battle/item/strange_cake_731300", func_802A18D8_731BD8); -INCLUDE_ASM(s32, "battle/item/strange_cake_731300", func_802A1998_731C98); +#include "common/AddHP.inc.c" -INCLUDE_ASM(s32, "battle/item/strange_cake_731300", func_802A19EC_731CEC); +#include "common/AddFP.inc.c" INCLUDE_ASM(s32, "battle/item/strange_cake_731300", func_802A1A40_731D40); diff --git a/src/battle/item/super_soda_724CE0.c b/src/battle/item/super_soda_724CE0.c index 1d9ea88dfd..8ad2b0e4bd 100644 --- a/src/battle/item/super_soda_724CE0.c +++ b/src/battle/item/super_soda_724CE0.c @@ -1,5 +1,7 @@ #include "common.h" +#define NAMESPACE battle_item_super_soda + INCLUDE_ASM(s32, "battle/item/super_soda_724CE0", func_802A1000_724CE0); INCLUDE_ASM(s32, "battle/item/super_soda_724CE0", func_802A11D4_724EB4); @@ -12,4 +14,4 @@ INCLUDE_ASM(s32, "battle/item/super_soda_724CE0", func_802A1378_725058); INCLUDE_ASM(s32, "battle/item/super_soda_724CE0", func_802A1418_7250F8); -INCLUDE_ASM(s32, "battle/item/super_soda_724CE0", func_802A14D8_7251B8); +#include "common/AddFP.inc.c" diff --git a/src/battle/star/chill_out_7900D0.c b/src/battle/star/chill_out_7900D0.c index c070f35273..2579822307 100644 --- a/src/battle/star/chill_out_7900D0.c +++ b/src/battle/star/chill_out_7900D0.c @@ -1,86 +1,20 @@ #include "common.h" +#define NAMESPACE battle_star_chill_out + extern s32 D_802A2CC0; -ApiStatus func_802A1000_7900D0(ScriptInstance* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - s32 a = get_variable(script, *args++); - s32 b = get_variable(script, *args++); - s32 c = get_variable(script, *args++); +#include "common/UnkStarFuncs.inc.c" - func_8006FEF0(0, a, b, c, 40.0f); - return ApiStatus_DONE2; -} - -ApiStatus func_802A10AC_79017C(ScriptInstance* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - s32 a = get_variable(script, *args++); - s32 b = get_variable(script, *args++); - s32 c = get_variable(script, *args++); - - func_80070550(5, a, b, c, 50.0f, 50.0f, 40, 30); - return ApiStatus_DONE2; -} - -ApiStatus func_802A116C_79023C(ScriptInstance* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - s32 a = get_variable(script, *args++); - s32 b = get_variable(script, *args++); - s32 c = get_variable(script, *args++); - - func_8006FEF0(0, a, b, c, 30.0f); - return ApiStatus_DONE2; -} - -INCLUDE_ASM(s32, "battle/star/chill_out_7900D0", func_802A1218_7902E8); - -#define NAMESPACE battle_star_chill_out #include "common/FadeBackgroundToBlack.inc.c" -ApiStatus func_802A137C_79044C(ScriptInstance* script, s32 isInitialCall) { - if (isInitialCall) { - func_8011D82C(1); - *D_801512F0 = 1; - set_background_color_blend(0, 0, 0, 0); - script->functionTemp[0].s = 0; - } +#include "common/UnkBackgroundFunc2.inc.c" - set_background_color_blend(0, 0, 0, script->functionTemp[0].s); - script->functionTemp[0].s += 10; - - if (script->functionTemp[0].s >= 230) { - set_background_color_blend(0, 0, 0, 230); - return ApiStatus_DONE2; - } - - return ApiStatus_BLOCK; -} - -ApiStatus func_802A1414_7904E4(ScriptInstance* script, s32 isInitialCall) { - if (isInitialCall) { - script->functionTemp[0].s = 20; - } - - set_background_color_blend(0, 0, 0, script->functionTemp[0].s * 10); - script->functionTemp[0].s -= 1; - - if (script->functionTemp[0].s == 0) { - set_background_color_blend(0, 0, 0, 0); - return ApiStatus_DONE2; - } - - return ApiStatus_BLOCK; -} +#include "common/UnkBackgroundFunc.inc.c" INCLUDE_ASM(s32, "battle/star/chill_out_7900D0", func_802A1494_790564); -ApiStatus func_802A14E8_7905B8(ScriptInstance* script, s32 isInitialCall) { - Npc* npc = get_npc_unsafe(100); - - npc->collisionHeight = 32; - npc->collisionRadius = 32; - return ApiStatus_DONE2; -} +#include "common/SetNpcCollision32.inc.c" ApiStatus func_802A1518_7905E8(ScriptInstance* script, s32 isInitialCall) { D_802A2CC0 = 0; @@ -107,6 +41,23 @@ ApiStatus func_802A153C_79060C(ScriptInstance* script, s32 isInitialCall) { return ApiStatus_DONE2; } -INCLUDE_ASM(s32, "battle/star/chill_out_7900D0", func_802A163C_79070C); +ApiStatus func_802A163C_79070C(ScriptInstance* script, s32 isInitialCall) { + Actor* actor = get_actor(script->owner1.actorID); + Actor* target = get_actor(actor->targetActorID); + ActorPart* part = get_actor_part(target, actor->targetPartIndex); + s32 flag1 = 0x400000; // these manual flag ones are necessary to match. once we figure out flags, we can add more + s32 flag2 = 0x80000; + + script->varTable[0] = 0; + + if ((target->flags & 0x4000) || (target->flags & flag1) || (target->flags & 0x2000) || + (part->eventFlags & 0x40000) || (part->eventFlags & flag2)) + { + return ApiStatus_DONE2; + } + + script->varTable[0] = 1; + return ApiStatus_DONE2; +} INCLUDE_ASM(s32, "battle/star/chill_out_7900D0", func_802A16F4_7907C4); diff --git a/src/battle/star/focus_789E60.c b/src/battle/star/focus_789E60.c index cb54c1c941..53c65ac531 100644 --- a/src/battle/star/focus_789E60.c +++ b/src/battle/star/focus_789E60.c @@ -1,25 +1,60 @@ #include "common.h" -INCLUDE_ASM(s32, "battle/star/focus_789E60", func_802A1000_789E60); - -INCLUDE_ASM(s32, "battle/star/focus_789E60", func_802A10AC_789F0C); - -INCLUDE_ASM(s32, "battle/star/focus_789E60", func_802A116C_789FCC); - -INCLUDE_ASM(s32, "battle/star/focus_789E60", func_802A1218_78A078); - #define NAMESPACE battle_star_focus + +#include "common/UnkStarFuncs.inc.c" + #include "common/FadeBackgroundToBlack.inc.c" -INCLUDE_ASM(s32, "battle/star/focus_789E60", func_802A137C_78A1DC); +#include "common/UnkBackgroundFunc2.inc.c" -INCLUDE_ASM(s32, "battle/star/focus_789E60", func_802A1414_78A274); +#include "common/UnkBackgroundFunc.inc.c" INCLUDE_ASM(s32, "battle/star/focus_789E60", func_802A1494_78A2F4); -// Duplicate of func_802A14E8_7905B8 -INCLUDE_ASM(s32, "battle/star/focus_789E60", func_802A14E8_78A348); +#include "common/SetNpcCollision32.inc.c" -INCLUDE_ASM(s32, "battle/star/focus_789E60", func_802A1518_78A378); +ApiStatus func_802A1518_78A378(ScriptInstance* script, s32 isInitialCall) { + PlayerData* playerData = &gPlayerData; + PlayerData* playerData2 = &gPlayerData; + s32 deepFocusSP; + s32 superFocusSP; -INCLUDE_ASM(s32, "battle/star/focus_789E60", func_802A15B0_78A410); + script->varTable[0] = 0; + + if (playerData->specialBarsFilled >= playerData->maxStarPower * 256) { + script->varTable[0] = 1; + return ApiStatus_DONE2; + } + + deepFocusSP = is_ability_active(Ability_DEEP_FOCUS) * 64; + superFocusSP = is_ability_active(Ability_SUPER_FOCUS) * 128; + + add_SP(deepFocusSP + superFocusSP + 128); + + if (playerData2->specialBarsFilled == playerData2->maxStarPower * 256) { + script->varTable[0] = 2; + } + + return ApiStatus_DONE2; +} + +ApiStatus func_802A15B0_78A410(ScriptInstance* script, s32 isInitialCall) { + PlayerData* playerData = &gPlayerData; + PlayerData* playerData2 = &gPlayerData; + + script->varTable[0] = 0; + + if (playerData->specialBarsFilled >= playerData->maxStarPower * 256) { + script->varTable[0] = 1; + return ApiStatus_DONE2; + } + + add_SP(128); + + if (playerData2->specialBarsFilled == playerData2->maxStarPower * 256) { + script->varTable[0] = 2; + } + + return ApiStatus_DONE2; +} diff --git a/src/battle/star/lullaby_78D150.c b/src/battle/star/lullaby_78D150.c index 125a1d54c3..7102a7a91f 100644 --- a/src/battle/star/lullaby_78D150.c +++ b/src/battle/star/lullaby_78D150.c @@ -1,22 +1,43 @@ #include "common.h" -INCLUDE_ASM(s32, "battle/star/lullaby_78D150", func_802A1000_78D150); - -INCLUDE_ASM(s32, "battle/star/lullaby_78D150", func_802A10AC_78D1FC); - -INCLUDE_ASM(s32, "battle/star/lullaby_78D150", func_802A116C_78D2BC); - -INCLUDE_ASM(s32, "battle/star/lullaby_78D150", func_802A1218_78D368); - #define NAMESPACE battle_star_lullaby + +#include "common/UnkStarFuncs.inc.c" + #include "common/FadeBackgroundToBlack.inc.c" -INCLUDE_ASM(s32, "battle/star/lullaby_78D150", func_802A137C_78D4CC); +#include "common/UnkBackgroundFunc2.inc.c" -INCLUDE_ASM(s32, "battle/star/lullaby_78D150", func_802A1414_78D564); +#include "common/UnkBackgroundFunc.inc.c" INCLUDE_ASM(s32, "battle/star/lullaby_78D150", func_802A1494_78D5E4); -INCLUDE_ASM(s32, "battle/star/lullaby_78D150", func_802A14E8_78D638); +#include "common/SetNpcCollision32.inc.c" -INCLUDE_ASM(s32, "battle/star/lullaby_78D150", func_802A1518_78D668); +ApiStatus func_802A1518_78D668(ScriptInstance* script, s32 isInitialCall) { + if (isInitialCall) { + script->functionTemp[0].s = 0; + } + + switch (script->functionTemp[0].s) { + s32 temp; + s32 temp2; + + case 0: + script->functionTemp[2].s = -80; + script->functionTemp[1].s = 0; + script->functionTemp[0].s = 1; + case 1: + temp = script->functionTemp[2].s; + temp2 = (sin_rad((script->functionTemp[1].s * TAU) / 360.0f) * 30.0f) + 30.0f; + func_800706D0(0, temp, temp2, 50.0f); + + script->functionTemp[2].s += 14; + script->functionTemp[1].s += 20; + + if (script->functionTemp[1].s >= 360) { + return ApiStatus_DONE2; + } + } + return ApiStatus_BLOCK; +} diff --git a/src/battle/star/peach_beam_7997B0.c b/src/battle/star/peach_beam_7997B0.c index 5b7c437a4a..14dc08c9ea 100644 --- a/src/battle/star/peach_beam_7997B0.c +++ b/src/battle/star/peach_beam_7997B0.c @@ -1,26 +1,40 @@ #include "common.h" -INCLUDE_ASM(s32, "battle/star/peach_beam_7997B0", func_802A1000_7997B0); - -INCLUDE_ASM(s32, "battle/star/peach_beam_7997B0", func_802A10AC_79985C); - -INCLUDE_ASM(s32, "battle/star/peach_beam_7997B0", func_802A116C_79991C); - -INCLUDE_ASM(s32, "battle/star/peach_beam_7997B0", func_802A1218_7999C8); - #define NAMESPACE battle_star_peach_beam + +#include "common/UnkStarFuncs.inc.c" + #include "common/FadeBackgroundToBlack.inc.c" -INCLUDE_ASM(s32, "battle/star/peach_beam_7997B0", func_802A137C_799B2C); +#include "common/UnkBackgroundFunc2.inc.c" -INCLUDE_ASM(s32, "battle/star/peach_beam_7997B0", func_802A1414_799BC4); +#include "common/UnkBackgroundFunc.inc.c" INCLUDE_ASM(s32, "battle/star/peach_beam_7997B0", func_802A1494_799C44); -INCLUDE_ASM(s32, "battle/star/peach_beam_7997B0", func_802A14E8_799C98); +#include "common/SetNpcCollision32.inc.c" INCLUDE_ASM(s32, "battle/star/peach_beam_7997B0", func_802A1518_799CC8); -INCLUDE_ASM(s32, "battle/star/peach_beam_7997B0", func_802A2468_79AC18); +ApiStatus func_802A2468_79AC18(ScriptInstance* script, s32 isInitialCall) { + script->varTable[0] = D_802A3838; + return ApiStatus_DONE2; +} -INCLUDE_ASM(s32, "battle/star/peach_beam_7997B0", func_802A247C_79AC2C); +ApiStatus func_802A247C_79AC2C(ScriptInstance* script, s32 isInitialCall) { + if (isInitialCall) { + script->functionTemp[0].s = 230; + } + + set_background_color_blend(0, 0, 0, script->functionTemp[0].s); + + script->functionTemp[0].s -= 5; + if (script->functionTemp[0].s <= 200) { + set_background_color_blend(0, 0, 0, 200); + return ApiStatus_DONE2; + } + + return ApiStatus_BLOCK; +} + +// this file is identical in c code to star beam diff --git a/src/battle/star/peach_dash_79D8A0.c b/src/battle/star/peach_dash_79D8A0.c index e04c93398f..77b0c26d4e 100644 --- a/src/battle/star/peach_dash_79D8A0.c +++ b/src/battle/star/peach_dash_79D8A0.c @@ -1,22 +1,35 @@ #include "common.h" -INCLUDE_ASM(s32, "battle/star/peach_dash_79D8A0", func_802A1000_79D8A0); - -INCLUDE_ASM(s32, "battle/star/peach_dash_79D8A0", func_802A10AC_79D94C); - -INCLUDE_ASM(s32, "battle/star/peach_dash_79D8A0", func_802A116C_79DA0C); - -INCLUDE_ASM(s32, "battle/star/peach_dash_79D8A0", func_802A1218_79DAB8); - #define NAMESPACE battle_star_peach_dash + +#include "common/UnkStarFuncs.inc.c" + #include "common/FadeBackgroundToBlack.inc.c" -INCLUDE_ASM(s32, "battle/star/peach_dash_79D8A0", func_802A137C_79DC1C); +#include "common/UnkBackgroundFunc2.inc.c" -INCLUDE_ASM(s32, "battle/star/peach_dash_79D8A0", func_802A1414_79DCB4); +#include "common/UnkBackgroundFunc.inc.c" INCLUDE_ASM(s32, "battle/star/peach_dash_79D8A0", func_802A1494_79DD34); -INCLUDE_ASM(s32, "battle/star/peach_dash_79D8A0", func_802A14E8_79DD88); +#include "common/SetNpcCollision32.inc.c" -INCLUDE_ASM(s32, "battle/star/peach_dash_79D8A0", func_802A1518_79DDB8); +ApiStatus func_802A1518_79DDB8(ScriptInstance* script, s32 isInitialCall) { + PlayerData* playerData = &gPlayerData; + PlayerData* playerData2 = &gPlayerData; + + if (is_ability_active(Ability_DEEP_FOCUS)) { + playerData->specialBarsFilled += 128; + } + if (is_ability_active(Ability_SUPER_FOCUS)) { + playerData->specialBarsFilled += 256; + } + + playerData->specialBarsFilled += 128; + + if (playerData2->specialBarsFilled >= playerData2->maxStarPower * 256) { + playerData2->specialBarsFilled = playerData2->maxStarPower * 256; + } + + return ApiStatus_DONE2; +} diff --git a/src/battle/star/peach_focus_79BFA0.c b/src/battle/star/peach_focus_79BFA0.c index 5b90243d27..942a62cb5e 100644 --- a/src/battle/star/peach_focus_79BFA0.c +++ b/src/battle/star/peach_focus_79BFA0.c @@ -1,22 +1,20 @@ #include "common.h" -INCLUDE_ASM(s32, "battle/star/peach_focus_79BFA0", func_802A1000_79BFA0); - -INCLUDE_ASM(s32, "battle/star/peach_focus_79BFA0", func_802A10AC_79C04C); - -INCLUDE_ASM(s32, "battle/star/peach_focus_79BFA0", func_802A116C_79C10C); - -INCLUDE_ASM(s32, "battle/star/peach_focus_79BFA0", func_802A1218_79C1B8); - #define NAMESPACE battle_star_peach_focus + +#include "common/UnkStarFuncs.inc.c" + #include "common/FadeBackgroundToBlack.inc.c" -INCLUDE_ASM(s32, "battle/star/peach_focus_79BFA0", func_802A137C_79C31C); +#include "common/UnkBackgroundFunc2.inc.c" -INCLUDE_ASM(s32, "battle/star/peach_focus_79BFA0", func_802A1414_79C3B4); +#include "common/UnkBackgroundFunc.inc.c" INCLUDE_ASM(s32, "battle/star/peach_focus_79BFA0", func_802A1494_79C434); -INCLUDE_ASM(s32, "battle/star/peach_focus_79BFA0", func_802A14E8_79C488); +#include "common/SetNpcCollision32.inc.c" -INCLUDE_ASM(s32, "battle/star/peach_focus_79BFA0", func_802A1518_79C4B8); +ApiStatus func_802A1518_79C4B8(ScriptInstance* script, s32 isInitialCall) { + ((s32*)script->varTable[0])[1]++; // TODO replace with actual struct when we know what this is + return ApiStatus_DONE2; +} diff --git a/src/battle/star/refresh_78B600.c b/src/battle/star/refresh_78B600.c index 4941ce14ad..4e645b1365 100644 --- a/src/battle/star/refresh_78B600.c +++ b/src/battle/star/refresh_78B600.c @@ -1,31 +1,43 @@ #include "common.h" -INCLUDE_ASM(s32, "battle/star/refresh_78B600", func_802A1000_78B600); - -INCLUDE_ASM(s32, "battle/star/refresh_78B600", func_802A10AC_78B6AC); - -INCLUDE_ASM(s32, "battle/star/refresh_78B600", func_802A116C_78B76C); - -INCLUDE_ASM(s32, "battle/star/refresh_78B600", func_802A1218_78B818); - #define NAMESPACE battle_star_refresh + +#include "common/UnkStarFuncs.inc.c" + #include "common/FadeBackgroundToBlack.inc.c" -INCLUDE_ASM(s32, "battle/star/refresh_78B600", func_802A137C_78B97C); +#include "common/UnkBackgroundFunc2.inc.c" -INCLUDE_ASM(s32, "battle/star/refresh_78B600", func_802A1414_78BA14); +#include "common/UnkBackgroundFunc.inc.c" INCLUDE_ASM(s32, "battle/star/refresh_78B600", func_802A1494_78BA94); -INCLUDE_ASM(s32, "battle/star/refresh_78B600", func_802A14E8_78BAE8); +#include "common/SetNpcCollision32.inc.c" INCLUDE_ASM(s32, "battle/star/refresh_78B600", func_802A1518_78BB18); -INCLUDE_ASM(s32, "battle/star/refresh_78B600", func_802A17D4_78BDD4); +ApiStatus func_802A17D4_78BDD4(ScriptInstance* script, s32 isInitialCall) { + Actor* actor = gBattleStatus.playerActor; -INCLUDE_ASM(s32, "battle/star/refresh_78B600", func_802A1840_78BE40); + if (actor->debuff != Debuff_END) { + actor->debuffDuration = 0; + actor->debuff = 0; + func_80047898(actor->unk_436); + } -INCLUDE_ASM(s32, "battle/star/refresh_78B600", func_802A1894_78BE94); + if (actor->koStatus != 0) { + actor->koDuration = 0; + actor->koStatus = 0; + actor->ptrDefuffIcon->ptrPropertyList[15] = 0; + } + + func_8026777C(); + return ApiStatus_DONE2; +} + +#include "common/AddHP.inc.c" + +#include "common/AddFP.inc.c" INCLUDE_ASM(s32, "battle/star/refresh_78B600", func_802A18E8_78BEE8); diff --git a/src/battle/star/smooch_791D90.c b/src/battle/star/smooch_791D90.c index f6a8b2f73c..887ecf32a0 100644 --- a/src/battle/star/smooch_791D90.c +++ b/src/battle/star/smooch_791D90.c @@ -1,24 +1,19 @@ #include "common.h" -INCLUDE_ASM(s32, "battle/star/smooch_791D90", func_802A1000_791D90); - -INCLUDE_ASM(s32, "battle/star/smooch_791D90", func_802A10AC_791E3C); - -INCLUDE_ASM(s32, "battle/star/smooch_791D90", func_802A116C_791EFC); - -INCLUDE_ASM(s32, "battle/star/smooch_791D90", func_802A1218_791FA8); - #define NAMESPACE battle_star_smooch + +#include "common/UnkStarFuncs.inc.c" + #include "common/FadeBackgroundToBlack.inc.c" -INCLUDE_ASM(s32, "battle/star/smooch_791D90", func_802A137C_79210C); +#include "common/UnkBackgroundFunc2.inc.c" -INCLUDE_ASM(s32, "battle/star/smooch_791D90", func_802A1414_7921A4); +#include "common/UnkBackgroundFunc.inc.c" INCLUDE_ASM(s32, "battle/star/smooch_791D90", func_802A1494_792224); -INCLUDE_ASM(s32, "battle/star/smooch_791D90", func_802A14E8_792278); +#include "common/SetNpcCollision32.inc.c" -INCLUDE_ASM(s32, "battle/star/smooch_791D90", func_802A1518_7922A8); +#include "common/AddHP.inc.c" INCLUDE_ASM(s32, "battle/star/smooch_791D90", func_802A156C_7922FC); diff --git a/src/battle/star/star_beam_796FC0.c b/src/battle/star/star_beam_796FC0.c index c8d7676ea5..e866397ac6 100644 --- a/src/battle/star/star_beam_796FC0.c +++ b/src/battle/star/star_beam_796FC0.c @@ -1,26 +1,38 @@ #include "common.h" -INCLUDE_ASM(s32, "battle/star/star_beam_796FC0", func_802A1000_796FC0); - -INCLUDE_ASM(s32, "battle/star/star_beam_796FC0", func_802A10AC_79706C); - -INCLUDE_ASM(s32, "battle/star/star_beam_796FC0", func_802A116C_79712C); - -INCLUDE_ASM(s32, "battle/star/star_beam_796FC0", func_802A1218_7971D8); - #define NAMESPACE battle_star_star_beam + +#include "common/UnkStarFuncs.inc.c" + #include "common/FadeBackgroundToBlack.inc.c" -INCLUDE_ASM(s32, "battle/star/star_beam_796FC0", func_802A137C_79733C); +#include "common/UnkBackgroundFunc2.inc.c" -INCLUDE_ASM(s32, "battle/star/star_beam_796FC0", func_802A1414_7973D4); +#include "common/UnkBackgroundFunc.inc.c" INCLUDE_ASM(s32, "battle/star/star_beam_796FC0", func_802A1494_797454); -INCLUDE_ASM(s32, "battle/star/star_beam_796FC0", func_802A14E8_7974A8); +#include "common/SetNpcCollision32.inc.c" INCLUDE_ASM(s32, "battle/star/star_beam_796FC0", func_802A1518_7974D8); -INCLUDE_ASM(s32, "battle/star/star_beam_796FC0", func_802A2468_798428); +ApiStatus func_802A2468_798428(ScriptInstance* script, s32 isInitialCall) { + script->varTable[0] = D_802A3838; + return ApiStatus_DONE2; +} -INCLUDE_ASM(s32, "battle/star/star_beam_796FC0", func_802A247C_79843C); +ApiStatus func_802A247C_79843C(ScriptInstance* script, s32 isInitialCall) { + if (isInitialCall) { + script->functionTemp[0].s = 230; + } + + set_background_color_blend(0, 0, 0, script->functionTemp[0].s); + + script->functionTemp[0].s -= 5; + if (script->functionTemp[0].s <= 200) { + set_background_color_blend(0, 0, 0, 200); + return ApiStatus_DONE2; + } + + return ApiStatus_BLOCK; +} diff --git a/src/battle/star/star_storm_78E7D0.c b/src/battle/star/star_storm_78E7D0.c index 12ba936729..d7e47d21b1 100644 --- a/src/battle/star/star_storm_78E7D0.c +++ b/src/battle/star/star_storm_78E7D0.c @@ -1,23 +1,18 @@ #include "common.h" -INCLUDE_ASM(s32, "battle/star/star_storm_78E7D0", func_802A1000_78E7D0); - -INCLUDE_ASM(s32, "battle/star/star_storm_78E7D0", func_802A10AC_78E87C); - -INCLUDE_ASM(s32, "battle/star/star_storm_78E7D0", func_802A116C_78E93C); - -INCLUDE_ASM(s32, "battle/star/star_storm_78E7D0", func_802A1218_78E9E8); - #define NAMESPACE battle_star_star_storm + +#include "common/UnkStarFuncs.inc.c" + #include "common/FadeBackgroundToBlack.inc.c" -INCLUDE_ASM(s32, "battle/star/star_storm_78E7D0", func_802A137C_78EB4C); +#include "common/UnkBackgroundFunc2.inc.c" -INCLUDE_ASM(s32, "battle/star/star_storm_78E7D0", func_802A1414_78EBE4); +#include "common/UnkBackgroundFunc.inc.c" INCLUDE_ASM(s32, "battle/star/star_storm_78E7D0", func_802A1494_78EC64); -INCLUDE_ASM(s32, "battle/star/star_storm_78E7D0", func_802A14E8_78ECB8); +#include "common/SetNpcCollision32.inc.c" INCLUDE_ASM(s32, "battle/star/star_storm_78E7D0", func_802A1518_78ECE8); diff --git a/src/battle/star/time_out_793D20.c b/src/battle/star/time_out_793D20.c index bf042e9886..dab6ab6cdc 100644 --- a/src/battle/star/time_out_793D20.c +++ b/src/battle/star/time_out_793D20.c @@ -1,20 +1,15 @@ #include "common.h" -INCLUDE_ASM(s32, "battle/star/time_out_793D20", func_802A1000_793D20); - -INCLUDE_ASM(s32, "battle/star/time_out_793D20", func_802A10AC_793DCC); - -INCLUDE_ASM(s32, "battle/star/time_out_793D20", func_802A116C_793E8C); - -INCLUDE_ASM(s32, "battle/star/time_out_793D20", func_802A1218_793F38); - #define NAMESPACE battle_star_time_out + +#include "common/UnkStarFuncs.inc.c" + #include "common/FadeBackgroundToBlack.inc.c" -INCLUDE_ASM(s32, "battle/star/time_out_793D20", func_802A137C_79409C); +#include "common/UnkBackgroundFunc2.inc.c" -INCLUDE_ASM(s32, "battle/star/time_out_793D20", func_802A1414_794134); +#include "common/UnkBackgroundFunc.inc.c" INCLUDE_ASM(s32, "battle/star/time_out_793D20", func_802A1494_7941B4); -INCLUDE_ASM(s32, "battle/star/time_out_793D20", func_802A14E8_794208); +#include "common/SetNpcCollision32.inc.c" diff --git a/src/battle/star/up_and_away_7952E0.c b/src/battle/star/up_and_away_7952E0.c index fd12044316..a632521f2e 100644 --- a/src/battle/star/up_and_away_7952E0.c +++ b/src/battle/star/up_and_away_7952E0.c @@ -1,23 +1,18 @@ #include "common.h" -INCLUDE_ASM(s32, "battle/star/up_and_away_7952E0", func_802A1000_7952E0); - -INCLUDE_ASM(s32, "battle/star/up_and_away_7952E0", func_802A10AC_79538C); - -INCLUDE_ASM(s32, "battle/star/up_and_away_7952E0", func_802A116C_79544C); - -INCLUDE_ASM(s32, "battle/star/up_and_away_7952E0", func_802A1218_7954F8); - #define NAMESPACE battle_star_up_and_away + +#include "common/UnkStarFuncs.inc.c" + #include "common/FadeBackgroundToBlack.inc.c" -INCLUDE_ASM(s32, "battle/star/up_and_away_7952E0", func_802A137C_79565C); +#include "common/UnkBackgroundFunc2.inc.c" -INCLUDE_ASM(s32, "battle/star/up_and_away_7952E0", func_802A1414_7956F4); +#include "common/UnkBackgroundFunc.inc.c" INCLUDE_ASM(s32, "battle/star/up_and_away_7952E0", func_802A1494_795774); -INCLUDE_ASM(s32, "battle/star/up_and_away_7952E0", func_802A14E8_7957C8); +#include "common/SetNpcCollision32.inc.c" INCLUDE_ASM(s32, "battle/star/up_and_away_7952E0", func_802A1518_7957F8); diff --git a/src/code_102C80.c b/src/code_102C80.c index c01bc3dbcc..c662d569ae 100644 --- a/src/code_102C80.c +++ b/src/code_102C80.c @@ -19,7 +19,7 @@ void func_802E1460(Entity* entity) { u16 temp2 = temp->unk_22--; if (temp2) { - entity->position.y -= D_802EB000; // 1.8625; + entity->position.y -= 1.8625; return; } func_80110678(entity); @@ -32,7 +32,7 @@ void func_802E14D8(Entity* entity) { u16 temp2 = temp->unk_22--; if (temp2) { - entity->position.y += D_802EB008; // 1.8625; + entity->position.y += 1.8625; return; } exec_entity_updatecmd(entity); diff --git a/src/code_104940_len_dc0.c b/src/code_104940_len_dc0.c index 0edd3ffc5e..db51232dc0 100644 --- a/src/code_104940_len_dc0.c +++ b/src/code_104940_len_dc0.c @@ -1,15 +1,5 @@ #include "common.h" -// TODO: replace usages of these with proper constants -extern f64 D_802EB1D0; // 0.09 -extern f64 D_802EB1D8; // 0.045 -extern f64 D_802EB1E0; // 0.18 -extern f64 D_802EB1E8; // 0.09 -extern f64 D_802EB1F0; // 1.2 -extern f64 D_802EB1F8; // 0.3 -extern f64 D_802EB200; // 1.2 -extern f64 D_802EB208; // 0.3 - //display list func INCLUDE_ASM(s32, "code_104940_len_dc0", func_802E30C0); @@ -35,14 +25,14 @@ f32 func_802E31EC(Entity* entity) { void func_802E328C(Entity* entity) { if ((get_entity_type(entity->listIndex) - 24) < 3) { - entity->scale.x -= D_802EB1D0; - entity->scale.z -= D_802EB1D0; - entity->scale.y += D_802EB1D8; + entity->scale.x -= 0.09; + entity->scale.z -= 0.09; + entity->scale.y += 0.045; entity->position.y -= 3.0f; } else { - entity->scale.x -= D_802EB1E0; - entity->scale.z -= D_802EB1E0; - entity->scale.y += D_802EB1E8; + entity->scale.x -= 0.18; + entity->scale.z -= 0.18; + entity->scale.y += 0.09; entity->position.y -= 3.0f; } func_802E3650(entity); diff --git a/src/code_109660_len_1270.c b/src/code_109660_len_1270.c index 3c39195271..690be24245 100644 --- a/src/code_109660_len_1270.c +++ b/src/code_109660_len_1270.c @@ -52,8 +52,6 @@ void func_802E7F6C(Entity* entity) { INCLUDE_ASM(s32, "code_109660_len_1270", func_802E7FA0); -extern f64 D_802EB370; - INCLUDE_ASM(s32, "code_109660_len_1270", func_802E854C); s32 func_802E8858(Entity* entity) { @@ -92,7 +90,7 @@ void func_802E88EC(Entity* entity, f32 arg1) { } if (flag) { - make_item_entity(temp->unk_00, entity->position.x, entity->position.y + D_802EB370, entity->position.z, 0xA, 0, + make_item_entity(temp->unk_00, entity->position.x, entity->position.y + 33.0, entity->position.z, 0xA, 0, func_800E546C(), temp->unk_04); } } diff --git a/src/code_10A8D0.c b/src/code_10A8D0.c index 3a2024d5d2..0b8acbfbc5 100644 --- a/src/code_10A8D0.c +++ b/src/code_10A8D0.c @@ -5,7 +5,7 @@ void func_802E9050(Entity* entity) { f32 val = fabsf(clamp_angle(180.0f - entity->rotation.y) - clamp_angle(atan2(entity->position.x, entity->position.z, playerStatus->position.x, playerStatus->position.z))); - if ((!(playerStatus->animFlags & 1)) && (!(entity->unk_06 & 1)) && ((val <= 40.0f) || (val >= 320.0f))) { + if (!(playerStatus->animFlags & 1) && !(entity->unk_06 & 1) && (val <= 40.0f || val >= 320.0f)) { entity->flags |= 0x1000; if ((playerStatus->animFlags & 0x10) && (entity->unk_06 & 8)) { func_80110678(entity); diff --git a/src/code_341d0.c b/src/code_341d0.c index e1e7d08a95..f162ea2c2a 100644 --- a/src/code_341d0.c +++ b/src/code_341d0.c @@ -4,7 +4,7 @@ typedef s32 TlbEntry[0x1000 / 4]; typedef TlbEntry TlbMappablePage[15]; extern TlbMappablePage D_80197000; -extern EffectTableEntry D_8007F210[135]; +extern EffectTableEntry gEffectTable[135]; #define EFFECT_LOADED 1 @@ -167,7 +167,7 @@ void remove_all_effects(void) { } s32 load_effect(s32 effectIndex) { - EffectTableEntry* effectTable = &D_8007F210[0]; + EffectTableEntry* effectTable = &gEffectTable[0]; EffectTableEntry* effectEntry; Effect* curEffect; TlbMappablePage* tlbMappablePages; diff --git a/src/code_4ac90_len_3910.c b/src/code_4ac90_len_3910.c index 8c4410a25c..32823517e9 100644 --- a/src/code_4ac90_len_3910.c +++ b/src/code_4ac90_len_3910.c @@ -1,6 +1,6 @@ #include "common.h" -extern EffectTableEntry D_8007F210[135]; +extern EffectTableEntry gEffectTable[135]; INCLUDE_ASM(s32, "code_4ac90_len_3910", func_8006F890); @@ -81,7 +81,7 @@ INCLUDE_ASM(s32, "code_4ac90_len_3910", func_80070610); INCLUDE_ASM(s32, "code_4ac90_len_3910", func_80070670); -INCLUDE_ASM(s32, "code_4ac90_len_3910", func_800706D0); +INCLUDE_ASM(void, "code_4ac90_len_3910", func_800706D0, s32 arg0, f32 arg1, f32 arg2, f32 arg3); INCLUDE_ASM(s32, "code_4ac90_len_3910", func_80070730); @@ -234,7 +234,8 @@ INCLUDE_ASM(s32, "code_4ac90_len_3910", func_80072290); INCLUDE_ASM(s32, "code_4ac90_len_3910", func_800722F0); -INCLUDE_ASM(s32, "code_4ac90_len_3910", func_80072350); +INCLUDE_ASM(UNK_TYPE, "code_4ac90_len_3910", func_80072350, s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, + f32 arg5, f32 arg6, s32 arg7, s32 arg8); INCLUDE_ASM(s32, "code_4ac90_len_3910", func_800723B0); diff --git a/src/common/AddFP.inc.c b/src/common/AddFP.inc.c new file mode 100644 index 0000000000..3bcec42eef --- /dev/null +++ b/src/common/AddFP.inc.c @@ -0,0 +1,16 @@ +#include "common.h" + +ApiStatus N(AddFP)(ScriptInstance* script, s32 isInitialCall) { + PlayerData* playerData = &gPlayerData; + PlayerData* playerData2 = &gPlayerData; + s32 amt = get_variable(script, *script->ptrReadPos); + s32 newFP = playerData->curFP + amt; + + if (newFP > playerData->curMaxFP) { + newFP = playerData->curMaxFP; + } + + playerData2->curFP = newFP; + + return ApiStatus_DONE2; +} diff --git a/src/common/AddHP.inc.c b/src/common/AddHP.inc.c new file mode 100644 index 0000000000..cd64819a7d --- /dev/null +++ b/src/common/AddHP.inc.c @@ -0,0 +1,16 @@ +#include "common.h" + +ApiStatus N(AddHP)(ScriptInstance* script, s32 isInitialCall) { + PlayerData* playerData = &gPlayerData; + PlayerData* playerData2 = &gPlayerData; + s32 amt = get_variable(script, *script->ptrReadPos); + s32 newHP = playerData->curHP + amt; + + if (newHP > playerData->curMaxHP) { + newHP = playerData->curMaxHP; + } + + playerData2->curHP = newHP; + + return ApiStatus_DONE2; +} diff --git a/src/common/SetNpcCollision32.inc.c b/src/common/SetNpcCollision32.inc.c new file mode 100644 index 0000000000..d795c9cbf0 --- /dev/null +++ b/src/common/SetNpcCollision32.inc.c @@ -0,0 +1,9 @@ +#include "common.h" + +ApiStatus N(SetNpcCollision32)(ScriptInstance* script, s32 isInitialCall) { + Npc* npc = get_npc_unsafe(100); + + npc->collisionHeight = 32; + npc->collisionRadius = 32; + return ApiStatus_DONE2; +} diff --git a/src/common/UnkBackgroundFunc.inc.c b/src/common/UnkBackgroundFunc.inc.c new file mode 100644 index 0000000000..79f7f8f5f0 --- /dev/null +++ b/src/common/UnkBackgroundFunc.inc.c @@ -0,0 +1,17 @@ +#include "common.h" + +ApiStatus N(UnkBackgroundFunc)(ScriptInstance* script, s32 isInitialCall) { + if (isInitialCall) { + script->functionTemp[0].s = 20; + } + + set_background_color_blend(0, 0, 0, script->functionTemp[0].s * 10); + script->functionTemp[0].s -= 1; + + if (script->functionTemp[0].s == 0) { + set_background_color_blend(0, 0, 0, 0); + return ApiStatus_DONE2; + } + + return ApiStatus_BLOCK; +} diff --git a/src/common/UnkBackgroundFunc2.inc.c b/src/common/UnkBackgroundFunc2.inc.c new file mode 100644 index 0000000000..2425592a4b --- /dev/null +++ b/src/common/UnkBackgroundFunc2.inc.c @@ -0,0 +1,20 @@ +#include "common.h" + +ApiStatus N(UnkBackgroundFunc2)(ScriptInstance* script, s32 isInitialCall) { + if (isInitialCall) { + func_8011D82C(1); + *D_801512F0 = 1; + set_background_color_blend(0, 0, 0, 0); + script->functionTemp[0].s = 0; + } + + set_background_color_blend(0, 0, 0, script->functionTemp[0].s); + script->functionTemp[0].s += 10; + + if (script->functionTemp[0].s >= 230) { + set_background_color_blend(0, 0, 0, 230); + return ApiStatus_DONE2; + } + + return ApiStatus_BLOCK; +} diff --git a/src/common/UnkStarFuncs.inc.c b/src/common/UnkStarFuncs.inc.c new file mode 100644 index 0000000000..4522177086 --- /dev/null +++ b/src/common/UnkStarFuncs.inc.c @@ -0,0 +1,40 @@ +#include "common.h" + +ApiStatus N(UnkStarFunc1)(ScriptInstance* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + s32 a = get_variable(script, *args++); + s32 b = get_variable(script, *args++); + s32 c = get_variable(script, *args++); + + func_8006FEF0(0, a, b, c, 40.0f); + return ApiStatus_DONE2; +} + +ApiStatus N(UnkStarFunc2)(ScriptInstance* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + s32 a = get_variable(script, *args++); + s32 b = get_variable(script, *args++); + s32 c = get_variable(script, *args++); + + func_80070550(5, a, b, c, 50.0f, 50.0f, 40, 30); + return ApiStatus_DONE2; +} + +ApiStatus N(UnkStarFunc3)(ScriptInstance* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + s32 a = get_variable(script, *args++); + s32 b = get_variable(script, *args++); + s32 c = get_variable(script, *args++); + + func_8006FEF0(0, a, b, c, 30.0f); + return ApiStatus_DONE2; +} + +ApiStatus N(UnkStarFunc4)(ScriptInstance* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + s32 var1 = get_variable(script, *args++); + s32 var2 = get_variable(script, *args++); + + func_80072350(4, var1, var2, get_variable(script, *args++), 20.0f, 20.0f, 1.0f, 0xA, 0xF); + return ApiStatus_DONE2; +} diff --git a/tools/assist.py b/tools/assist.py index 30742a7e87..9323e6af0b 100755 --- a/tools/assist.py +++ b/tools/assist.py @@ -9,11 +9,11 @@ import sys script_dir = os.path.dirname(os.path.realpath(__file__)) root_dir = script_dir + "/../" -asm_dir = root_dir + "asm/nonmatchings/" +asm_dir = root_dir + "ver/current/asm/nonmatchings/" build_dir = root_dir + "build/" def read_rom(): - with open("baserom.z64", "rb") as f: + with open("ver/current/baserom.z64", "rb") as f: return f.read() diff --git a/tools/splat/.gitrepo b/tools/splat/.gitrepo index f9dbf9398e..4ff31e2d3e 100644 --- a/tools/splat/.gitrepo +++ b/tools/splat/.gitrepo @@ -6,7 +6,7 @@ [subrepo] remote = https://github.com/ethteck/splat.git branch = master - commit = 36030366ceb13038b0d4debde96df4734fd8cba9 - parent = e40cb32054c2b6130598c61891560eb21836d5f0 + commit = f602284b3e7bc6513e412097c35b002a1d844c33 + parent = 6fb912cb08e7ec2d4f8a49129ee0011e1b253938 method = merge cmdver = 0.4.3 diff --git a/tools/splat/segtypes/n64/code.py b/tools/splat/segtypes/n64/code.py index ad4d5d3ee4..4280a5229c 100644 --- a/tools/splat/segtypes/n64/code.py +++ b/tools/splat/segtypes/n64/code.py @@ -604,6 +604,7 @@ class N64SegCode(N64Segment): # Determine symbols def determine_symbols(self, funcs): + hi_lo_max_distance = self.options.get("hi_lo_max_distance", 6) ret = {} for func_addr in funcs: @@ -629,7 +630,7 @@ class N64SegCode(N64Segment): lui_val = int(op_split[1], 0) if lui_val >= 0x8000: - for j in range(i + 1, min(i + 6, len(func))): + for j in range(i + 1, min(i + hi_lo_max_distance, len(func))): s_insn = func[j][0] s_op_split = s_insn.op_str.split(", ") diff --git a/ver/us/asm/data/battle/item/food_733700.data.s b/ver/us/asm/data/battle/item/food_733700.data.s index 9a9c7ad327..5dd3e3a2de 100644 --- a/ver/us/asm/data/battle/item/food_733700.data.s +++ b/ver/us/asm/data/battle/item/food_733700.data.s @@ -3,4 +3,4 @@ .section .data glabel D_802A1630_733700 -.word 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000045, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000208D, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001001F, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000012, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000027, 0x00000002, 0xFE363C81, 0x0000002D, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C81, 0x00000027, 0x00000002, 0xFE363C83, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C83, 0x00000002, 0x00000043, 0x0000000F, PlayEffect, 0x00000033, 0x00000001, 0xFE363C80, 0xFE363C83, 0xFE363C82, 0xF24A7E80, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C8A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000043, 0x00000001, func_802A1000_7330D0, 0x00000008, 0x00000001, 0xFE363C80, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000001, func_802A11D4_7332A4, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C8A, 0x00000012, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000208D, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001001F, 0x00000008, 0x00000001, 0x00000004, 0x00000027, 0x00000002, 0xFE363C81, 0x0000002D, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C81, 0x00000027, 0x00000002, 0xFE363C83, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C83, 0x00000002, 0x00000043, 0x0000000F, PlayEffect, 0x00000033, 0x00000001, 0xFE363C80, 0xFE363C83, 0xFE363C82, 0xF24A7E80, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C8A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C8A, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000013, 0x00000043, 0x00000004, SetBattleCamTarget, 0xFFFFFFAB, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetBattleCamOffsetZ, 0x00000029, 0x00000043, 0x00000002, SetBattleCamZoom, 0x000000F8, 0x00000043, 0x00000002, MoveBattleCamOver, 0x0000001E, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001001F, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000002D, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C8A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C80, 0x00000043, 0x00000001, func_802A1000_7330D0, 0x00000008, 0x00000001, 0xFE363C80, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000001, func_802A11D4_7332A4, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C8E, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, UseIdleAnimation, 0x00000000, 0x00000000, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000043, 0x00000003, UseIdleAnimation, 0x00000000, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000004, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002095, 0x00000008, 0x00000001, 0x0000000A, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001001C, 0x00000008, 0x00000001, 0x0000002D, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000004, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002095, 0x00000008, 0x00000001, 0x0000000A, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010025, 0x00000008, 0x00000001, 0x0000002D, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetActorYaw, 0x00000000, 0x0000001E, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetActorYaw, 0x00000000, 0x0000003C, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetActorYaw, 0x00000000, 0x0000005A, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetActorYaw, 0x00000000, 0x00000078, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetActorYaw, 0x00000000, 0x00000096, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetActorYaw, 0x00000000, 0x000000B4, 0x00000008, 0x00000001, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C8F, 0x00000046, 0x00000001, 0x802A1934, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C8A, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010016, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000057, 0x00000000, 0x00000043, 0x00000003, func_802D3474, 0xFE363C8A, 0x80283EE8, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000000, 0x00000027, 0x00000002, 0xFE363C81, 0x0000001E, 0x00000027, 0x00000002, 0xFE363C82, 0x00000005, 0x00000043, 0x00000005, func_802D36E0, 0xFE363C8A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, func_802D3F74, 0xFE363C8A, 0x00000020, 0x00000056, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000002D, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C8E, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C80, 0x00000005, 0x00000001, 0x00000019, 0x00000043, 0x00000005, func_802D378C, 0xFE363C8A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_802A123C_73330C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C8E, 0x00000057, 0x00000000, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000002, SetGoalToTarget, 0xFFFFFF81, 0x00000043, 0x00000005, GetGoalPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetBattleCamTarget, 0xFFFFFF83, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetBattleCamOffsetZ, 0x00000029, 0x00000043, 0x00000002, SetBattleCamZoom, 0x000000F8, 0x00000043, 0x00000002, MoveBattleCamOver, 0x00000019, 0x00000043, 0x00000003, func_802D39FC, 0xFE363C8A, 0xF24A7C1A, 0x00000027, 0x00000002, 0xFE363C82, 0x00000005, 0x00000043, 0x00000006, func_802D3C58, 0xFE363C8A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000019, 0x00000043, 0x00000002, AddBattleCamZoom, 0x00000064, 0x00000043, 0x00000002, MoveBattleCamOver, 0x0000001E, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000019, 0x00000043, 0x00000005, func_802D7520, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C8B, 0x0000000D, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000002, func_802A12EC_7333BC, 0xFE363C8B, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, func_802D75D8, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C8B, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetActorYaw, 0x00000000, 0x00000096, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetActorYaw, 0x00000000, 0x00000078, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetActorYaw, 0x00000000, 0x0000005A, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetActorYaw, 0x00000000, 0x0000003C, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetActorYaw, 0x00000000, 0x0000001E, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetActorYaw, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C81, 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C81, 0x00000043, 0x00000002, func_802A15A0_733670, 0xFE363C8A, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, GetOwnerTarget, 0xFE363C80, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000100, 0x00000046, 0x00000001, 0x802A1BEC, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C8E, 0x00000046, 0x00000001, D_802A1630_733700, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000000, 0x00000046, 0x00000001, 0x802A1AFC, 0x00000012, 0x00000000, 0x00000046, 0x00000001, 0x802A1B74, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8F, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001001D, 0x00000013, 0x00000000, 0x0000000D, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000000, 0x00000027, 0x00000002, 0xFE363C81, 0x00000023, 0x00000043, 0x00000005, func_802A1378_733448, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C8B, 0x00000013, 0x00000000, 0x0000000C, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000000, 0x00000027, 0x00000002, 0xFE363C81, 0x00000023, 0x00000043, 0x00000005, func_802A1378_733448, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C8B, 0x00000013, 0x00000000, 0x0000000D, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000014, 0x00000027, 0x00000002, 0xFE363C81, 0x00000019, 0x00000043, 0x00000005, func_802A1438_733508, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C8C, 0x00000013, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000019, 0x00000043, 0x00000005, func_802D7520, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C8B, 0x0000000B, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000002, func_802A14F8_7335C8, 0xFE363C8B, 0x00000013, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000043, 0x00000002, func_802A154C_73361C, 0xFE363C8C, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8F, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010032, 0x00000008, 0x00000001, 0x0000001E, 0x00000012, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000013, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, func_802D75D8, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C8B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000008, 0x00000001, 0x00000014, 0x00000046, 0x00000001, 0x802A1A60, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000045, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000208D, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001001F, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000012, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000027, 0x00000002, 0xFE363C81, 0x0000002D, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C81, 0x00000027, 0x00000002, 0xFE363C83, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C83, 0x00000002, 0x00000043, 0x0000000F, PlayEffect, 0x00000033, 0x00000001, 0xFE363C80, 0xFE363C83, 0xFE363C82, 0xF24A7E80, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C8A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000043, 0x00000001, func_802A1000_7330D0, 0x00000008, 0x00000001, 0xFE363C80, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000001, func_802A11D4_7332A4, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C8A, 0x00000012, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000208D, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001001F, 0x00000008, 0x00000001, 0x00000004, 0x00000027, 0x00000002, 0xFE363C81, 0x0000002D, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C81, 0x00000027, 0x00000002, 0xFE363C83, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C83, 0x00000002, 0x00000043, 0x0000000F, PlayEffect, 0x00000033, 0x00000001, 0xFE363C80, 0xFE363C83, 0xFE363C82, 0xF24A7E80, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C8A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C8A, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000013, 0x00000043, 0x00000004, SetBattleCamTarget, 0xFFFFFFAB, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetBattleCamOffsetZ, 0x00000029, 0x00000043, 0x00000002, SetBattleCamZoom, 0x000000F8, 0x00000043, 0x00000002, MoveBattleCamOver, 0x0000001E, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001001F, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000002D, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C8A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C80, 0x00000043, 0x00000001, func_802A1000_7330D0, 0x00000008, 0x00000001, 0xFE363C80, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000001, func_802A11D4_7332A4, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C8E, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, UseIdleAnimation, 0x00000000, 0x00000000, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000043, 0x00000003, UseIdleAnimation, 0x00000000, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000004, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002095, 0x00000008, 0x00000001, 0x0000000A, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001001C, 0x00000008, 0x00000001, 0x0000002D, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000004, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002095, 0x00000008, 0x00000001, 0x0000000A, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010025, 0x00000008, 0x00000001, 0x0000002D, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetActorYaw, 0x00000000, 0x0000001E, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetActorYaw, 0x00000000, 0x0000003C, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetActorYaw, 0x00000000, 0x0000005A, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetActorYaw, 0x00000000, 0x00000078, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetActorYaw, 0x00000000, 0x00000096, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetActorYaw, 0x00000000, 0x000000B4, 0x00000008, 0x00000001, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C8F, 0x00000046, 0x00000001, 0x802A1934, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C8A, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010016, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000057, 0x00000000, 0x00000043, 0x00000003, func_802D3474, 0xFE363C8A, 0x80283EE8, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000000, 0x00000027, 0x00000002, 0xFE363C81, 0x0000001E, 0x00000027, 0x00000002, 0xFE363C82, 0x00000005, 0x00000043, 0x00000005, func_802D36E0, 0xFE363C8A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, func_802D3F74, 0xFE363C8A, 0x00000020, 0x00000056, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000002D, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C8E, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C80, 0x00000005, 0x00000001, 0x00000019, 0x00000043, 0x00000005, func_802D378C, 0xFE363C8A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_802A123C_73330C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C8E, 0x00000057, 0x00000000, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000002, SetGoalToTarget, 0xFFFFFF81, 0x00000043, 0x00000005, GetGoalPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetBattleCamTarget, 0xFFFFFF83, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetBattleCamOffsetZ, 0x00000029, 0x00000043, 0x00000002, SetBattleCamZoom, 0x000000F8, 0x00000043, 0x00000002, MoveBattleCamOver, 0x00000019, 0x00000043, 0x00000003, func_802D39FC, 0xFE363C8A, 0xF24A7C1A, 0x00000027, 0x00000002, 0xFE363C82, 0x00000005, 0x00000043, 0x00000006, func_802D3C58, 0xFE363C8A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000019, 0x00000043, 0x00000002, AddBattleCamZoom, 0x00000064, 0x00000043, 0x00000002, MoveBattleCamOver, 0x0000001E, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000019, 0x00000043, 0x00000005, func_802D7520, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C8B, 0x0000000D, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000002, func_802A12EC_7333BC, 0xFE363C8B, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, func_802D75D8, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C8B, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetActorYaw, 0x00000000, 0x00000096, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetActorYaw, 0x00000000, 0x00000078, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetActorYaw, 0x00000000, 0x0000005A, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetActorYaw, 0x00000000, 0x0000003C, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetActorYaw, 0x00000000, 0x0000001E, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetActorYaw, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C81, 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C81, 0x00000043, 0x00000002, func_802A15A0_733670, 0xFE363C8A, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, GetOwnerTarget, 0xFE363C80, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000100, 0x00000046, 0x00000001, 0x802A1BEC, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C8E, 0x00000046, 0x00000001, D_802A1630_733700, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000000, 0x00000046, 0x00000001, 0x802A1AFC, 0x00000012, 0x00000000, 0x00000046, 0x00000001, 0x802A1B74, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8F, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001001D, 0x00000013, 0x00000000, 0x0000000D, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000000, 0x00000027, 0x00000002, 0xFE363C81, 0x00000023, 0x00000043, 0x00000005, func_802A1378_733448, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C8B, 0x00000013, 0x00000000, 0x0000000C, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000000, 0x00000027, 0x00000002, 0xFE363C81, 0x00000023, 0x00000043, 0x00000005, func_802A1378_733448, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C8B, 0x00000013, 0x00000000, 0x0000000D, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000014, 0x00000027, 0x00000002, 0xFE363C81, 0x00000019, 0x00000043, 0x00000005, func_802A1438_733508, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C8C, 0x00000013, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000019, 0x00000043, 0x00000005, func_802D7520, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C8B, 0x0000000B, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000002, battle_item_food_AddHP, 0xFE363C8B, 0x00000013, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000043, 0x00000002, battle_item_food_AddFP, 0xFE363C8C, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8F, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010032, 0x00000008, 0x00000001, 0x0000001E, 0x00000012, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000013, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, func_802D75D8, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C8B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000008, 0x00000001, 0x00000014, 0x00000046, 0x00000001, 0x802A1A60, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/battle/item/mushroom_715E50.data.s b/ver/us/asm/data/battle/item/mushroom_715E50.data.s index d320862945..48f739b5c7 100644 --- a/ver/us/asm/data/battle/item/mushroom_715E50.data.s +++ b/ver/us/asm/data/battle/item/mushroom_715E50.data.s @@ -3,4 +3,4 @@ .section .data glabel D_802A1600_715E50 -.word 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000045, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000208D, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001001F, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000012, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000027, 0x00000002, 0xFE363C81, 0x0000002D, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C81, 0x00000027, 0x00000002, 0xFE363C83, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C83, 0x00000002, 0x00000043, 0x0000000F, PlayEffect, 0x00000033, 0x00000001, 0xFE363C80, 0xFE363C83, 0xFE363C82, 0xF24A7E80, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C8A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000043, 0x00000001, func_802A1000_715850, 0x00000008, 0x00000001, 0xFE363C80, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000001, func_802A11D4_715A24, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C8A, 0x00000012, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000208D, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001001F, 0x00000008, 0x00000001, 0x00000004, 0x00000027, 0x00000002, 0xFE363C81, 0x0000002D, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C81, 0x00000027, 0x00000002, 0xFE363C83, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C83, 0x00000002, 0x00000043, 0x0000000F, PlayEffect, 0x00000033, 0x00000001, 0xFE363C80, 0xFE363C83, 0xFE363C82, 0xF24A7E80, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C8A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C8A, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000013, 0x00000043, 0x00000004, SetBattleCamTarget, 0xFFFFFFAB, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetBattleCamOffsetZ, 0x00000029, 0x00000043, 0x00000002, SetBattleCamZoom, 0x000000F8, 0x00000043, 0x00000002, MoveBattleCamOver, 0x0000001E, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001001F, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000002D, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C8A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C80, 0x00000043, 0x00000001, func_802A1000_715850, 0x00000008, 0x00000001, 0xFE363C80, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000001, func_802A11D4_715A24, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C8E, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, UseIdleAnimation, 0x00000000, 0x00000000, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000043, 0x00000003, UseIdleAnimation, 0x00000000, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000004, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002095, 0x00000008, 0x00000001, 0x0000000A, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001001C, 0x00000008, 0x00000001, 0x0000002D, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000004, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002095, 0x00000008, 0x00000001, 0x0000000A, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010025, 0x00000008, 0x00000001, 0x0000002D, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetActorYaw, 0x00000000, 0x0000001E, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetActorYaw, 0x00000000, 0x0000003C, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetActorYaw, 0x00000000, 0x0000005A, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetActorYaw, 0x00000000, 0x00000078, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetActorYaw, 0x00000000, 0x00000096, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetActorYaw, 0x00000000, 0x000000B4, 0x00000008, 0x00000001, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C8F, 0x00000046, 0x00000001, 0x802A1904, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C8A, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010016, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000057, 0x00000000, 0x00000043, 0x00000003, func_802D3474, 0xFE363C8A, 0x80283EE8, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000000, 0x00000027, 0x00000002, 0xFE363C81, 0x0000001E, 0x00000027, 0x00000002, 0xFE363C82, 0x00000005, 0x00000043, 0x00000005, func_802D36E0, 0xFE363C8A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, func_802D3F74, 0xFE363C8A, 0x00000020, 0x00000056, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000002D, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C8E, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C80, 0x00000005, 0x00000001, 0x00000019, 0x00000043, 0x00000005, func_802D378C, 0xFE363C8A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_802A123C_715A8C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C8E, 0x00000057, 0x00000000, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000002, SetGoalToTarget, 0xFFFFFF81, 0x00000043, 0x00000005, GetGoalPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetBattleCamTarget, 0xFFFFFF83, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetBattleCamOffsetZ, 0x00000029, 0x00000043, 0x00000002, SetBattleCamZoom, 0x000000F8, 0x00000043, 0x00000002, MoveBattleCamOver, 0x00000019, 0x00000043, 0x00000003, func_802D39FC, 0xFE363C8A, 0xF24A7C1A, 0x00000027, 0x00000002, 0xFE363C82, 0x00000005, 0x00000043, 0x00000006, func_802D3C58, 0xFE363C8A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000019, 0x00000043, 0x00000002, AddBattleCamZoom, 0x00000064, 0x00000043, 0x00000002, MoveBattleCamOver, 0x0000001E, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000019, 0x00000043, 0x00000005, func_802D7520, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C8B, 0x0000000D, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000002, func_802A12EC_715B3C, 0xFE363C8B, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, func_802D75D8, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C8B, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetActorYaw, 0x00000000, 0x00000096, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetActorYaw, 0x00000000, 0x00000078, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetActorYaw, 0x00000000, 0x0000005A, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetActorYaw, 0x00000000, 0x0000003C, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetActorYaw, 0x00000000, 0x0000001E, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetActorYaw, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C81, 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C81, 0x00000043, 0x00000002, func_802A15A0_715DF0, 0xFE363C8A, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, GetOwnerTarget, 0xFE363C80, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000100, 0x00000046, 0x00000001, 0x802A1BBC, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C8E, 0x00000046, 0x00000001, D_802A1600_715E50, 0x00000046, 0x00000001, 0x802A1ACC, 0x0000000A, 0x00000002, 0xFE363C8F, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001001D, 0x00000013, 0x00000000, 0x0000000D, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000000, 0x00000027, 0x00000002, 0xFE363C81, 0x00000023, 0x00000043, 0x00000005, func_802A1378_715BC8, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C8B, 0x00000013, 0x00000000, 0x0000000D, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000014, 0x00000027, 0x00000002, 0xFE363C81, 0x00000019, 0x00000043, 0x00000005, func_802A1438_715C88, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C8C, 0x00000013, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000019, 0x00000043, 0x00000005, func_802D7520, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C8B, 0x0000000B, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000002, func_802A14F8_715D48, 0xFE363C8B, 0x00000013, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000043, 0x00000002, func_802A154C_715D9C, 0xFE363C8C, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8F, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010032, 0x00000008, 0x00000001, 0x0000001E, 0x00000012, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000013, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, func_802D75D8, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C8B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000008, 0x00000001, 0x00000014, 0x00000046, 0x00000001, 0x802A1A30, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 +.word 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000045, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000208D, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001001F, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000012, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000027, 0x00000002, 0xFE363C81, 0x0000002D, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C81, 0x00000027, 0x00000002, 0xFE363C83, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C83, 0x00000002, 0x00000043, 0x0000000F, PlayEffect, 0x00000033, 0x00000001, 0xFE363C80, 0xFE363C83, 0xFE363C82, 0xF24A7E80, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C8A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000043, 0x00000001, func_802A1000_715850, 0x00000008, 0x00000001, 0xFE363C80, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000001, func_802A11D4_715A24, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C8A, 0x00000012, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000208D, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001001F, 0x00000008, 0x00000001, 0x00000004, 0x00000027, 0x00000002, 0xFE363C81, 0x0000002D, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C81, 0x00000027, 0x00000002, 0xFE363C83, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C83, 0x00000002, 0x00000043, 0x0000000F, PlayEffect, 0x00000033, 0x00000001, 0xFE363C80, 0xFE363C83, 0xFE363C82, 0xF24A7E80, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C8A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C8A, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000013, 0x00000043, 0x00000004, SetBattleCamTarget, 0xFFFFFFAB, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetBattleCamOffsetZ, 0x00000029, 0x00000043, 0x00000002, SetBattleCamZoom, 0x000000F8, 0x00000043, 0x00000002, MoveBattleCamOver, 0x0000001E, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001001F, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000002D, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C8A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C80, 0x00000043, 0x00000001, func_802A1000_715850, 0x00000008, 0x00000001, 0xFE363C80, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000001, func_802A11D4_715A24, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C8E, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, UseIdleAnimation, 0x00000000, 0x00000000, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000043, 0x00000003, UseIdleAnimation, 0x00000000, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000004, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002095, 0x00000008, 0x00000001, 0x0000000A, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001001C, 0x00000008, 0x00000001, 0x0000002D, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000004, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002095, 0x00000008, 0x00000001, 0x0000000A, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010025, 0x00000008, 0x00000001, 0x0000002D, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetActorYaw, 0x00000000, 0x0000001E, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetActorYaw, 0x00000000, 0x0000003C, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetActorYaw, 0x00000000, 0x0000005A, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetActorYaw, 0x00000000, 0x00000078, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetActorYaw, 0x00000000, 0x00000096, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetActorYaw, 0x00000000, 0x000000B4, 0x00000008, 0x00000001, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C8F, 0x00000046, 0x00000001, 0x802A1904, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C8A, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010016, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000057, 0x00000000, 0x00000043, 0x00000003, func_802D3474, 0xFE363C8A, 0x80283EE8, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000000, 0x00000027, 0x00000002, 0xFE363C81, 0x0000001E, 0x00000027, 0x00000002, 0xFE363C82, 0x00000005, 0x00000043, 0x00000005, func_802D36E0, 0xFE363C8A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, func_802D3F74, 0xFE363C8A, 0x00000020, 0x00000056, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000002D, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C8E, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C80, 0x00000005, 0x00000001, 0x00000019, 0x00000043, 0x00000005, func_802D378C, 0xFE363C8A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_802A123C_715A8C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C8E, 0x00000057, 0x00000000, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000002, SetGoalToTarget, 0xFFFFFF81, 0x00000043, 0x00000005, GetGoalPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetBattleCamTarget, 0xFFFFFF83, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetBattleCamOffsetZ, 0x00000029, 0x00000043, 0x00000002, SetBattleCamZoom, 0x000000F8, 0x00000043, 0x00000002, MoveBattleCamOver, 0x00000019, 0x00000043, 0x00000003, func_802D39FC, 0xFE363C8A, 0xF24A7C1A, 0x00000027, 0x00000002, 0xFE363C82, 0x00000005, 0x00000043, 0x00000006, func_802D3C58, 0xFE363C8A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000019, 0x00000043, 0x00000002, AddBattleCamZoom, 0x00000064, 0x00000043, 0x00000002, MoveBattleCamOver, 0x0000001E, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000019, 0x00000043, 0x00000005, func_802D7520, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C8B, 0x0000000D, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000002, func_802A12EC_715B3C, 0xFE363C8B, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, func_802D75D8, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C8B, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetActorYaw, 0x00000000, 0x00000096, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetActorYaw, 0x00000000, 0x00000078, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetActorYaw, 0x00000000, 0x0000005A, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetActorYaw, 0x00000000, 0x0000003C, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetActorYaw, 0x00000000, 0x0000001E, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetActorYaw, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C81, 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C81, 0x00000043, 0x00000002, func_802A15A0_715DF0, 0xFE363C8A, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, GetOwnerTarget, 0xFE363C80, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000100, 0x00000046, 0x00000001, 0x802A1BBC, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C8E, 0x00000046, 0x00000001, D_802A1600_715E50, 0x00000046, 0x00000001, 0x802A1ACC, 0x0000000A, 0x00000002, 0xFE363C8F, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001001D, 0x00000013, 0x00000000, 0x0000000D, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000000, 0x00000027, 0x00000002, 0xFE363C81, 0x00000023, 0x00000043, 0x00000005, func_802A1378_715BC8, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C8B, 0x00000013, 0x00000000, 0x0000000D, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000014, 0x00000027, 0x00000002, 0xFE363C81, 0x00000019, 0x00000043, 0x00000005, func_802A1438_715C88, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C8C, 0x00000013, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000019, 0x00000043, 0x00000005, func_802D7520, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C8B, 0x0000000B, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000002, battle_item_mushroom_AddHP, 0xFE363C8B, 0x00000013, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000043, 0x00000002, battle_item_mushroom_AddFP, 0xFE363C8C, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8F, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010032, 0x00000008, 0x00000001, 0x0000001E, 0x00000012, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000013, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, func_802D75D8, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C8B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000008, 0x00000001, 0x00000014, 0x00000046, 0x00000001, 0x802A1A30, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/battle/item/super_soda_725210.data.s b/ver/us/asm/data/battle/item/super_soda_725210.data.s index 2871ea054c..eea88d389e 100644 --- a/ver/us/asm/data/battle/item/super_soda_725210.data.s +++ b/ver/us/asm/data/battle/item/super_soda_725210.data.s @@ -3,4 +3,4 @@ .section .data glabel D_802A1530_725210 -.word 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000045, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000208D, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001001F, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000012, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000027, 0x00000002, 0xFE363C81, 0x0000002D, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C81, 0x00000027, 0x00000002, 0xFE363C83, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C83, 0x00000002, 0x00000043, 0x0000000F, PlayEffect, 0x00000033, 0x00000001, 0xFE363C80, 0xFE363C83, 0xFE363C82, 0xF24A7E80, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C8A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000043, 0x00000001, func_802A1000_724CE0, 0x00000008, 0x00000001, 0xFE363C80, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000001, func_802A11D4_724EB4, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C8A, 0x00000012, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000208D, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001001F, 0x00000008, 0x00000001, 0x00000004, 0x00000027, 0x00000002, 0xFE363C81, 0x0000002D, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C81, 0x00000027, 0x00000002, 0xFE363C83, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C83, 0x00000002, 0x00000043, 0x0000000F, PlayEffect, 0x00000033, 0x00000001, 0xFE363C80, 0xFE363C83, 0xFE363C82, 0xF24A7E80, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C8A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C8A, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000013, 0x00000043, 0x00000004, SetBattleCamTarget, 0xFFFFFFAB, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetBattleCamOffsetZ, 0x00000029, 0x00000043, 0x00000002, SetBattleCamZoom, 0x000000F8, 0x00000043, 0x00000002, MoveBattleCamOver, 0x0000001E, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001001F, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000002D, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C8A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C80, 0x00000043, 0x00000001, func_802A1000_724CE0, 0x00000008, 0x00000001, 0xFE363C80, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000001, func_802A11D4_724EB4, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C8E, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, UseIdleAnimation, 0x00000000, 0x00000000, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000043, 0x00000003, UseIdleAnimation, 0x00000000, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000004, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002095, 0x00000008, 0x00000001, 0x0000000A, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001001C, 0x00000008, 0x00000001, 0x0000002D, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000004, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002095, 0x00000008, 0x00000001, 0x0000000A, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010025, 0x00000008, 0x00000001, 0x0000002D, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetActorYaw, 0x00000000, 0x0000001E, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetActorYaw, 0x00000000, 0x0000003C, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetActorYaw, 0x00000000, 0x0000005A, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetActorYaw, 0x00000000, 0x00000078, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetActorYaw, 0x00000000, 0x00000096, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetActorYaw, 0x00000000, 0x000000B4, 0x00000008, 0x00000001, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C8F, 0x00000046, 0x00000001, 0x802A1834, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C8A, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010016, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000057, 0x00000000, 0x00000043, 0x00000003, func_802D3474, 0xFE363C8A, 0x80283EE8, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000000, 0x00000027, 0x00000002, 0xFE363C81, 0x0000001E, 0x00000027, 0x00000002, 0xFE363C82, 0x00000005, 0x00000043, 0x00000005, func_802D36E0, 0xFE363C8A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, func_802D3F74, 0xFE363C8A, 0x00000020, 0x00000056, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000002D, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C8E, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C80, 0x00000005, 0x00000001, 0x00000019, 0x00000043, 0x00000005, func_802D378C, 0xFE363C8A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_802A123C_724F1C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C8E, 0x00000057, 0x00000000, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000002, SetGoalToTarget, 0xFFFFFF81, 0x00000043, 0x00000005, GetGoalPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetBattleCamTarget, 0xFFFFFF83, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetBattleCamOffsetZ, 0x00000029, 0x00000043, 0x00000002, SetBattleCamZoom, 0x000000F8, 0x00000043, 0x00000002, MoveBattleCamOver, 0x00000019, 0x00000043, 0x00000003, func_802D39FC, 0xFE363C8A, 0xF24A7C1A, 0x00000027, 0x00000002, 0xFE363C82, 0x00000005, 0x00000043, 0x00000006, func_802D3C58, 0xFE363C8A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000019, 0x00000043, 0x00000002, AddBattleCamZoom, 0x00000064, 0x00000043, 0x00000002, MoveBattleCamOver, 0x0000001E, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000019, 0x00000043, 0x00000005, func_802D7520, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C8B, 0x0000000D, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000002, func_802A12EC_724FCC, 0xFE363C8B, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, func_802D75D8, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C8B, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetActorYaw, 0x00000000, 0x00000096, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetActorYaw, 0x00000000, 0x00000078, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetActorYaw, 0x00000000, 0x0000005A, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetActorYaw, 0x00000000, 0x0000003C, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetActorYaw, 0x00000000, 0x0000001E, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetActorYaw, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000025, 0x00000002, 0xFE363C8A, 0x0000009B, 0x00000046, 0x00000001, D_802A1530_725210, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, GetOwnerTarget, 0xFE363C80, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002095, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010025, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000000, 0x00000027, 0x00000002, 0xFE363C81, 0x00000023, 0x00000043, 0x00000005, func_802A1418_7250F8, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000043, 0x00000002, func_802A14D8_7251B8, 0x00000005, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000019, 0x00000043, 0x00000005, func_802D7520, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000014, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010032, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, func_802D75D8, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, GetOwnerTarget, 0xFE363C80, 0xFE363C81, 0x00000043, 0x00000002, func_802A1378_725058, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000000, 0x00000046, 0x00000001, 0x802A1AEC, 0x00000013, 0x00000000, 0x00000046, 0x00000001, 0x802A1960, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 +.word 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000045, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000208D, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001001F, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000012, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000027, 0x00000002, 0xFE363C81, 0x0000002D, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C81, 0x00000027, 0x00000002, 0xFE363C83, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C83, 0x00000002, 0x00000043, 0x0000000F, PlayEffect, 0x00000033, 0x00000001, 0xFE363C80, 0xFE363C83, 0xFE363C82, 0xF24A7E80, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C8A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000043, 0x00000001, func_802A1000_724CE0, 0x00000008, 0x00000001, 0xFE363C80, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000001, func_802A11D4_724EB4, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C8A, 0x00000012, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000208D, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001001F, 0x00000008, 0x00000001, 0x00000004, 0x00000027, 0x00000002, 0xFE363C81, 0x0000002D, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C81, 0x00000027, 0x00000002, 0xFE363C83, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C83, 0x00000002, 0x00000043, 0x0000000F, PlayEffect, 0x00000033, 0x00000001, 0xFE363C80, 0xFE363C83, 0xFE363C82, 0xF24A7E80, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C8A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C8A, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000013, 0x00000043, 0x00000004, SetBattleCamTarget, 0xFFFFFFAB, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetBattleCamOffsetZ, 0x00000029, 0x00000043, 0x00000002, SetBattleCamZoom, 0x000000F8, 0x00000043, 0x00000002, MoveBattleCamOver, 0x0000001E, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001001F, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000002D, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C8A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C80, 0x00000043, 0x00000001, func_802A1000_724CE0, 0x00000008, 0x00000001, 0xFE363C80, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000001, func_802A11D4_724EB4, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C8E, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, UseIdleAnimation, 0x00000000, 0x00000000, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000043, 0x00000003, UseIdleAnimation, 0x00000000, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000004, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002095, 0x00000008, 0x00000001, 0x0000000A, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001001C, 0x00000008, 0x00000001, 0x0000002D, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000004, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002095, 0x00000008, 0x00000001, 0x0000000A, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010025, 0x00000008, 0x00000001, 0x0000002D, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetActorYaw, 0x00000000, 0x0000001E, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetActorYaw, 0x00000000, 0x0000003C, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetActorYaw, 0x00000000, 0x0000005A, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetActorYaw, 0x00000000, 0x00000078, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetActorYaw, 0x00000000, 0x00000096, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetActorYaw, 0x00000000, 0x000000B4, 0x00000008, 0x00000001, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C8F, 0x00000046, 0x00000001, 0x802A1834, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C8A, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010016, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000057, 0x00000000, 0x00000043, 0x00000003, func_802D3474, 0xFE363C8A, 0x80283EE8, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000000, 0x00000027, 0x00000002, 0xFE363C81, 0x0000001E, 0x00000027, 0x00000002, 0xFE363C82, 0x00000005, 0x00000043, 0x00000005, func_802D36E0, 0xFE363C8A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, func_802D3F74, 0xFE363C8A, 0x00000020, 0x00000056, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000002D, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C8E, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C80, 0x00000005, 0x00000001, 0x00000019, 0x00000043, 0x00000005, func_802D378C, 0xFE363C8A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_802A123C_724F1C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C8E, 0x00000057, 0x00000000, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000002, SetGoalToTarget, 0xFFFFFF81, 0x00000043, 0x00000005, GetGoalPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetBattleCamTarget, 0xFFFFFF83, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetBattleCamOffsetZ, 0x00000029, 0x00000043, 0x00000002, SetBattleCamZoom, 0x000000F8, 0x00000043, 0x00000002, MoveBattleCamOver, 0x00000019, 0x00000043, 0x00000003, func_802D39FC, 0xFE363C8A, 0xF24A7C1A, 0x00000027, 0x00000002, 0xFE363C82, 0x00000005, 0x00000043, 0x00000006, func_802D3C58, 0xFE363C8A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000019, 0x00000043, 0x00000002, AddBattleCamZoom, 0x00000064, 0x00000043, 0x00000002, MoveBattleCamOver, 0x0000001E, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000019, 0x00000043, 0x00000005, func_802D7520, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C8B, 0x0000000D, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000002, func_802A12EC_724FCC, 0xFE363C8B, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, func_802D75D8, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C8B, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetActorYaw, 0x00000000, 0x00000096, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetActorYaw, 0x00000000, 0x00000078, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetActorYaw, 0x00000000, 0x0000005A, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetActorYaw, 0x00000000, 0x0000003C, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetActorYaw, 0x00000000, 0x0000001E, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetActorYaw, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000025, 0x00000002, 0xFE363C8A, 0x0000009B, 0x00000046, 0x00000001, D_802A1530_725210, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, GetOwnerTarget, 0xFE363C80, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002095, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010025, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000000, 0x00000027, 0x00000002, 0xFE363C81, 0x00000023, 0x00000043, 0x00000005, func_802A1418_7250F8, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000043, 0x00000002, battle_item_super_soda_AddFP, 0x00000005, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000019, 0x00000043, 0x00000005, func_802D7520, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000014, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010032, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, func_802D75D8, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, GetOwnerTarget, 0xFE363C80, 0xFE363C81, 0x00000043, 0x00000002, func_802A1378_725058, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000000, 0x00000046, 0x00000001, 0x802A1AEC, 0x00000013, 0x00000000, 0x00000046, 0x00000001, 0x802A1960, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/battle/star/chill_out_7909C0.data.s b/ver/us/asm/data/battle/star/chill_out_7909C0.data.s index 2f31dbf46e..e8771461e6 100644 --- a/ver/us/asm/data/battle/star/chill_out_7909C0.data.s +++ b/ver/us/asm/data/battle/star/chill_out_7909C0.data.s @@ -3,4 +3,4 @@ .section .data glabel D_802A18F0_7909C0 -.word 0x00000043, 0x00000002, GetOwnerID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000045, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001001F, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000010, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, PlaySound, 0x00000241, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000F, 0x00000043, 0x00000004, func_802A1000_7900D0, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000001, battle_star_chill_out_FadeBackgroundToBlack, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001002C, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x00002051, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_802A10AC_79017C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001002A, 0x00000012, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000045, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, func_802A1494_790564, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000010, 0x00000043, 0x00000003, SetActorSpeed, 0x00000100, 0xF24A8A80, 0x00000043, 0x00000005, SetGoalPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, RunToGoal, 0x00000100, 0x00000000, 0x00000000, 0x00000043, 0x00000002, func_802A1494_790564, 0x00000004, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, PlaySound, 0x00000241, 0x00000043, 0x00000002, func_802A1494_790564, 0x00000001, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000F, 0x00000043, 0x00000004, func_802A1000_7900D0, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000001, battle_star_chill_out_FadeBackgroundToBlack, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, PlaySound, 0x00002051, 0x00000043, 0x00000002, func_802A1494_790564, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_802A10AC_79017C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, func_802A1494_790564, 0x00000004, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetOwnerID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000045, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001001F, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000010, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, PlaySound, 0x00000241, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000F, 0x00000043, 0x00000004, func_802A1000_7900D0, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000001, func_802A137C_79044C, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001002C, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x00002051, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_802A10AC_79017C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001002A, 0x00000012, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000045, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, func_802A1494_790564, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000010, 0x00000043, 0x00000003, SetActorSpeed, 0x00000100, 0xF24A8A80, 0x00000043, 0x00000005, SetGoalPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, RunToGoal, 0x00000100, 0x00000000, 0x00000000, 0x00000043, 0x00000002, func_802A1494_790564, 0x00000004, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, PlaySound, 0x00000241, 0x00000043, 0x00000002, func_802A1494_790564, 0x00000001, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000F, 0x00000043, 0x00000004, func_802A1000_7900D0, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000001, func_802A137C_79044C, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, PlaySound, 0x00002051, 0x00000043, 0x00000002, func_802A1494_790564, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_802A10AC_79017C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, func_802A1494_790564, 0x00000004, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, SetForegroundModelsVisible, 0x00000000, 0x00000043, 0x00000002, func_8024E664, 0x00000049, 0x00000043, 0x00000002, MoveBattleCamOver, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00002041, 0x00000043, 0x00000003, CreateNpc, 0x00000064, 0xFE363C80, 0x00000043, 0x00000001, func_802A14E8_7905B8, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000064, 0x00040000, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0x00000064, 0xFFFFFFB5, 0x00000096, 0x00000000, 0x00000043, 0x00000004, SetNpcEffect, 0x00000064, 0x00000000, 0x00000005, 0x00000043, 0x00000004, func_802A116C_79023C, 0xFFFFFFB5, 0x000000A7, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000064, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x00000008, 0x00000027, 0x00000002, 0xFE363C80, 0x00000043, 0x00000043, 0x00000005, SetNpcRotation, 0x00000064, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000064, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, UseCamPreset, 0x00000045, 0x00000057, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000032, 0x00000043, 0x00000008, NpcFlyTo, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000001E, 0x00000000, 0x0000000A, 0x00000043, 0x00000002, SetForegroundModelsVisible, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetOwnerID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000002, 0x00000043, 0x00000002, PlaySound, 0x00002047, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000005, GetNpcPos, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_802A1218_7902E8, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000064, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x000002D0, 0x00000043, 0x00000005, MakeLerp, 0xFE363C82, 0xFE363C83, 0x0000001E, 0x00000002, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetNpcRotation, 0x00000064, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000003C, 0x00000043, 0x00000008, NpcFlyTo, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000000, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C81, 0x0000008C, 0x00000043, 0x00000008, NpcFlyTo, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000000, 0x0000000A, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000064, 0x00000000, 0x00000043, 0x00000002, DeleteNpc, 0x00000064, 0x00000012, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000002, 0x00000043, 0x00000002, PlaySound, 0x00002045, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000005, GetNpcPos, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_802A1218_7902E8, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000064, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x000002D0, 0x00000043, 0x00000005, MakeLerp, 0xFE363C82, 0xFE363C83, 0x0000001E, 0x00000002, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetNpcRotation, 0x00000064, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000003C, 0x00000043, 0x00000008, NpcFlyTo, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000000, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C81, 0x0000008C, 0x00000043, 0x00000008, NpcFlyTo, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000000, 0x0000000A, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000064, 0x00000000, 0x00000043, 0x00000002, DeleteNpc, 0x00000064, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetOwnerID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000001, func_802A1414_7904E4, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000012, 0x00000000, 0x00000043, 0x00000001, func_802A1414_7904E4, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, SetGoalToHome, 0x00000100, 0x00000043, 0x00000003, SetActorSpeed, 0x00000100, 0xF24A9A80, 0x00000043, 0x00000002, func_802A1494_790564, 0x00000003, 0x00000043, 0x00000003, RunToGoal, 0x00000100, 0x00000000, 0x00000043, 0x00000002, func_802A1494_790564, 0x00000004, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_802A1518_7905E8, 0x00000046, 0x00000001, D_802A18F0_7909C0, 0x00000025, 0x00000002, 0xFE363C80, 0x001C0001, 0x00000046, 0x00000001, 0x802A2020, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000064, 0x001C0002, 0x00000008, 0x00000001, 0x00000010, 0x00000043, 0x00000002, UseCamPreset, 0x00000003, 0x00000043, 0x00000002, PlaySound, 0x00000244, 0x00000043, 0x00000001, InitTargetIterator, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, ItemCheckHit, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000006, 0x00000004, 0x00000001, 0x0000000B, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_802A163C_79070C, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000003, GetOwnerTarget, 0xFE363C8A, 0xFE363C8B, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000005, SetActorScaleModifier, 0xFE363C8A, 0xF24A7E80, 0xF24A7E80, 0xF24A7E80, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, SetActorScaleModifier, 0xFE363C8A, 0xF24A7EE7, 0xF24A7E80, 0xF24A7E80, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, SetActorScaleModifier, 0xFE363C8A, 0xF24A7F4D, 0xF24A7E4D, 0xF24A7E80, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, SetActorScaleModifier, 0xFE363C8A, 0xF24A7FB4, 0xF24A7E1A, 0xF24A7E80, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, SetActorScaleModifier, 0xFE363C8A, 0xF24A7FE7, 0xF24A7DE7, 0xF24A7E80, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, SetActorScaleModifier, 0xFE363C8A, 0xF24A8006, 0xF24A7DB4, 0xF24A7E80, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, SetActorScaleModifier, 0xFE363C8A, 0xF24A801A, 0xF24A7DB4, 0xF24A7E80, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, SetActorScaleModifier, 0xFE363C8A, 0xF24A7FB4, 0xF24A7DE7, 0xF24A7E80, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, SetActorScaleModifier, 0xFE363C8A, 0xF24A7F4D, 0xF24A7E1A, 0xF24A7E80, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, SetActorScaleModifier, 0xFE363C8A, 0xF24A7EE7, 0xF24A7E4D, 0xF24A7E80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000005, SetActorScaleModifier, 0xFE363C8A, 0xF24A7E80, 0xF24A7E80, 0xF24A7E80, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x0000000B, 0x00000043, 0x00000003, ChooseNextTarget, 0x00000000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000005, 0x00000001, 0x0000001E, 0x00000043, 0x00000001, func_802A153C_79060C, 0x00000008, 0x00000001, 0x00000002, 0x00000006, 0x00000000, 0x00000043, 0x00000003, ChooseNextTarget, 0xFFFFFFFF, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetGoalToTarget, 0xFFFFFF81, 0x00000043, 0x00000006, ItemCheckHit, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000006, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_802A163C_79070C, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000001, func_802A16F4_7907C4, 0x00000012, 0x00000000, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C80, 0x00000000, 0x0000FFFF, 0x00000000, 0x00000000, 0x00000820, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x00000001, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, ChooseNextTarget, 0x00000000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, func_802A1528_7905F8, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000003, ShowMessageBox, 0x0000002C, 0x0000003C, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_80276EFC, 0x00000046, 0x00000001, 0x802A222C, 0x00000046, 0x00000001, 0x802A267C, 0x00000043, 0x00000001, func_802A1528_7905F8, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000001, WaitForMessageBoxDone, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000043, 0x00000002, GetOwnerID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000045, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001001F, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000010, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, PlaySound, 0x00000241, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000F, 0x00000043, 0x00000004, battle_star_chill_out_UnkStarFunc1, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000001, battle_star_chill_out_FadeBackgroundToBlack, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001002C, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x00002051, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, battle_star_chill_out_UnkStarFunc2, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001002A, 0x00000012, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000045, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, func_802A1494_790564, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000010, 0x00000043, 0x00000003, SetActorSpeed, 0x00000100, 0xF24A8A80, 0x00000043, 0x00000005, SetGoalPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, RunToGoal, 0x00000100, 0x00000000, 0x00000000, 0x00000043, 0x00000002, func_802A1494_790564, 0x00000004, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, PlaySound, 0x00000241, 0x00000043, 0x00000002, func_802A1494_790564, 0x00000001, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000F, 0x00000043, 0x00000004, battle_star_chill_out_UnkStarFunc1, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000001, battle_star_chill_out_FadeBackgroundToBlack, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, PlaySound, 0x00002051, 0x00000043, 0x00000002, func_802A1494_790564, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, battle_star_chill_out_UnkStarFunc2, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, func_802A1494_790564, 0x00000004, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetOwnerID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000045, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001001F, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000010, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, PlaySound, 0x00000241, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000F, 0x00000043, 0x00000004, battle_star_chill_out_UnkStarFunc1, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000001, battle_star_chill_out_UnkBackgroundFunc2, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001002C, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x00002051, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, battle_star_chill_out_UnkStarFunc2, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001002A, 0x00000012, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000045, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, func_802A1494_790564, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000010, 0x00000043, 0x00000003, SetActorSpeed, 0x00000100, 0xF24A8A80, 0x00000043, 0x00000005, SetGoalPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, RunToGoal, 0x00000100, 0x00000000, 0x00000000, 0x00000043, 0x00000002, func_802A1494_790564, 0x00000004, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, PlaySound, 0x00000241, 0x00000043, 0x00000002, func_802A1494_790564, 0x00000001, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000F, 0x00000043, 0x00000004, battle_star_chill_out_UnkStarFunc1, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000001, battle_star_chill_out_UnkBackgroundFunc2, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, PlaySound, 0x00002051, 0x00000043, 0x00000002, func_802A1494_790564, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, battle_star_chill_out_UnkStarFunc2, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, func_802A1494_790564, 0x00000004, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, SetForegroundModelsVisible, 0x00000000, 0x00000043, 0x00000002, func_8024E664, 0x00000049, 0x00000043, 0x00000002, MoveBattleCamOver, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00002041, 0x00000043, 0x00000003, CreateNpc, 0x00000064, 0xFE363C80, 0x00000043, 0x00000001, battle_star_chill_out_SetNpcCollision32, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000064, 0x00040000, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0x00000064, 0xFFFFFFB5, 0x00000096, 0x00000000, 0x00000043, 0x00000004, SetNpcEffect, 0x00000064, 0x00000000, 0x00000005, 0x00000043, 0x00000004, battle_star_chill_out_UnkStarFunc3, 0xFFFFFFB5, 0x000000A7, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000064, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x00000008, 0x00000027, 0x00000002, 0xFE363C80, 0x00000043, 0x00000043, 0x00000005, SetNpcRotation, 0x00000064, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000064, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, UseCamPreset, 0x00000045, 0x00000057, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000032, 0x00000043, 0x00000008, NpcFlyTo, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000001E, 0x00000000, 0x0000000A, 0x00000043, 0x00000002, SetForegroundModelsVisible, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetOwnerID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000002, 0x00000043, 0x00000002, PlaySound, 0x00002047, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000005, GetNpcPos, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, battle_star_chill_out_UnkStarFunc4, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000064, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x000002D0, 0x00000043, 0x00000005, MakeLerp, 0xFE363C82, 0xFE363C83, 0x0000001E, 0x00000002, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetNpcRotation, 0x00000064, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000003C, 0x00000043, 0x00000008, NpcFlyTo, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000000, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C81, 0x0000008C, 0x00000043, 0x00000008, NpcFlyTo, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000000, 0x0000000A, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000064, 0x00000000, 0x00000043, 0x00000002, DeleteNpc, 0x00000064, 0x00000012, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000002, 0x00000043, 0x00000002, PlaySound, 0x00002045, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000005, GetNpcPos, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, battle_star_chill_out_UnkStarFunc4, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000064, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x000002D0, 0x00000043, 0x00000005, MakeLerp, 0xFE363C82, 0xFE363C83, 0x0000001E, 0x00000002, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetNpcRotation, 0x00000064, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000003C, 0x00000043, 0x00000008, NpcFlyTo, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000000, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C81, 0x0000008C, 0x00000043, 0x00000008, NpcFlyTo, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000000, 0x0000000A, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000064, 0x00000000, 0x00000043, 0x00000002, DeleteNpc, 0x00000064, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetOwnerID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000001, battle_star_chill_out_UnkBackgroundFunc, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000012, 0x00000000, 0x00000043, 0x00000001, battle_star_chill_out_UnkBackgroundFunc, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, SetGoalToHome, 0x00000100, 0x00000043, 0x00000003, SetActorSpeed, 0x00000100, 0xF24A9A80, 0x00000043, 0x00000002, func_802A1494_790564, 0x00000003, 0x00000043, 0x00000003, RunToGoal, 0x00000100, 0x00000000, 0x00000043, 0x00000002, func_802A1494_790564, 0x00000004, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_802A1518_7905E8, 0x00000046, 0x00000001, D_802A18F0_7909C0, 0x00000025, 0x00000002, 0xFE363C80, 0x001C0001, 0x00000046, 0x00000001, 0x802A2020, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000064, 0x001C0002, 0x00000008, 0x00000001, 0x00000010, 0x00000043, 0x00000002, UseCamPreset, 0x00000003, 0x00000043, 0x00000002, PlaySound, 0x00000244, 0x00000043, 0x00000001, InitTargetIterator, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, ItemCheckHit, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000006, 0x00000004, 0x00000001, 0x0000000B, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_802A163C_79070C, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000003, GetOwnerTarget, 0xFE363C8A, 0xFE363C8B, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000005, SetActorScaleModifier, 0xFE363C8A, 0xF24A7E80, 0xF24A7E80, 0xF24A7E80, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, SetActorScaleModifier, 0xFE363C8A, 0xF24A7EE7, 0xF24A7E80, 0xF24A7E80, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, SetActorScaleModifier, 0xFE363C8A, 0xF24A7F4D, 0xF24A7E4D, 0xF24A7E80, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, SetActorScaleModifier, 0xFE363C8A, 0xF24A7FB4, 0xF24A7E1A, 0xF24A7E80, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, SetActorScaleModifier, 0xFE363C8A, 0xF24A7FE7, 0xF24A7DE7, 0xF24A7E80, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, SetActorScaleModifier, 0xFE363C8A, 0xF24A8006, 0xF24A7DB4, 0xF24A7E80, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, SetActorScaleModifier, 0xFE363C8A, 0xF24A801A, 0xF24A7DB4, 0xF24A7E80, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, SetActorScaleModifier, 0xFE363C8A, 0xF24A7FB4, 0xF24A7DE7, 0xF24A7E80, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, SetActorScaleModifier, 0xFE363C8A, 0xF24A7F4D, 0xF24A7E1A, 0xF24A7E80, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, SetActorScaleModifier, 0xFE363C8A, 0xF24A7EE7, 0xF24A7E4D, 0xF24A7E80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000005, SetActorScaleModifier, 0xFE363C8A, 0xF24A7E80, 0xF24A7E80, 0xF24A7E80, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x0000000B, 0x00000043, 0x00000003, ChooseNextTarget, 0x00000000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000005, 0x00000001, 0x0000001E, 0x00000043, 0x00000001, func_802A153C_79060C, 0x00000008, 0x00000001, 0x00000002, 0x00000006, 0x00000000, 0x00000043, 0x00000003, ChooseNextTarget, 0xFFFFFFFF, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetGoalToTarget, 0xFFFFFF81, 0x00000043, 0x00000006, ItemCheckHit, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000006, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_802A163C_79070C, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000001, func_802A16F4_7907C4, 0x00000012, 0x00000000, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C80, 0x00000000, 0x0000FFFF, 0x00000000, 0x00000000, 0x00000820, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x00000001, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, ChooseNextTarget, 0x00000000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, func_802A1528_7905F8, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000003, ShowMessageBox, 0x0000002C, 0x0000003C, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_80276EFC, 0x00000046, 0x00000001, 0x802A222C, 0x00000046, 0x00000001, 0x802A267C, 0x00000043, 0x00000001, func_802A1528_7905F8, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000001, WaitForMessageBoxDone, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/battle/star/focus_78A480.data.s b/ver/us/asm/data/battle/star/focus_78A480.data.s deleted file mode 100644 index 834e08bf75..0000000000 --- a/ver/us/asm/data/battle/star/focus_78A480.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -glabel D_802A1620_78A480 -.word 0x27BD0020, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, GetOwnerID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000045, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001001F, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000010, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, PlaySound, 0x00000241, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000F, 0x00000043, 0x00000004, func_802A1000_789E60, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000001, battle_star_focus_FadeBackgroundToBlack, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001002C, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x00002051, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_802A10AC_789F0C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001002A, 0x00000012, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000045, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, func_802A1494_78A2F4, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000010, 0x00000043, 0x00000003, SetActorSpeed, 0x00000100, 0xF24A8A80, 0x00000043, 0x00000005, SetGoalPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, RunToGoal, 0x00000100, 0x00000000, 0x00000000, 0x00000043, 0x00000002, func_802A1494_78A2F4, 0x00000004, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, PlaySound, 0x00000241, 0x00000043, 0x00000002, func_802A1494_78A2F4, 0x00000001, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000F, 0x00000043, 0x00000004, func_802A1000_789E60, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000001, battle_star_focus_FadeBackgroundToBlack, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, PlaySound, 0x00002051, 0x00000043, 0x00000002, func_802A1494_78A2F4, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_802A10AC_789F0C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, func_802A1494_78A2F4, 0x00000004, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetOwnerID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000045, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001001F, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000010, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, PlaySound, 0x00000241, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000F, 0x00000043, 0x00000004, func_802A1000_789E60, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000001, func_802A137C_78A1DC, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001002C, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x00002051, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_802A10AC_789F0C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001002A, 0x00000012, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000045, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, func_802A1494_78A2F4, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000010, 0x00000043, 0x00000003, SetActorSpeed, 0x00000100, 0xF24A8A80, 0x00000043, 0x00000005, SetGoalPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, RunToGoal, 0x00000100, 0x00000000, 0x00000000, 0x00000043, 0x00000002, func_802A1494_78A2F4, 0x00000004, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, PlaySound, 0x00000241, 0x00000043, 0x00000002, func_802A1494_78A2F4, 0x00000001, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000F, 0x00000043, 0x00000004, func_802A1000_789E60, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000001, func_802A137C_78A1DC, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, PlaySound, 0x00002051, 0x00000043, 0x00000002, func_802A1494_78A2F4, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_802A10AC_789F0C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, func_802A1494_78A2F4, 0x00000004, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, SetForegroundModelsVisible, 0x00000000, 0x00000043, 0x00000002, func_8024E664, 0x00000049, 0x00000043, 0x00000002, MoveBattleCamOver, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00002041, 0x00000043, 0x00000003, CreateNpc, 0x00000064, 0xFE363C80, 0x00000043, 0x00000001, func_802A14E8_78A348, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000064, 0x00040000, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0x00000064, 0xFFFFFFB5, 0x00000096, 0x00000000, 0x00000043, 0x00000004, SetNpcEffect, 0x00000064, 0x00000000, 0x00000005, 0x00000043, 0x00000004, func_802A116C_789FCC, 0xFFFFFFB5, 0x000000A7, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000064, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x00000008, 0x00000027, 0x00000002, 0xFE363C80, 0x00000043, 0x00000043, 0x00000005, SetNpcRotation, 0x00000064, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000064, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, UseCamPreset, 0x00000045, 0x00000057, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000032, 0x00000043, 0x00000008, NpcFlyTo, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000001E, 0x00000000, 0x0000000A, 0x00000043, 0x00000002, SetForegroundModelsVisible, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetOwnerID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000002, 0x00000043, 0x00000002, PlaySound, 0x00002047, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000005, GetNpcPos, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_802A1218_78A078, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000064, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x000002D0, 0x00000043, 0x00000005, MakeLerp, 0xFE363C82, 0xFE363C83, 0x0000001E, 0x00000002, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetNpcRotation, 0x00000064, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000003C, 0x00000043, 0x00000008, NpcFlyTo, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000000, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C81, 0x0000008C, 0x00000043, 0x00000008, NpcFlyTo, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000000, 0x0000000A, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000064, 0x00000000, 0x00000043, 0x00000002, DeleteNpc, 0x00000064, 0x00000012, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000002, 0x00000043, 0x00000002, PlaySound, 0x00002045, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000005, GetNpcPos, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_802A1218_78A078, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000064, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x000002D0, 0x00000043, 0x00000005, MakeLerp, 0xFE363C82, 0xFE363C83, 0x0000001E, 0x00000002, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetNpcRotation, 0x00000064, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000003C, 0x00000043, 0x00000008, NpcFlyTo, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000000, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C81, 0x0000008C, 0x00000043, 0x00000008, NpcFlyTo, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000000, 0x0000000A, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000064, 0x00000000, 0x00000043, 0x00000002, DeleteNpc, 0x00000064, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetOwnerID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000001, func_802A1414_78A274, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000012, 0x00000000, 0x00000043, 0x00000001, func_802A1414_78A274, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, SetGoalToHome, 0x00000100, 0x00000043, 0x00000003, SetActorSpeed, 0x00000100, 0xF24A9A80, 0x00000043, 0x00000002, func_802A1494_78A2F4, 0x00000003, 0x00000043, 0x00000003, RunToGoal, 0x00000100, 0x00000000, 0x00000043, 0x00000002, func_802A1494_78A2F4, 0x00000004, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000046, 0x00000001, 0x802A1630, 0x00000043, 0x00000002, func_802535B4, 0x00000001, 0x00000043, 0x00000002, GetOwnerID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00002053, 0x00000043, 0x00000001, func_802A1518_78A378, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000001, func_802A1414_78A274, 0x00000043, 0x00000002, UseCamPreset, 0x00000002, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, ShowMessageBox, 0x0000001A, 0x0000003C, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000003, ShowMessageBox, 0x0000001B, 0x0000003C, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, ShowMessageBox, 0x0000001C, 0x0000003C, 0x00000023, 0x00000000, 0x00000043, 0x00000001, WaitForMessageBoxDone, 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000012, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00002053, 0x00000043, 0x00000001, func_802A15B0_78A410, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000001, func_802A1414_78A274, 0x00000043, 0x00000002, UseCamPreset, 0x00000002, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, ShowMessageBox, 0x0000001A, 0x0000003C, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000003, ShowMessageBox, 0x0000001B, 0x0000003C, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, ShowMessageBox, 0x0000001C, 0x0000003C, 0x00000023, 0x00000000, 0x00000043, 0x00000001, WaitForMessageBoxDone, 0x00000043, 0x00000001, func_80280818, 0x00000043, 0x00000002, SetGoalToHome, 0x00000100, 0x00000043, 0x00000003, SetActorSpeed, 0x00000100, 0xF24A9A80, 0x00000043, 0x00000002, func_802A1494_78A2F4, 0x00000003, 0x00000043, 0x00000003, RunToGoal, 0x00000100, 0x00000000, 0x00000043, 0x00000002, func_802A1494_78A2F4, 0x00000004, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/battle/star/focus_78A490.data.s b/ver/us/asm/data/battle/star/focus_78A490.data.s new file mode 100644 index 0000000000..78a4f183a5 --- /dev/null +++ b/ver/us/asm/data/battle/star/focus_78A490.data.s @@ -0,0 +1,6 @@ +.include "macro.inc" + +.section .data + +glabel D_802A1630_78A490 +.word 0x00000043, 0x00000002, GetOwnerID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000045, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001001F, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000010, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, PlaySound, 0x00000241, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000F, 0x00000043, 0x00000004, battle_star_focus_UnkStarFunc1, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000001, battle_star_focus_FadeBackgroundToBlack, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001002C, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x00002051, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, battle_star_focus_UnkStarFunc2, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001002A, 0x00000012, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000045, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, func_802A1494_78A2F4, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000010, 0x00000043, 0x00000003, SetActorSpeed, 0x00000100, 0xF24A8A80, 0x00000043, 0x00000005, SetGoalPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, RunToGoal, 0x00000100, 0x00000000, 0x00000000, 0x00000043, 0x00000002, func_802A1494_78A2F4, 0x00000004, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, PlaySound, 0x00000241, 0x00000043, 0x00000002, func_802A1494_78A2F4, 0x00000001, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000F, 0x00000043, 0x00000004, battle_star_focus_UnkStarFunc1, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000001, battle_star_focus_FadeBackgroundToBlack, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, PlaySound, 0x00002051, 0x00000043, 0x00000002, func_802A1494_78A2F4, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, battle_star_focus_UnkStarFunc2, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, func_802A1494_78A2F4, 0x00000004, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetOwnerID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000045, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001001F, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000010, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, PlaySound, 0x00000241, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000F, 0x00000043, 0x00000004, battle_star_focus_UnkStarFunc1, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000001, battle_star_focus_UnkBackgroundFunc2, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001002C, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x00002051, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, battle_star_focus_UnkStarFunc2, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001002A, 0x00000012, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000045, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, func_802A1494_78A2F4, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000010, 0x00000043, 0x00000003, SetActorSpeed, 0x00000100, 0xF24A8A80, 0x00000043, 0x00000005, SetGoalPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, RunToGoal, 0x00000100, 0x00000000, 0x00000000, 0x00000043, 0x00000002, func_802A1494_78A2F4, 0x00000004, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, PlaySound, 0x00000241, 0x00000043, 0x00000002, func_802A1494_78A2F4, 0x00000001, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000F, 0x00000043, 0x00000004, battle_star_focus_UnkStarFunc1, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000001, battle_star_focus_UnkBackgroundFunc2, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, PlaySound, 0x00002051, 0x00000043, 0x00000002, func_802A1494_78A2F4, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, battle_star_focus_UnkStarFunc2, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, func_802A1494_78A2F4, 0x00000004, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, SetForegroundModelsVisible, 0x00000000, 0x00000043, 0x00000002, func_8024E664, 0x00000049, 0x00000043, 0x00000002, MoveBattleCamOver, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00002041, 0x00000043, 0x00000003, CreateNpc, 0x00000064, 0xFE363C80, 0x00000043, 0x00000001, battle_star_focus_SetNpcCollision32, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000064, 0x00040000, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0x00000064, 0xFFFFFFB5, 0x00000096, 0x00000000, 0x00000043, 0x00000004, SetNpcEffect, 0x00000064, 0x00000000, 0x00000005, 0x00000043, 0x00000004, battle_star_focus_UnkStarFunc3, 0xFFFFFFB5, 0x000000A7, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000064, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x00000008, 0x00000027, 0x00000002, 0xFE363C80, 0x00000043, 0x00000043, 0x00000005, SetNpcRotation, 0x00000064, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000064, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, UseCamPreset, 0x00000045, 0x00000057, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000032, 0x00000043, 0x00000008, NpcFlyTo, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000001E, 0x00000000, 0x0000000A, 0x00000043, 0x00000002, SetForegroundModelsVisible, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetOwnerID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000002, 0x00000043, 0x00000002, PlaySound, 0x00002047, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000005, GetNpcPos, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, battle_star_focus_UnkStarFunc4, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000064, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x000002D0, 0x00000043, 0x00000005, MakeLerp, 0xFE363C82, 0xFE363C83, 0x0000001E, 0x00000002, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetNpcRotation, 0x00000064, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000003C, 0x00000043, 0x00000008, NpcFlyTo, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000000, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C81, 0x0000008C, 0x00000043, 0x00000008, NpcFlyTo, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000000, 0x0000000A, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000064, 0x00000000, 0x00000043, 0x00000002, DeleteNpc, 0x00000064, 0x00000012, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000002, 0x00000043, 0x00000002, PlaySound, 0x00002045, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000005, GetNpcPos, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, battle_star_focus_UnkStarFunc4, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000064, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x000002D0, 0x00000043, 0x00000005, MakeLerp, 0xFE363C82, 0xFE363C83, 0x0000001E, 0x00000002, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetNpcRotation, 0x00000064, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000003C, 0x00000043, 0x00000008, NpcFlyTo, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000000, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C81, 0x0000008C, 0x00000043, 0x00000008, NpcFlyTo, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000000, 0x0000000A, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000064, 0x00000000, 0x00000043, 0x00000002, DeleteNpc, 0x00000064, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetOwnerID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000001, battle_star_focus_UnkBackgroundFunc, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000012, 0x00000000, 0x00000043, 0x00000001, battle_star_focus_UnkBackgroundFunc, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, SetGoalToHome, 0x00000100, 0x00000043, 0x00000003, SetActorSpeed, 0x00000100, 0xF24A9A80, 0x00000043, 0x00000002, func_802A1494_78A2F4, 0x00000003, 0x00000043, 0x00000003, RunToGoal, 0x00000100, 0x00000000, 0x00000043, 0x00000002, func_802A1494_78A2F4, 0x00000004, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000046, 0x00000001, D_802A1630_78A490, 0x00000043, 0x00000002, func_802535B4, 0x00000001, 0x00000043, 0x00000002, GetOwnerID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00002053, 0x00000043, 0x00000001, func_802A1518_78A378, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000001, battle_star_focus_UnkBackgroundFunc, 0x00000043, 0x00000002, UseCamPreset, 0x00000002, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, ShowMessageBox, 0x0000001A, 0x0000003C, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000003, ShowMessageBox, 0x0000001B, 0x0000003C, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, ShowMessageBox, 0x0000001C, 0x0000003C, 0x00000023, 0x00000000, 0x00000043, 0x00000001, WaitForMessageBoxDone, 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000012, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00002053, 0x00000043, 0x00000001, func_802A15B0_78A410, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000001, battle_star_focus_UnkBackgroundFunc, 0x00000043, 0x00000002, UseCamPreset, 0x00000002, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, ShowMessageBox, 0x0000001A, 0x0000003C, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000003, ShowMessageBox, 0x0000001B, 0x0000003C, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, ShowMessageBox, 0x0000001C, 0x0000003C, 0x00000023, 0x00000000, 0x00000043, 0x00000001, WaitForMessageBoxDone, 0x00000043, 0x00000001, func_80280818, 0x00000043, 0x00000002, SetGoalToHome, 0x00000100, 0x00000043, 0x00000003, SetActorSpeed, 0x00000100, 0xF24A9A80, 0x00000043, 0x00000002, func_802A1494_78A2F4, 0x00000003, 0x00000043, 0x00000003, RunToGoal, 0x00000100, 0x00000000, 0x00000043, 0x00000002, func_802A1494_78A2F4, 0x00000004, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/battle/star/lullaby_78D770.data.s b/ver/us/asm/data/battle/star/lullaby_78D770.data.s index 92901a19ab..15bbfcfb27 100644 --- a/ver/us/asm/data/battle/star/lullaby_78D770.data.s +++ b/ver/us/asm/data/battle/star/lullaby_78D770.data.s @@ -3,4 +3,4 @@ .section .data glabel D_802A1620_78D770 -.word 0x00000043, 0x00000002, GetOwnerID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000045, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001001F, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000010, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, PlaySound, 0x00000241, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000F, 0x00000043, 0x00000004, func_802A1000_78D150, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000001, battle_star_lullaby_FadeBackgroundToBlack, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001002C, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x00002051, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_802A10AC_78D1FC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001002A, 0x00000012, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000045, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, func_802A1494_78D5E4, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000010, 0x00000043, 0x00000003, SetActorSpeed, 0x00000100, 0xF24A8A80, 0x00000043, 0x00000005, SetGoalPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, RunToGoal, 0x00000100, 0x00000000, 0x00000000, 0x00000043, 0x00000002, func_802A1494_78D5E4, 0x00000004, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, PlaySound, 0x00000241, 0x00000043, 0x00000002, func_802A1494_78D5E4, 0x00000001, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000F, 0x00000043, 0x00000004, func_802A1000_78D150, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000001, battle_star_lullaby_FadeBackgroundToBlack, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, PlaySound, 0x00002051, 0x00000043, 0x00000002, func_802A1494_78D5E4, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_802A10AC_78D1FC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, func_802A1494_78D5E4, 0x00000004, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetOwnerID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000045, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001001F, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000010, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, PlaySound, 0x00000241, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000F, 0x00000043, 0x00000004, func_802A1000_78D150, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000001, func_802A137C_78D4CC, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001002C, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x00002051, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_802A10AC_78D1FC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001002A, 0x00000012, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000045, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, func_802A1494_78D5E4, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000010, 0x00000043, 0x00000003, SetActorSpeed, 0x00000100, 0xF24A8A80, 0x00000043, 0x00000005, SetGoalPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, RunToGoal, 0x00000100, 0x00000000, 0x00000000, 0x00000043, 0x00000002, func_802A1494_78D5E4, 0x00000004, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, PlaySound, 0x00000241, 0x00000043, 0x00000002, func_802A1494_78D5E4, 0x00000001, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000F, 0x00000043, 0x00000004, func_802A1000_78D150, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000001, func_802A137C_78D4CC, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, PlaySound, 0x00002051, 0x00000043, 0x00000002, func_802A1494_78D5E4, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_802A10AC_78D1FC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, func_802A1494_78D5E4, 0x00000004, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, SetForegroundModelsVisible, 0x00000000, 0x00000043, 0x00000002, func_8024E664, 0x00000049, 0x00000043, 0x00000002, MoveBattleCamOver, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00002041, 0x00000043, 0x00000003, CreateNpc, 0x00000064, 0xFE363C80, 0x00000043, 0x00000001, func_802A14E8_78D638, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000064, 0x00040000, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0x00000064, 0xFFFFFFB5, 0x00000096, 0x00000000, 0x00000043, 0x00000004, SetNpcEffect, 0x00000064, 0x00000000, 0x00000005, 0x00000043, 0x00000004, func_802A116C_78D2BC, 0xFFFFFFB5, 0x000000A7, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000064, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x00000008, 0x00000027, 0x00000002, 0xFE363C80, 0x00000043, 0x00000043, 0x00000005, SetNpcRotation, 0x00000064, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000064, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, UseCamPreset, 0x00000045, 0x00000057, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000032, 0x00000043, 0x00000008, NpcFlyTo, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000001E, 0x00000000, 0x0000000A, 0x00000043, 0x00000002, SetForegroundModelsVisible, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetOwnerID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000002, 0x00000043, 0x00000002, PlaySound, 0x00002047, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000005, GetNpcPos, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_802A1218_78D368, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000064, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x000002D0, 0x00000043, 0x00000005, MakeLerp, 0xFE363C82, 0xFE363C83, 0x0000001E, 0x00000002, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetNpcRotation, 0x00000064, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000003C, 0x00000043, 0x00000008, NpcFlyTo, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000000, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C81, 0x0000008C, 0x00000043, 0x00000008, NpcFlyTo, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000000, 0x0000000A, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000064, 0x00000000, 0x00000043, 0x00000002, DeleteNpc, 0x00000064, 0x00000012, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000002, 0x00000043, 0x00000002, PlaySound, 0x00002045, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000005, GetNpcPos, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_802A1218_78D368, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000064, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x000002D0, 0x00000043, 0x00000005, MakeLerp, 0xFE363C82, 0xFE363C83, 0x0000001E, 0x00000002, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetNpcRotation, 0x00000064, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000003C, 0x00000043, 0x00000008, NpcFlyTo, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000000, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C81, 0x0000008C, 0x00000043, 0x00000008, NpcFlyTo, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000000, 0x0000000A, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000064, 0x00000000, 0x00000043, 0x00000002, DeleteNpc, 0x00000064, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetOwnerID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000001, func_802A1414_78D564, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000012, 0x00000000, 0x00000043, 0x00000001, func_802A1414_78D564, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, SetGoalToHome, 0x00000100, 0x00000043, 0x00000003, SetActorSpeed, 0x00000100, 0xF24A9A80, 0x00000043, 0x00000002, func_802A1494_78D5E4, 0x00000003, 0x00000043, 0x00000003, RunToGoal, 0x00000100, 0x00000000, 0x00000043, 0x00000002, func_802A1494_78D5E4, 0x00000004, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000046, 0x00000001, D_802A1620_78D770, 0x00000025, 0x00000002, 0xFE363C80, 0x001A0001, 0x00000046, 0x00000001, 0x802A1D50, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000064, 0x001A0002, 0x00000008, 0x00000001, 0x00000010, 0x00000043, 0x00000002, UseCamPreset, 0x00000003, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, PlaySound, 0x000003F4, 0x00000043, 0x00000001, func_802A1518_78D668, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000001, InitTargetIterator, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetGoalToTarget, 0xFFFFFF81, 0x00000043, 0x00000006, ItemCheckHit, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000006, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000006, ItemDamageEnemy, 0xFE363C80, 0x70000000, 0x80001364, 0x00000000, 0x00000020, 0x00000003, 0x00000001, 0x00000001, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, ChooseNextTarget, 0x00000000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, func_80276EFC, 0x00000046, 0x00000001, 0x802A1F5C, 0x00000046, 0x00000001, 0x802A23AC, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, GetOwnerID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000045, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001001F, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000010, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, PlaySound, 0x00000241, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000F, 0x00000043, 0x00000004, battle_star_lullaby_UnkStarFunc1, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000001, battle_star_lullaby_FadeBackgroundToBlack, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001002C, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x00002051, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, battle_star_lullaby_UnkStarFunc2, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001002A, 0x00000012, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000045, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, func_802A1494_78D5E4, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000010, 0x00000043, 0x00000003, SetActorSpeed, 0x00000100, 0xF24A8A80, 0x00000043, 0x00000005, SetGoalPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, RunToGoal, 0x00000100, 0x00000000, 0x00000000, 0x00000043, 0x00000002, func_802A1494_78D5E4, 0x00000004, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, PlaySound, 0x00000241, 0x00000043, 0x00000002, func_802A1494_78D5E4, 0x00000001, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000F, 0x00000043, 0x00000004, battle_star_lullaby_UnkStarFunc1, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000001, battle_star_lullaby_FadeBackgroundToBlack, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, PlaySound, 0x00002051, 0x00000043, 0x00000002, func_802A1494_78D5E4, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, battle_star_lullaby_UnkStarFunc2, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, func_802A1494_78D5E4, 0x00000004, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetOwnerID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000045, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001001F, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000010, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, PlaySound, 0x00000241, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000F, 0x00000043, 0x00000004, battle_star_lullaby_UnkStarFunc1, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000001, battle_star_lullaby_UnkBackgroundFunc2, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001002C, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x00002051, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, battle_star_lullaby_UnkStarFunc2, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001002A, 0x00000012, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000045, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, func_802A1494_78D5E4, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000010, 0x00000043, 0x00000003, SetActorSpeed, 0x00000100, 0xF24A8A80, 0x00000043, 0x00000005, SetGoalPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, RunToGoal, 0x00000100, 0x00000000, 0x00000000, 0x00000043, 0x00000002, func_802A1494_78D5E4, 0x00000004, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, PlaySound, 0x00000241, 0x00000043, 0x00000002, func_802A1494_78D5E4, 0x00000001, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000F, 0x00000043, 0x00000004, battle_star_lullaby_UnkStarFunc1, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000001, battle_star_lullaby_UnkBackgroundFunc2, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, PlaySound, 0x00002051, 0x00000043, 0x00000002, func_802A1494_78D5E4, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, battle_star_lullaby_UnkStarFunc2, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, func_802A1494_78D5E4, 0x00000004, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, SetForegroundModelsVisible, 0x00000000, 0x00000043, 0x00000002, func_8024E664, 0x00000049, 0x00000043, 0x00000002, MoveBattleCamOver, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00002041, 0x00000043, 0x00000003, CreateNpc, 0x00000064, 0xFE363C80, 0x00000043, 0x00000001, battle_star_lullaby_SetNpcCollision32, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000064, 0x00040000, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0x00000064, 0xFFFFFFB5, 0x00000096, 0x00000000, 0x00000043, 0x00000004, SetNpcEffect, 0x00000064, 0x00000000, 0x00000005, 0x00000043, 0x00000004, battle_star_lullaby_UnkStarFunc3, 0xFFFFFFB5, 0x000000A7, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000064, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x00000008, 0x00000027, 0x00000002, 0xFE363C80, 0x00000043, 0x00000043, 0x00000005, SetNpcRotation, 0x00000064, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000064, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, UseCamPreset, 0x00000045, 0x00000057, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000032, 0x00000043, 0x00000008, NpcFlyTo, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000001E, 0x00000000, 0x0000000A, 0x00000043, 0x00000002, SetForegroundModelsVisible, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetOwnerID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000002, 0x00000043, 0x00000002, PlaySound, 0x00002047, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000005, GetNpcPos, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, battle_star_lullaby_UnkStarFunc4, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000064, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x000002D0, 0x00000043, 0x00000005, MakeLerp, 0xFE363C82, 0xFE363C83, 0x0000001E, 0x00000002, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetNpcRotation, 0x00000064, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000003C, 0x00000043, 0x00000008, NpcFlyTo, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000000, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C81, 0x0000008C, 0x00000043, 0x00000008, NpcFlyTo, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000000, 0x0000000A, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000064, 0x00000000, 0x00000043, 0x00000002, DeleteNpc, 0x00000064, 0x00000012, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000002, 0x00000043, 0x00000002, PlaySound, 0x00002045, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000005, GetNpcPos, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, battle_star_lullaby_UnkStarFunc4, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000064, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x000002D0, 0x00000043, 0x00000005, MakeLerp, 0xFE363C82, 0xFE363C83, 0x0000001E, 0x00000002, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetNpcRotation, 0x00000064, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000003C, 0x00000043, 0x00000008, NpcFlyTo, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000000, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C81, 0x0000008C, 0x00000043, 0x00000008, NpcFlyTo, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000000, 0x0000000A, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000064, 0x00000000, 0x00000043, 0x00000002, DeleteNpc, 0x00000064, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetOwnerID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000001, battle_star_lullaby_UnkBackgroundFunc, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000012, 0x00000000, 0x00000043, 0x00000001, battle_star_lullaby_UnkBackgroundFunc, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, SetGoalToHome, 0x00000100, 0x00000043, 0x00000003, SetActorSpeed, 0x00000100, 0xF24A9A80, 0x00000043, 0x00000002, func_802A1494_78D5E4, 0x00000003, 0x00000043, 0x00000003, RunToGoal, 0x00000100, 0x00000000, 0x00000043, 0x00000002, func_802A1494_78D5E4, 0x00000004, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000046, 0x00000001, D_802A1620_78D770, 0x00000025, 0x00000002, 0xFE363C80, 0x001A0001, 0x00000046, 0x00000001, 0x802A1D50, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000064, 0x001A0002, 0x00000008, 0x00000001, 0x00000010, 0x00000043, 0x00000002, UseCamPreset, 0x00000003, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, PlaySound, 0x000003F4, 0x00000043, 0x00000001, func_802A1518_78D668, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000001, InitTargetIterator, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetGoalToTarget, 0xFFFFFF81, 0x00000043, 0x00000006, ItemCheckHit, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000006, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000006, ItemDamageEnemy, 0xFE363C80, 0x70000000, 0x80001364, 0x00000000, 0x00000020, 0x00000003, 0x00000001, 0x00000001, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, ChooseNextTarget, 0x00000000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, func_80276EFC, 0x00000046, 0x00000001, 0x802A1F5C, 0x00000046, 0x00000001, 0x802A23AC, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/battle/star/peach_beam_79ACA0.data.s b/ver/us/asm/data/battle/star/peach_beam_79ACA0.data.s index d14e7b42ce..8feab9f45b 100644 --- a/ver/us/asm/data/battle/star/peach_beam_79ACA0.data.s +++ b/ver/us/asm/data/battle/star/peach_beam_79ACA0.data.s @@ -3,7 +3,7 @@ .section .data glabel D_802A24F0_79ACA0 -.word 0x00000043, 0x00000002, GetOwnerID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000045, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001001F, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000010, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, PlaySound, 0x00000241, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000F, 0x00000043, 0x00000004, func_802A1000_7997B0, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000001, battle_star_peach_beam_FadeBackgroundToBlack, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001002C, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x00002051, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_802A10AC_79985C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001002A, 0x00000012, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000045, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, func_802A1494_799C44, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000010, 0x00000043, 0x00000003, SetActorSpeed, 0x00000100, 0xF24A8A80, 0x00000043, 0x00000005, SetGoalPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, RunToGoal, 0x00000100, 0x00000000, 0x00000000, 0x00000043, 0x00000002, func_802A1494_799C44, 0x00000004, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, PlaySound, 0x00000241, 0x00000043, 0x00000002, func_802A1494_799C44, 0x00000001, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000F, 0x00000043, 0x00000004, func_802A1000_7997B0, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000001, battle_star_peach_beam_FadeBackgroundToBlack, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, PlaySound, 0x00002051, 0x00000043, 0x00000002, func_802A1494_799C44, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_802A10AC_79985C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, func_802A1494_799C44, 0x00000004, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetOwnerID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000045, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001001F, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000010, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, PlaySound, 0x00000241, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000F, 0x00000043, 0x00000004, func_802A1000_7997B0, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000001, func_802A137C_799B2C, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001002C, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x00002051, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_802A10AC_79985C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001002A, 0x00000012, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000045, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, func_802A1494_799C44, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000010, 0x00000043, 0x00000003, SetActorSpeed, 0x00000100, 0xF24A8A80, 0x00000043, 0x00000005, SetGoalPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, RunToGoal, 0x00000100, 0x00000000, 0x00000000, 0x00000043, 0x00000002, func_802A1494_799C44, 0x00000004, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, PlaySound, 0x00000241, 0x00000043, 0x00000002, func_802A1494_799C44, 0x00000001, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000F, 0x00000043, 0x00000004, func_802A1000_7997B0, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000001, func_802A137C_799B2C, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, PlaySound, 0x00002051, 0x00000043, 0x00000002, func_802A1494_799C44, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_802A10AC_79985C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, func_802A1494_799C44, 0x00000004, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, SetForegroundModelsVisible, 0x00000000, 0x00000043, 0x00000002, func_8024E664, 0x00000049, 0x00000043, 0x00000002, MoveBattleCamOver, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00002041, 0x00000043, 0x00000003, CreateNpc, 0x00000064, 0xFE363C80, 0x00000043, 0x00000001, func_802A14E8_799C98, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000064, 0x00040000, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0x00000064, 0xFFFFFFB5, 0x00000096, 0x00000000, 0x00000043, 0x00000004, SetNpcEffect, 0x00000064, 0x00000000, 0x00000005, 0x00000043, 0x00000004, func_802A116C_79991C, 0xFFFFFFB5, 0x000000A7, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000064, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x00000008, 0x00000027, 0x00000002, 0xFE363C80, 0x00000043, 0x00000043, 0x00000005, SetNpcRotation, 0x00000064, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000064, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, UseCamPreset, 0x00000045, 0x00000057, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000032, 0x00000043, 0x00000008, NpcFlyTo, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000001E, 0x00000000, 0x0000000A, 0x00000043, 0x00000002, SetForegroundModelsVisible, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetOwnerID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000002, 0x00000043, 0x00000002, PlaySound, 0x00002047, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000005, GetNpcPos, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_802A1218_7999C8, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000064, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x000002D0, 0x00000043, 0x00000005, MakeLerp, 0xFE363C82, 0xFE363C83, 0x0000001E, 0x00000002, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetNpcRotation, 0x00000064, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000003C, 0x00000043, 0x00000008, NpcFlyTo, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000000, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C81, 0x0000008C, 0x00000043, 0x00000008, NpcFlyTo, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000000, 0x0000000A, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000064, 0x00000000, 0x00000043, 0x00000002, DeleteNpc, 0x00000064, 0x00000012, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000002, 0x00000043, 0x00000002, PlaySound, 0x00002045, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000005, GetNpcPos, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_802A1218_7999C8, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000064, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x000002D0, 0x00000043, 0x00000005, MakeLerp, 0xFE363C82, 0xFE363C83, 0x0000001E, 0x00000002, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetNpcRotation, 0x00000064, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000003C, 0x00000043, 0x00000008, NpcFlyTo, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000000, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C81, 0x0000008C, 0x00000043, 0x00000008, NpcFlyTo, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000000, 0x0000000A, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000064, 0x00000000, 0x00000043, 0x00000002, DeleteNpc, 0x00000064, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetOwnerID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000001, func_802A1414_799BC4, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000012, 0x00000000, 0x00000043, 0x00000001, func_802A1414_799BC4, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, SetGoalToHome, 0x00000100, 0x00000043, 0x00000003, SetActorSpeed, 0x00000100, 0xF24A9A80, 0x00000043, 0x00000002, func_802A1494_799C44, 0x00000003, 0x00000043, 0x00000003, RunToGoal, 0x00000100, 0x00000000, 0x00000043, 0x00000002, func_802A1494_799C44, 0x00000004, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, GetOwnerID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000045, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001001F, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000010, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, PlaySound, 0x00000241, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000F, 0x00000043, 0x00000004, battle_star_peach_beam_UnkStarFunc1, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000001, battle_star_peach_beam_FadeBackgroundToBlack, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001002C, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x00002051, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, battle_star_peach_beam_UnkStarFunc2, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001002A, 0x00000012, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000045, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, func_802A1494_799C44, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000010, 0x00000043, 0x00000003, SetActorSpeed, 0x00000100, 0xF24A8A80, 0x00000043, 0x00000005, SetGoalPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, RunToGoal, 0x00000100, 0x00000000, 0x00000000, 0x00000043, 0x00000002, func_802A1494_799C44, 0x00000004, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, PlaySound, 0x00000241, 0x00000043, 0x00000002, func_802A1494_799C44, 0x00000001, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000F, 0x00000043, 0x00000004, battle_star_peach_beam_UnkStarFunc1, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000001, battle_star_peach_beam_FadeBackgroundToBlack, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, PlaySound, 0x00002051, 0x00000043, 0x00000002, func_802A1494_799C44, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, battle_star_peach_beam_UnkStarFunc2, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, func_802A1494_799C44, 0x00000004, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetOwnerID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000045, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001001F, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000010, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, PlaySound, 0x00000241, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000F, 0x00000043, 0x00000004, battle_star_peach_beam_UnkStarFunc1, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000001, battle_star_peach_beam_UnkBackgroundFunc2, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001002C, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x00002051, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, battle_star_peach_beam_UnkStarFunc2, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001002A, 0x00000012, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000045, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, func_802A1494_799C44, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000010, 0x00000043, 0x00000003, SetActorSpeed, 0x00000100, 0xF24A8A80, 0x00000043, 0x00000005, SetGoalPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, RunToGoal, 0x00000100, 0x00000000, 0x00000000, 0x00000043, 0x00000002, func_802A1494_799C44, 0x00000004, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, PlaySound, 0x00000241, 0x00000043, 0x00000002, func_802A1494_799C44, 0x00000001, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000F, 0x00000043, 0x00000004, battle_star_peach_beam_UnkStarFunc1, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000001, battle_star_peach_beam_UnkBackgroundFunc2, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, PlaySound, 0x00002051, 0x00000043, 0x00000002, func_802A1494_799C44, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, battle_star_peach_beam_UnkStarFunc2, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, func_802A1494_799C44, 0x00000004, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, SetForegroundModelsVisible, 0x00000000, 0x00000043, 0x00000002, func_8024E664, 0x00000049, 0x00000043, 0x00000002, MoveBattleCamOver, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00002041, 0x00000043, 0x00000003, CreateNpc, 0x00000064, 0xFE363C80, 0x00000043, 0x00000001, battle_star_peach_beam_SetNpcCollision32, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000064, 0x00040000, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0x00000064, 0xFFFFFFB5, 0x00000096, 0x00000000, 0x00000043, 0x00000004, SetNpcEffect, 0x00000064, 0x00000000, 0x00000005, 0x00000043, 0x00000004, battle_star_peach_beam_UnkStarFunc3, 0xFFFFFFB5, 0x000000A7, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000064, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x00000008, 0x00000027, 0x00000002, 0xFE363C80, 0x00000043, 0x00000043, 0x00000005, SetNpcRotation, 0x00000064, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000064, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, UseCamPreset, 0x00000045, 0x00000057, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000032, 0x00000043, 0x00000008, NpcFlyTo, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000001E, 0x00000000, 0x0000000A, 0x00000043, 0x00000002, SetForegroundModelsVisible, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetOwnerID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000002, 0x00000043, 0x00000002, PlaySound, 0x00002047, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000005, GetNpcPos, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, battle_star_peach_beam_UnkStarFunc4, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000064, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x000002D0, 0x00000043, 0x00000005, MakeLerp, 0xFE363C82, 0xFE363C83, 0x0000001E, 0x00000002, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetNpcRotation, 0x00000064, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000003C, 0x00000043, 0x00000008, NpcFlyTo, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000000, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C81, 0x0000008C, 0x00000043, 0x00000008, NpcFlyTo, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000000, 0x0000000A, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000064, 0x00000000, 0x00000043, 0x00000002, DeleteNpc, 0x00000064, 0x00000012, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000002, 0x00000043, 0x00000002, PlaySound, 0x00002045, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000005, GetNpcPos, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, battle_star_peach_beam_UnkStarFunc4, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000064, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x000002D0, 0x00000043, 0x00000005, MakeLerp, 0xFE363C82, 0xFE363C83, 0x0000001E, 0x00000002, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetNpcRotation, 0x00000064, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000003C, 0x00000043, 0x00000008, NpcFlyTo, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000000, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C81, 0x0000008C, 0x00000043, 0x00000008, NpcFlyTo, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000000, 0x0000000A, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000064, 0x00000000, 0x00000043, 0x00000002, DeleteNpc, 0x00000064, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetOwnerID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000001, battle_star_peach_beam_UnkBackgroundFunc, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000012, 0x00000000, 0x00000043, 0x00000001, battle_star_peach_beam_UnkBackgroundFunc, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, SetGoalToHome, 0x00000100, 0x00000043, 0x00000003, SetActorSpeed, 0x00000100, 0xF24A9A80, 0x00000043, 0x00000002, func_802A1494_799C44, 0x00000003, 0x00000043, 0x00000003, RunToGoal, 0x00000100, 0x00000000, 0x00000043, 0x00000002, func_802A1494_799C44, 0x00000004, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 glabel D_802A33A8_79BB58 .word 0x00000056, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000038, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xF24A7E80, 0x00000064, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x0000000F, PlayEffect, 0x00000038, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xF24A7E80, 0x00000064, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000001, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x0000000F, PlayEffect, 0x00000038, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xF24A7E80, 0x00000064, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x0000000F, PlayEffect, 0x00000052, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xF24A7E80, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/battle/star/peach_dash_79DE50.data.s b/ver/us/asm/data/battle/star/peach_dash_79DE50.data.s index 5e4d901a1f..da54b11f61 100644 --- a/ver/us/asm/data/battle/star/peach_dash_79DE50.data.s +++ b/ver/us/asm/data/battle/star/peach_dash_79DE50.data.s @@ -3,4 +3,4 @@ .section .data glabel D_802A15B0_79DE50 -.word 0x00000043, 0x00000002, GetOwnerID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000045, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001001F, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000010, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, PlaySound, 0x00000241, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000F, 0x00000043, 0x00000004, func_802A1000_79D8A0, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000001, battle_star_peach_dash_FadeBackgroundToBlack, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001002C, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x00002051, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_802A10AC_79D94C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001002A, 0x00000012, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000045, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, func_802A1494_79DD34, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000010, 0x00000043, 0x00000003, SetActorSpeed, 0x00000100, 0xF24A8A80, 0x00000043, 0x00000005, SetGoalPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, RunToGoal, 0x00000100, 0x00000000, 0x00000000, 0x00000043, 0x00000002, func_802A1494_79DD34, 0x00000004, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, PlaySound, 0x00000241, 0x00000043, 0x00000002, func_802A1494_79DD34, 0x00000001, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000F, 0x00000043, 0x00000004, func_802A1000_79D8A0, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000001, battle_star_peach_dash_FadeBackgroundToBlack, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, PlaySound, 0x00002051, 0x00000043, 0x00000002, func_802A1494_79DD34, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_802A10AC_79D94C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, func_802A1494_79DD34, 0x00000004, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetOwnerID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000045, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001001F, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000010, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, PlaySound, 0x00000241, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000F, 0x00000043, 0x00000004, func_802A1000_79D8A0, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000001, func_802A137C_79DC1C, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001002C, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x00002051, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_802A10AC_79D94C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001002A, 0x00000012, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000045, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, func_802A1494_79DD34, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000010, 0x00000043, 0x00000003, SetActorSpeed, 0x00000100, 0xF24A8A80, 0x00000043, 0x00000005, SetGoalPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, RunToGoal, 0x00000100, 0x00000000, 0x00000000, 0x00000043, 0x00000002, func_802A1494_79DD34, 0x00000004, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, PlaySound, 0x00000241, 0x00000043, 0x00000002, func_802A1494_79DD34, 0x00000001, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000F, 0x00000043, 0x00000004, func_802A1000_79D8A0, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000001, func_802A137C_79DC1C, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, PlaySound, 0x00002051, 0x00000043, 0x00000002, func_802A1494_79DD34, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_802A10AC_79D94C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, func_802A1494_79DD34, 0x00000004, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, SetForegroundModelsVisible, 0x00000000, 0x00000043, 0x00000002, func_8024E664, 0x00000049, 0x00000043, 0x00000002, MoveBattleCamOver, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00002041, 0x00000043, 0x00000003, CreateNpc, 0x00000064, 0xFE363C80, 0x00000043, 0x00000001, func_802A14E8_79DD88, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000064, 0x00040000, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0x00000064, 0xFFFFFFB5, 0x00000096, 0x00000000, 0x00000043, 0x00000004, SetNpcEffect, 0x00000064, 0x00000000, 0x00000005, 0x00000043, 0x00000004, func_802A116C_79DA0C, 0xFFFFFFB5, 0x000000A7, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000064, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x00000008, 0x00000027, 0x00000002, 0xFE363C80, 0x00000043, 0x00000043, 0x00000005, SetNpcRotation, 0x00000064, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000064, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, UseCamPreset, 0x00000045, 0x00000057, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000032, 0x00000043, 0x00000008, NpcFlyTo, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000001E, 0x00000000, 0x0000000A, 0x00000043, 0x00000002, SetForegroundModelsVisible, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetOwnerID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000002, 0x00000043, 0x00000002, PlaySound, 0x00002047, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000005, GetNpcPos, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_802A1218_79DAB8, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000064, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x000002D0, 0x00000043, 0x00000005, MakeLerp, 0xFE363C82, 0xFE363C83, 0x0000001E, 0x00000002, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetNpcRotation, 0x00000064, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000003C, 0x00000043, 0x00000008, NpcFlyTo, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000000, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C81, 0x0000008C, 0x00000043, 0x00000008, NpcFlyTo, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000000, 0x0000000A, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000064, 0x00000000, 0x00000043, 0x00000002, DeleteNpc, 0x00000064, 0x00000012, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000002, 0x00000043, 0x00000002, PlaySound, 0x00002045, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000005, GetNpcPos, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_802A1218_79DAB8, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000064, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x000002D0, 0x00000043, 0x00000005, MakeLerp, 0xFE363C82, 0xFE363C83, 0x0000001E, 0x00000002, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetNpcRotation, 0x00000064, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000003C, 0x00000043, 0x00000008, NpcFlyTo, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000000, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C81, 0x0000008C, 0x00000043, 0x00000008, NpcFlyTo, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000000, 0x0000000A, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000064, 0x00000000, 0x00000043, 0x00000002, DeleteNpc, 0x00000064, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetOwnerID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000001, func_802A1414_79DCB4, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000012, 0x00000000, 0x00000043, 0x00000001, func_802A1414_79DCB4, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, SetGoalToHome, 0x00000100, 0x00000043, 0x00000003, SetActorSpeed, 0x00000100, 0xF24A9A80, 0x00000043, 0x00000002, func_802A1494_79DD34, 0x00000003, 0x00000043, 0x00000003, RunToGoal, 0x00000100, 0x00000000, 0x00000043, 0x00000002, func_802A1494_79DD34, 0x00000004, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000045, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x000C0010, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000010, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000014, 0x00000043, 0x00000004, func_802A1000_79D8A0, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000001, battle_star_peach_dash_FadeBackgroundToBlack, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x000D000F, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000014, 0x00000043, 0x00000004, func_802A10AC_79D94C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x000C000C, 0x00000043, 0x00000001, func_802A1518_79DDB8, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, func_802A1414_79DCB4, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x000A0003, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x000A0001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, GetOwnerID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000045, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001001F, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000010, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, PlaySound, 0x00000241, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000F, 0x00000043, 0x00000004, battle_star_peach_dash_UnkStarFunc1, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000001, battle_star_peach_dash_FadeBackgroundToBlack, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001002C, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x00002051, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, battle_star_peach_dash_UnkStarFunc2, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001002A, 0x00000012, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000045, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, func_802A1494_79DD34, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000010, 0x00000043, 0x00000003, SetActorSpeed, 0x00000100, 0xF24A8A80, 0x00000043, 0x00000005, SetGoalPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, RunToGoal, 0x00000100, 0x00000000, 0x00000000, 0x00000043, 0x00000002, func_802A1494_79DD34, 0x00000004, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, PlaySound, 0x00000241, 0x00000043, 0x00000002, func_802A1494_79DD34, 0x00000001, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000F, 0x00000043, 0x00000004, battle_star_peach_dash_UnkStarFunc1, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000001, battle_star_peach_dash_FadeBackgroundToBlack, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, PlaySound, 0x00002051, 0x00000043, 0x00000002, func_802A1494_79DD34, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, battle_star_peach_dash_UnkStarFunc2, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, func_802A1494_79DD34, 0x00000004, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetOwnerID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000045, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001001F, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000010, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, PlaySound, 0x00000241, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000F, 0x00000043, 0x00000004, battle_star_peach_dash_UnkStarFunc1, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000001, battle_star_peach_dash_UnkBackgroundFunc2, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001002C, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x00002051, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, battle_star_peach_dash_UnkStarFunc2, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001002A, 0x00000012, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000045, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, func_802A1494_79DD34, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000010, 0x00000043, 0x00000003, SetActorSpeed, 0x00000100, 0xF24A8A80, 0x00000043, 0x00000005, SetGoalPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, RunToGoal, 0x00000100, 0x00000000, 0x00000000, 0x00000043, 0x00000002, func_802A1494_79DD34, 0x00000004, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, PlaySound, 0x00000241, 0x00000043, 0x00000002, func_802A1494_79DD34, 0x00000001, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000F, 0x00000043, 0x00000004, battle_star_peach_dash_UnkStarFunc1, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000001, battle_star_peach_dash_UnkBackgroundFunc2, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, PlaySound, 0x00002051, 0x00000043, 0x00000002, func_802A1494_79DD34, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, battle_star_peach_dash_UnkStarFunc2, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, func_802A1494_79DD34, 0x00000004, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, SetForegroundModelsVisible, 0x00000000, 0x00000043, 0x00000002, func_8024E664, 0x00000049, 0x00000043, 0x00000002, MoveBattleCamOver, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00002041, 0x00000043, 0x00000003, CreateNpc, 0x00000064, 0xFE363C80, 0x00000043, 0x00000001, battle_star_peach_dash_SetNpcCollision32, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000064, 0x00040000, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0x00000064, 0xFFFFFFB5, 0x00000096, 0x00000000, 0x00000043, 0x00000004, SetNpcEffect, 0x00000064, 0x00000000, 0x00000005, 0x00000043, 0x00000004, battle_star_peach_dash_UnkStarFunc3, 0xFFFFFFB5, 0x000000A7, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000064, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x00000008, 0x00000027, 0x00000002, 0xFE363C80, 0x00000043, 0x00000043, 0x00000005, SetNpcRotation, 0x00000064, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000064, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, UseCamPreset, 0x00000045, 0x00000057, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000032, 0x00000043, 0x00000008, NpcFlyTo, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000001E, 0x00000000, 0x0000000A, 0x00000043, 0x00000002, SetForegroundModelsVisible, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetOwnerID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000002, 0x00000043, 0x00000002, PlaySound, 0x00002047, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000005, GetNpcPos, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, battle_star_peach_dash_UnkStarFunc4, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000064, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x000002D0, 0x00000043, 0x00000005, MakeLerp, 0xFE363C82, 0xFE363C83, 0x0000001E, 0x00000002, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetNpcRotation, 0x00000064, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000003C, 0x00000043, 0x00000008, NpcFlyTo, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000000, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C81, 0x0000008C, 0x00000043, 0x00000008, NpcFlyTo, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000000, 0x0000000A, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000064, 0x00000000, 0x00000043, 0x00000002, DeleteNpc, 0x00000064, 0x00000012, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000002, 0x00000043, 0x00000002, PlaySound, 0x00002045, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000005, GetNpcPos, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, battle_star_peach_dash_UnkStarFunc4, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000064, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x000002D0, 0x00000043, 0x00000005, MakeLerp, 0xFE363C82, 0xFE363C83, 0x0000001E, 0x00000002, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetNpcRotation, 0x00000064, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000003C, 0x00000043, 0x00000008, NpcFlyTo, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000000, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C81, 0x0000008C, 0x00000043, 0x00000008, NpcFlyTo, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000000, 0x0000000A, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000064, 0x00000000, 0x00000043, 0x00000002, DeleteNpc, 0x00000064, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetOwnerID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000001, battle_star_peach_dash_UnkBackgroundFunc, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000012, 0x00000000, 0x00000043, 0x00000001, battle_star_peach_dash_UnkBackgroundFunc, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, SetGoalToHome, 0x00000100, 0x00000043, 0x00000003, SetActorSpeed, 0x00000100, 0xF24A9A80, 0x00000043, 0x00000002, func_802A1494_79DD34, 0x00000003, 0x00000043, 0x00000003, RunToGoal, 0x00000100, 0x00000000, 0x00000043, 0x00000002, func_802A1494_79DD34, 0x00000004, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000045, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x000C0010, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000010, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000014, 0x00000043, 0x00000004, battle_star_peach_dash_UnkStarFunc1, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000001, battle_star_peach_dash_FadeBackgroundToBlack, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x000D000F, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000014, 0x00000043, 0x00000004, battle_star_peach_dash_UnkStarFunc2, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x000C000C, 0x00000043, 0x00000001, func_802A1518_79DDB8, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, battle_star_peach_dash_UnkBackgroundFunc, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x000A0003, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x000A0001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/battle/star/peach_focus_79C4D0.data.s b/ver/us/asm/data/battle/star/peach_focus_79C4D0.data.s index 59324fb8d6..0d267594d9 100644 --- a/ver/us/asm/data/battle/star/peach_focus_79C4D0.data.s +++ b/ver/us/asm/data/battle/star/peach_focus_79C4D0.data.s @@ -3,4 +3,4 @@ .section .data glabel D_802A1530_79C4D0 -.word 0x00000043, 0x00000002, GetOwnerID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000045, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001001F, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000010, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, PlaySound, 0x00000241, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000F, 0x00000043, 0x00000004, func_802A1000_79BFA0, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000001, battle_star_peach_focus_FadeBackgroundToBlack, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001002C, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x00002051, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_802A10AC_79C04C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001002A, 0x00000012, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000045, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, func_802A1494_79C434, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000010, 0x00000043, 0x00000003, SetActorSpeed, 0x00000100, 0xF24A8A80, 0x00000043, 0x00000005, SetGoalPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, RunToGoal, 0x00000100, 0x00000000, 0x00000000, 0x00000043, 0x00000002, func_802A1494_79C434, 0x00000004, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, PlaySound, 0x00000241, 0x00000043, 0x00000002, func_802A1494_79C434, 0x00000001, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000F, 0x00000043, 0x00000004, func_802A1000_79BFA0, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000001, battle_star_peach_focus_FadeBackgroundToBlack, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, PlaySound, 0x00002051, 0x00000043, 0x00000002, func_802A1494_79C434, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_802A10AC_79C04C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, func_802A1494_79C434, 0x00000004, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetOwnerID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000045, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001001F, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000010, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, PlaySound, 0x00000241, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000F, 0x00000043, 0x00000004, func_802A1000_79BFA0, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000001, func_802A137C_79C31C, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001002C, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x00002051, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_802A10AC_79C04C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001002A, 0x00000012, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000045, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, func_802A1494_79C434, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000010, 0x00000043, 0x00000003, SetActorSpeed, 0x00000100, 0xF24A8A80, 0x00000043, 0x00000005, SetGoalPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, RunToGoal, 0x00000100, 0x00000000, 0x00000000, 0x00000043, 0x00000002, func_802A1494_79C434, 0x00000004, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, PlaySound, 0x00000241, 0x00000043, 0x00000002, func_802A1494_79C434, 0x00000001, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000F, 0x00000043, 0x00000004, func_802A1000_79BFA0, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000001, func_802A137C_79C31C, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, PlaySound, 0x00002051, 0x00000043, 0x00000002, func_802A1494_79C434, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_802A10AC_79C04C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, func_802A1494_79C434, 0x00000004, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, SetForegroundModelsVisible, 0x00000000, 0x00000043, 0x00000002, func_8024E664, 0x00000049, 0x00000043, 0x00000002, MoveBattleCamOver, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00002041, 0x00000043, 0x00000003, CreateNpc, 0x00000064, 0xFE363C80, 0x00000043, 0x00000001, func_802A14E8_79C488, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000064, 0x00040000, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0x00000064, 0xFFFFFFB5, 0x00000096, 0x00000000, 0x00000043, 0x00000004, SetNpcEffect, 0x00000064, 0x00000000, 0x00000005, 0x00000043, 0x00000004, func_802A116C_79C10C, 0xFFFFFFB5, 0x000000A7, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000064, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x00000008, 0x00000027, 0x00000002, 0xFE363C80, 0x00000043, 0x00000043, 0x00000005, SetNpcRotation, 0x00000064, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000064, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, UseCamPreset, 0x00000045, 0x00000057, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000032, 0x00000043, 0x00000008, NpcFlyTo, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000001E, 0x00000000, 0x0000000A, 0x00000043, 0x00000002, SetForegroundModelsVisible, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetOwnerID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000002, 0x00000043, 0x00000002, PlaySound, 0x00002047, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000005, GetNpcPos, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_802A1218_79C1B8, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000064, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x000002D0, 0x00000043, 0x00000005, MakeLerp, 0xFE363C82, 0xFE363C83, 0x0000001E, 0x00000002, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetNpcRotation, 0x00000064, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000003C, 0x00000043, 0x00000008, NpcFlyTo, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000000, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C81, 0x0000008C, 0x00000043, 0x00000008, NpcFlyTo, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000000, 0x0000000A, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000064, 0x00000000, 0x00000043, 0x00000002, DeleteNpc, 0x00000064, 0x00000012, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000002, 0x00000043, 0x00000002, PlaySound, 0x00002045, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000005, GetNpcPos, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_802A1218_79C1B8, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000064, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x000002D0, 0x00000043, 0x00000005, MakeLerp, 0xFE363C82, 0xFE363C83, 0x0000001E, 0x00000002, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetNpcRotation, 0x00000064, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000003C, 0x00000043, 0x00000008, NpcFlyTo, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000000, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C81, 0x0000008C, 0x00000043, 0x00000008, NpcFlyTo, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000000, 0x0000000A, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000064, 0x00000000, 0x00000043, 0x00000002, DeleteNpc, 0x00000064, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetOwnerID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000001, func_802A1414_79C3B4, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000012, 0x00000000, 0x00000043, 0x00000001, func_802A1414_79C3B4, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, SetGoalToHome, 0x00000100, 0x00000043, 0x00000003, SetActorSpeed, 0x00000100, 0xF24A9A80, 0x00000043, 0x00000002, func_802A1494_79C434, 0x00000003, 0x00000043, 0x00000003, RunToGoal, 0x00000100, 0x00000000, 0x00000043, 0x00000002, func_802A1494_79C434, 0x00000004, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000045, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x000A0003, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000010, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x000C000D, 0x00000043, 0x00000003, SetActorYaw, 0x00000000, 0x0000001E, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetActorYaw, 0x00000000, 0x0000003C, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetActorYaw, 0x00000000, 0x0000005A, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetActorYaw, 0x00000000, 0x00000078, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetActorYaw, 0x00000000, 0x00000096, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetActorYaw, 0x00000000, 0x000000B4, 0x00000043, 0x00000002, UseCamPreset, 0x00000013, 0x00000043, 0x00000004, SetBattleCamTarget, 0xFFFFFF97, 0xFFFFFFF9, 0x00000000, 0x00000043, 0x00000002, SetBattleCamZoom, 0x000000D5, 0x00000043, 0x00000002, MoveBattleCamOver, 0x0000003C, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x000D000F, 0x00000043, 0x00000002, PlaySound, 0x00000241, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000014, 0x00000043, 0x00000004, func_802A1000_79BFA0, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000001, battle_star_peach_focus_FadeBackgroundToBlack, 0x00000043, 0x00000004, GetActorVar, 0x00000100, 0x00000000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000006, ActorSpeak, 0x00130096, 0x00000000, 0x00000000, 0x000D000F, 0x000D000F, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x000A0001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x00002051, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_802A10AC_79C04C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, PlaySound, 0x00002053, 0x00000043, 0x00000004, GetActorVar, 0x00000100, 0x00000000, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000004, SetActorVar, 0x00000100, 0x00000000, 0xFE363C80, 0x00000043, 0x00000008, ModifyActorDecoration, 0x00000100, 0x00000001, 0x00000000, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, GetActorVar, 0x00000100, 0x00000001, 0xFE363C80, 0x00000043, 0x00000001, func_802A1518_79C4B8, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, UseCamPreset, 0x00000002, 0x00000043, 0x00000003, SetActorYaw, 0xFFFFFF81, 0x00000096, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetActorYaw, 0xFFFFFF81, 0x00000078, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetActorYaw, 0xFFFFFF81, 0x0000005A, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetActorYaw, 0xFFFFFF81, 0x0000003C, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetActorYaw, 0xFFFFFF81, 0x0000001E, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetActorYaw, 0xFFFFFF81, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000001, func_802A1414_79C3B4, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x000A0003, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x000A0002, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, GetOwnerID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000045, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001001F, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000010, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, PlaySound, 0x00000241, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000F, 0x00000043, 0x00000004, battle_star_peach_focus_UnkStarFunc1, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000001, battle_star_peach_focus_FadeBackgroundToBlack, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001002C, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x00002051, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, battle_star_peach_focus_UnkStarFunc2, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001002A, 0x00000012, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000045, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, func_802A1494_79C434, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000010, 0x00000043, 0x00000003, SetActorSpeed, 0x00000100, 0xF24A8A80, 0x00000043, 0x00000005, SetGoalPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, RunToGoal, 0x00000100, 0x00000000, 0x00000000, 0x00000043, 0x00000002, func_802A1494_79C434, 0x00000004, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, PlaySound, 0x00000241, 0x00000043, 0x00000002, func_802A1494_79C434, 0x00000001, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000F, 0x00000043, 0x00000004, battle_star_peach_focus_UnkStarFunc1, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000001, battle_star_peach_focus_FadeBackgroundToBlack, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, PlaySound, 0x00002051, 0x00000043, 0x00000002, func_802A1494_79C434, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, battle_star_peach_focus_UnkStarFunc2, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, func_802A1494_79C434, 0x00000004, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetOwnerID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000045, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001001F, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000010, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, PlaySound, 0x00000241, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000F, 0x00000043, 0x00000004, battle_star_peach_focus_UnkStarFunc1, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000001, battle_star_peach_focus_UnkBackgroundFunc2, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001002C, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x00002051, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, battle_star_peach_focus_UnkStarFunc2, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001002A, 0x00000012, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000045, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, func_802A1494_79C434, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000010, 0x00000043, 0x00000003, SetActorSpeed, 0x00000100, 0xF24A8A80, 0x00000043, 0x00000005, SetGoalPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, RunToGoal, 0x00000100, 0x00000000, 0x00000000, 0x00000043, 0x00000002, func_802A1494_79C434, 0x00000004, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, PlaySound, 0x00000241, 0x00000043, 0x00000002, func_802A1494_79C434, 0x00000001, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000F, 0x00000043, 0x00000004, battle_star_peach_focus_UnkStarFunc1, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000001, battle_star_peach_focus_UnkBackgroundFunc2, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, PlaySound, 0x00002051, 0x00000043, 0x00000002, func_802A1494_79C434, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, battle_star_peach_focus_UnkStarFunc2, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, func_802A1494_79C434, 0x00000004, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, SetForegroundModelsVisible, 0x00000000, 0x00000043, 0x00000002, func_8024E664, 0x00000049, 0x00000043, 0x00000002, MoveBattleCamOver, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00002041, 0x00000043, 0x00000003, CreateNpc, 0x00000064, 0xFE363C80, 0x00000043, 0x00000001, battle_star_peach_focus_SetNpcCollision32, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000064, 0x00040000, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0x00000064, 0xFFFFFFB5, 0x00000096, 0x00000000, 0x00000043, 0x00000004, SetNpcEffect, 0x00000064, 0x00000000, 0x00000005, 0x00000043, 0x00000004, battle_star_peach_focus_UnkStarFunc3, 0xFFFFFFB5, 0x000000A7, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000064, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x00000008, 0x00000027, 0x00000002, 0xFE363C80, 0x00000043, 0x00000043, 0x00000005, SetNpcRotation, 0x00000064, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000064, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, UseCamPreset, 0x00000045, 0x00000057, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000032, 0x00000043, 0x00000008, NpcFlyTo, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000001E, 0x00000000, 0x0000000A, 0x00000043, 0x00000002, SetForegroundModelsVisible, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetOwnerID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000002, 0x00000043, 0x00000002, PlaySound, 0x00002047, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000005, GetNpcPos, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, battle_star_peach_focus_UnkStarFunc4, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000064, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x000002D0, 0x00000043, 0x00000005, MakeLerp, 0xFE363C82, 0xFE363C83, 0x0000001E, 0x00000002, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetNpcRotation, 0x00000064, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000003C, 0x00000043, 0x00000008, NpcFlyTo, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000000, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C81, 0x0000008C, 0x00000043, 0x00000008, NpcFlyTo, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000000, 0x0000000A, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000064, 0x00000000, 0x00000043, 0x00000002, DeleteNpc, 0x00000064, 0x00000012, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000002, 0x00000043, 0x00000002, PlaySound, 0x00002045, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000005, GetNpcPos, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, battle_star_peach_focus_UnkStarFunc4, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000064, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x000002D0, 0x00000043, 0x00000005, MakeLerp, 0xFE363C82, 0xFE363C83, 0x0000001E, 0x00000002, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetNpcRotation, 0x00000064, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000003C, 0x00000043, 0x00000008, NpcFlyTo, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000000, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C81, 0x0000008C, 0x00000043, 0x00000008, NpcFlyTo, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000000, 0x0000000A, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000064, 0x00000000, 0x00000043, 0x00000002, DeleteNpc, 0x00000064, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetOwnerID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000001, battle_star_peach_focus_UnkBackgroundFunc, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000012, 0x00000000, 0x00000043, 0x00000001, battle_star_peach_focus_UnkBackgroundFunc, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, SetGoalToHome, 0x00000100, 0x00000043, 0x00000003, SetActorSpeed, 0x00000100, 0xF24A9A80, 0x00000043, 0x00000002, func_802A1494_79C434, 0x00000003, 0x00000043, 0x00000003, RunToGoal, 0x00000100, 0x00000000, 0x00000043, 0x00000002, func_802A1494_79C434, 0x00000004, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000045, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x000A0003, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000010, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x000C000D, 0x00000043, 0x00000003, SetActorYaw, 0x00000000, 0x0000001E, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetActorYaw, 0x00000000, 0x0000003C, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetActorYaw, 0x00000000, 0x0000005A, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetActorYaw, 0x00000000, 0x00000078, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetActorYaw, 0x00000000, 0x00000096, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetActorYaw, 0x00000000, 0x000000B4, 0x00000043, 0x00000002, UseCamPreset, 0x00000013, 0x00000043, 0x00000004, SetBattleCamTarget, 0xFFFFFF97, 0xFFFFFFF9, 0x00000000, 0x00000043, 0x00000002, SetBattleCamZoom, 0x000000D5, 0x00000043, 0x00000002, MoveBattleCamOver, 0x0000003C, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x000D000F, 0x00000043, 0x00000002, PlaySound, 0x00000241, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000014, 0x00000043, 0x00000004, battle_star_peach_focus_UnkStarFunc1, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000001, battle_star_peach_focus_FadeBackgroundToBlack, 0x00000043, 0x00000004, GetActorVar, 0x00000100, 0x00000000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000006, ActorSpeak, 0x00130096, 0x00000000, 0x00000000, 0x000D000F, 0x000D000F, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x000A0001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x00002051, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, battle_star_peach_focus_UnkStarFunc2, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, PlaySound, 0x00002053, 0x00000043, 0x00000004, GetActorVar, 0x00000100, 0x00000000, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000004, SetActorVar, 0x00000100, 0x00000000, 0xFE363C80, 0x00000043, 0x00000008, ModifyActorDecoration, 0x00000100, 0x00000001, 0x00000000, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, GetActorVar, 0x00000100, 0x00000001, 0xFE363C80, 0x00000043, 0x00000001, func_802A1518_79C4B8, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, UseCamPreset, 0x00000002, 0x00000043, 0x00000003, SetActorYaw, 0xFFFFFF81, 0x00000096, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetActorYaw, 0xFFFFFF81, 0x00000078, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetActorYaw, 0xFFFFFF81, 0x0000005A, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetActorYaw, 0xFFFFFF81, 0x0000003C, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetActorYaw, 0xFFFFFF81, 0x0000001E, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetActorYaw, 0xFFFFFF81, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000001, battle_star_peach_focus_UnkBackgroundFunc, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x000A0003, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x000A0002, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/battle/star/refresh_78C070.data.s b/ver/us/asm/data/battle/star/refresh_78C070.data.s index 257daddbcc..694c45d00c 100644 --- a/ver/us/asm/data/battle/star/refresh_78C070.data.s +++ b/ver/us/asm/data/battle/star/refresh_78C070.data.s @@ -3,4 +3,4 @@ .section .data glabel D_802A1A70_78C070 -.word 0x00000043, 0x00000002, GetOwnerID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000045, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001001F, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000010, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, PlaySound, 0x00000241, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000F, 0x00000043, 0x00000004, func_802A1000_78B600, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000001, battle_star_refresh_FadeBackgroundToBlack, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001002C, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x00002051, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_802A10AC_78B6AC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001002A, 0x00000012, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000045, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, func_802A1494_78BA94, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000010, 0x00000043, 0x00000003, SetActorSpeed, 0x00000100, 0xF24A8A80, 0x00000043, 0x00000005, SetGoalPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, RunToGoal, 0x00000100, 0x00000000, 0x00000000, 0x00000043, 0x00000002, func_802A1494_78BA94, 0x00000004, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, PlaySound, 0x00000241, 0x00000043, 0x00000002, func_802A1494_78BA94, 0x00000001, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000F, 0x00000043, 0x00000004, func_802A1000_78B600, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000001, battle_star_refresh_FadeBackgroundToBlack, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, PlaySound, 0x00002051, 0x00000043, 0x00000002, func_802A1494_78BA94, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_802A10AC_78B6AC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, func_802A1494_78BA94, 0x00000004, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetOwnerID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000045, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001001F, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000010, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, PlaySound, 0x00000241, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000F, 0x00000043, 0x00000004, func_802A1000_78B600, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000001, func_802A137C_78B97C, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001002C, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x00002051, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_802A10AC_78B6AC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001002A, 0x00000012, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000045, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, func_802A1494_78BA94, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000010, 0x00000043, 0x00000003, SetActorSpeed, 0x00000100, 0xF24A8A80, 0x00000043, 0x00000005, SetGoalPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, RunToGoal, 0x00000100, 0x00000000, 0x00000000, 0x00000043, 0x00000002, func_802A1494_78BA94, 0x00000004, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, PlaySound, 0x00000241, 0x00000043, 0x00000002, func_802A1494_78BA94, 0x00000001, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000F, 0x00000043, 0x00000004, func_802A1000_78B600, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000001, func_802A137C_78B97C, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, PlaySound, 0x00002051, 0x00000043, 0x00000002, func_802A1494_78BA94, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_802A10AC_78B6AC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, func_802A1494_78BA94, 0x00000004, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, SetForegroundModelsVisible, 0x00000000, 0x00000043, 0x00000002, func_8024E664, 0x00000049, 0x00000043, 0x00000002, MoveBattleCamOver, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00002041, 0x00000043, 0x00000003, CreateNpc, 0x00000064, 0xFE363C80, 0x00000043, 0x00000001, func_802A14E8_78BAE8, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000064, 0x00040000, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0x00000064, 0xFFFFFFB5, 0x00000096, 0x00000000, 0x00000043, 0x00000004, SetNpcEffect, 0x00000064, 0x00000000, 0x00000005, 0x00000043, 0x00000004, func_802A116C_78B76C, 0xFFFFFFB5, 0x000000A7, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000064, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x00000008, 0x00000027, 0x00000002, 0xFE363C80, 0x00000043, 0x00000043, 0x00000005, SetNpcRotation, 0x00000064, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000064, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, UseCamPreset, 0x00000045, 0x00000057, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000032, 0x00000043, 0x00000008, NpcFlyTo, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000001E, 0x00000000, 0x0000000A, 0x00000043, 0x00000002, SetForegroundModelsVisible, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetOwnerID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000002, 0x00000043, 0x00000002, PlaySound, 0x00002047, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000005, GetNpcPos, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_802A1218_78B818, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000064, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x000002D0, 0x00000043, 0x00000005, MakeLerp, 0xFE363C82, 0xFE363C83, 0x0000001E, 0x00000002, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetNpcRotation, 0x00000064, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000003C, 0x00000043, 0x00000008, NpcFlyTo, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000000, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C81, 0x0000008C, 0x00000043, 0x00000008, NpcFlyTo, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000000, 0x0000000A, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000064, 0x00000000, 0x00000043, 0x00000002, DeleteNpc, 0x00000064, 0x00000012, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000002, 0x00000043, 0x00000002, PlaySound, 0x00002045, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000005, GetNpcPos, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_802A1218_78B818, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000064, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x000002D0, 0x00000043, 0x00000005, MakeLerp, 0xFE363C82, 0xFE363C83, 0x0000001E, 0x00000002, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetNpcRotation, 0x00000064, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000003C, 0x00000043, 0x00000008, NpcFlyTo, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000000, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C81, 0x0000008C, 0x00000043, 0x00000008, NpcFlyTo, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000000, 0x0000000A, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000064, 0x00000000, 0x00000043, 0x00000002, DeleteNpc, 0x00000064, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetOwnerID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000001, func_802A1414_78BA14, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000012, 0x00000000, 0x00000043, 0x00000001, func_802A1414_78BA14, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, SetGoalToHome, 0x00000100, 0x00000043, 0x00000003, SetActorSpeed, 0x00000100, 0xF24A9A80, 0x00000043, 0x00000002, func_802A1494_78BA94, 0x00000003, 0x00000043, 0x00000003, RunToGoal, 0x00000100, 0x00000000, 0x00000043, 0x00000002, func_802A1494_78BA94, 0x00000004, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000046, 0x00000001, D_802A1A70_78C070, 0x00000025, 0x00000002, 0xFE363C80, 0x00190001, 0x00000046, 0x00000001, 0x802A21A0, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000064, 0x00190002, 0x00000008, 0x00000001, 0x00000010, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, UseCamPreset, 0x00000002, 0x00000057, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000242, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000064, 0x00000001, 0x00000043, 0x00000002, func_802A1518_78BB18, 0x00000064, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000064, 0x00000000, 0x00000043, 0x00000002, DeleteNpc, 0x00000064, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000000, 0x00000027, 0x00000002, 0xFE363C81, 0x00000023, 0x00000043, 0x00000005, func_802A18E8_78BEE8, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000014, 0x00000027, 0x00000002, 0xFE363C81, 0x00000019, 0x00000043, 0x00000005, func_802A19A8_78BFA8, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000019, 0x00000043, 0x00000005, func_802D7520, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000043, 0x00000002, func_802A1840_78BE40, 0x00000005, 0x00000043, 0x00000002, func_802A1894_78BE94, 0x00000005, 0x00000043, 0x00000001, func_802A17D4_78BDD4, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000001, func_80276EFC, 0x00000046, 0x00000001, 0x802A27FC, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 +.word 0x00000043, 0x00000002, GetOwnerID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000045, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001001F, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000010, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, PlaySound, 0x00000241, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000F, 0x00000043, 0x00000004, battle_star_refresh_UnkStarFunc1, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000001, battle_star_refresh_FadeBackgroundToBlack, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001002C, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x00002051, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, battle_star_refresh_UnkStarFunc2, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001002A, 0x00000012, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000045, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, func_802A1494_78BA94, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000010, 0x00000043, 0x00000003, SetActorSpeed, 0x00000100, 0xF24A8A80, 0x00000043, 0x00000005, SetGoalPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, RunToGoal, 0x00000100, 0x00000000, 0x00000000, 0x00000043, 0x00000002, func_802A1494_78BA94, 0x00000004, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, PlaySound, 0x00000241, 0x00000043, 0x00000002, func_802A1494_78BA94, 0x00000001, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000F, 0x00000043, 0x00000004, battle_star_refresh_UnkStarFunc1, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000001, battle_star_refresh_FadeBackgroundToBlack, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, PlaySound, 0x00002051, 0x00000043, 0x00000002, func_802A1494_78BA94, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, battle_star_refresh_UnkStarFunc2, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, func_802A1494_78BA94, 0x00000004, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetOwnerID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000045, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001001F, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000010, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, PlaySound, 0x00000241, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000F, 0x00000043, 0x00000004, battle_star_refresh_UnkStarFunc1, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000001, battle_star_refresh_UnkBackgroundFunc2, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001002C, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x00002051, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, battle_star_refresh_UnkStarFunc2, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001002A, 0x00000012, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000045, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, func_802A1494_78BA94, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000010, 0x00000043, 0x00000003, SetActorSpeed, 0x00000100, 0xF24A8A80, 0x00000043, 0x00000005, SetGoalPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, RunToGoal, 0x00000100, 0x00000000, 0x00000000, 0x00000043, 0x00000002, func_802A1494_78BA94, 0x00000004, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, PlaySound, 0x00000241, 0x00000043, 0x00000002, func_802A1494_78BA94, 0x00000001, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000F, 0x00000043, 0x00000004, battle_star_refresh_UnkStarFunc1, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000001, battle_star_refresh_UnkBackgroundFunc2, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, PlaySound, 0x00002051, 0x00000043, 0x00000002, func_802A1494_78BA94, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, battle_star_refresh_UnkStarFunc2, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, func_802A1494_78BA94, 0x00000004, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, SetForegroundModelsVisible, 0x00000000, 0x00000043, 0x00000002, func_8024E664, 0x00000049, 0x00000043, 0x00000002, MoveBattleCamOver, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00002041, 0x00000043, 0x00000003, CreateNpc, 0x00000064, 0xFE363C80, 0x00000043, 0x00000001, battle_star_refresh_SetNpcCollision32, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000064, 0x00040000, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0x00000064, 0xFFFFFFB5, 0x00000096, 0x00000000, 0x00000043, 0x00000004, SetNpcEffect, 0x00000064, 0x00000000, 0x00000005, 0x00000043, 0x00000004, battle_star_refresh_UnkStarFunc3, 0xFFFFFFB5, 0x000000A7, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000064, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x00000008, 0x00000027, 0x00000002, 0xFE363C80, 0x00000043, 0x00000043, 0x00000005, SetNpcRotation, 0x00000064, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000064, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, UseCamPreset, 0x00000045, 0x00000057, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000032, 0x00000043, 0x00000008, NpcFlyTo, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000001E, 0x00000000, 0x0000000A, 0x00000043, 0x00000002, SetForegroundModelsVisible, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetOwnerID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000002, 0x00000043, 0x00000002, PlaySound, 0x00002047, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000005, GetNpcPos, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, battle_star_refresh_UnkStarFunc4, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000064, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x000002D0, 0x00000043, 0x00000005, MakeLerp, 0xFE363C82, 0xFE363C83, 0x0000001E, 0x00000002, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetNpcRotation, 0x00000064, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000003C, 0x00000043, 0x00000008, NpcFlyTo, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000000, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C81, 0x0000008C, 0x00000043, 0x00000008, NpcFlyTo, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000000, 0x0000000A, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000064, 0x00000000, 0x00000043, 0x00000002, DeleteNpc, 0x00000064, 0x00000012, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000002, 0x00000043, 0x00000002, PlaySound, 0x00002045, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000005, GetNpcPos, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, battle_star_refresh_UnkStarFunc4, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000064, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x000002D0, 0x00000043, 0x00000005, MakeLerp, 0xFE363C82, 0xFE363C83, 0x0000001E, 0x00000002, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetNpcRotation, 0x00000064, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000003C, 0x00000043, 0x00000008, NpcFlyTo, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000000, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C81, 0x0000008C, 0x00000043, 0x00000008, NpcFlyTo, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000000, 0x0000000A, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000064, 0x00000000, 0x00000043, 0x00000002, DeleteNpc, 0x00000064, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetOwnerID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000001, battle_star_refresh_UnkBackgroundFunc, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000012, 0x00000000, 0x00000043, 0x00000001, battle_star_refresh_UnkBackgroundFunc, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, SetGoalToHome, 0x00000100, 0x00000043, 0x00000003, SetActorSpeed, 0x00000100, 0xF24A9A80, 0x00000043, 0x00000002, func_802A1494_78BA94, 0x00000003, 0x00000043, 0x00000003, RunToGoal, 0x00000100, 0x00000000, 0x00000043, 0x00000002, func_802A1494_78BA94, 0x00000004, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000046, 0x00000001, D_802A1A70_78C070, 0x00000025, 0x00000002, 0xFE363C80, 0x00190001, 0x00000046, 0x00000001, 0x802A21A0, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000064, 0x00190002, 0x00000008, 0x00000001, 0x00000010, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, UseCamPreset, 0x00000002, 0x00000057, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000242, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000064, 0x00000001, 0x00000043, 0x00000002, func_802A1518_78BB18, 0x00000064, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000064, 0x00000000, 0x00000043, 0x00000002, DeleteNpc, 0x00000064, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000000, 0x00000027, 0x00000002, 0xFE363C81, 0x00000023, 0x00000043, 0x00000005, func_802A18E8_78BEE8, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000014, 0x00000027, 0x00000002, 0xFE363C81, 0x00000019, 0x00000043, 0x00000005, func_802A19A8_78BFA8, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000019, 0x00000043, 0x00000005, func_802D7520, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000043, 0x00000002, battle_star_refresh_AddHP, 0x00000005, 0x00000043, 0x00000002, battle_star_refresh_AddFP, 0x00000005, 0x00000043, 0x00000001, func_802A17D4_78BDD4, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000001, func_80276EFC, 0x00000046, 0x00000001, 0x802A27FC, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/battle/star/smooch_7923C0.data.s b/ver/us/asm/data/battle/star/smooch_7923C0.data.s index 4393f04e0a..0ea2fc3a01 100644 --- a/ver/us/asm/data/battle/star/smooch_7923C0.data.s +++ b/ver/us/asm/data/battle/star/smooch_7923C0.data.s @@ -3,4 +3,4 @@ .section .data glabel D_802A1630_7923C0 -.word 0x00000043, 0x00000002, GetOwnerID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000045, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001001F, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000010, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, PlaySound, 0x00000241, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000F, 0x00000043, 0x00000004, func_802A1000_791D90, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000001, battle_star_smooch_FadeBackgroundToBlack, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001002C, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x00002051, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_802A10AC_791E3C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001002A, 0x00000012, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000045, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, func_802A1494_792224, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000010, 0x00000043, 0x00000003, SetActorSpeed, 0x00000100, 0xF24A8A80, 0x00000043, 0x00000005, SetGoalPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, RunToGoal, 0x00000100, 0x00000000, 0x00000000, 0x00000043, 0x00000002, func_802A1494_792224, 0x00000004, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, PlaySound, 0x00000241, 0x00000043, 0x00000002, func_802A1494_792224, 0x00000001, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000F, 0x00000043, 0x00000004, func_802A1000_791D90, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000001, battle_star_smooch_FadeBackgroundToBlack, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, PlaySound, 0x00002051, 0x00000043, 0x00000002, func_802A1494_792224, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_802A10AC_791E3C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, func_802A1494_792224, 0x00000004, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetOwnerID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000045, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001001F, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000010, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, PlaySound, 0x00000241, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000F, 0x00000043, 0x00000004, func_802A1000_791D90, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000001, func_802A137C_79210C, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001002C, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x00002051, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_802A10AC_791E3C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001002A, 0x00000012, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000045, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, func_802A1494_792224, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000010, 0x00000043, 0x00000003, SetActorSpeed, 0x00000100, 0xF24A8A80, 0x00000043, 0x00000005, SetGoalPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, RunToGoal, 0x00000100, 0x00000000, 0x00000000, 0x00000043, 0x00000002, func_802A1494_792224, 0x00000004, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, PlaySound, 0x00000241, 0x00000043, 0x00000002, func_802A1494_792224, 0x00000001, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000F, 0x00000043, 0x00000004, func_802A1000_791D90, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000001, func_802A137C_79210C, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, PlaySound, 0x00002051, 0x00000043, 0x00000002, func_802A1494_792224, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_802A10AC_791E3C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, func_802A1494_792224, 0x00000004, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, SetForegroundModelsVisible, 0x00000000, 0x00000043, 0x00000002, func_8024E664, 0x00000049, 0x00000043, 0x00000002, MoveBattleCamOver, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00002041, 0x00000043, 0x00000003, CreateNpc, 0x00000064, 0xFE363C80, 0x00000043, 0x00000001, func_802A14E8_792278, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000064, 0x00040000, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0x00000064, 0xFFFFFFB5, 0x00000096, 0x00000000, 0x00000043, 0x00000004, SetNpcEffect, 0x00000064, 0x00000000, 0x00000005, 0x00000043, 0x00000004, func_802A116C_791EFC, 0xFFFFFFB5, 0x000000A7, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000064, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x00000008, 0x00000027, 0x00000002, 0xFE363C80, 0x00000043, 0x00000043, 0x00000005, SetNpcRotation, 0x00000064, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000064, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, UseCamPreset, 0x00000045, 0x00000057, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000032, 0x00000043, 0x00000008, NpcFlyTo, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000001E, 0x00000000, 0x0000000A, 0x00000043, 0x00000002, SetForegroundModelsVisible, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetOwnerID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000002, 0x00000043, 0x00000002, PlaySound, 0x00002047, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000005, GetNpcPos, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_802A1218_791FA8, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000064, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x000002D0, 0x00000043, 0x00000005, MakeLerp, 0xFE363C82, 0xFE363C83, 0x0000001E, 0x00000002, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetNpcRotation, 0x00000064, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000003C, 0x00000043, 0x00000008, NpcFlyTo, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000000, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C81, 0x0000008C, 0x00000043, 0x00000008, NpcFlyTo, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000000, 0x0000000A, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000064, 0x00000000, 0x00000043, 0x00000002, DeleteNpc, 0x00000064, 0x00000012, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000002, 0x00000043, 0x00000002, PlaySound, 0x00002045, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000005, GetNpcPos, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_802A1218_791FA8, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000064, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x000002D0, 0x00000043, 0x00000005, MakeLerp, 0xFE363C82, 0xFE363C83, 0x0000001E, 0x00000002, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetNpcRotation, 0x00000064, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000003C, 0x00000043, 0x00000008, NpcFlyTo, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000000, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C81, 0x0000008C, 0x00000043, 0x00000008, NpcFlyTo, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000000, 0x0000000A, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000064, 0x00000000, 0x00000043, 0x00000002, DeleteNpc, 0x00000064, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetOwnerID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000001, func_802A1414_7921A4, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000012, 0x00000000, 0x00000043, 0x00000001, func_802A1414_7921A4, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, SetGoalToHome, 0x00000100, 0x00000043, 0x00000003, SetActorSpeed, 0x00000100, 0xF24A9A80, 0x00000043, 0x00000002, func_802A1494_792224, 0x00000003, 0x00000043, 0x00000003, RunToGoal, 0x00000100, 0x00000000, 0x00000043, 0x00000002, func_802A1494_792224, 0x00000004, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000F, 0x0000000F, 0xFFFFFFDF, 0x0000001B, 0xFFFFFFEA, 0xFFFFFFE6, 0x0000000A, 0xFFFFFFDD, 0x00000023, 0x00000000, 0x00000046, 0x00000001, D_802A1630_7923C0, 0x00000025, 0x00000002, 0xFE363C80, 0x001D0000, 0x00000046, 0x00000001, 0x802A1D60, 0x00000008, 0x00000001, 0x00000010, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, SetNpcRotation, 0x00000064, 0x00000000, 0x000000B4, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, SetNpcRotation, 0x00000064, 0x00000000, 0x00000096, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, SetNpcRotation, 0x00000064, 0x00000000, 0x00000078, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, SetNpcRotation, 0x00000064, 0x00000000, 0x0000005A, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, SetNpcRotation, 0x00000064, 0x00000000, 0x0000003C, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, SetNpcRotation, 0x00000064, 0x00000000, 0x0000001E, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, SetNpcRotation, 0x00000064, 0x00000000, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000019, 0x00000027, 0x00000002, 0xFE363C80, 0x0000001E, 0x00000043, 0x00000008, NpcFlyTo, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000000, 0x0000000A, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000064, 0x001D0001, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C82, 0xFFFFFFFB, 0x00000043, 0x00000008, NpcFlyTo, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000A, 0x00000000, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x00000245, 0x00000056, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000040, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000030, 0x00000001, 0x802A24E8, 0x00000005, 0x00000001, 0x00000005, 0x00000032, 0x00000002, 0xFE363C85, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C81, 0x00000027, 0x00000002, 0xFE363C83, 0xFE363C85, 0x00000027, 0x00000002, 0xFE363C84, 0xFE363C86, 0x00000043, 0x0000000F, PlayEffect, 0x00000040, 0x00000002, 0xFE363C83, 0xFE363C84, 0xFE363C82, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C80, 0x00000005, 0x00000043, 0x00000004, func_802A1000_791D90, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000014, 0x00000027, 0x00000002, 0xFE363C80, 0x00000019, 0x00000043, 0x00000008, NpcFlyTo, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000A, 0x00000000, 0x0000000A, 0x00000057, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001002E, 0x00000008, 0x00000001, 0x0000000C, 0x00000056, 0x00000000, 0x00000046, 0x00000001, 0x802A1F6C, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetActorScale, 0xFFFFFF81, 0xF24A7E80, 0xF24A7E80, 0xF24A7E80, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, SetActorScale, 0xFFFFFF81, 0xF24A7EE7, 0xF24A7E80, 0xF24A7E80, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, SetActorScale, 0xFFFFFF81, 0xF24A7F4D, 0xF24A7E4D, 0xF24A7E80, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, SetActorScale, 0xFFFFFF81, 0xF24A7FB4, 0xF24A7E1A, 0xF24A7E80, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, SetActorScale, 0xFFFFFF81, 0xF24A7FE7, 0xF24A7DE7, 0xF24A7E80, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, SetActorScale, 0xFFFFFF81, 0xF24A8006, 0xF24A7DB4, 0xF24A7E80, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, SetActorScale, 0xFFFFFF81, 0xF24A801A, 0xF24A7DB4, 0xF24A7E80, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, SetActorScale, 0xFFFFFF81, 0xF24A7FB4, 0xF24A7DE7, 0xF24A7E80, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, SetActorScale, 0xFFFFFF81, 0xF24A7F4D, 0xF24A7E1A, 0xF24A7E80, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, SetActorScale, 0xFFFFFF81, 0xF24A7EE7, 0xF24A7E4D, 0xF24A7E80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000005, SetActorScale, 0xFFFFFF81, 0xF24A7E80, 0xF24A7E80, 0xF24A7E80, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, SetActorScale, 0xFFFFFF81, 0xF24A7EE7, 0xF24A7E80, 0xF24A7E80, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, SetActorScale, 0xFFFFFF81, 0xF24A7F4D, 0xF24A7E4D, 0xF24A7E80, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, SetActorScale, 0xFFFFFF81, 0xF24A7FB4, 0xF24A7E1A, 0xF24A7E80, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, SetActorScale, 0xFFFFFF81, 0xF24A7FE7, 0xF24A7DE7, 0xF24A7E80, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, SetActorScale, 0xFFFFFF81, 0xF24A8006, 0xF24A7DB4, 0xF24A7E80, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, SetActorScale, 0xFFFFFF81, 0xF24A801A, 0xF24A7DB4, 0xF24A7E80, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, SetActorScale, 0xFFFFFF81, 0xF24A7E1A, 0xF24A7FB4, 0xF24A7E80, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, SetActorScale, 0xFFFFFF81, 0xF24A7E1A, 0xF24A7F4D, 0xF24A7E80, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, SetActorScale, 0xFFFFFF81, 0xF24A7E4D, 0xF24A7EE7, 0xF24A7E80, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, SetActorScale, 0xFFFFFF81, 0xF24A7E80, 0xF24A7E80, 0xF24A7E80, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000057, 0x00000000, 0x00000005, 0x00000001, 0x0000000A, 0x00000008, 0x00000001, 0x00000003, 0x00000006, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000002, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000000, 0x00000027, 0x00000002, 0xFE363C81, 0x00000023, 0x00000043, 0x00000005, func_802A156C_7922FC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000019, 0x00000043, 0x00000005, func_802D7520, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000043, 0x00000002, func_802A1518_7922A8, 0x00000014, 0x00000056, 0x00000000, 0x00000043, 0x00000001, func_802A1414_7921A4, 0x00000057, 0x00000000, 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000160, 0x00000043, 0x00000003, SetActorJumpGravity, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00010008, 0x00010009, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_80273444, 0x00000014, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000043, 0x00000002, GetOwnerID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000045, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001001F, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000010, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, PlaySound, 0x00000241, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000F, 0x00000043, 0x00000004, battle_star_smooch_UnkStarFunc1, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000001, battle_star_smooch_FadeBackgroundToBlack, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001002C, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x00002051, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, battle_star_smooch_UnkStarFunc2, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001002A, 0x00000012, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000045, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, func_802A1494_792224, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000010, 0x00000043, 0x00000003, SetActorSpeed, 0x00000100, 0xF24A8A80, 0x00000043, 0x00000005, SetGoalPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, RunToGoal, 0x00000100, 0x00000000, 0x00000000, 0x00000043, 0x00000002, func_802A1494_792224, 0x00000004, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, PlaySound, 0x00000241, 0x00000043, 0x00000002, func_802A1494_792224, 0x00000001, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000F, 0x00000043, 0x00000004, battle_star_smooch_UnkStarFunc1, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000001, battle_star_smooch_FadeBackgroundToBlack, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, PlaySound, 0x00002051, 0x00000043, 0x00000002, func_802A1494_792224, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, battle_star_smooch_UnkStarFunc2, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, func_802A1494_792224, 0x00000004, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetOwnerID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000045, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001001F, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000010, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, PlaySound, 0x00000241, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000F, 0x00000043, 0x00000004, battle_star_smooch_UnkStarFunc1, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000001, battle_star_smooch_UnkBackgroundFunc2, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001002C, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x00002051, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, battle_star_smooch_UnkStarFunc2, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001002A, 0x00000012, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000045, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, func_802A1494_792224, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000010, 0x00000043, 0x00000003, SetActorSpeed, 0x00000100, 0xF24A8A80, 0x00000043, 0x00000005, SetGoalPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, RunToGoal, 0x00000100, 0x00000000, 0x00000000, 0x00000043, 0x00000002, func_802A1494_792224, 0x00000004, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, PlaySound, 0x00000241, 0x00000043, 0x00000002, func_802A1494_792224, 0x00000001, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000F, 0x00000043, 0x00000004, battle_star_smooch_UnkStarFunc1, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000001, battle_star_smooch_UnkBackgroundFunc2, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, PlaySound, 0x00002051, 0x00000043, 0x00000002, func_802A1494_792224, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, battle_star_smooch_UnkStarFunc2, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, func_802A1494_792224, 0x00000004, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, SetForegroundModelsVisible, 0x00000000, 0x00000043, 0x00000002, func_8024E664, 0x00000049, 0x00000043, 0x00000002, MoveBattleCamOver, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00002041, 0x00000043, 0x00000003, CreateNpc, 0x00000064, 0xFE363C80, 0x00000043, 0x00000001, battle_star_smooch_SetNpcCollision32, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000064, 0x00040000, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0x00000064, 0xFFFFFFB5, 0x00000096, 0x00000000, 0x00000043, 0x00000004, SetNpcEffect, 0x00000064, 0x00000000, 0x00000005, 0x00000043, 0x00000004, battle_star_smooch_UnkStarFunc3, 0xFFFFFFB5, 0x000000A7, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000064, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x00000008, 0x00000027, 0x00000002, 0xFE363C80, 0x00000043, 0x00000043, 0x00000005, SetNpcRotation, 0x00000064, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000064, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, UseCamPreset, 0x00000045, 0x00000057, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000032, 0x00000043, 0x00000008, NpcFlyTo, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000001E, 0x00000000, 0x0000000A, 0x00000043, 0x00000002, SetForegroundModelsVisible, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetOwnerID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000002, 0x00000043, 0x00000002, PlaySound, 0x00002047, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000005, GetNpcPos, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, battle_star_smooch_UnkStarFunc4, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000064, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x000002D0, 0x00000043, 0x00000005, MakeLerp, 0xFE363C82, 0xFE363C83, 0x0000001E, 0x00000002, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetNpcRotation, 0x00000064, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000003C, 0x00000043, 0x00000008, NpcFlyTo, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000000, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C81, 0x0000008C, 0x00000043, 0x00000008, NpcFlyTo, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000000, 0x0000000A, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000064, 0x00000000, 0x00000043, 0x00000002, DeleteNpc, 0x00000064, 0x00000012, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000002, 0x00000043, 0x00000002, PlaySound, 0x00002045, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000005, GetNpcPos, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, battle_star_smooch_UnkStarFunc4, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000064, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x000002D0, 0x00000043, 0x00000005, MakeLerp, 0xFE363C82, 0xFE363C83, 0x0000001E, 0x00000002, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetNpcRotation, 0x00000064, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000003C, 0x00000043, 0x00000008, NpcFlyTo, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000000, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C81, 0x0000008C, 0x00000043, 0x00000008, NpcFlyTo, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000000, 0x0000000A, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000064, 0x00000000, 0x00000043, 0x00000002, DeleteNpc, 0x00000064, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetOwnerID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000001, battle_star_smooch_UnkBackgroundFunc, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000012, 0x00000000, 0x00000043, 0x00000001, battle_star_smooch_UnkBackgroundFunc, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, SetGoalToHome, 0x00000100, 0x00000043, 0x00000003, SetActorSpeed, 0x00000100, 0xF24A9A80, 0x00000043, 0x00000002, func_802A1494_792224, 0x00000003, 0x00000043, 0x00000003, RunToGoal, 0x00000100, 0x00000000, 0x00000043, 0x00000002, func_802A1494_792224, 0x00000004, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000F, 0x0000000F, 0xFFFFFFDF, 0x0000001B, 0xFFFFFFEA, 0xFFFFFFE6, 0x0000000A, 0xFFFFFFDD, 0x00000023, 0x00000000, 0x00000046, 0x00000001, D_802A1630_7923C0, 0x00000025, 0x00000002, 0xFE363C80, 0x001D0000, 0x00000046, 0x00000001, 0x802A1D60, 0x00000008, 0x00000001, 0x00000010, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, SetNpcRotation, 0x00000064, 0x00000000, 0x000000B4, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, SetNpcRotation, 0x00000064, 0x00000000, 0x00000096, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, SetNpcRotation, 0x00000064, 0x00000000, 0x00000078, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, SetNpcRotation, 0x00000064, 0x00000000, 0x0000005A, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, SetNpcRotation, 0x00000064, 0x00000000, 0x0000003C, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, SetNpcRotation, 0x00000064, 0x00000000, 0x0000001E, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, SetNpcRotation, 0x00000064, 0x00000000, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000019, 0x00000027, 0x00000002, 0xFE363C80, 0x0000001E, 0x00000043, 0x00000008, NpcFlyTo, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000000, 0x0000000A, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000064, 0x001D0001, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C82, 0xFFFFFFFB, 0x00000043, 0x00000008, NpcFlyTo, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000A, 0x00000000, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x00000245, 0x00000056, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000040, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000030, 0x00000001, 0x802A24E8, 0x00000005, 0x00000001, 0x00000005, 0x00000032, 0x00000002, 0xFE363C85, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C81, 0x00000027, 0x00000002, 0xFE363C83, 0xFE363C85, 0x00000027, 0x00000002, 0xFE363C84, 0xFE363C86, 0x00000043, 0x0000000F, PlayEffect, 0x00000040, 0x00000002, 0xFE363C83, 0xFE363C84, 0xFE363C82, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C80, 0x00000005, 0x00000043, 0x00000004, battle_star_smooch_UnkStarFunc1, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000014, 0x00000027, 0x00000002, 0xFE363C80, 0x00000019, 0x00000043, 0x00000008, NpcFlyTo, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000A, 0x00000000, 0x0000000A, 0x00000057, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001002E, 0x00000008, 0x00000001, 0x0000000C, 0x00000056, 0x00000000, 0x00000046, 0x00000001, 0x802A1F6C, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetActorScale, 0xFFFFFF81, 0xF24A7E80, 0xF24A7E80, 0xF24A7E80, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, SetActorScale, 0xFFFFFF81, 0xF24A7EE7, 0xF24A7E80, 0xF24A7E80, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, SetActorScale, 0xFFFFFF81, 0xF24A7F4D, 0xF24A7E4D, 0xF24A7E80, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, SetActorScale, 0xFFFFFF81, 0xF24A7FB4, 0xF24A7E1A, 0xF24A7E80, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, SetActorScale, 0xFFFFFF81, 0xF24A7FE7, 0xF24A7DE7, 0xF24A7E80, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, SetActorScale, 0xFFFFFF81, 0xF24A8006, 0xF24A7DB4, 0xF24A7E80, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, SetActorScale, 0xFFFFFF81, 0xF24A801A, 0xF24A7DB4, 0xF24A7E80, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, SetActorScale, 0xFFFFFF81, 0xF24A7FB4, 0xF24A7DE7, 0xF24A7E80, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, SetActorScale, 0xFFFFFF81, 0xF24A7F4D, 0xF24A7E1A, 0xF24A7E80, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, SetActorScale, 0xFFFFFF81, 0xF24A7EE7, 0xF24A7E4D, 0xF24A7E80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000005, SetActorScale, 0xFFFFFF81, 0xF24A7E80, 0xF24A7E80, 0xF24A7E80, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, SetActorScale, 0xFFFFFF81, 0xF24A7EE7, 0xF24A7E80, 0xF24A7E80, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, SetActorScale, 0xFFFFFF81, 0xF24A7F4D, 0xF24A7E4D, 0xF24A7E80, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, SetActorScale, 0xFFFFFF81, 0xF24A7FB4, 0xF24A7E1A, 0xF24A7E80, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, SetActorScale, 0xFFFFFF81, 0xF24A7FE7, 0xF24A7DE7, 0xF24A7E80, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, SetActorScale, 0xFFFFFF81, 0xF24A8006, 0xF24A7DB4, 0xF24A7E80, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, SetActorScale, 0xFFFFFF81, 0xF24A801A, 0xF24A7DB4, 0xF24A7E80, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, SetActorScale, 0xFFFFFF81, 0xF24A7E1A, 0xF24A7FB4, 0xF24A7E80, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, SetActorScale, 0xFFFFFF81, 0xF24A7E1A, 0xF24A7F4D, 0xF24A7E80, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, SetActorScale, 0xFFFFFF81, 0xF24A7E4D, 0xF24A7EE7, 0xF24A7E80, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, SetActorScale, 0xFFFFFF81, 0xF24A7E80, 0xF24A7E80, 0xF24A7E80, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000057, 0x00000000, 0x00000005, 0x00000001, 0x0000000A, 0x00000008, 0x00000001, 0x00000003, 0x00000006, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000002, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000000, 0x00000027, 0x00000002, 0xFE363C81, 0x00000023, 0x00000043, 0x00000005, func_802A156C_7922FC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000019, 0x00000043, 0x00000005, func_802D7520, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000043, 0x00000002, battle_star_smooch_AddHP, 0x00000014, 0x00000056, 0x00000000, 0x00000043, 0x00000001, battle_star_smooch_UnkBackgroundFunc, 0x00000057, 0x00000000, 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000160, 0x00000043, 0x00000003, SetActorJumpGravity, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00010008, 0x00010009, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_80273444, 0x00000014, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/battle/star/star_beam_7984B0.data.s b/ver/us/asm/data/battle/star/star_beam_7984B0.data.s index e4b172861e..5aed08ecd6 100644 --- a/ver/us/asm/data/battle/star/star_beam_7984B0.data.s +++ b/ver/us/asm/data/battle/star/star_beam_7984B0.data.s @@ -3,7 +3,7 @@ .section .data glabel D_802A24F0_7984B0 -.word 0x00000043, 0x00000002, GetOwnerID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000045, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001001F, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000010, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, PlaySound, 0x00000241, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000F, 0x00000043, 0x00000004, func_802A1000_796FC0, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000001, battle_star_star_beam_FadeBackgroundToBlack, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001002C, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x00002051, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_802A10AC_79706C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001002A, 0x00000012, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000045, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, func_802A1494_797454, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000010, 0x00000043, 0x00000003, SetActorSpeed, 0x00000100, 0xF24A8A80, 0x00000043, 0x00000005, SetGoalPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, RunToGoal, 0x00000100, 0x00000000, 0x00000000, 0x00000043, 0x00000002, func_802A1494_797454, 0x00000004, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, PlaySound, 0x00000241, 0x00000043, 0x00000002, func_802A1494_797454, 0x00000001, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000F, 0x00000043, 0x00000004, func_802A1000_796FC0, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000001, battle_star_star_beam_FadeBackgroundToBlack, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, PlaySound, 0x00002051, 0x00000043, 0x00000002, func_802A1494_797454, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_802A10AC_79706C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, func_802A1494_797454, 0x00000004, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetOwnerID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000045, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001001F, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000010, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, PlaySound, 0x00000241, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000F, 0x00000043, 0x00000004, func_802A1000_796FC0, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000001, func_802A137C_79733C, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001002C, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x00002051, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_802A10AC_79706C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001002A, 0x00000012, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000045, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, func_802A1494_797454, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000010, 0x00000043, 0x00000003, SetActorSpeed, 0x00000100, 0xF24A8A80, 0x00000043, 0x00000005, SetGoalPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, RunToGoal, 0x00000100, 0x00000000, 0x00000000, 0x00000043, 0x00000002, func_802A1494_797454, 0x00000004, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, PlaySound, 0x00000241, 0x00000043, 0x00000002, func_802A1494_797454, 0x00000001, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000F, 0x00000043, 0x00000004, func_802A1000_796FC0, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000001, func_802A137C_79733C, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, PlaySound, 0x00002051, 0x00000043, 0x00000002, func_802A1494_797454, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_802A10AC_79706C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, func_802A1494_797454, 0x00000004, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, SetForegroundModelsVisible, 0x00000000, 0x00000043, 0x00000002, func_8024E664, 0x00000049, 0x00000043, 0x00000002, MoveBattleCamOver, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00002041, 0x00000043, 0x00000003, CreateNpc, 0x00000064, 0xFE363C80, 0x00000043, 0x00000001, func_802A14E8_7974A8, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000064, 0x00040000, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0x00000064, 0xFFFFFFB5, 0x00000096, 0x00000000, 0x00000043, 0x00000004, SetNpcEffect, 0x00000064, 0x00000000, 0x00000005, 0x00000043, 0x00000004, func_802A116C_79712C, 0xFFFFFFB5, 0x000000A7, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000064, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x00000008, 0x00000027, 0x00000002, 0xFE363C80, 0x00000043, 0x00000043, 0x00000005, SetNpcRotation, 0x00000064, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000064, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, UseCamPreset, 0x00000045, 0x00000057, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000032, 0x00000043, 0x00000008, NpcFlyTo, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000001E, 0x00000000, 0x0000000A, 0x00000043, 0x00000002, SetForegroundModelsVisible, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetOwnerID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000002, 0x00000043, 0x00000002, PlaySound, 0x00002047, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000005, GetNpcPos, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_802A1218_7971D8, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000064, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x000002D0, 0x00000043, 0x00000005, MakeLerp, 0xFE363C82, 0xFE363C83, 0x0000001E, 0x00000002, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetNpcRotation, 0x00000064, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000003C, 0x00000043, 0x00000008, NpcFlyTo, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000000, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C81, 0x0000008C, 0x00000043, 0x00000008, NpcFlyTo, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000000, 0x0000000A, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000064, 0x00000000, 0x00000043, 0x00000002, DeleteNpc, 0x00000064, 0x00000012, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000002, 0x00000043, 0x00000002, PlaySound, 0x00002045, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000005, GetNpcPos, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_802A1218_7971D8, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000064, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x000002D0, 0x00000043, 0x00000005, MakeLerp, 0xFE363C82, 0xFE363C83, 0x0000001E, 0x00000002, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetNpcRotation, 0x00000064, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000003C, 0x00000043, 0x00000008, NpcFlyTo, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000000, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C81, 0x0000008C, 0x00000043, 0x00000008, NpcFlyTo, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000000, 0x0000000A, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000064, 0x00000000, 0x00000043, 0x00000002, DeleteNpc, 0x00000064, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetOwnerID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000001, func_802A1414_7973D4, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000012, 0x00000000, 0x00000043, 0x00000001, func_802A1414_7973D4, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, SetGoalToHome, 0x00000100, 0x00000043, 0x00000003, SetActorSpeed, 0x00000100, 0xF24A9A80, 0x00000043, 0x00000002, func_802A1494_797454, 0x00000003, 0x00000043, 0x00000003, RunToGoal, 0x00000100, 0x00000000, 0x00000043, 0x00000002, func_802A1494_797454, 0x00000004, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, GetOwnerID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000045, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001001F, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000010, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, PlaySound, 0x00000241, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000F, 0x00000043, 0x00000004, battle_star_star_beam_UnkStarFunc1, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000001, battle_star_star_beam_FadeBackgroundToBlack, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001002C, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x00002051, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, battle_star_star_beam_UnkStarFunc2, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001002A, 0x00000012, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000045, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, func_802A1494_797454, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000010, 0x00000043, 0x00000003, SetActorSpeed, 0x00000100, 0xF24A8A80, 0x00000043, 0x00000005, SetGoalPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, RunToGoal, 0x00000100, 0x00000000, 0x00000000, 0x00000043, 0x00000002, func_802A1494_797454, 0x00000004, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, PlaySound, 0x00000241, 0x00000043, 0x00000002, func_802A1494_797454, 0x00000001, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000F, 0x00000043, 0x00000004, battle_star_star_beam_UnkStarFunc1, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000001, battle_star_star_beam_FadeBackgroundToBlack, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, PlaySound, 0x00002051, 0x00000043, 0x00000002, func_802A1494_797454, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, battle_star_star_beam_UnkStarFunc2, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, func_802A1494_797454, 0x00000004, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetOwnerID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000045, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001001F, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000010, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, PlaySound, 0x00000241, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000F, 0x00000043, 0x00000004, battle_star_star_beam_UnkStarFunc1, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000001, battle_star_star_beam_UnkBackgroundFunc2, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001002C, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x00002051, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, battle_star_star_beam_UnkStarFunc2, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001002A, 0x00000012, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000045, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, func_802A1494_797454, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000010, 0x00000043, 0x00000003, SetActorSpeed, 0x00000100, 0xF24A8A80, 0x00000043, 0x00000005, SetGoalPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, RunToGoal, 0x00000100, 0x00000000, 0x00000000, 0x00000043, 0x00000002, func_802A1494_797454, 0x00000004, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, PlaySound, 0x00000241, 0x00000043, 0x00000002, func_802A1494_797454, 0x00000001, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000F, 0x00000043, 0x00000004, battle_star_star_beam_UnkStarFunc1, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000001, battle_star_star_beam_UnkBackgroundFunc2, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, PlaySound, 0x00002051, 0x00000043, 0x00000002, func_802A1494_797454, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, battle_star_star_beam_UnkStarFunc2, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, func_802A1494_797454, 0x00000004, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, SetForegroundModelsVisible, 0x00000000, 0x00000043, 0x00000002, func_8024E664, 0x00000049, 0x00000043, 0x00000002, MoveBattleCamOver, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00002041, 0x00000043, 0x00000003, CreateNpc, 0x00000064, 0xFE363C80, 0x00000043, 0x00000001, battle_star_star_beam_SetNpcCollision32, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000064, 0x00040000, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0x00000064, 0xFFFFFFB5, 0x00000096, 0x00000000, 0x00000043, 0x00000004, SetNpcEffect, 0x00000064, 0x00000000, 0x00000005, 0x00000043, 0x00000004, battle_star_star_beam_UnkStarFunc3, 0xFFFFFFB5, 0x000000A7, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000064, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x00000008, 0x00000027, 0x00000002, 0xFE363C80, 0x00000043, 0x00000043, 0x00000005, SetNpcRotation, 0x00000064, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000064, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, UseCamPreset, 0x00000045, 0x00000057, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000032, 0x00000043, 0x00000008, NpcFlyTo, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000001E, 0x00000000, 0x0000000A, 0x00000043, 0x00000002, SetForegroundModelsVisible, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetOwnerID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000002, 0x00000043, 0x00000002, PlaySound, 0x00002047, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000005, GetNpcPos, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, battle_star_star_beam_UnkStarFunc4, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000064, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x000002D0, 0x00000043, 0x00000005, MakeLerp, 0xFE363C82, 0xFE363C83, 0x0000001E, 0x00000002, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetNpcRotation, 0x00000064, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000003C, 0x00000043, 0x00000008, NpcFlyTo, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000000, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C81, 0x0000008C, 0x00000043, 0x00000008, NpcFlyTo, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000000, 0x0000000A, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000064, 0x00000000, 0x00000043, 0x00000002, DeleteNpc, 0x00000064, 0x00000012, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000002, 0x00000043, 0x00000002, PlaySound, 0x00002045, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000005, GetNpcPos, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, battle_star_star_beam_UnkStarFunc4, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000064, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x000002D0, 0x00000043, 0x00000005, MakeLerp, 0xFE363C82, 0xFE363C83, 0x0000001E, 0x00000002, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetNpcRotation, 0x00000064, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000003C, 0x00000043, 0x00000008, NpcFlyTo, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000000, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C81, 0x0000008C, 0x00000043, 0x00000008, NpcFlyTo, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000000, 0x0000000A, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000064, 0x00000000, 0x00000043, 0x00000002, DeleteNpc, 0x00000064, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetOwnerID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000001, battle_star_star_beam_UnkBackgroundFunc, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000012, 0x00000000, 0x00000043, 0x00000001, battle_star_star_beam_UnkBackgroundFunc, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, SetGoalToHome, 0x00000100, 0x00000043, 0x00000003, SetActorSpeed, 0x00000100, 0xF24A9A80, 0x00000043, 0x00000002, func_802A1494_797454, 0x00000003, 0x00000043, 0x00000003, RunToGoal, 0x00000100, 0x00000000, 0x00000043, 0x00000002, func_802A1494_797454, 0x00000004, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 glabel D_802A33A8_799368 .word 0x00000056, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000038, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xF24A7E80, 0x00000064, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x0000000F, PlayEffect, 0x00000038, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xF24A7E80, 0x00000064, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000001, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x0000000F, PlayEffect, 0x00000038, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xF24A7E80, 0x00000064, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x0000000F, PlayEffect, 0x00000052, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xF24A7E80, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/battle/star/star_storm_78EEB0.data.s b/ver/us/asm/data/battle/star/star_storm_78EEB0.data.s deleted file mode 100644 index 60954405e1..0000000000 --- a/ver/us/asm/data/battle/star/star_storm_78EEB0.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -glabel D_802A16E0_78EEB0 -.word 0x27BD0030, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, GetOwnerID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000045, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001001F, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000010, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, PlaySound, 0x00000241, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000F, 0x00000043, 0x00000004, func_802A1000_78E7D0, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000001, battle_star_star_storm_FadeBackgroundToBlack, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001002C, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x00002051, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_802A10AC_78E87C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001002A, 0x00000012, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000045, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, func_802A1494_78EC64, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000010, 0x00000043, 0x00000003, SetActorSpeed, 0x00000100, 0xF24A8A80, 0x00000043, 0x00000005, SetGoalPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, RunToGoal, 0x00000100, 0x00000000, 0x00000000, 0x00000043, 0x00000002, func_802A1494_78EC64, 0x00000004, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, PlaySound, 0x00000241, 0x00000043, 0x00000002, func_802A1494_78EC64, 0x00000001, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000F, 0x00000043, 0x00000004, func_802A1000_78E7D0, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000001, battle_star_star_storm_FadeBackgroundToBlack, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, PlaySound, 0x00002051, 0x00000043, 0x00000002, func_802A1494_78EC64, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_802A10AC_78E87C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, func_802A1494_78EC64, 0x00000004, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetOwnerID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000045, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001001F, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000010, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, PlaySound, 0x00000241, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000F, 0x00000043, 0x00000004, func_802A1000_78E7D0, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000001, func_802A137C_78EB4C, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001002C, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x00002051, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_802A10AC_78E87C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001002A, 0x00000012, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000045, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, func_802A1494_78EC64, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000010, 0x00000043, 0x00000003, SetActorSpeed, 0x00000100, 0xF24A8A80, 0x00000043, 0x00000005, SetGoalPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, RunToGoal, 0x00000100, 0x00000000, 0x00000000, 0x00000043, 0x00000002, func_802A1494_78EC64, 0x00000004, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, PlaySound, 0x00000241, 0x00000043, 0x00000002, func_802A1494_78EC64, 0x00000001, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000F, 0x00000043, 0x00000004, func_802A1000_78E7D0, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000001, func_802A137C_78EB4C, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, PlaySound, 0x00002051, 0x00000043, 0x00000002, func_802A1494_78EC64, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_802A10AC_78E87C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, func_802A1494_78EC64, 0x00000004, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, SetForegroundModelsVisible, 0x00000000, 0x00000043, 0x00000002, func_8024E664, 0x00000049, 0x00000043, 0x00000002, MoveBattleCamOver, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00002041, 0x00000043, 0x00000003, CreateNpc, 0x00000064, 0xFE363C80, 0x00000043, 0x00000001, func_802A14E8_78ECB8, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000064, 0x00040000, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0x00000064, 0xFFFFFFB5, 0x00000096, 0x00000000, 0x00000043, 0x00000004, SetNpcEffect, 0x00000064, 0x00000000, 0x00000005, 0x00000043, 0x00000004, func_802A116C_78E93C, 0xFFFFFFB5, 0x000000A7, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000064, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x00000008, 0x00000027, 0x00000002, 0xFE363C80, 0x00000043, 0x00000043, 0x00000005, SetNpcRotation, 0x00000064, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000064, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, UseCamPreset, 0x00000045, 0x00000057, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000032, 0x00000043, 0x00000008, NpcFlyTo, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000001E, 0x00000000, 0x0000000A, 0x00000043, 0x00000002, SetForegroundModelsVisible, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetOwnerID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000002, 0x00000043, 0x00000002, PlaySound, 0x00002047, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000005, GetNpcPos, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_802A1218_78E9E8, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000064, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x000002D0, 0x00000043, 0x00000005, MakeLerp, 0xFE363C82, 0xFE363C83, 0x0000001E, 0x00000002, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetNpcRotation, 0x00000064, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000003C, 0x00000043, 0x00000008, NpcFlyTo, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000000, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C81, 0x0000008C, 0x00000043, 0x00000008, NpcFlyTo, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000000, 0x0000000A, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000064, 0x00000000, 0x00000043, 0x00000002, DeleteNpc, 0x00000064, 0x00000012, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000002, 0x00000043, 0x00000002, PlaySound, 0x00002045, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000005, GetNpcPos, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_802A1218_78E9E8, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000064, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x000002D0, 0x00000043, 0x00000005, MakeLerp, 0xFE363C82, 0xFE363C83, 0x0000001E, 0x00000002, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetNpcRotation, 0x00000064, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000003C, 0x00000043, 0x00000008, NpcFlyTo, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000000, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C81, 0x0000008C, 0x00000043, 0x00000008, NpcFlyTo, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000000, 0x0000000A, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000064, 0x00000000, 0x00000043, 0x00000002, DeleteNpc, 0x00000064, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetOwnerID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000001, func_802A1414_78EBE4, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000012, 0x00000000, 0x00000043, 0x00000001, func_802A1414_78EBE4, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, SetGoalToHome, 0x00000100, 0x00000043, 0x00000003, SetActorSpeed, 0x00000100, 0xF24A9A80, 0x00000043, 0x00000002, func_802A1494_78EC64, 0x00000003, 0x00000043, 0x00000003, RunToGoal, 0x00000100, 0x00000000, 0x00000043, 0x00000002, func_802A1494_78EC64, 0x00000004, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000046, 0x00000001, 0x802A16F0, 0x00000025, 0x00000002, 0xFE363C80, 0x001B0001, 0x00000046, 0x00000001, 0x802A1E20, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000064, 0x001B0002, 0x00000008, 0x00000001, 0x00000010, 0x00000043, 0x00000002, UseCamPreset, 0x00000003, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x00000259, 0x00000043, 0x00000001, func_802A1518_78ECE8, 0x00000008, 0x00000001, 0x00000005, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x0000025A, 0x00000043, 0x00000001, func_802A1518_78ECE8, 0x00000008, 0x00000001, 0x00000005, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000032, 0x00000005, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x0000025C, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, PlaySound, 0x0000025D, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000008, 0x00000001, 0x00000005, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x0000000A, 0x00000008, 0x00000001, 0x00000007, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000005, 0xF24A7E80, 0x00000043, 0x00000002, StartRumble, 0x00000008, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000005A, 0x00000043, 0x00000001, InitTargetIterator, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetGoalToTarget, 0xFFFFFF81, 0x00000043, 0x00000006, ItemCheckHit, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000006, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000005, GetGoalPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_802A1628_78EDF8, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, ItemDamageEnemy, 0xFE363C80, 0x38000100, 0x00000000, 0x00000007, 0x00000020, 0x00000003, 0x00000001, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, ChooseNextTarget, 0x00000000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000046, 0x00000001, 0x802A202C, 0x00000043, 0x00000001, func_80276EFC, 0x00000046, 0x00000001, 0x802A247C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/battle/star/star_storm_78EEC0.data.s b/ver/us/asm/data/battle/star/star_storm_78EEC0.data.s new file mode 100644 index 0000000000..7e85549dd8 --- /dev/null +++ b/ver/us/asm/data/battle/star/star_storm_78EEC0.data.s @@ -0,0 +1,6 @@ +.include "macro.inc" + +.section .data + +glabel D_802A16F0_78EEC0 +.word 0x00000043, 0x00000002, GetOwnerID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000045, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001001F, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000010, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, PlaySound, 0x00000241, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000F, 0x00000043, 0x00000004, battle_star_star_storm_UnkStarFunc1, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000001, battle_star_star_storm_FadeBackgroundToBlack, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001002C, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x00002051, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, battle_star_star_storm_UnkStarFunc2, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001002A, 0x00000012, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000045, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, func_802A1494_78EC64, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000010, 0x00000043, 0x00000003, SetActorSpeed, 0x00000100, 0xF24A8A80, 0x00000043, 0x00000005, SetGoalPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, RunToGoal, 0x00000100, 0x00000000, 0x00000000, 0x00000043, 0x00000002, func_802A1494_78EC64, 0x00000004, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, PlaySound, 0x00000241, 0x00000043, 0x00000002, func_802A1494_78EC64, 0x00000001, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000F, 0x00000043, 0x00000004, battle_star_star_storm_UnkStarFunc1, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000001, battle_star_star_storm_FadeBackgroundToBlack, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, PlaySound, 0x00002051, 0x00000043, 0x00000002, func_802A1494_78EC64, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, battle_star_star_storm_UnkStarFunc2, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, func_802A1494_78EC64, 0x00000004, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetOwnerID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000045, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001001F, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000010, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, PlaySound, 0x00000241, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000F, 0x00000043, 0x00000004, battle_star_star_storm_UnkStarFunc1, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000001, battle_star_star_storm_UnkBackgroundFunc2, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001002C, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x00002051, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, battle_star_star_storm_UnkStarFunc2, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001002A, 0x00000012, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000045, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, func_802A1494_78EC64, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000010, 0x00000043, 0x00000003, SetActorSpeed, 0x00000100, 0xF24A8A80, 0x00000043, 0x00000005, SetGoalPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, RunToGoal, 0x00000100, 0x00000000, 0x00000000, 0x00000043, 0x00000002, func_802A1494_78EC64, 0x00000004, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, PlaySound, 0x00000241, 0x00000043, 0x00000002, func_802A1494_78EC64, 0x00000001, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000F, 0x00000043, 0x00000004, battle_star_star_storm_UnkStarFunc1, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000001, battle_star_star_storm_UnkBackgroundFunc2, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, PlaySound, 0x00002051, 0x00000043, 0x00000002, func_802A1494_78EC64, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, battle_star_star_storm_UnkStarFunc2, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, func_802A1494_78EC64, 0x00000004, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, SetForegroundModelsVisible, 0x00000000, 0x00000043, 0x00000002, func_8024E664, 0x00000049, 0x00000043, 0x00000002, MoveBattleCamOver, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00002041, 0x00000043, 0x00000003, CreateNpc, 0x00000064, 0xFE363C80, 0x00000043, 0x00000001, battle_star_star_storm_SetNpcCollision32, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000064, 0x00040000, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0x00000064, 0xFFFFFFB5, 0x00000096, 0x00000000, 0x00000043, 0x00000004, SetNpcEffect, 0x00000064, 0x00000000, 0x00000005, 0x00000043, 0x00000004, battle_star_star_storm_UnkStarFunc3, 0xFFFFFFB5, 0x000000A7, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000064, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x00000008, 0x00000027, 0x00000002, 0xFE363C80, 0x00000043, 0x00000043, 0x00000005, SetNpcRotation, 0x00000064, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000064, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, UseCamPreset, 0x00000045, 0x00000057, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000032, 0x00000043, 0x00000008, NpcFlyTo, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000001E, 0x00000000, 0x0000000A, 0x00000043, 0x00000002, SetForegroundModelsVisible, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetOwnerID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000002, 0x00000043, 0x00000002, PlaySound, 0x00002047, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000005, GetNpcPos, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, battle_star_star_storm_UnkStarFunc4, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000064, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x000002D0, 0x00000043, 0x00000005, MakeLerp, 0xFE363C82, 0xFE363C83, 0x0000001E, 0x00000002, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetNpcRotation, 0x00000064, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000003C, 0x00000043, 0x00000008, NpcFlyTo, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000000, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C81, 0x0000008C, 0x00000043, 0x00000008, NpcFlyTo, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000000, 0x0000000A, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000064, 0x00000000, 0x00000043, 0x00000002, DeleteNpc, 0x00000064, 0x00000012, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000002, 0x00000043, 0x00000002, PlaySound, 0x00002045, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000005, GetNpcPos, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, battle_star_star_storm_UnkStarFunc4, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000064, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x000002D0, 0x00000043, 0x00000005, MakeLerp, 0xFE363C82, 0xFE363C83, 0x0000001E, 0x00000002, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetNpcRotation, 0x00000064, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000003C, 0x00000043, 0x00000008, NpcFlyTo, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000000, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C81, 0x0000008C, 0x00000043, 0x00000008, NpcFlyTo, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000000, 0x0000000A, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000064, 0x00000000, 0x00000043, 0x00000002, DeleteNpc, 0x00000064, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetOwnerID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000001, battle_star_star_storm_UnkBackgroundFunc, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000012, 0x00000000, 0x00000043, 0x00000001, battle_star_star_storm_UnkBackgroundFunc, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, SetGoalToHome, 0x00000100, 0x00000043, 0x00000003, SetActorSpeed, 0x00000100, 0xF24A9A80, 0x00000043, 0x00000002, func_802A1494_78EC64, 0x00000003, 0x00000043, 0x00000003, RunToGoal, 0x00000100, 0x00000000, 0x00000043, 0x00000002, func_802A1494_78EC64, 0x00000004, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000046, 0x00000001, D_802A16F0_78EEC0, 0x00000025, 0x00000002, 0xFE363C80, 0x001B0001, 0x00000046, 0x00000001, 0x802A1E20, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000064, 0x001B0002, 0x00000008, 0x00000001, 0x00000010, 0x00000043, 0x00000002, UseCamPreset, 0x00000003, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x00000259, 0x00000043, 0x00000001, func_802A1518_78ECE8, 0x00000008, 0x00000001, 0x00000005, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x0000025A, 0x00000043, 0x00000001, func_802A1518_78ECE8, 0x00000008, 0x00000001, 0x00000005, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000032, 0x00000005, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x0000025C, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, PlaySound, 0x0000025D, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000008, 0x00000001, 0x00000005, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x0000000A, 0x00000008, 0x00000001, 0x00000007, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000005, 0xF24A7E80, 0x00000043, 0x00000002, StartRumble, 0x00000008, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000005A, 0x00000043, 0x00000001, InitTargetIterator, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetGoalToTarget, 0xFFFFFF81, 0x00000043, 0x00000006, ItemCheckHit, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000006, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000005, GetGoalPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_802A1628_78EDF8, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, ItemDamageEnemy, 0xFE363C80, 0x38000100, 0x00000000, 0x00000007, 0x00000020, 0x00000003, 0x00000001, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, ChooseNextTarget, 0x00000000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000046, 0x00000001, 0x802A202C, 0x00000043, 0x00000001, func_80276EFC, 0x00000046, 0x00000001, 0x802A247C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/battle/star/time_out_794240.data.s b/ver/us/asm/data/battle/star/time_out_794240.data.s index 885133c193..2fb66ab1a0 100644 --- a/ver/us/asm/data/battle/star/time_out_794240.data.s +++ b/ver/us/asm/data/battle/star/time_out_794240.data.s @@ -3,4 +3,4 @@ .section .data glabel D_802A1520_794240 -.word 0x00000043, 0x00000002, GetOwnerID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000045, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001001F, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000010, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, PlaySound, 0x00000241, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000F, 0x00000043, 0x00000004, func_802A1000_793D20, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000001, battle_star_time_out_FadeBackgroundToBlack, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001002C, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x00002051, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_802A10AC_793DCC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001002A, 0x00000012, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000045, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, func_802A1494_7941B4, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000010, 0x00000043, 0x00000003, SetActorSpeed, 0x00000100, 0xF24A8A80, 0x00000043, 0x00000005, SetGoalPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, RunToGoal, 0x00000100, 0x00000000, 0x00000000, 0x00000043, 0x00000002, func_802A1494_7941B4, 0x00000004, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, PlaySound, 0x00000241, 0x00000043, 0x00000002, func_802A1494_7941B4, 0x00000001, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000F, 0x00000043, 0x00000004, func_802A1000_793D20, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000001, battle_star_time_out_FadeBackgroundToBlack, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, PlaySound, 0x00002051, 0x00000043, 0x00000002, func_802A1494_7941B4, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_802A10AC_793DCC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, func_802A1494_7941B4, 0x00000004, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetOwnerID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000045, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001001F, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000010, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, PlaySound, 0x00000241, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000F, 0x00000043, 0x00000004, func_802A1000_793D20, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000001, func_802A137C_79409C, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001002C, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x00002051, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_802A10AC_793DCC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001002A, 0x00000012, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000045, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, func_802A1494_7941B4, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000010, 0x00000043, 0x00000003, SetActorSpeed, 0x00000100, 0xF24A8A80, 0x00000043, 0x00000005, SetGoalPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, RunToGoal, 0x00000100, 0x00000000, 0x00000000, 0x00000043, 0x00000002, func_802A1494_7941B4, 0x00000004, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, PlaySound, 0x00000241, 0x00000043, 0x00000002, func_802A1494_7941B4, 0x00000001, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000F, 0x00000043, 0x00000004, func_802A1000_793D20, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000001, func_802A137C_79409C, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, PlaySound, 0x00002051, 0x00000043, 0x00000002, func_802A1494_7941B4, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_802A10AC_793DCC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, func_802A1494_7941B4, 0x00000004, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, SetForegroundModelsVisible, 0x00000000, 0x00000043, 0x00000002, func_8024E664, 0x00000049, 0x00000043, 0x00000002, MoveBattleCamOver, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00002041, 0x00000043, 0x00000003, CreateNpc, 0x00000064, 0xFE363C80, 0x00000043, 0x00000001, func_802A14E8_794208, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000064, 0x00040000, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0x00000064, 0xFFFFFFB5, 0x00000096, 0x00000000, 0x00000043, 0x00000004, SetNpcEffect, 0x00000064, 0x00000000, 0x00000005, 0x00000043, 0x00000004, func_802A116C_793E8C, 0xFFFFFFB5, 0x000000A7, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000064, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x00000008, 0x00000027, 0x00000002, 0xFE363C80, 0x00000043, 0x00000043, 0x00000005, SetNpcRotation, 0x00000064, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000064, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, UseCamPreset, 0x00000045, 0x00000057, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000032, 0x00000043, 0x00000008, NpcFlyTo, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000001E, 0x00000000, 0x0000000A, 0x00000043, 0x00000002, SetForegroundModelsVisible, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetOwnerID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000002, 0x00000043, 0x00000002, PlaySound, 0x00002047, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000005, GetNpcPos, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_802A1218_793F38, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000064, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x000002D0, 0x00000043, 0x00000005, MakeLerp, 0xFE363C82, 0xFE363C83, 0x0000001E, 0x00000002, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetNpcRotation, 0x00000064, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000003C, 0x00000043, 0x00000008, NpcFlyTo, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000000, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C81, 0x0000008C, 0x00000043, 0x00000008, NpcFlyTo, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000000, 0x0000000A, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000064, 0x00000000, 0x00000043, 0x00000002, DeleteNpc, 0x00000064, 0x00000012, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000002, 0x00000043, 0x00000002, PlaySound, 0x00002045, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000005, GetNpcPos, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_802A1218_793F38, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000064, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x000002D0, 0x00000043, 0x00000005, MakeLerp, 0xFE363C82, 0xFE363C83, 0x0000001E, 0x00000002, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetNpcRotation, 0x00000064, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000003C, 0x00000043, 0x00000008, NpcFlyTo, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000000, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C81, 0x0000008C, 0x00000043, 0x00000008, NpcFlyTo, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000000, 0x0000000A, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000064, 0x00000000, 0x00000043, 0x00000002, DeleteNpc, 0x00000064, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetOwnerID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000001, func_802A1414_794134, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000012, 0x00000000, 0x00000043, 0x00000001, func_802A1414_794134, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, SetGoalToHome, 0x00000100, 0x00000043, 0x00000003, SetActorSpeed, 0x00000100, 0xF24A9A80, 0x00000043, 0x00000002, func_802A1494_7941B4, 0x00000003, 0x00000043, 0x00000003, RunToGoal, 0x00000100, 0x00000000, 0x00000043, 0x00000002, func_802A1494_7941B4, 0x00000004, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000046, 0x00000001, D_802A1520_794240, 0x00000025, 0x00000002, 0xFE363C80, 0x001E0001, 0x00000046, 0x00000001, 0x802A1C50, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000064, 0x001E0002, 0x00000008, 0x00000001, 0x00000010, 0x00000043, 0x00000002, UseCamPreset, 0x00000003, 0x00000043, 0x00000002, PlaySound, 0x00000246, 0x00000043, 0x0000000F, PlayEffect, 0x00000062, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xF24A7E80, 0x000000C8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000246, 0x00000008, 0x00000001, 0x000000C8, 0x00000043, 0x00000001, InitTargetIterator, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetGoalToTarget, 0xFFFFFF81, 0x00000043, 0x00000006, ItemCheckHit, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000006, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000006, ItemDamageEnemy, 0xFE363C80, 0x70000000, 0x80200564, 0x00000000, 0x00000020, 0x00000008, 0x00000001, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000003, ChooseNextTarget, 0x00000000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, func_80276EFC, 0x00000046, 0x00000001, 0x802A1E5C, 0x00000046, 0x00000001, 0x802A22AC, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, GetOwnerID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000045, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001001F, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000010, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, PlaySound, 0x00000241, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000F, 0x00000043, 0x00000004, battle_star_time_out_UnkStarFunc1, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000001, battle_star_time_out_FadeBackgroundToBlack, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001002C, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x00002051, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, battle_star_time_out_UnkStarFunc2, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001002A, 0x00000012, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000045, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, func_802A1494_7941B4, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000010, 0x00000043, 0x00000003, SetActorSpeed, 0x00000100, 0xF24A8A80, 0x00000043, 0x00000005, SetGoalPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, RunToGoal, 0x00000100, 0x00000000, 0x00000000, 0x00000043, 0x00000002, func_802A1494_7941B4, 0x00000004, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, PlaySound, 0x00000241, 0x00000043, 0x00000002, func_802A1494_7941B4, 0x00000001, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000F, 0x00000043, 0x00000004, battle_star_time_out_UnkStarFunc1, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000001, battle_star_time_out_FadeBackgroundToBlack, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, PlaySound, 0x00002051, 0x00000043, 0x00000002, func_802A1494_7941B4, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, battle_star_time_out_UnkStarFunc2, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, func_802A1494_7941B4, 0x00000004, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetOwnerID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000045, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001001F, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000010, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, PlaySound, 0x00000241, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000F, 0x00000043, 0x00000004, battle_star_time_out_UnkStarFunc1, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000001, battle_star_time_out_UnkBackgroundFunc2, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001002C, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x00002051, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, battle_star_time_out_UnkStarFunc2, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001002A, 0x00000012, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000045, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, func_802A1494_7941B4, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000010, 0x00000043, 0x00000003, SetActorSpeed, 0x00000100, 0xF24A8A80, 0x00000043, 0x00000005, SetGoalPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, RunToGoal, 0x00000100, 0x00000000, 0x00000000, 0x00000043, 0x00000002, func_802A1494_7941B4, 0x00000004, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, PlaySound, 0x00000241, 0x00000043, 0x00000002, func_802A1494_7941B4, 0x00000001, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000F, 0x00000043, 0x00000004, battle_star_time_out_UnkStarFunc1, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000001, battle_star_time_out_UnkBackgroundFunc2, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, PlaySound, 0x00002051, 0x00000043, 0x00000002, func_802A1494_7941B4, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, battle_star_time_out_UnkStarFunc2, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, func_802A1494_7941B4, 0x00000004, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, SetForegroundModelsVisible, 0x00000000, 0x00000043, 0x00000002, func_8024E664, 0x00000049, 0x00000043, 0x00000002, MoveBattleCamOver, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00002041, 0x00000043, 0x00000003, CreateNpc, 0x00000064, 0xFE363C80, 0x00000043, 0x00000001, battle_star_time_out_SetNpcCollision32, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000064, 0x00040000, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0x00000064, 0xFFFFFFB5, 0x00000096, 0x00000000, 0x00000043, 0x00000004, SetNpcEffect, 0x00000064, 0x00000000, 0x00000005, 0x00000043, 0x00000004, battle_star_time_out_UnkStarFunc3, 0xFFFFFFB5, 0x000000A7, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000064, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x00000008, 0x00000027, 0x00000002, 0xFE363C80, 0x00000043, 0x00000043, 0x00000005, SetNpcRotation, 0x00000064, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000064, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, UseCamPreset, 0x00000045, 0x00000057, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000032, 0x00000043, 0x00000008, NpcFlyTo, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000001E, 0x00000000, 0x0000000A, 0x00000043, 0x00000002, SetForegroundModelsVisible, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetOwnerID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000002, 0x00000043, 0x00000002, PlaySound, 0x00002047, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000005, GetNpcPos, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, battle_star_time_out_UnkStarFunc4, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000064, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x000002D0, 0x00000043, 0x00000005, MakeLerp, 0xFE363C82, 0xFE363C83, 0x0000001E, 0x00000002, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetNpcRotation, 0x00000064, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000003C, 0x00000043, 0x00000008, NpcFlyTo, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000000, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C81, 0x0000008C, 0x00000043, 0x00000008, NpcFlyTo, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000000, 0x0000000A, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000064, 0x00000000, 0x00000043, 0x00000002, DeleteNpc, 0x00000064, 0x00000012, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000002, 0x00000043, 0x00000002, PlaySound, 0x00002045, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000005, GetNpcPos, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, battle_star_time_out_UnkStarFunc4, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000064, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x000002D0, 0x00000043, 0x00000005, MakeLerp, 0xFE363C82, 0xFE363C83, 0x0000001E, 0x00000002, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetNpcRotation, 0x00000064, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000003C, 0x00000043, 0x00000008, NpcFlyTo, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000000, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C81, 0x0000008C, 0x00000043, 0x00000008, NpcFlyTo, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000000, 0x0000000A, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000064, 0x00000000, 0x00000043, 0x00000002, DeleteNpc, 0x00000064, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetOwnerID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000001, battle_star_time_out_UnkBackgroundFunc, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000012, 0x00000000, 0x00000043, 0x00000001, battle_star_time_out_UnkBackgroundFunc, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, SetGoalToHome, 0x00000100, 0x00000043, 0x00000003, SetActorSpeed, 0x00000100, 0xF24A9A80, 0x00000043, 0x00000002, func_802A1494_7941B4, 0x00000003, 0x00000043, 0x00000003, RunToGoal, 0x00000100, 0x00000000, 0x00000043, 0x00000002, func_802A1494_7941B4, 0x00000004, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000046, 0x00000001, D_802A1520_794240, 0x00000025, 0x00000002, 0xFE363C80, 0x001E0001, 0x00000046, 0x00000001, 0x802A1C50, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000064, 0x001E0002, 0x00000008, 0x00000001, 0x00000010, 0x00000043, 0x00000002, UseCamPreset, 0x00000003, 0x00000043, 0x00000002, PlaySound, 0x00000246, 0x00000043, 0x0000000F, PlayEffect, 0x00000062, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xF24A7E80, 0x000000C8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000246, 0x00000008, 0x00000001, 0x000000C8, 0x00000043, 0x00000001, InitTargetIterator, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetGoalToTarget, 0xFFFFFF81, 0x00000043, 0x00000006, ItemCheckHit, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000006, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000006, ItemDamageEnemy, 0xFE363C80, 0x70000000, 0x80200564, 0x00000000, 0x00000020, 0x00000008, 0x00000001, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000003, ChooseNextTarget, 0x00000000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, func_80276EFC, 0x00000046, 0x00000001, 0x802A1E5C, 0x00000046, 0x00000001, 0x802A22AC, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/battle/star/up_and_away_7959B0.data.s b/ver/us/asm/data/battle/star/up_and_away_7959B0.data.s index 2089a14219..2e4be907b6 100644 --- a/ver/us/asm/data/battle/star/up_and_away_7959B0.data.s +++ b/ver/us/asm/data/battle/star/up_and_away_7959B0.data.s @@ -3,4 +3,4 @@ .section .data glabel D_802A16D0_7959B0 -.word 0x00000043, 0x00000002, GetOwnerID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000045, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001001F, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000010, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, PlaySound, 0x00000241, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000F, 0x00000043, 0x00000004, func_802A1000_7952E0, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000001, battle_star_up_and_away_FadeBackgroundToBlack, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001002C, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x00002051, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_802A10AC_79538C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001002A, 0x00000012, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000045, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, func_802A1494_795774, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000010, 0x00000043, 0x00000003, SetActorSpeed, 0x00000100, 0xF24A8A80, 0x00000043, 0x00000005, SetGoalPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, RunToGoal, 0x00000100, 0x00000000, 0x00000000, 0x00000043, 0x00000002, func_802A1494_795774, 0x00000004, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, PlaySound, 0x00000241, 0x00000043, 0x00000002, func_802A1494_795774, 0x00000001, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000F, 0x00000043, 0x00000004, func_802A1000_7952E0, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000001, battle_star_up_and_away_FadeBackgroundToBlack, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, PlaySound, 0x00002051, 0x00000043, 0x00000002, func_802A1494_795774, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_802A10AC_79538C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, func_802A1494_795774, 0x00000004, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetOwnerID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000045, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001001F, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000010, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, PlaySound, 0x00000241, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000F, 0x00000043, 0x00000004, func_802A1000_7952E0, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000001, func_802A137C_79565C, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001002C, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x00002051, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_802A10AC_79538C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001002A, 0x00000012, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000045, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, func_802A1494_795774, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000010, 0x00000043, 0x00000003, SetActorSpeed, 0x00000100, 0xF24A8A80, 0x00000043, 0x00000005, SetGoalPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, RunToGoal, 0x00000100, 0x00000000, 0x00000000, 0x00000043, 0x00000002, func_802A1494_795774, 0x00000004, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, PlaySound, 0x00000241, 0x00000043, 0x00000002, func_802A1494_795774, 0x00000001, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000F, 0x00000043, 0x00000004, func_802A1000_7952E0, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000001, func_802A137C_79565C, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, PlaySound, 0x00002051, 0x00000043, 0x00000002, func_802A1494_795774, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_802A10AC_79538C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, func_802A1494_795774, 0x00000004, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, SetForegroundModelsVisible, 0x00000000, 0x00000043, 0x00000002, func_8024E664, 0x00000049, 0x00000043, 0x00000002, MoveBattleCamOver, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00002041, 0x00000043, 0x00000003, CreateNpc, 0x00000064, 0xFE363C80, 0x00000043, 0x00000001, func_802A14E8_7957C8, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000064, 0x00040000, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0x00000064, 0xFFFFFFB5, 0x00000096, 0x00000000, 0x00000043, 0x00000004, SetNpcEffect, 0x00000064, 0x00000000, 0x00000005, 0x00000043, 0x00000004, func_802A116C_79544C, 0xFFFFFFB5, 0x000000A7, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000064, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x00000008, 0x00000027, 0x00000002, 0xFE363C80, 0x00000043, 0x00000043, 0x00000005, SetNpcRotation, 0x00000064, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000064, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, UseCamPreset, 0x00000045, 0x00000057, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000032, 0x00000043, 0x00000008, NpcFlyTo, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000001E, 0x00000000, 0x0000000A, 0x00000043, 0x00000002, SetForegroundModelsVisible, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetOwnerID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000002, 0x00000043, 0x00000002, PlaySound, 0x00002047, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000005, GetNpcPos, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_802A1218_7954F8, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000064, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x000002D0, 0x00000043, 0x00000005, MakeLerp, 0xFE363C82, 0xFE363C83, 0x0000001E, 0x00000002, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetNpcRotation, 0x00000064, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000003C, 0x00000043, 0x00000008, NpcFlyTo, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000000, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C81, 0x0000008C, 0x00000043, 0x00000008, NpcFlyTo, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000000, 0x0000000A, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000064, 0x00000000, 0x00000043, 0x00000002, DeleteNpc, 0x00000064, 0x00000012, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000002, 0x00000043, 0x00000002, PlaySound, 0x00002045, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000005, GetNpcPos, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_802A1218_7954F8, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000064, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x000002D0, 0x00000043, 0x00000005, MakeLerp, 0xFE363C82, 0xFE363C83, 0x0000001E, 0x00000002, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetNpcRotation, 0x00000064, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000003C, 0x00000043, 0x00000008, NpcFlyTo, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000000, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C81, 0x0000008C, 0x00000043, 0x00000008, NpcFlyTo, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000000, 0x0000000A, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000064, 0x00000000, 0x00000043, 0x00000002, DeleteNpc, 0x00000064, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetOwnerID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000001, func_802A1414_7956F4, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000012, 0x00000000, 0x00000043, 0x00000001, func_802A1414_7956F4, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, SetGoalToHome, 0x00000100, 0x00000043, 0x00000003, SetActorSpeed, 0x00000100, 0xF24A9A80, 0x00000043, 0x00000002, func_802A1494_795774, 0x00000003, 0x00000043, 0x00000003, RunToGoal, 0x00000100, 0x00000000, 0x00000043, 0x00000002, func_802A1494_795774, 0x00000004, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000046, 0x00000001, D_802A16D0_7959B0, 0x00000025, 0x00000002, 0xFE363C80, 0x001F0001, 0x00000046, 0x00000001, 0x802A1E00, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000064, 0x001F0002, 0x00000043, 0x00000002, UseCamPreset, 0x00000002, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000008, Spawn802D9D50, 0x00000000, 0x00000000, 0x00000000, 0x00000140, 0x000000F0, 0x00000080, 0x0000000A, 0x00000043, 0x00000001, func_802A1518_7957F8, 0x00000043, 0x00000002, PlaySound, 0x00000247, 0x00000043, 0x0000000F, PlayEffect, 0x00000039, 0x00000000, 0x00000000, 0x00000014, 0x00000000, 0xF24A7E80, 0x0000005A, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000056, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x0000003A, 0x00000000, 0x00000000, 0x00000032, 0x00000000, 0x0000012C, 0x00000064, 0x0000000A, 0x00000028, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000039, 0x00000000, 0x00000000, 0x00000014, 0x00000000, 0xF24A7E80, 0x0000005A, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000004B, 0x00000043, 0x00000008, Spawn802D9D50, 0x00000000, 0x00000000, 0x00000000, 0x00000140, 0x000000F0, 0x00000000, 0x0000000A, 0x00000043, 0x00000001, InitTargetIterator, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetGoalToTarget, 0xFFFFFF81, 0x00000043, 0x00000001, func_802A1628_795908, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000043, 0x00000006, ItemCheckHit, 0xFE363C81, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000006, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000013, 0x00000000, 0x00000014, 0x00000001, 0xFE363C80, 0x00000019, 0x00000001, 0x00000000, 0x00000043, 0x00000003, GetOwnerTarget, 0xFE363C80, 0xFE363C81, 0x00000043, 0x00000003, DispatchEvent, 0xFE363C80, 0x0000003D, 0x00000043, 0x00000005, SetActorRotationOffset, 0xFE363C80, 0x00000000, 0x0000000A, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, GetOwnerTarget, 0xFE363C8B, 0xFE363C81, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, func_802D3474, 0xFE363C8A, 0x80283EE8, 0x00000043, 0x00000005, GetActorPos, 0xFE363C8B, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C8D, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C8F, 0xFE363C82, 0x00000043, 0x00000005, func_802D36E0, 0xFE363C8A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000026, 0x00000002, 0xFE363C80, 0xF24A7B4D, 0x00000043, 0x00000005, func_802D38EC, 0xFE363C8A, 0xFE363C80, 0xFE363C80, 0xFE363C80, 0x00000005, 0x00000001, 0x00000004, 0x0000002C, 0x00000002, 0xFE363C80, 0xF24A7B4D, 0x00000043, 0x00000005, func_802D38EC, 0xFE363C8A, 0xFE363C80, 0xFE363C80, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000027, 0x00000002, 0xFE363C80, 0x00000048, 0x00000043, 0x00000005, func_802D3840, 0xFE363C8A, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00002052, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8D, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C8E, 0x00000024, 0x00000002, 0xFE363C82, 0xFE363C8F, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000005, 0x00000001, 0x00000032, 0x00000043, 0x00000005, func_802D36E0, 0xFE363C8A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, func_802D3840, 0xFE363C8A, 0x00000000, 0xFE363C83, 0x00000000, 0x00000027, 0x00000002, 0xFE363C81, 0x00000006, 0x00000027, 0x00000002, 0xFE363C83, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00002071, 0x00000043, 0x00000003, GetOwnerTarget, 0xFE363C8A, 0xFE363C81, 0x00000043, 0x00000004, SetActorFlagBits, 0xFE363C8A, 0x00000004, 0x00000001, 0x00000026, 0x00000002, 0xFE363C80, 0xF24A7E80, 0x00000005, 0x00000001, 0x00000012, 0x0000002D, 0x00000002, 0xFE363C80, 0xF24A7AB4, 0x00000043, 0x00000005, SetActorScale, 0xFE363C8A, 0xFE363C80, 0xFE363C80, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000005, SetActorPos, 0xFE363C8A, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0xFE363C8A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000001, 0x0000000A, 0x00000043, 0x0000000F, PlayEffect, 0x00000011, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000027, 0x00000002, 0xFE363C81, 0x0000001E, 0x00000008, 0x00000001, 0x00000005, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetBattleFlagBits, 0x01000000, 0x00000001, 0x00000043, 0x00000002, RemoveActor, 0xFE363C8A, 0x00000057, 0x00000000, 0x0000001C, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C80, 0x00000000, 0x0000FFFF, 0x00000000, 0x00000000, 0x00000820, 0x00000013, 0x00000000, 0x00000023, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, ChooseNextTarget, 0x00000000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000046, 0x00000043, 0x00000001, func_802A15B4_795894, 0x00000046, 0x00000001, 0x802A200C, 0x00000043, 0x00000001, func_80276EFC, 0x00000046, 0x00000001, 0x802A245C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000043, 0x00000002, GetOwnerID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000045, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001001F, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000010, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, PlaySound, 0x00000241, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000F, 0x00000043, 0x00000004, battle_star_up_and_away_UnkStarFunc1, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000001, battle_star_up_and_away_FadeBackgroundToBlack, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001002C, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x00002051, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, battle_star_up_and_away_UnkStarFunc2, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001002A, 0x00000012, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000045, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, func_802A1494_795774, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000010, 0x00000043, 0x00000003, SetActorSpeed, 0x00000100, 0xF24A8A80, 0x00000043, 0x00000005, SetGoalPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, RunToGoal, 0x00000100, 0x00000000, 0x00000000, 0x00000043, 0x00000002, func_802A1494_795774, 0x00000004, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, PlaySound, 0x00000241, 0x00000043, 0x00000002, func_802A1494_795774, 0x00000001, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000F, 0x00000043, 0x00000004, battle_star_up_and_away_UnkStarFunc1, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000001, battle_star_up_and_away_FadeBackgroundToBlack, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, PlaySound, 0x00002051, 0x00000043, 0x00000002, func_802A1494_795774, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, battle_star_up_and_away_UnkStarFunc2, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, func_802A1494_795774, 0x00000004, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetOwnerID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000045, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001001F, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000010, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, PlaySound, 0x00000241, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000F, 0x00000043, 0x00000004, battle_star_up_and_away_UnkStarFunc1, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000001, battle_star_up_and_away_UnkBackgroundFunc2, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001002C, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x00002051, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, battle_star_up_and_away_UnkStarFunc2, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001002A, 0x00000012, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000045, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, func_802A1494_795774, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000010, 0x00000043, 0x00000003, SetActorSpeed, 0x00000100, 0xF24A8A80, 0x00000043, 0x00000005, SetGoalPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, RunToGoal, 0x00000100, 0x00000000, 0x00000000, 0x00000043, 0x00000002, func_802A1494_795774, 0x00000004, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, PlaySound, 0x00000241, 0x00000043, 0x00000002, func_802A1494_795774, 0x00000001, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000F, 0x00000043, 0x00000004, battle_star_up_and_away_UnkStarFunc1, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000001, battle_star_up_and_away_UnkBackgroundFunc2, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, PlaySound, 0x00002051, 0x00000043, 0x00000002, func_802A1494_795774, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, battle_star_up_and_away_UnkStarFunc2, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, func_802A1494_795774, 0x00000004, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, SetForegroundModelsVisible, 0x00000000, 0x00000043, 0x00000002, func_8024E664, 0x00000049, 0x00000043, 0x00000002, MoveBattleCamOver, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00002041, 0x00000043, 0x00000003, CreateNpc, 0x00000064, 0xFE363C80, 0x00000043, 0x00000001, battle_star_up_and_away_SetNpcCollision32, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000064, 0x00040000, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0x00000064, 0xFFFFFFB5, 0x00000096, 0x00000000, 0x00000043, 0x00000004, SetNpcEffect, 0x00000064, 0x00000000, 0x00000005, 0x00000043, 0x00000004, battle_star_up_and_away_UnkStarFunc3, 0xFFFFFFB5, 0x000000A7, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000064, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x00000008, 0x00000027, 0x00000002, 0xFE363C80, 0x00000043, 0x00000043, 0x00000005, SetNpcRotation, 0x00000064, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000064, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, UseCamPreset, 0x00000045, 0x00000057, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000032, 0x00000043, 0x00000008, NpcFlyTo, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000001E, 0x00000000, 0x0000000A, 0x00000043, 0x00000002, SetForegroundModelsVisible, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetOwnerID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000002, 0x00000043, 0x00000002, PlaySound, 0x00002047, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000005, GetNpcPos, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, battle_star_up_and_away_UnkStarFunc4, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000064, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x000002D0, 0x00000043, 0x00000005, MakeLerp, 0xFE363C82, 0xFE363C83, 0x0000001E, 0x00000002, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetNpcRotation, 0x00000064, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000003C, 0x00000043, 0x00000008, NpcFlyTo, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000000, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C81, 0x0000008C, 0x00000043, 0x00000008, NpcFlyTo, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000000, 0x0000000A, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000064, 0x00000000, 0x00000043, 0x00000002, DeleteNpc, 0x00000064, 0x00000012, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000002, 0x00000043, 0x00000002, PlaySound, 0x00002045, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000005, GetNpcPos, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, battle_star_up_and_away_UnkStarFunc4, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000064, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x000002D0, 0x00000043, 0x00000005, MakeLerp, 0xFE363C82, 0xFE363C83, 0x0000001E, 0x00000002, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetNpcRotation, 0x00000064, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000003C, 0x00000043, 0x00000008, NpcFlyTo, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000000, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C81, 0x0000008C, 0x00000043, 0x00000008, NpcFlyTo, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000000, 0x0000000A, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000064, 0x00000000, 0x00000043, 0x00000002, DeleteNpc, 0x00000064, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetOwnerID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000001, battle_star_up_and_away_UnkBackgroundFunc, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000012, 0x00000000, 0x00000043, 0x00000001, battle_star_up_and_away_UnkBackgroundFunc, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, SetGoalToHome, 0x00000100, 0x00000043, 0x00000003, SetActorSpeed, 0x00000100, 0xF24A9A80, 0x00000043, 0x00000002, func_802A1494_795774, 0x00000003, 0x00000043, 0x00000003, RunToGoal, 0x00000100, 0x00000000, 0x00000043, 0x00000002, func_802A1494_795774, 0x00000004, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000046, 0x00000001, D_802A16D0_7959B0, 0x00000025, 0x00000002, 0xFE363C80, 0x001F0001, 0x00000046, 0x00000001, 0x802A1E00, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000064, 0x001F0002, 0x00000043, 0x00000002, UseCamPreset, 0x00000002, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000008, Spawn802D9D50, 0x00000000, 0x00000000, 0x00000000, 0x00000140, 0x000000F0, 0x00000080, 0x0000000A, 0x00000043, 0x00000001, func_802A1518_7957F8, 0x00000043, 0x00000002, PlaySound, 0x00000247, 0x00000043, 0x0000000F, PlayEffect, 0x00000039, 0x00000000, 0x00000000, 0x00000014, 0x00000000, 0xF24A7E80, 0x0000005A, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000056, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x0000003A, 0x00000000, 0x00000000, 0x00000032, 0x00000000, 0x0000012C, 0x00000064, 0x0000000A, 0x00000028, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000039, 0x00000000, 0x00000000, 0x00000014, 0x00000000, 0xF24A7E80, 0x0000005A, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000004B, 0x00000043, 0x00000008, Spawn802D9D50, 0x00000000, 0x00000000, 0x00000000, 0x00000140, 0x000000F0, 0x00000000, 0x0000000A, 0x00000043, 0x00000001, InitTargetIterator, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetGoalToTarget, 0xFFFFFF81, 0x00000043, 0x00000001, func_802A1628_795908, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000043, 0x00000006, ItemCheckHit, 0xFE363C81, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000006, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000013, 0x00000000, 0x00000014, 0x00000001, 0xFE363C80, 0x00000019, 0x00000001, 0x00000000, 0x00000043, 0x00000003, GetOwnerTarget, 0xFE363C80, 0xFE363C81, 0x00000043, 0x00000003, DispatchEvent, 0xFE363C80, 0x0000003D, 0x00000043, 0x00000005, SetActorRotationOffset, 0xFE363C80, 0x00000000, 0x0000000A, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, GetOwnerTarget, 0xFE363C8B, 0xFE363C81, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, func_802D3474, 0xFE363C8A, 0x80283EE8, 0x00000043, 0x00000005, GetActorPos, 0xFE363C8B, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C8D, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C8F, 0xFE363C82, 0x00000043, 0x00000005, func_802D36E0, 0xFE363C8A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000026, 0x00000002, 0xFE363C80, 0xF24A7B4D, 0x00000043, 0x00000005, func_802D38EC, 0xFE363C8A, 0xFE363C80, 0xFE363C80, 0xFE363C80, 0x00000005, 0x00000001, 0x00000004, 0x0000002C, 0x00000002, 0xFE363C80, 0xF24A7B4D, 0x00000043, 0x00000005, func_802D38EC, 0xFE363C8A, 0xFE363C80, 0xFE363C80, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000027, 0x00000002, 0xFE363C80, 0x00000048, 0x00000043, 0x00000005, func_802D3840, 0xFE363C8A, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00002052, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8D, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C8E, 0x00000024, 0x00000002, 0xFE363C82, 0xFE363C8F, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000005, 0x00000001, 0x00000032, 0x00000043, 0x00000005, func_802D36E0, 0xFE363C8A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, func_802D3840, 0xFE363C8A, 0x00000000, 0xFE363C83, 0x00000000, 0x00000027, 0x00000002, 0xFE363C81, 0x00000006, 0x00000027, 0x00000002, 0xFE363C83, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00002071, 0x00000043, 0x00000003, GetOwnerTarget, 0xFE363C8A, 0xFE363C81, 0x00000043, 0x00000004, SetActorFlagBits, 0xFE363C8A, 0x00000004, 0x00000001, 0x00000026, 0x00000002, 0xFE363C80, 0xF24A7E80, 0x00000005, 0x00000001, 0x00000012, 0x0000002D, 0x00000002, 0xFE363C80, 0xF24A7AB4, 0x00000043, 0x00000005, SetActorScale, 0xFE363C8A, 0xFE363C80, 0xFE363C80, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000005, SetActorPos, 0xFE363C8A, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0xFE363C8A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000001, 0x0000000A, 0x00000043, 0x0000000F, PlayEffect, 0x00000011, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000027, 0x00000002, 0xFE363C81, 0x0000001E, 0x00000008, 0x00000001, 0x00000005, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetBattleFlagBits, 0x01000000, 0x00000001, 0x00000043, 0x00000002, RemoveActor, 0xFE363C8A, 0x00000057, 0x00000000, 0x0000001C, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C80, 0x00000000, 0x0000FFFF, 0x00000000, 0x00000000, 0x00000820, 0x00000013, 0x00000000, 0x00000023, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, ChooseNextTarget, 0x00000000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000046, 0x00000043, 0x00000001, func_802A15B4_795894, 0x00000046, 0x00000001, 0x802A200C, 0x00000043, 0x00000001, func_80276EFC, 0x00000046, 0x00000001, 0x802A245C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/code_102c80.rodata.s b/ver/us/asm/data/code_102c80.rodata.s deleted file mode 100644 index 7ec797f602..0000000000 --- a/ver/us/asm/data/code_102c80.rodata.s +++ /dev/null @@ -1,117 +0,0 @@ -.include "macro.inc" - -.section .rodata - -glabel D_802EB000 -.double 1.8625 - -glabel D_802EB008 -.double 1.8625 - -glabel jtbl_802EB010 -.word L802E17EC_10306C, L802E1894_103114, L802E1938_1031B8, L802E19E0_103260, L802E1A84_103304, L802E1B18_103398 - -glabel D_802EB028 -.double 0.3 - -glabel D_802EB030 -.double 0.01 - -glabel D_802EB038 -.double -0.2 - -glabel D_802EB040 -.double -0.01 - -glabel D_802EB048 -.double 0.15 - -glabel D_802EB050 -.double 0.01 - -glabel D_802EB058 -.double -0.1 - -glabel D_802EB060 -.double -0.01 - -glabel D_802EB068 -.double 0.01 - -glabel jtbl_802EB070 -.word L802E1B48_1033C8, L802E1BF0_103470, L802E1C94_103514, L802E1D38_1035B8, L802E1DDC_10365C, L802E1E6C_1036EC - -glabel D_802EB088 -.double -0.01 - -glabel D_802EB090 -.double 0.1 - -glabel D_802EB098 -.double 0.01 - -glabel D_802EB0A0 -.double -0.3 - -glabel D_802EB0A8 -.double -0.01 - -glabel D_802EB0B0 -.double 0.01 - -glabel D_802EB0B8 -.double -0.01 - -glabel jtbl_802EB0C0 -.word L802E1F20_1037A0, L802E1FBC_10383C, L802E1FD0_103850, L802E206C_1038EC, L802E211C_10399C, 0 - -glabel D_802EB0D8 -.double 0.3 - -glabel D_802EB0E0 -.double 0.01 - -glabel D_802EB0E8 -.double -0.2 - -glabel D_802EB0F0 -.double 0.15 - -glabel D_802EB0F8 -.double 0.01 - -glabel D_802EB100 -.double -0.1 - -glabel D_802EB108 -.double -0.01 - -glabel D_802EB110 -.double 0.1 - -glabel D_802EB118 -.double 0.01 - -glabel D_802EB120 -.double -0.3 - -glabel D_802EB128 -.double -0.01 - -glabel D_802EB130 -.double 2.7 - -glabel D_802EB138 -.double 360.0 - -glabel D_802EB140 -.double 0.3 - -glabel D_802EB148 -.double 1.2 - -glabel D_802EB150 -.double -12.2 - -glabel D_802EB158 -.double 6.283180236816406 diff --git a/ver/us/asm/data/code_104940_len_dc0.rodata.s b/ver/us/asm/data/code_104940_len_dc0.rodata.s deleted file mode 100644 index c60ea12c06..0000000000 --- a/ver/us/asm/data/code_104940_len_dc0.rodata.s +++ /dev/null @@ -1,30 +0,0 @@ -.include "macro.inc" - -.section .rodata - -glabel D_802EB1D0 -.double 0.09 - -glabel D_802EB1D8 -.double 0.045 - -glabel D_802EB1E0 -.double 0.18 - -glabel D_802EB1E8 -.double 0.09 - -glabel D_802EB1F0 -.double 1.2 - -glabel D_802EB1F8 -.double 0.3 - -glabel D_802EB200 -.double 1.2 - -glabel D_802EB208 -.double 0.3 - -glabel jtbl_802EB210 -.word L802E3DCC_10564C, L802E3DDC_10565C, L802E3C34_1054B4, L802E3C34_1054B4, L802E3C34_1054B4, L802E3C34_1054B4, L802E3C34_1054B4, L802E3C34_1054B4, L802E3DE4_105664, L802E3C34_1054B4, L802E3CD8_105558, L802E3D2C_1055AC, L802E3D84_105604, L802E3CD8_105558, L802E3D2C_1055AC, L802E3D84_105604, L802E3DCC_10564C, L802E3DCC_10564C, L802E3DCC_10564C, L802E3DCC_10564C, L802E3DCC_10564C, 0, 0, 0 diff --git a/ver/us/asm/data/code_10A9F0.data.s b/ver/us/asm/data/code_10A9F0.data.s new file mode 100644 index 0000000000..c1af09439a --- /dev/null +++ b/ver/us/asm/data/code_10A9F0.data.s @@ -0,0 +1,9 @@ +.include "macro.inc" + +.section .data + +glabel D_802E9170 +.word 0x00000000, 0x00000000, 0x01111111, 0x11111111, 0x01333333, 0x33333333, 0x01355555, 0x55555555, 0x01357777, 0x77777777, 0x01357999, 0x99999999, 0x013579BB, 0xBBBBBBBB, 0x013579BD, 0xDDDDDDDD, 0x013579BD, 0xFFFFFFFF, 0x013579BD, 0xFFFFFFFF, 0x013579BD, 0xFFFFFFFF, 0x013579BD, 0xFFFFFFFF, 0x013579BD, 0xFFFFFFFF, 0x013579BD, 0xFFFFFFFF, 0x013579BD, 0xFFFFFFFF, 0x013579BD, 0xFFFFFFFF + +glabel D_802E91F0 +.word 0x00000000, 0x00000000, 0x00000000, 0x00000011, 0x00000000, 0x00112222, 0x00000000, 0x11223344, 0x00000001, 0x22344555, 0x00000012, 0x34456666, 0x00000123, 0x45667788, 0x00001234, 0x56788999, 0x00012345, 0x67899AAB, 0x00012456, 0x789ABBCC, 0x00123467, 0x89ABCDDD, 0x00124568, 0x9ABCDEEF, 0x00234678, 0x9BCDEFFF, 0x00235679, 0xABDEFFFF, 0x01245689, 0xACDEFFFF, 0x01245689, 0xBCDFFFFF diff --git a/ver/us/asm/data/code_10AAF0.data.s b/ver/us/asm/data/code_10AAF0.data.s new file mode 100644 index 0000000000..48c800a754 --- /dev/null +++ b/ver/us/asm/data/code_10AAF0.data.s @@ -0,0 +1,9 @@ +.include "macro.inc" + +.section .data + +glabel D_802E9270 +.word 0x007D0000, 0x007D0000, 0x04000000, 0xFFFFFF4B, 0x007D0000, 0xFF830000, 0x04000400, 0xFFFFFF4B, 0xFF830000, 0xFF830000, 0x00000400, 0xFFFFFF4B, 0xFF830000, 0x007D0000, 0x00000000, 0xFFFFFF4B + +glabel D_802E92B0 +.word 0xFF830000, 0xFF830000, 0x00000400, 0xFFFFFF4B, 0xFF830000, 0x007D0000, 0x00000000, 0xFFFFFF4B, 0x007D0000, 0x007D0000, 0x04000000, 0xFFFFFF4B, 0x007D0000, 0xFF830000, 0x04000400, 0xFFFFFF4B, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x01111111, 0x11111111, 0x11111111, 0x11111110, 0x01353333, 0x33333333, 0x33333333, 0x33335310, 0x01355555, 0x55555555, 0x55555555, 0x55555310, 0x01357777, 0x77777777, 0x77777777, 0x77775310, 0x01357999, 0x99999999, 0x99999999, 0x99975310, 0x013579BB, 0xBBBBBBBB, 0xBBBBBBBB, 0xBB975310, 0x013579CC, 0xCCCCCCCC, 0xCCCCCCCC, 0xCC975310, 0x013579DD, 0xDDDDDDDD, 0xDDDDDDDD, 0xDD975310, 0x013579DD, 0xDDDDDDDD, 0xDDDDDDDD, 0xDD975310, 0x013579BC, 0xDDEEEEEE, 0xEEEEEEDD, 0xCB975310, 0x013579BC, 0xDDEEEEEE, 0xEEEEEEDD, 0xCB975310, 0x013579BC, 0xDDEEFFFF, 0xFFFFEEDD, 0xCB975310, 0x013579BC, 0xDDEEFFFF, 0xFFFFEEDD, 0xCB975310, 0x013579BC, 0xDDEEFFFF, 0xFFFFEEDD, 0xCB975310, 0x013579BC, 0xDDEEFFFF, 0xFFFFEEDD, 0xCB975310, 0x013579BC, 0xDDEEFFFF, 0xFFFFEEDD, 0xCB975310, 0x013579BC, 0xDDEEFFFF, 0xFFFFEEDD, 0xCB975310, 0x013579BC, 0xDDEEFFFF, 0xFFFFEEDD, 0xBC975310, 0x013579BC, 0xDDEEFFFF, 0xFFFFEEDD, 0xCB975310, 0x013579BC, 0xDDEEEEEE, 0xEEEEEEDD, 0xCB975310, 0x013579BC, 0xDDEEEEEE, 0xEEEEEEDD, 0xCB975310, 0x013579DD, 0xDDDDDDDD, 0xDDDDDDDD, 0xDD975310, 0x013579DD, 0xDDDDDDDD, 0xDDDDDDDD, 0xDD975310, 0x013579CC, 0xCCCCCCCC, 0xCCCCCCCC, 0xCC975310, 0x013579BB, 0xBBBBBBBB, 0xBBBBBBBB, 0xBB975310, 0x01357999, 0x99999999, 0x99999999, 0x99975310, 0x01357777, 0x77777777, 0x77777777, 0x77775310, 0x01355555, 0x55555555, 0x55555555, 0x55555310, 0x01353333, 0x33333333, 0x33333333, 0x33335310, 0x01111111, 0x11111111, 0x11111111, 0x11111110, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001111, 0x11110000, 0x00000000, 0x00000000, 0x00113333, 0x33331100, 0x00000000, 0x00000000, 0x01335555, 0x55553310, 0x00000000, 0x00000000, 0x13555555, 0x55555531, 0x00000000, 0x00000013, 0x35555888, 0x88855553, 0x31000000, 0x00000135, 0x55588CCC, 0xCCC88555, 0x53100000, 0x00001355, 0x588CDDDD, 0xDDDDC885, 0x55301000, 0x00013555, 0x8CDDDDDD, 0xDDDDDDC8, 0x55531000, 0x00013558, 0xDDDDDDDD, 0xDDDDDDDC, 0x85531000, 0x00135558, 0xDDDDDDDD, 0xDDDDDDDC, 0x85553100, 0x0013558C, 0xDDDDDDDD, 0xDDDDDDDC, 0x85553100, 0x0135558C, 0xDDDDDDDD, 0xDDDDDDDD, 0xC8555310, 0x013558CD, 0xDDDDDDDD, 0xDDDDDDDD, 0xDC855310, 0x013558CD, 0xDDDDDDDD, 0xDDDDDDDD, 0xDC855310, 0x013558CD, 0xDDDDDDDD, 0xDDDDDDDD, 0xDC855310, 0x013598CD, 0xDDDDDDDD, 0xDDDDDDDD, 0xDC895310, 0x013598CD, 0xDDDDDDDD, 0xDDDDDDDD, 0xDC895310, 0x0135598C, 0xDDDDDDDD, 0xDDDDDDDD, 0xC8955310, 0x0013598C, 0xDDDDDDDD, 0xDDDDDDDD, 0xC8953100, 0x00135598, 0xCDDDDDDD, 0xDDDDDDDC, 0x89553100, 0x00013598, 0xCDDDDDDD, 0xDDDDDDDC, 0x89531000, 0x00011359, 0x8CDDDDDD, 0xDDDDDDC8, 0x95531000, 0x00001355, 0x988CCDDD, 0xDDDCC889, 0x55310000, 0x00001135, 0x59988CCC, 0xCCC88995, 0x53100000, 0x00000011, 0x35599888, 0x88899953, 0x11000000, 0x00000000, 0x11355999, 0x99995531, 0x00000000, 0x00000000, 0x01135555, 0x55553110, 0x00000000, 0x00000000, 0x00013333, 0x33331000, 0x00000000, 0x00000000, 0x00001111, 0x11110000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/code_10B608.data.s b/ver/us/asm/data/code_10B608.data.s index fced07c63d..b8b1d93b6f 100644 --- a/ver/us/asm/data/code_10B608.data.s +++ b/ver/us/asm/data/code_10B608.data.s @@ -3,7 +3,7 @@ .section .data glabel D_802E9D88 -.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x80, 0x2E, 0x36, 0x50, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x01, 0x4E, 0x00, 0x00, 0x00, 0x02, 0x80, 0x2E, 0x31, 0xEC, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x06, 0x80, 0x2E, 0x32, 0x8C, 0x00, 0x00, 0x00, 0x02, 0x80, 0x11, 0x06, 0x78, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x80, 0x2E, 0x36, 0x50, 0x00, 0x00, 0x00, 0x02, 0x80, 0x11, 0x06, 0x78, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x80, 0x2E, 0x36, 0x50, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x01, 0x4E, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x80, 0x2E, 0x36, 0x50, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x01, 0x4E, 0x00, 0x00, 0x00, 0x02, 0x80, 0x2E, 0x37, 0x14, 0x00, 0x00, 0x00, 0x02, 0x80, 0x11, 0x06, 0x78, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x80, 0x2E, 0x37, 0x28, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x80, 0x2E, 0x37, 0xE4, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +.word 0x00000003, 0x00000000, func_802E3650, 0x00000009, 0x0000014E, 0x00000002, func_802E31EC, 0x00000003, 0x00000006, func_802E328C, 0x00000002, func_80110678, 0x00000004, 0x00000000, 0x00000000, 0x00000003, 0x00000000, func_802E3650, 0x00000002, func_80110678, 0x00000004, 0x00000000, 0x00000000, 0x00000003, 0x00000000, func_802E3650, 0x00000009, 0x0000014E, 0x00000004, 0x00000000, 0x00000000, 0x00000003, 0x00000000, func_802E3650, 0x00000009, 0x0000014E, 0x00000002, func_802E3714, 0x00000002, func_80110678, 0x00000003, 0x00000000, func_802E3728, 0x00000003, 0x00000000, func_802E37E4, 0x00000004, 0x00000000, 0x00000000 glabel D_802E9E54 .word 0x00000002, func_802E3714, 0x00000003, 0x00000000, func_802E3728, 0x00000003, 0x00000000, func_802E37E4, 0x00000001, 0x802E9E0C, 0x00000000 @@ -15,7 +15,13 @@ glabel D_802EA07C .word 0x42000020, 0x802E9F80, 0x00000000, entity_init_Hammer1Block_normal, 0x802E9E0C, func_802E3BA4, 0x00E42240, 0x00E42740, 0x0B191919 glabel D_802EA0A0 -.word 0x42000020, 0x802E9F9C, 0x00000000, entity_init_Hammer1Block_normal, 0x802E9E0C, func_802E3BA4, 0x00E42740, 0x00E431F0, 0x13191919, 0x42800020, 0x802EA044, 0x00000000, entity_init_Hammer23Block_normal, 0x802E9EB4, func_802E3BA4, 0x00E3DDB0, 0x00E3E260, 0x0D191919, 0x42000020, 0x802E9FB8, 0x00000000, func_802E3898, 0x802E9F28, func_802E3BA4, 0x00E3DDB0, 0x00E3E260, 0x0E191919, 0x42800020, 0x802E9FD4, 0x00000000, entity_init_Hammer1Block_normal, 0x802E9F00, func_802E3BA4, 0x00E31530, 0x00E31A30, 0x15323232, 0x42800020, 0x802E9FD4, 0x00000000, entity_init_Hammer1Block_normal, 0x802E9F00, func_802E3BA4, 0x00E31530, 0x00E31A30, 0x15643232, 0x42800020, 0x802E9FD4, 0x00000000, entity_init_Hammer1Block_normal, 0x802E9F00, func_802E3BA4, 0x00E31530, 0x00E31A30, 0x15323264, 0x42800020, 0x802E9FD4, 0x00000000, entity_init_HammerBlock_small, 0x802E9DCC, func_802E3BA4, 0x00E31530, 0x00E31A30, 0x18191919, 0x42800020, 0x802E9FF0, 0x00000000, entity_init_Hammer23Block_normal, 0x802E9DCC, func_802E3BA4, 0x00E31A30, 0x00E31F30, 0x16323232, 0x42800020, 0x802E9FF0, 0x00000000, entity_init_Hammer23Block_normal, 0x802E9DCC, func_802E3BA4, 0x00E31A30, 0x00E31F30, 0x16643232, 0x42800020, 0x802E9FF0, 0x00000000, entity_init_Hammer23Block_normal, 0x802E9DCC, func_802E3BA4, 0x00E31A30, 0x00E31F30, 0x16323264, 0x42800020, 0x802E9FF0, 0x00000000, entity_init_HammerBlock_small, 0x802E9DCC, func_802E3BA4, 0x00E31A30, 0x00E31F30, 0x19191919, 0x42800020, 0x802EA00C, 0x00000000, entity_init_Hammer23Block_normal, 0x802E9DCC, func_802E3BA4, 0x00E31F30, 0x00E32420, 0x17323232, 0x42800020, 0x802EA00C, 0x00000000, entity_init_Hammer23Block_normal, 0x802E9DCC, func_802E3BA4, 0x00E31F30, 0x00E32420, 0x17643232, 0x42800020, 0x802EA00C, 0x00000000, entity_init_Hammer23Block_normal, 0x802E9DCC, func_802E3BA4, 0x00E31F30, 0x00E32420, 0x17323264, 0x42800020, 0x802EA00C, 0x00000000, entity_init_HammerBlock_small, 0x802E9DCC, func_802E3BA4, 0x00E31F30, 0x00E32420, 0x1A191919, 0x40000020, 0x802EA028, 0x00000000, entity_init_Hammer23Block_normal, 0x802E9DCC, func_802E3BA4, 0x00E3DA60, 0x00E3DDB0, 0x0C191919, 0x40000020, 0x802EA060, 0x00000000, entity_init_Hammer23Block_normal, 0x802E9D90, func_802E3BA4, 0x00E43B20, 0x00E44800, 0x211E1919, 0x00000000, 0x00000000, 0x00000000 +.word 0x42000020, 0x802E9F9C, 0x00000000, entity_init_Hammer1Block_normal, 0x802E9E0C, func_802E3BA4, 0x00E42740, 0x00E431F0, 0x13191919 + +glabel D_802EA0C4 +.word 0x42800020, 0x802EA044, 0x00000000, entity_init_Hammer23Block_normal, 0x802E9EB4, func_802E3BA4, 0x00E3DDB0, 0x00E3E260, 0x0D191919, 0x42000020, 0x802E9FB8, 0x00000000, func_802E3898, 0x802E9F28, func_802E3BA4, 0x00E3DDB0, 0x00E3E260, 0x0E191919, 0x42800020, 0x802E9FD4, 0x00000000, entity_init_Hammer1Block_normal, 0x802E9F00, func_802E3BA4, 0x00E31530, 0x00E31A30, 0x15323232, 0x42800020, 0x802E9FD4, 0x00000000, entity_init_Hammer1Block_normal, 0x802E9F00, func_802E3BA4, 0x00E31530, 0x00E31A30, 0x15643232, 0x42800020, 0x802E9FD4, 0x00000000, entity_init_Hammer1Block_normal, 0x802E9F00, func_802E3BA4, 0x00E31530, 0x00E31A30, 0x15323264, 0x42800020, 0x802E9FD4, 0x00000000, entity_init_HammerBlock_small, 0x802E9DCC, func_802E3BA4, 0x00E31530, 0x00E31A30, 0x18191919, 0x42800020, 0x802E9FF0, 0x00000000, entity_init_Hammer23Block_normal, 0x802E9DCC, func_802E3BA4, 0x00E31A30, 0x00E31F30, 0x16323232, 0x42800020, 0x802E9FF0, 0x00000000, entity_init_Hammer23Block_normal, 0x802E9DCC, func_802E3BA4, 0x00E31A30, 0x00E31F30, 0x16643232, 0x42800020, 0x802E9FF0, 0x00000000, entity_init_Hammer23Block_normal, 0x802E9DCC, func_802E3BA4, 0x00E31A30, 0x00E31F30, 0x16323264, 0x42800020, 0x802E9FF0, 0x00000000, entity_init_HammerBlock_small, 0x802E9DCC, func_802E3BA4, 0x00E31A30, 0x00E31F30, 0x19191919, 0x42800020, 0x802EA00C, 0x00000000, entity_init_Hammer23Block_normal, 0x802E9DCC, func_802E3BA4, 0x00E31F30, 0x00E32420, 0x17323232, 0x42800020, 0x802EA00C, 0x00000000, entity_init_Hammer23Block_normal, 0x802E9DCC, func_802E3BA4, 0x00E31F30, 0x00E32420, 0x17643232, 0x42800020, 0x802EA00C, 0x00000000, entity_init_Hammer23Block_normal, 0x802E9DCC, func_802E3BA4, 0x00E31F30, 0x00E32420, 0x17323264, 0x42800020, 0x802EA00C, 0x00000000, entity_init_HammerBlock_small, 0x802E9DCC, func_802E3BA4, 0x00E31F30, 0x00E32420, 0x1A191919 + +glabel D_802EA2BC +.word 0x40000020, 0x802EA028, 0x00000000, entity_init_Hammer23Block_normal, 0x802E9DCC, func_802E3BA4, 0x00E3DA60, 0x00E3DDB0, 0x0C191919, 0x40000020, 0x802EA060, 0x00000000, entity_init_Hammer23Block_normal, 0x802E9D90, func_802E3BA4, 0x00E43B20, 0x00E44800, 0x211E1919, 0x00000000, 0x00000000, 0x00000000 glabel D_802EA310 .word 0x00000003, 0x00000002, 0x00000000, 0x00000007, 0x20000000, 0x00000000, 0x00000002, func_802E4154, 0x00000003, 0x00000000, 0x00000000, 0x00000003, 0x00000000, func_802E3E80, 0x00000009, 0x0000014E, 0x00000002, func_802E3F0C, 0x00000002, func_802E421C, 0x00000003, 0x00000001, 0x00000000, 0x00000007, 0x00000001, 0x00000003, 0x00000002, 0x00000000, 0x00000007, 0x20000000, 0x00000000, 0x00000002, func_802E4154, 0x00000003, 0x00000000, 0x00000000, 0x00000003, 0x00000000, func_802E3E9C, 0x00000009, 0x0000014E, 0x00000002, func_802E3F0C, 0x00000002, func_802E421C, 0x00000003, 0x00000001, 0x00000000, 0x00000007, 0x00000001, 0x00000003, 0x00000002, 0x00000000, 0x00000007, 0x20000000, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000002, func_802E40A0, 0x00000003, 0x0000000A, func_802E3EE0, 0x00000002, func_802E4484, 0x00000002, func_802E4108, 0x00000003, 0x00000001, 0x00000000, 0x00000007, 0x00000001, 0x00000007, 0x04000000, 0x00000000, 0x00000003, 0x00000000, func_802E3E80, 0x00000002, func_802E44F8, 0x00000009, 0x0000014E, 0x00000002, func_802E405C, 0x00000002, func_802E3714, 0x00000003, 0x00000000, func_802E3728, 0x00000003, 0x00000000, func_802E37E4, 0x00000002, func_802E44CC, 0x00000002, func_802E4540, 0x00000007, 0x00000001, 0x00000007, 0x00000020, 0x00000002, func_802E4040, 0x00000003, 0x00000002, 0x00000000, 0x00000007, 0x04000000, 0x00000000, 0x00E459F0, 0x00E46E10, 0x00E46E10, 0x00E470B0, 0x00E470B0, 0x00E484F0, 0x00E484F0, 0x00E48780, 0x00E48780, 0x00E49BE0, 0x00E49BE0, 0x00E49E40, 0x00000004, 0x00000001, 0x00000001, 0x0000003C, 0x0A000A90, 0x00000002, 0x00000000, 0x00000004, 0x00000016, 0x00000001, 0x0000003C, 0x0A000A90, 0x00000002, 0x00000000, 0x00000004, 0x00000001, 0x00000001, 0x0000003C, 0x0A000A90, 0x00000002, 0x00000000, 0x00000004, 0x00000016, 0x00000001, 0x0000003C, 0x0A000A90, 0x00000002, 0x00000000, 0x42000020, 0x802EA4F4, 0x00000000, func_802E464C, 0x802EA328, func_802E3BA4, 0x00E3B870, 0x00E3C320, 0x0F191919, 0x42000020, 0x802EA510, 0x00000000, func_802E4694, 0x802EA38C, func_802E3BA4, 0x00E3B870, 0x00E3C320, 0x11191919, 0x42000020, 0x802EA52C, 0x00000000, func_802E464C, 0x802EA328, func_802E3BA4, 0x00E3C320, 0x00E3CDD0, 0x14191919, 0x42000020, 0x802EA548, 0x00000000, func_802E4694, 0x802EA38C, func_802E3BA4, 0x00E3C320, 0x00E3CDD0, 0x12191919, 0xC2080020, 0x0000023C, 0x00000084, func_802E46BC, 0x802EA440, func_802E3BA4, 0x802EA4C4, 0x00000000, 0x10191919 @@ -75,4 +81,7 @@ glabel D_802EAD7C .word 0x00000003, 0x00000000, 0x00000000, 0x00000000, 0x00000002, func_802E7034, 0x00000003, 0x00000000, func_802E70B0, 0x00000002, func_802E71F8, 0x00000002, func_802E7C70, 0x00000002, func_802E7D28, 0x00000003, 0x00000000, func_802E7230, 0x00000002, func_802E7C8C, 0x00000003, 0x00000000, func_802E742C, 0x00000003, 0x00000000, 0x00000000, 0x00000004, 0x00000000, 0x00000000, 0x00000004, 0x00000001, 0x00000001, 0x0000003C, 0x0A000EB8, 0x00000002, 0x00000000, 0x40000038, 0x802EADF0, 0x00000000, func_802E7D54, 0x802EACFC, 0x00000000, 0x00E648D0, 0x00E657A0, 0x32322D2E, 0xC0000038, 0x802EADF0, 0x00000000, entity_init_Chest, 0x802EAD8C, 0x00000000, 0x00E648D0, 0x00E657A0, 0x321C1A17, 0x00000000, 0x00000000, 0x00000000, 0x00000004, 0x00000001, 0x00000001, 0x0000003C, 0x0A004338, 0x00000002, 0x00000000 glabel D_802EAE7C -.word 0x00000004, 0x00000011, 0x00000001, 0x0000003C, 0x802E9828, 0x00000002, 0x00000000, 0x00000003, 0x00000000, func_802E8858, 0x00000007, 0x00000020, 0x00000002, func_802E88EC, 0x00000003, 0x00000000, func_802E7FA0, 0x00000007, 0x00000001, 0x00000007, 0x20000000, 0x00000000, 0x42000394, 0x802EAE60, 0x00000000, func_802E7F40, 0x802EAE98, 0x00000000, 0x00E51640, 0x00E55A40, 0x24231E23, 0x00000000, 0x00000000, 0x00000003, 0x00000000, func_802E89B0, 0x00000003, 0x00000000, func_802E89F8, 0x00000003, 0x00000000, func_802E8A58, 0x00000003, 0x00000000, func_802E8ADC, 0x00000002, func_802E8BC0, 0x00000003, 0x00000000, func_802E8C94, 0x00000002, player_enter_blue_pipe, 0x00000003, 0x00000000, func_802E8D74, 0x00000002, func_802E8E10, 0x00000000, 0x00000004, 0x00000001, 0x00000001, 0x0000003C, 0x0A0006B8, 0x00000002, 0x00000000, 0x0000001C, 0x802EAF64, 0x00000000, func_802E8F94, 0x802EAF00, 0x00000000, 0x00E58CD0, 0x00E59480, 0x2B283228, 0x00000000, 0x00000000, 0x00000000, 0x00000003, 0x00000000, func_802E9050, 0x00000000, 0x00000004, 0x00000001, 0x00000001, 0x0000003C, 0x0A000A68, 0x00000002, 0x00000000, 0x0E000008, 0x802EAFC0, 0x00000000, 0x00000000, 0x802EAFB0, 0x00000000, 0x00E59480, 0x00E59F00, 0x33283214 +.word 0x00000004, 0x00000011, 0x00000001, 0x0000003C, D_802E9828, 0x00000002, 0x00000000, 0x00000003, 0x00000000, func_802E8858, 0x00000007, 0x00000020, 0x00000002, func_802E88EC, 0x00000003, 0x00000000, func_802E7FA0, 0x00000007, 0x00000001, 0x00000007, 0x20000000, 0x00000000, 0x42000394, 0x802EAE60, 0x00000000, func_802E7F40, 0x802EAE98, 0x00000000, 0x00E51640, 0x00E55A40, 0x24231E23, 0x00000000, 0x00000000, 0x00000003, 0x00000000, func_802E89B0, 0x00000003, 0x00000000, func_802E89F8, 0x00000003, 0x00000000, func_802E8A58, 0x00000003, 0x00000000, func_802E8ADC, 0x00000002, func_802E8BC0, 0x00000003, 0x00000000, func_802E8C94, 0x00000002, player_enter_blue_pipe, 0x00000003, 0x00000000, func_802E8D74, 0x00000002, func_802E8E10, 0x00000000, 0x00000004, 0x00000001, 0x00000001, 0x0000003C, 0x0A0006B8, 0x00000002, 0x00000000, 0x0000001C, 0x802EAF64, 0x00000000, func_802E8F94, 0x802EAF00, 0x00000000, 0x00E58CD0, 0x00E59480, 0x2B283228, 0x00000000, 0x00000000, 0x00000000, 0x00000003, 0x00000000, func_802E9050, 0x00000000, 0x00000004, 0x00000001, 0x00000001, 0x0000003C, 0x0A000A68, 0x00000002, 0x00000000 + +glabel D_802EAFDC +.word 0x0E000008, 0x802EAFC0, 0x00000000, 0x00000000, 0x802EAFB0, 0x00000000, 0x00E59480, 0x00E59F00, 0x33283214 diff --git a/ver/us/asm/data/code_542E0.data.s b/ver/us/asm/data/code_542E0.data.s index eb0571ef35..475ad0bf92 100644 --- a/ver/us/asm/data/code_542E0.data.s +++ b/ver/us/asm/data/code_542E0.data.s @@ -44,413 +44,8 @@ glabel D_8007F200 glabel D_8007F204 .word D_8007F1D0, 0x00000000, 0x00000000 -glabel D_8007F210 -.word 0x00000000 - glabel gEffectTable -.word 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -glabel D_8007F228 -.word func_E0002000, 0x003278F0, 0x00328110, func_E0002000, 0x00326410, 0x003278F0 - -glabel D_8007F240 -.word 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -glabel D_8007F258 -.word 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -glabel D_8007F270 -.word 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -glabel D_8007F288 -.word 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -glabel D_8007F2A0 -.word func_E000C160, 0x00328110, 0x00328EA0, func_E000C000, 0x00328EA0, 0x0032C110 - -glabel D_8007F2B8 -.word func_E000E000, 0x0032C110, 0x0032C7A0, func_E000E000, 0x00328EA0, 0x0032C110 - -glabel D_8007F2D0 -.word func_E00101E8, 0x0032C7A0, 0x0032CEC0, func_E0010000, 0x0032CEC0, 0x0032DD10 - -glabel D_8007F2E8 -.word func_E0012204, 0x0032DD10, 0x0032E490, func_E0012000, 0x0032CEC0, 0x0032DD10 - -glabel D_8007F300 -.word func_E0014000, 0x0032E490, 0x0032EC50, func_E0014000, 0x0032EC50, 0x0032EE30 - -glabel D_8007F318 -.word func_E0016000, 0x0032EE30, 0x0032F580, func_E0016000, 0x0032EC50, 0x0032EE30 - -glabel D_8007F330 -.word func_E0018078, 0x0032F580, 0x0032FB50, func_E0018000, 0x0032FB50, 0x0032FE30 - -glabel D_8007F348 -.word func_E001A000, 0x0032FE30, 0x00330460, func_E001A000, 0x00330460, 0x00330910 - -glabel D_8007F360 -.word func_E001C000, 0x00330910, 0x00330F00, func_E001C000, 0x00330F00, 0x00331940 - -glabel D_8007F378 -.word func_E001E000, 0x00331940, 0x003326A0, func_E001E000, 0x003326A0, 0x00333EC0 - -glabel D_8007F390 -.word func_E00202CC, 0x00333EC0, 0x00334C70, func_E0020000, 0x00334C70, 0x00337240 - -glabel D_8007F3A8 -.word func_E0022000, 0x00337240, 0x00337FC0, func_E0022000, 0x00337FC0, 0x00339250 - -glabel D_8007F3C0 -.word func_E0024000, 0x00339250, 0x00339F60, func_E0024000, 0x00339F60, 0x0033B180 - -glabel D_8007F3D8 -.word func_E0026000, 0x0033B180, 0x0033BBD0, func_E0026000, 0x0033BBD0, 0x0033CDF0 - -glabel D_8007F3F0 -.word func_E0028000, 0x0033CDF0, 0x0033D610, func_E0028000, 0x0033D610, 0x0033E8C0 - -glabel D_8007F408 -.word func_E002A000, 0x0033E8C0, 0x0033F000, func_E002A000, 0x0033F000, 0x0033FE80 - -glabel D_8007F420 -.word func_E002C000, 0x0033FE80, 0x00340880, func_E002C000, 0x00340880, 0x003419E0 - -glabel D_8007F438 -.word func_E002E000, 0x003419E0, 0x00342140, func_E002E000, 0x00328EA0, 0x0032C110 - -glabel D_8007F450 -.word func_E0030000, 0x00342140, 0x00343040, func_E0030000, 0x00343040, 0x00343680 - -glabel D_8007F468 -.word func_E0032000, 0x00343680, 0x00343F70, func_E0032000, 0x00343F70, 0x00344A10 - -glabel D_8007F480 -.word func_E0034000, 0x00344A10, 0x003451E0, func_E0034000, 0x003451E0, 0x003454E0 - -glabel D_8007F498 -.word func_E0036000, 0x003454E0, 0x00345B40, func_E0036000, 0x00345B40, 0x0034DD20 - -glabel D_8007F4B0 -.word func_E0038000, 0x0034DD20, 0x0034E770, func_E0038000, 0x0034E770, 0x0034EC80 - -glabel D_8007F4C8 -.word func_E003A000, 0x0034EC80, 0x0034F4C0, func_E003A000, 0x00328EA0, 0x0032C110 - -glabel D_8007F4E0 -.word func_E003C000, 0x0034F4C0, 0x00350220, func_E003C000, 0x00350220, 0x00352440 - -glabel D_8007F4F8 -.word func_E003E000, 0x00352440, 0x00352CE0, func_E003E000, 0x00352CE0, 0x00353300 - -glabel D_8007F510 -.word func_E0040000, 0x00353300, 0x00353BB0, func_E0040000, 0x00353BB0, 0x003547A0 - -glabel D_8007F528 -.word func_E0042000, 0x003547A0, 0x00354F60, func_E0042000, 0x00343040, 0x00343680 - -glabel D_8007F540 -.word func_E0044000, 0x00354F60, 0x00355EE0, func_E0044000, 0x00337FC0, 0x00339250 - -glabel D_8007F558 -.word func_E0046000, 0x00355EE0, 0x00356530, func_E0046000, 0x00356530, 0x00356980 - -glabel D_8007F570 -.word func_E0048000, 0x00356980, 0x003573A0, func_E0048000, 0x003573A0, 0x003584C0 - -glabel D_8007F588 -.word func_E004A000, 0x003584C0, 0x003593B0, func_E004A000, 0x003593B0, 0x00359F20 - -glabel D_8007F5A0 -.word func_E004C000, 0x00359F20, 0x0035A5E0, func_E004C000, 0x0035A5E0, 0x0035B9D0 - -glabel D_8007F5B8 -.word func_E004E000, 0x0035B9D0, 0x0035BFD0, func_E004E000, 0x00328EA0, 0x0032C110 - -glabel D_8007F5D0 -.word func_E0050000, 0x0035BFD0, 0x0035C550, func_E0050000, 0x0035C550, 0x0035CA80 - -glabel D_8007F5E8 -.word func_E0052000, 0x0035CA80, 0x0035D510, func_E0052000, 0x0035D510, 0x0035DA00 - -glabel D_8007F600 -.word 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -glabel D_8007F618 -.word func_E0056000, 0x0035DA00, 0x0035E920, func_E0056000, 0x0033D610, 0x0033E8C0 - -glabel D_8007F630 -.word func_E0058000, 0x0035E920, 0x0035F0E0, func_E0058000, 0x0035F0E0, 0x003602C0 - -glabel D_8007F648 -.word func_E005A000, 0x003602C0, 0x00360A30, func_E005A000, 0x00360A30, 0x00360F40 - -glabel D_8007F660 -.word func_E005C000, 0x00360F40, 0x00361670, func_E005C000, 0x00361670, 0x003625C0 - -glabel D_8007F678 -.word func_E005E000, 0x003625C0, 0x00362C50, func_E005E000, 0x00362C50, 0x00363160 - -glabel D_8007F690 -.word func_E0060000, 0x00363160, 0x003638C0, func_E0060000, 0x003638C0, 0x00364300 - -glabel D_8007F6A8 -.word func_E0062000, 0x00364300, 0x00364C00, func_E0062000, 0x00364C00, 0x00364F10 - -glabel D_8007F6C0 -.word func_E0064000, 0x00364F10, 0x003659B0, func_E0064000, 0x003659B0, 0x00366030 - -glabel D_8007F6D8 -.word func_E0066000, 0x00366030, 0x00366D60, func_E0066000, 0x00366D60, 0x0036A8D0 - -glabel D_8007F6F0 -.word func_E0068000, 0x0036A8D0, 0x0036AEE0, func_E0068000, 0x0036AEE0, 0x0036D020 - -glabel D_8007F708 -.word func_E006A1E8, 0x0036D020, 0x0036DF90, func_E006A000, 0x0036DF90, 0x0036E1D0 - -glabel D_8007F720 -.word func_E006C000, 0x0036E1D0, 0x0036ED60, func_E006C000, 0x0036ED60, 0x00372790 - -glabel D_8007F738 -.word func_E006E000, 0x00372790, 0x003733E0, func_E006E000, 0x003733E0, 0x003740B0 - -glabel D_8007F750 -.word func_E0070000, 0x003740B0, 0x00374E50, func_E0070000, 0x00337FC0, 0x00339250 - -glabel D_8007F768 -.word func_E0072000, 0x00374E50, 0x00375510, func_E0072000, 0x00375510, 0x00376460 - -glabel D_8007F780 -.word func_E0074000, 0x00376460, 0x00377070, func_E0074000, 0x00337FC0, 0x00339250 - -glabel D_8007F798 -.word func_E0076000, 0x00377070, 0x00377F80, func_E0076000, 0x00377F80, 0x0037A3F0 - -glabel D_8007F7B0 -.word func_E0078000, 0x0037A3F0, 0x0037ADD0, func_E0078000, 0x0037ADD0, 0x0037C540 - -glabel D_8007F7C8 -.word func_E007A000, 0x0037C540, 0x0037D180, func_E007A000, 0x0037D180, 0x0037D490 - -glabel D_8007F7E0 -.word func_E007C000, 0x0037D490, 0x0037D9D0, func_E007C000, 0x0037D9D0, 0x0037F720 - -glabel D_8007F7F8 -.word func_E007E000, 0x0037F720, 0x003803A0, func_E007E000, 0x003803A0, 0x003812C0 - -glabel D_8007F810 -.word func_E0080000, 0x003812C0, 0x00381E00, func_E0080000, 0x00381E00, 0x00385640 - -glabel D_8007F828 -.word func_E0082000, 0x00385640, 0x003863B0, func_E0082000, 0x003863B0, 0x003889D0 - -glabel D_8007F840 -.word func_E0084084, 0x003889D0, 0x00389850, func_E0084000, 0x0037D9D0, 0x0037F720 - -glabel D_8007F858 -.word func_E0086000, 0x00389850, 0x0038A350, func_E0086000, 0x0038A350, 0x0038ADF0 - -glabel D_8007F870 -.word func_E008817C, 0x0038ADF0, 0x0038BBA0, func_E0088000, 0x0038BBA0, 0x0038C5F0 - -glabel D_8007F888 -.word func_E008A188, 0x0038C5F0, 0x0038D070, func_E008A000, 0x0038D070, 0x0038DE00 - -glabel D_8007F8A0 -.word func_E008C000, 0x0038DE00, 0x0038E990, func_E008C000, 0x0038E990, 0x0038EE60 - -glabel D_8007F8B8 -.word func_E008E000, 0x0038EE60, 0x0038F710, func_E008E000, 0x0038F710, 0x0038F900 - -glabel D_8007F8D0 -.word func_E0090000, 0x0038F900, 0x003903D0, func_E0090000, 0x003903D0, 0x00391D30 - -glabel D_8007F8E8 -.word func_E0092000, 0x00391D30, 0x00392440, func_E0092000, 0x00392440, 0x003928D0 - -glabel D_8007F900 -.word func_E0094000, 0x003928D0, 0x003930A0, func_E0094000, 0x003930A0, 0x00394280 - -glabel D_8007F918 -.word func_E0096000, 0x00394280, 0x00394670, func_E0096000, 0x00394670, 0x00395BB0 - -glabel D_8007F930 -.word func_E0098000, 0x00395BB0, 0x003960F0, func_E0098000, 0x003960F0, 0x003965B0 - -glabel D_8007F948 -.word func_E009A000, 0x003965B0, 0x00397040, func_E009A000, 0x00397040, 0x003981F0 - -glabel D_8007F960 -.word func_E009C000, 0x003981F0, 0x00398BC0, func_E009C000, 0x00398BC0, 0x0039FF20 - -glabel D_8007F978 -.word func_E009E000, 0x0039FF20, 0x003A0D60, func_E009E000, 0x003A0D60, 0x003A2290 - -glabel D_8007F990 -.word func_E00A0000, 0x003A2290, 0x003A2440, func_E00A0000, 0x003A2440, 0x003A2990 - -glabel D_8007F9A8 -.word func_E00A2000, 0x003A2990, 0x003A33D0, func_E00A2000, 0x003A33D0, 0x003A37E0 - -glabel D_8007F9C0 -.word func_E00A4000, 0x003A37E0, 0x003A4320, func_E00A4000, 0x003A4320, 0x003A5550 - -glabel D_8007F9D8 -.word func_E00A6000, 0x003A5550, 0x003A5BE0, func_E00A6000, 0x003A5BE0, 0x003A70F0 - -glabel D_8007F9F0 -.word func_E00A8000, 0x003A70F0, 0x003A77A0, func_E00A8000, 0x003A77A0, 0x003AA920 - -glabel D_8007FA08 -.word func_E00AA000, 0x003AA920, 0x003AB030, func_E00AA000, 0x003AB030, 0x003AEE20 - -glabel D_8007FA20 -.word func_E00AC000, 0x003AEE20, 0x003AF700, func_E00AC000, 0x003AF700, 0x003B2350 - -glabel D_8007FA38 -.word func_E00AE000, 0x003B2350, 0x003B2D90, func_E00AE000, 0x003B2D90, 0x003B3EB0 - -glabel D_8007FA50 -.word func_E00B0000, 0x003B3EB0, 0x003B46A0, func_E00B0000, 0x003B46A0, 0x003B4790 - -glabel D_8007FA68 -.word func_E00B2000, 0x003B4790, 0x003B5340, func_E00B2000, 0x003B5340, 0x003B5CF0 - -glabel D_8007FA80 -.word func_E00B4000, 0x003B5CF0, 0x003B6BF0, func_E00B4000, 0x003B6BF0, 0x003B7160 - -glabel D_8007FA98 -.word func_E00B6000, 0x003B7160, 0x003B78D0, func_E00B6000, 0x003B78D0, 0x003B7B80 - -glabel D_8007FAB0 -.word func_E00B8000, 0x003B7B80, 0x003B8860, func_E00B8000, 0x003B8860, 0x003B8BD0 - -glabel D_8007FAC8 -.word func_E00BA000, 0x003B8BD0, 0x003B9A70, func_E00BA000, 0x003B9A70, 0x003BA030 - -glabel D_8007FAE0 -.word func_E00BC000, 0x003BA030, 0x003BAEA0, func_E00BC000, 0x003BAEA0, 0x003BBF60 - -glabel D_8007FAF8 -.word func_E00BE000, 0x003BBF60, 0x003BCA90, func_E00BE000, 0x003BCA90, 0x003BCD60 - -glabel D_8007FB10 -.word func_E00C0000, 0x003BCD60, 0x003BD9A0, func_E00C0000, 0x003BD9A0, 0x003C11D0 - -glabel D_8007FB28 -.word func_E00C2000, 0x003C11D0, 0x003C1BA0, func_E00C2000, 0x003C1BA0, 0x003CADF0 - -glabel D_8007FB40 -.word func_E00C4000, 0x003CADF0, 0x003CB890, func_E00C4000, 0x003CB890, 0x003CC9E0 - -glabel D_8007FB58 -.word func_E00C6000, 0x003CC9E0, 0x003CD6E0, func_E00C6000, 0x003CD6E0, 0x003CF3A0 - -glabel D_8007FB70 -.word func_E00C8000, 0x003CF3A0, 0x003CFAF0, func_E00C8000, 0x003CFAF0, 0x003D0500 - -glabel D_8007FB88 -.word func_E00CA000, 0x003D0500, 0x003D11E0, func_E00CA000, 0x003D11E0, 0x003D1690 - -glabel D_8007FBA0 -.word func_E00CC000, 0x003D1690, 0x003D2580, func_E00CC000, 0x003D2580, 0x003D2AC0 - -glabel D_8007FBB8 -.word func_E00CE000, 0x003D2AC0, 0x003D3930, func_E00CE000, 0x003D3930, 0x003D3E20 - -glabel D_8007FBD0 -.word func_E00D0000, 0x003D3E20, 0x003D4970, func_E00D0000, 0x003593B0, 0x00359F20 - -glabel D_8007FBE8 -.word func_E00D2000, 0x003D4970, 0x003D4E90, func_E00D2000, 0x003D4E90, 0x003D5020 - -glabel D_8007FC00 -.word 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -glabel D_8007FC18 -.word func_E00D6000, 0x003D5020, 0x003D5F30, func_E00D6000, 0x003D5F30, 0x003D67C0 - -glabel D_8007FC30 -.word func_E00D8000, 0x003D67C0, 0x003D7040, func_E00D8000, 0x003D7040, 0x003D7240 - -glabel D_8007FC48 -.word func_E00DA000, 0x003D7240, 0x003D7770, func_E00DA000, 0x003D7770, 0x003D7A70 - -glabel D_8007FC60 -.word func_E00DC000, 0x003D7A70, 0x003D80C0, func_E00DC000, 0x003D80C0, 0x003D8720 - -glabel D_8007FC78 -.word func_E00DE000, 0x003D8720, 0x003D9100, func_E00DE000, 0x003D9100, 0x003DB460 - -glabel D_8007FC90 -.word func_E00E0000, 0x003DB460, 0x003DBF40, func_E00E0000, 0x003DBF40, 0x003DC310 - -glabel D_8007FCA8 -.word func_E00E2000, 0x003DC310, 0x003DCD50, func_E00E2000, 0x003DCD50, 0x003DE000 - -glabel D_8007FCC0 -.word func_E00E4000, 0x003DE000, 0x003DEE60, func_E00E4000, 0x003DEE60, 0x003E0930 - -glabel D_8007FCD8 -.word func_E00E6000, 0x003E0930, 0x003E12D0, func_E00E6000, 0x003E12D0, 0x003E1690 - -glabel D_8007FCF0 -.word func_E00E8000, 0x003E1690, 0x003E1CD0, func_E00E8000, 0x003E1CD0, 0x003E1EE0 - -glabel D_8007FD08 -.word func_E00EA000, 0x003E1EE0, 0x003E2960, func_E00EA000, 0x003E2960, 0x003E43A0 - -glabel D_8007FD20 -.word 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -glabel D_8007FD38 -.word func_E010A000, 0x003E43A0, 0x003E5350, func_E010A000, 0x003E5350, 0x003E54C0 - -glabel D_8007FD50 -.word func_E010C000, 0x003E54C0, 0x003E5F30, func_E010C000, 0x003E5F30, 0x003EB4E0 - -glabel D_8007FD68 -.word func_E010E32C, 0x003EB4E0, 0x003EBE60, func_E010E000, 0x003EBE60, 0x003F83F0 - -glabel D_8007FD80 -.word func_E0110000, 0x003F83F0, 0x003F8CC0, func_E0110000, 0x003F8CC0, 0x003F9E50 - -glabel D_8007FD98 -.word func_E0112000, 0x003F9E50, 0x003FA4B0, func_E0112000, 0x003FA4B0, 0x003FEAE0 - -glabel D_8007FDB0 -.word func_E0114000, 0x003FEAE0, 0x003FF250, func_E0114000, 0x003FF250, 0x00402640 - -glabel D_8007FDC8 -.word func_E0116000, 0x00402640, 0x00403400, func_E0116000, 0x003FA4B0, 0x003FEAE0 - -glabel D_8007FDE0 -.word func_E0118000, 0x00403400, 0x00403BF0, func_E0118000, 0x00403BF0, 0x00404220 - -glabel D_8007FDF8 -.word func_E011A000, 0x00404220, 0x00404F40, func_E011A000, 0x00404F40, 0x00406B40 - -glabel D_8007FE10 -.word func_E011C000, 0x00406B40, 0x00407080, func_E011C000, 0x00407080, 0x00409990 - -glabel D_8007FE28 -.word func_E011E000, 0x00409990, 0x0040A1C0, func_E011E000, 0x0040A1C0, 0x0040B3F0 - -glabel D_8007FE40 -.word func_E0120000, 0x0040B3F0, 0x0040BBA0, func_E0120000, 0x0040BBA0, 0x0040C5A0 - -glabel D_8007FE58 -.word func_E0122000, 0x0040C5A0, 0x0040D290, func_E0122000, 0x0040D290, 0x00412730 - -glabel D_8007FE70 -.word func_E0124000, 0x00412730, 0x00413360, func_E0124000, 0x00337FC0, 0x00339250 - -glabel D_8007FE88 -.word func_E0126000, 0x00413360, 0x00413FA0, func_E0126000, 0x00413FA0, 0x00414BA0 - -glabel D_8007FEA0 -.word func_E0128000, 0x00414BA0, 0x00415060, func_E0128000, 0x00415060, 0x00415D90, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00000000, 0x00000200, 0x00000000, 0x00000000, 0x00000003, 0x00000000 +.word 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_E0002000, 0x003278F0, 0x00328110, func_E0002000, 0x00326410, 0x003278F0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_E000C160, 0x00328110, 0x00328EA0, func_E000C000, 0x00328EA0, 0x0032C110, func_E000E000, 0x0032C110, 0x0032C7A0, func_E000E000, 0x00328EA0, 0x0032C110, func_E00101E8, 0x0032C7A0, 0x0032CEC0, func_E0010000, 0x0032CEC0, 0x0032DD10, func_E0012204, 0x0032DD10, 0x0032E490, func_E0012000, 0x0032CEC0, 0x0032DD10, func_E0014000, 0x0032E490, 0x0032EC50, func_E0014000, 0x0032EC50, 0x0032EE30, func_E0016000, 0x0032EE30, 0x0032F580, func_E0016000, 0x0032EC50, 0x0032EE30, func_E0018078, 0x0032F580, 0x0032FB50, func_E0018000, 0x0032FB50, 0x0032FE30, func_E001A000, 0x0032FE30, 0x00330460, func_E001A000, 0x00330460, 0x00330910, func_E001C000, 0x00330910, 0x00330F00, func_E001C000, 0x00330F00, 0x00331940, func_E001E000, 0x00331940, 0x003326A0, func_E001E000, 0x003326A0, 0x00333EC0, func_E00202CC, 0x00333EC0, 0x00334C70, func_E0020000, 0x00334C70, 0x00337240, func_E0022000, 0x00337240, 0x00337FC0, func_E0022000, 0x00337FC0, 0x00339250, func_E0024000, 0x00339250, 0x00339F60, func_E0024000, 0x00339F60, 0x0033B180, func_E0026000, 0x0033B180, 0x0033BBD0, func_E0026000, 0x0033BBD0, 0x0033CDF0, func_E0028000, 0x0033CDF0, 0x0033D610, func_E0028000, 0x0033D610, 0x0033E8C0, func_E002A000, 0x0033E8C0, 0x0033F000, func_E002A000, 0x0033F000, 0x0033FE80, func_E002C000, 0x0033FE80, 0x00340880, func_E002C000, 0x00340880, 0x003419E0, func_E002E000, 0x003419E0, 0x00342140, func_E002E000, 0x00328EA0, 0x0032C110, func_E0030000, 0x00342140, 0x00343040, func_E0030000, 0x00343040, 0x00343680, func_E0032000, 0x00343680, 0x00343F70, func_E0032000, 0x00343F70, 0x00344A10, func_E0034000, 0x00344A10, 0x003451E0, func_E0034000, 0x003451E0, 0x003454E0, func_E0036000, 0x003454E0, 0x00345B40, func_E0036000, 0x00345B40, 0x0034DD20, func_E0038000, 0x0034DD20, 0x0034E770, func_E0038000, 0x0034E770, 0x0034EC80, func_E003A000, 0x0034EC80, 0x0034F4C0, func_E003A000, 0x00328EA0, 0x0032C110, func_E003C000, 0x0034F4C0, 0x00350220, func_E003C000, 0x00350220, 0x00352440, func_E003E000, 0x00352440, 0x00352CE0, func_E003E000, 0x00352CE0, 0x00353300, func_E0040000, 0x00353300, 0x00353BB0, func_E0040000, 0x00353BB0, 0x003547A0, func_E0042000, 0x003547A0, 0x00354F60, func_E0042000, 0x00343040, 0x00343680, func_E0044000, 0x00354F60, 0x00355EE0, func_E0044000, 0x00337FC0, 0x00339250, func_E0046000, 0x00355EE0, 0x00356530, func_E0046000, 0x00356530, 0x00356980, func_E0048000, 0x00356980, 0x003573A0, func_E0048000, 0x003573A0, 0x003584C0, func_E004A000, 0x003584C0, 0x003593B0, func_E004A000, 0x003593B0, 0x00359F20, func_E004C000, 0x00359F20, 0x0035A5E0, func_E004C000, 0x0035A5E0, 0x0035B9D0, func_E004E000, 0x0035B9D0, 0x0035BFD0, func_E004E000, 0x00328EA0, 0x0032C110, func_E0050000, 0x0035BFD0, 0x0035C550, func_E0050000, 0x0035C550, 0x0035CA80, func_E0052000, 0x0035CA80, 0x0035D510, func_E0052000, 0x0035D510, 0x0035DA00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_E0056000, 0x0035DA00, 0x0035E920, func_E0056000, 0x0033D610, 0x0033E8C0, func_E0058000, 0x0035E920, 0x0035F0E0, func_E0058000, 0x0035F0E0, 0x003602C0, func_E005A000, 0x003602C0, 0x00360A30, func_E005A000, 0x00360A30, 0x00360F40, func_E005C000, 0x00360F40, 0x00361670, func_E005C000, 0x00361670, 0x003625C0, func_E005E000, 0x003625C0, 0x00362C50, func_E005E000, 0x00362C50, 0x00363160, func_E0060000, 0x00363160, 0x003638C0, func_E0060000, 0x003638C0, 0x00364300, func_E0062000, 0x00364300, 0x00364C00, func_E0062000, 0x00364C00, 0x00364F10, func_E0064000, 0x00364F10, 0x003659B0, func_E0064000, 0x003659B0, 0x00366030, func_E0066000, 0x00366030, 0x00366D60, func_E0066000, 0x00366D60, 0x0036A8D0, func_E0068000, 0x0036A8D0, 0x0036AEE0, func_E0068000, 0x0036AEE0, 0x0036D020, func_E006A1E8, 0x0036D020, 0x0036DF90, func_E006A000, 0x0036DF90, 0x0036E1D0, func_E006C000, 0x0036E1D0, 0x0036ED60, func_E006C000, 0x0036ED60, 0x00372790, func_E006E000, 0x00372790, 0x003733E0, func_E006E000, 0x003733E0, 0x003740B0, func_E0070000, 0x003740B0, 0x00374E50, func_E0070000, 0x00337FC0, 0x00339250, func_E0072000, 0x00374E50, 0x00375510, func_E0072000, 0x00375510, 0x00376460, func_E0074000, 0x00376460, 0x00377070, func_E0074000, 0x00337FC0, 0x00339250, func_E0076000, 0x00377070, 0x00377F80, func_E0076000, 0x00377F80, 0x0037A3F0, func_E0078000, 0x0037A3F0, 0x0037ADD0, func_E0078000, 0x0037ADD0, 0x0037C540, func_E007A000, 0x0037C540, 0x0037D180, func_E007A000, 0x0037D180, 0x0037D490, func_E007C000, 0x0037D490, 0x0037D9D0, func_E007C000, 0x0037D9D0, 0x0037F720, func_E007E000, 0x0037F720, 0x003803A0, func_E007E000, 0x003803A0, 0x003812C0, func_E0080000, 0x003812C0, 0x00381E00, func_E0080000, 0x00381E00, 0x00385640, func_E0082000, 0x00385640, 0x003863B0, func_E0082000, 0x003863B0, 0x003889D0, func_E0084084, 0x003889D0, 0x00389850, func_E0084000, 0x0037D9D0, 0x0037F720, func_E0086000, 0x00389850, 0x0038A350, func_E0086000, 0x0038A350, 0x0038ADF0, func_E008817C, 0x0038ADF0, 0x0038BBA0, func_E0088000, 0x0038BBA0, 0x0038C5F0, func_E008A188, 0x0038C5F0, 0x0038D070, func_E008A000, 0x0038D070, 0x0038DE00, func_E008C000, 0x0038DE00, 0x0038E990, func_E008C000, 0x0038E990, 0x0038EE60, func_E008E000, 0x0038EE60, 0x0038F710, func_E008E000, 0x0038F710, 0x0038F900, func_E0090000, 0x0038F900, 0x003903D0, func_E0090000, 0x003903D0, 0x00391D30, func_E0092000, 0x00391D30, 0x00392440, func_E0092000, 0x00392440, 0x003928D0, func_E0094000, 0x003928D0, 0x003930A0, func_E0094000, 0x003930A0, 0x00394280, func_E0096000, 0x00394280, 0x00394670, func_E0096000, 0x00394670, 0x00395BB0, func_E0098000, 0x00395BB0, 0x003960F0, func_E0098000, 0x003960F0, 0x003965B0, func_E009A000, 0x003965B0, 0x00397040, func_E009A000, 0x00397040, 0x003981F0, func_E009C000, 0x003981F0, 0x00398BC0, func_E009C000, 0x00398BC0, 0x0039FF20, func_E009E000, 0x0039FF20, 0x003A0D60, func_E009E000, 0x003A0D60, 0x003A2290, func_E00A0000, 0x003A2290, 0x003A2440, func_E00A0000, 0x003A2440, 0x003A2990, func_E00A2000, 0x003A2990, 0x003A33D0, func_E00A2000, 0x003A33D0, 0x003A37E0, func_E00A4000, 0x003A37E0, 0x003A4320, func_E00A4000, 0x003A4320, 0x003A5550, func_E00A6000, 0x003A5550, 0x003A5BE0, func_E00A6000, 0x003A5BE0, 0x003A70F0, func_E00A8000, 0x003A70F0, 0x003A77A0, func_E00A8000, 0x003A77A0, 0x003AA920, func_E00AA000, 0x003AA920, 0x003AB030, func_E00AA000, 0x003AB030, 0x003AEE20, func_E00AC000, 0x003AEE20, 0x003AF700, func_E00AC000, 0x003AF700, 0x003B2350, func_E00AE000, 0x003B2350, 0x003B2D90, func_E00AE000, 0x003B2D90, 0x003B3EB0, func_E00B0000, 0x003B3EB0, 0x003B46A0, func_E00B0000, 0x003B46A0, 0x003B4790, func_E00B2000, 0x003B4790, 0x003B5340, func_E00B2000, 0x003B5340, 0x003B5CF0, func_E00B4000, 0x003B5CF0, 0x003B6BF0, func_E00B4000, 0x003B6BF0, 0x003B7160, func_E00B6000, 0x003B7160, 0x003B78D0, func_E00B6000, 0x003B78D0, 0x003B7B80, func_E00B8000, 0x003B7B80, 0x003B8860, func_E00B8000, 0x003B8860, 0x003B8BD0, func_E00BA000, 0x003B8BD0, 0x003B9A70, func_E00BA000, 0x003B9A70, 0x003BA030, func_E00BC000, 0x003BA030, 0x003BAEA0, func_E00BC000, 0x003BAEA0, 0x003BBF60, func_E00BE000, 0x003BBF60, 0x003BCA90, func_E00BE000, 0x003BCA90, 0x003BCD60, func_E00C0000, 0x003BCD60, 0x003BD9A0, func_E00C0000, 0x003BD9A0, 0x003C11D0, func_E00C2000, 0x003C11D0, 0x003C1BA0, func_E00C2000, 0x003C1BA0, 0x003CADF0, func_E00C4000, 0x003CADF0, 0x003CB890, func_E00C4000, 0x003CB890, 0x003CC9E0, func_E00C6000, 0x003CC9E0, 0x003CD6E0, func_E00C6000, 0x003CD6E0, 0x003CF3A0, func_E00C8000, 0x003CF3A0, 0x003CFAF0, func_E00C8000, 0x003CFAF0, 0x003D0500, func_E00CA000, 0x003D0500, 0x003D11E0, func_E00CA000, 0x003D11E0, 0x003D1690, func_E00CC000, 0x003D1690, 0x003D2580, func_E00CC000, 0x003D2580, 0x003D2AC0, func_E00CE000, 0x003D2AC0, 0x003D3930, func_E00CE000, 0x003D3930, 0x003D3E20, func_E00D0000, 0x003D3E20, 0x003D4970, func_E00D0000, 0x003593B0, 0x00359F20, func_E00D2000, 0x003D4970, 0x003D4E90, func_E00D2000, 0x003D4E90, 0x003D5020, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_E00D6000, 0x003D5020, 0x003D5F30, func_E00D6000, 0x003D5F30, 0x003D67C0, func_E00D8000, 0x003D67C0, 0x003D7040, func_E00D8000, 0x003D7040, 0x003D7240, func_E00DA000, 0x003D7240, 0x003D7770, func_E00DA000, 0x003D7770, 0x003D7A70, func_E00DC000, 0x003D7A70, 0x003D80C0, func_E00DC000, 0x003D80C0, 0x003D8720, func_E00DE000, 0x003D8720, 0x003D9100, func_E00DE000, 0x003D9100, 0x003DB460, func_E00E0000, 0x003DB460, 0x003DBF40, func_E00E0000, 0x003DBF40, 0x003DC310, func_E00E2000, 0x003DC310, 0x003DCD50, func_E00E2000, 0x003DCD50, 0x003DE000, func_E00E4000, 0x003DE000, 0x003DEE60, func_E00E4000, 0x003DEE60, 0x003E0930, func_E00E6000, 0x003E0930, 0x003E12D0, func_E00E6000, 0x003E12D0, 0x003E1690, func_E00E8000, 0x003E1690, 0x003E1CD0, func_E00E8000, 0x003E1CD0, 0x003E1EE0, func_E00EA000, 0x003E1EE0, 0x003E2960, func_E00EA000, 0x003E2960, 0x003E43A0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_E010A000, 0x003E43A0, 0x003E5350, func_E010A000, 0x003E5350, 0x003E54C0, func_E010C000, 0x003E54C0, 0x003E5F30, func_E010C000, 0x003E5F30, 0x003EB4E0, func_E010E32C, 0x003EB4E0, 0x003EBE60, func_E010E000, 0x003EBE60, 0x003F83F0, func_E0110000, 0x003F83F0, 0x003F8CC0, func_E0110000, 0x003F8CC0, 0x003F9E50, func_E0112000, 0x003F9E50, 0x003FA4B0, func_E0112000, 0x003FA4B0, 0x003FEAE0, func_E0114000, 0x003FEAE0, 0x003FF250, func_E0114000, 0x003FF250, 0x00402640, func_E0116000, 0x00402640, 0x00403400, func_E0116000, 0x003FA4B0, 0x003FEAE0, func_E0118000, 0x00403400, 0x00403BF0, func_E0118000, 0x00403BF0, 0x00404220, func_E011A000, 0x00404220, 0x00404F40, func_E011A000, 0x00404F40, 0x00406B40, func_E011C000, 0x00406B40, 0x00407080, func_E011C000, 0x00407080, 0x00409990, func_E011E000, 0x00409990, 0x0040A1C0, func_E011E000, 0x0040A1C0, 0x0040B3F0, func_E0120000, 0x0040B3F0, 0x0040BBA0, func_E0120000, 0x0040BBA0, 0x0040C5A0, func_E0122000, 0x0040C5A0, 0x0040D290, func_E0122000, 0x0040D290, 0x00412730, func_E0124000, 0x00412730, 0x00413360, func_E0124000, 0x00337FC0, 0x00339250, func_E0126000, 0x00413360, 0x00413FA0, func_E0126000, 0x00413FA0, 0x00414BA0, func_E0128000, 0x00414BA0, 0x00415060, func_E0128000, 0x00415060, 0x00415D90, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00000000, 0x00000200, 0x00000000, 0x00000000, 0x00000003, 0x00000000 glabel D_8007FF20 .word 0x00000008, 0x00000005, 0x00000002, 0x00000004, 0x0000000C, 0x00000000, 0xFFFFFFFF, 0x0000000D, 0x00000001, 0x0002C7C0, 0x0002C8E0, 0x00000000, 0x00000000, 0x0000000C, 0x00000000, 0xFFFFFFFF, 0x0000000D, 0x00000001, 0x0002C7C0, 0x0002C8E0, 0x00000000, 0x00000000, 0x0000000C, 0x00000000, 0xFFFFFFFF, 0x0000000D, 0x00000001, 0x0002C7C0, 0x0002C8E0, 0x00000000, 0x00000000, 0x0000000C, 0x00000000, 0xFFFFFFFF, 0x0000000D, 0x00000001, 0x0002C7C0, 0x0002C8E0, 0x00000000, 0x00000000, 0x0000000C, 0x00000002, 0xFFFFFFFF, 0x0000000D, 0x00000001, 0x0002C900, 0x0002CA20, 0x00000000, 0x00000000, 0x0000000C, 0x00000002, 0xFFFFFFFF, 0x0000000D, 0x00000001, 0x0002CA40, 0x0002CB60, 0x00000000, 0x00000000, 0x0000000C, 0x00000002, 0xFFFFFFFF, 0x0000000D, 0x00000004, 0x0002CB80, 0x0002CCA0, 0x00000000, 0x00000000, 0x0000000C, 0x00000002, 0x00000004, 0x0000000D, 0x00000001, 0x0002C900, 0x0002CA20, 0x00000000, 0x00000000, 0x0000000C, 0x00000000, 0x00000003, 0x0000000D, 0x00000001, 0x0002C7C0, 0x0002C8E0, 0x00000000, 0x00000000, 0x0000000C, 0x00000000, 0xFFFFFFFF, 0x0000000D, 0x0000000E, 0x0002CCC0, 0x0002CDE0, 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x00000008, 0x00000005, 0x00000002, 0x0000000C, 0x00000000, 0xFFFFFFFF, 0x0000000D, 0x00000001, 0x0002C7C0, 0x0002C8E0, 0x00000000, 0x00000000, 0x0000000C, 0x00000002, 0xFFFFFFFF, 0x0000000D, 0x00000001, 0x0002C900, 0x0002CA20, 0x00000000, 0x00000000, 0x0000000C, 0x00000002, 0xFFFFFFFF, 0x0000000D, 0x00000001, 0x0002CA40, 0x0002CB60, 0x00000000, 0x00000000, 0x0000000C, 0x00000002, 0xFFFFFFFF, 0x0000000D, 0x00000004, 0x0002CB80, 0x0002CCA0, 0x00000000, 0x00000000, 0x0000000C, 0x00000002, 0x00000004, 0x0000000D, 0x00000001, 0x0002C900, 0x0002CA20, 0x00000000, 0x00000000, 0x0000000C, 0x00000000, 0x00000003, 0x0000000D, 0x00000001, 0x0002C7C0, 0x0002C8E0, 0x00000000, 0x00000000, 0x0000000C, 0x00000000, 0xFFFFFFFF, 0x0000000D, 0x00000002, 0x0002CCC0, 0x0002CDE0, 0x00000000, 0x00000000, 0x0000000C, 0x00000000, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0002C7C0, 0x0002C8E0, 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x00000008, 0x00000005, 0x00000002, 0x00000004, 0x0000000D, 0x0000003C, 0x0002C7C0, 0x0002C8E0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 diff --git a/ver/us/asm/data/code_A5100.rodata.s b/ver/us/asm/data/code_A5100.rodata.s deleted file mode 100644 index 37e3e9a5f4..0000000000 --- a/ver/us/asm/data/code_A5100.rodata.s +++ /dev/null @@ -1,144 +0,0 @@ -.include "macro.inc" - -.section .rodata - -glabel D_8010BC50 -.double 0.1, 0.0 - -glabel jtbl_8010BC60 -.word L800E08F8_79DA8, L800E08F8_79DA8, L800E08F8_79DA8, L800E08F8_79DA8, L800E09C0_79E70, L800E09C0_79E70, L800E09C0_79E70, L800E09C0_79E70, L800E09C0_79E70, L800E08F8_79DA8, L800E09C0_79E70, L800E09C0_79E70, L800E09C0_79E70, L800E09C0_79E70, L800E09C0_79E70, L800E09C0_79E70, L800E09C0_79E70, L800E09C0_79E70, L800E09C0_79E70, L800E09C0_79E70, L800E09C0_79E70, L800E09C0_79E70, L800E09C0_79E70, L800E09C0_79E70, L800E09C0_79E70, L800E09C0_79E70, L800E09C0_79E70, L800E09C0_79E70, L800E09C0_79E70, L800E09C0_79E70, L800E09C0_79E70, L800E09C0_79E70, L800E09C0_79E70, L800E09C0_79E70, L800E09C0_79E70, L800E09C0_79E70, L800E09C0_79E70, L800E09C0_79E70, L800E09C0_79E70, L800E09C0_79E70, L800E09C0_79E70, L800E09C0_79E70, L800E09C0_79E70, L800E09C0_79E70, L800E09C0_79E70, L800E09C0_79E70, L800E09C0_79E70, L800E08F8_79DA8, L800E08F8_79DA8, 0, 0, 0 - -glabel D_8010BD30 -.double 180.0 - -glabel jtbl_8010BD38 -.word L800E25A4_7BA54, L800E25A4_7BA54, L800E2594_7BA44, L800E2630_7BAE0, L800E2630_7BAE0, L800E2630_7BAE0, L800E2630_7BAE0, L800E2594_7BA44, L800E2630_7BAE0, L800E2630_7BAE0, L800E2630_7BAE0, L800E2630_7BAE0, L800E2630_7BAE0, L800E2630_7BAE0, L800E2630_7BAE0, L800E2630_7BAE0, L800E2620_7BAD0, 0 - -glabel D_8010BD80 -.double -0.47 - -glabel D_8010BD88 -.double 0.001 - -glabel D_8010BD90 -.double -1.2 - -glabel jtbl_8010BD98 -.word L800E2D8C_7C23C, L800E2DFC_7C2AC, L800E2D6C_7C21C, L800E2D7C_7C22C, L800E2E68_7C318, L800E2E68_7C318, L800E2E68_7C318, L800E2E68_7C318, L800E2E68_7C318, L800E2E68_7C318, L800E2E68_7C318, L800E2E68_7C318, L800E2E68_7C318, L800E2E68_7C318, L800E2E68_7C318, L800E2E68_7C318, L800E2E68_7C318, L800E2F4C_7C3FC, L800E2E68_7C318, L800E2F4C_7C3FC - -glabel jtbl_8010BDE8 -.word L800E2FD0_7C480, L800E3064_7C514, L800E3064_7C514, L800E3064_7C514, L800E2F98_7C448, L800E3064_7C514, L800E3064_7C514, L800E3064_7C514, L800E3064_7C514, L800E3064_7C514, L800E2FD0_7C480, L800E2FD0_7C480, L800E2FD0_7C480, L800E2FD0_7C480, L800E3064_7C514, L800E3064_7C514, L800E3064_7C514, L800E3064_7C514, L800E2FD0_7C480, L800E3064_7C514, L800E2FD0_7C480, 0 - -glabel jtbl_8010BE40 -.word L800E31B0_7C660, L800E3200_7C6B0, L800E31C0_7C670, L800E31B0_7C660, L800E31B0_7C660, 0 - -glabel jtbl_8010BE58 -.word L800E42E0_7D790, L800E3B18_7CFC8, L800E3B18_7CFC8, L800E42E0_7D790, L800E42E0_7D790, L800E3B18_7CFC8, L800E3B18_7CFC8, L800E3824_7CCD4, L800E42E0_7D790, L800E3824_7CCD4, L800E42E0_7D790, L800E3940_7CDF0, L800E3B18_7CFC8, L800E3B18_7CFC8, L800E42E0_7D790, L800E3B18_7CFC8, L800E42E0_7D790, L800E3B18_7CFC8, L800E42E0_7D790, L800E3B18_7CFC8, L800E3B18_7CFC8, L800E3B18_7CFC8, L800E3B18_7CFC8, L800E3B18_7CFC8, L800E3B18_7CFC8, L800E3B18_7CFC8, L800E3750_7CC00, L800E36FC_7CBAC, L800E3B18_7CFC8, L800E3B18_7CFC8, L800E3B18_7CFC8, L800E42E0_7D790 - -glabel D_8010BED8 -.double 35.0 - -glabel D_8010BEE0 -.double 180.0 - -glabel D_8010BEE8 -.double 180.0 - -glabel D_8010BEF0 -.double 90.0 - -glabel D_8010BEF8 -.double 180.0 - -glabel jtbl_8010BF00 -.word L800E583C_7ECEC, L800E55A8_7EA58, L800E568C_7EB3C, L800E55F0_7EAA0, L800E5604_7EAB4, L800E56E8_7EB98, L800E5840_7ECF0, L800E5618_7EAC8, L800E5654_7EB04, L800E5840_7ECF0, L800E574C_7EBFC, L800E57B0_7EC60 - -glabel jtbl_8010BF30 -.word L800E6DD8_80288, L800E6F14_803C4, L800E6FC8_80478, L800E7044_804F4, L800E7090_80540, L800E726C_8071C, L800E726C_8071C, L800E726C_8071C, L800E726C_8071C, L800E726C_8071C, L800E7208_806B8, 0 - -glabel D_8010BF60 -.word 0x800E9DEC, 0x800EA07C, 0x800E9DF4, 0x800E9DFC, 0x800E9E04, 0x800E9E0C, 0x800E9E14, 0x800E9E34, 0x800E9E3C, 0x800E9E44, 0x800E9E4C, 0x800E9E54, 0x800E9E5C, 0x800E9E64, 0x800E9E6C, 0x800E9E74, 0x800E9F38, 0x800E9F40, 0x800E9F48, 0x800E9F50, 0x800E9F58, 0x800E9F60, 0x800E9F68, 0x800E9F70, 0x800E9F78, 0x800E9F80, 0x800EA008, 0x800E9F88, 0x800E9F90, 0x800E9F98, 0x800E9FA0, 0x800E9FA8, 0x800E9FB0, 0x800E9FB8, 0x800E9FC0, 0x800E9FC8, 0x800E9FD0, 0x800E9FD8, 0x800E9FE0, 0x800E9FE8, 0x800E9FF0, 0x800E9FF8, 0x800EA000, 0x800EA010, 0x800EA018, 0x800EA020, 0x800EA028, 0x800EA030, 0x800EA038, 0x800EA040, 0x800EA048, 0x800EA050, 0x800EA058, 0x800EA060, 0x800EA068, 0x800EA070 - -glabel D_8010C040 -.word 0x800EA4F8, 0x800EA4F8, 0x800EA4F8, 0x800EA4F8, 0x800EA500, 0x800EA500, 0x800EA500, 0x800EA500, 0x800EA500, 0x800EA500, 0x800EA500, 0x800EA500, 0x800EA500, 0x800EA500, 0x800EA500, 0x800EA500, 0x800EA500, 0x800EA500, 0x800EA500, 0x800EA500, 0x800EA500, 0x800EA500, 0x800EA500, 0x800EA500, 0x800EA500, 0x800EA500, 0x800EA500, 0x800EA500, 0x800EA500, 0x800EA500, 0x800EA500, 0x800EA500, 0x800EA500, 0x800EA500, 0x800EA500, 0x800EA500, 0x800EA500, 0x800EA500, 0x800EA500, 0x800EA4F8, 0x800EA4F8, 0x800EA500, 0x800EA500, 0x800EA4F8, 0x800EA500, 0x800EA500, 0x800EA4F8, 0x800EA4F8, 0x800EA4F8, 0x800EA4F8, 0x800EA4F8, 0x800EA4F8, 0x800EA4F8, 0x800EA4F8 - -glabel jtbl_8010C118 -.word L800EB14C_845FC, L800EB124_845D4, L800EAA48_83EF8, L800EA83C_83CEC, L800EAB90_84040, L800EAC30_840E0, L800EAC7C_8412C, L800EADC0_84270, L800EAEF4_843A4, L800EAFD0_84480, L800EB0E0_84590, 0 - -glabel jtbl_8010C148 -.word L800EBD18_851C8, L800EC148_855F8, L800EC45C_8590C, L800ED2E4_86794, L800ED2E4_86794, L800EC6FC_85BAC, L800ED2E4_86794, L800ED2E4_86794, L800ED2E4_86794, L800ED2E4_86794, L800ED2E4_86794, L800ED2E4_86794, L800ED2E4_86794, L800ED2E4_86794, L800ED2E4_86794, L800ECCC0_86170, L800ED2E4_86794, L800ED2E4_86794, L800ED2E4_86794, L800ED2E4_86794, L800ED0B0_86560, L800ED2E4_86794, L800ED2E4_86794, L800ED2E4_86794, L800ED2E4_86794, L800ED2E4_86794, L800ED2E4_86794, L800ED2E4_86794, L800ED2E4_86794, L800ED2E4_86794, L800ED2E4_86794, L800ED2E4_86794, L800ED2E4_86794, L800ED2E4_86794, L800ED2E4_86794, L800ED2E4_86794, L800ED2E4_86794, L800ED2E4_86794, L800ED2E4_86794, L800ED2E4_86794, L800ED0C4_86574, L800ED2E4_86794, L800ED2E4_86794, L800ED2E4_86794, L800ED2E4_86794, L800ED2E4_86794, L800ED2E4_86794, L800ED2E4_86794, L800ED2E4_86794, L800ED2E4_86794, L800ED2E4_86794, 0 - -glabel jtbl_8010C218 -.word L800EDA5C_86F0C, L800EDDEC_8729C, L800EE078_87528, L800EDDEC_8729C, L800EE968_87E18, L800EE18C_8763C, L800EE968_87E18, L800EE968_87E18, L800EE968_87E18, L800EE968_87E18, L800EE968_87E18, L800EE968_87E18, L800EE968_87E18, L800EE968_87E18, L800EE968_87E18, L800EE56C_87A1C, L800EE968_87E18, L800EE968_87E18, L800EE968_87E18, L800EE968_87E18, L800EE930_87DE0, L800EE968_87E18, L800EE968_87E18, L800EE968_87E18, L800EE968_87E18, L800EE968_87E18, L800EE968_87E18, L800EE968_87E18, L800EE968_87E18, L800EE968_87E18, L800EE968_87E18, L800EE968_87E18, L800EE968_87E18, L800EE968_87E18, L800EE968_87E18, L800EE968_87E18, L800EE968_87E18, L800EE968_87E18, L800EE968_87E18, L800EE968_87E18, L800EE944_87DF4, L800EE968_87E18, L800EE968_87E18, L800EE968_87E18, L800EE968_87E18, L800EE968_87E18, L800EE968_87E18, L800EE968_87E18, L800EE968_87E18, L800EE968_87E18, L800EE968_87E18, 0 - -glabel jtbl_8010C2E8 -.word L800EFDFC_892AC, L800EFE0C_892BC, L800EFE0C_892BC, L800EFE0C_892BC, L800EFE0C_892BC, L800EFDBC_8926C, L800EFDCC_8927C, L800EFDDC_8928C, L800EFDEC_8929C, 0 - -glabel D_8010C310 -.double 0.1 - -glabel D_8010C318 -.double 0.92 - -glabel D_8010C320 -.double 0.04, 0.0 - -glabel jtbl_8010C330 -.word L800F13F8_8A8A8, L800F13F8_8A8A8, L800F13F8_8A8A8, L800F13F8_8A8A8, L800F13F8_8A8A8, L800F13F8_8A8A8, L800F13F8_8A8A8, L800F13F8_8A8A8, L800F13F8_8A8A8, L800F13F8_8A8A8, L800F1414_8A8C4, L800F1414_8A8C4, L800F13F8_8A8A8, L800F1414_8A8C4 - -glabel jtbl_8010C368 -.word L800F145C_8A90C, L800F145C_8A90C, L800F145C_8A90C, L800F145C_8A90C, L800F145C_8A90C, L800F145C_8A90C, L800F145C_8A90C, L800F145C_8A90C, L800F145C_8A90C, L800F145C_8A90C, L800F1470_8A920, L800F1470_8A920, L800F145C_8A90C, L800F1470_8A920 - -glabel jtbl_8010C3A0 -.word L800F1718_8ABC8, L800F1734_8ABE4, L800F1718_8ABC8, L800F1718_8ABC8, L800F1734_8ABE4, L800F1718_8ABC8, L800F1718_8ABC8, L800F1718_8ABC8, L800F1718_8ABC8, L800F1718_8ABC8, L800F1768_8AC18, L800F1768_8AC18, L800F1718_8ABC8, L800F1768_8AC18 - -glabel jtbl_8010C3D8 -.word L800F17C0_8AC70, L800F17D4_8AC84, L800F17C0_8AC70, L800F17C0_8AC70, L800F17D4_8AC84, L800F17C0_8AC70, L800F17C0_8AC70, L800F17C0_8AC70, L800F17C0_8AC70, L800F17C0_8AC70, L800F17E8_8AC98, L800F17E8_8AC98, L800F17C0_8AC70, L800F17E8_8AC98 - -glabel jtbl_8010C410 -.word L800F2F5C_8C40C, L800F2F44_8C3F4, L800F2F5C_8C40C, L800F2F18_8C3C8, L800F2E84_8C334, L800F2E64_8C314, L800F2CC0_8C170, L800F1A54_8AF04, L800F2860_8BD10, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F2F74_8C424, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F2FB8_8C468, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3010_8C4C0, L800F3034_8C4E4, L800F30EC_8C59C, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3184_8C634, L800F341C_8C8CC, L800F345C_8C90C, L800F3464_8C914, 0 - -glabel jtbl_8010C5D0 -.word L800F1E3C_8B2EC, L800F1EFC_8B3AC, L800F1E3C_8B2EC, L800F1F54_8B404, L800F1FF4_8B4A4, L800F204C_8B4FC, L800F1E3C_8B2EC, L800F1E3C_8B2EC, L800F20EC_8B59C, L800F218C_8B63C, L800F222C_8B6DC, L800F22CC_8B77C, L800F1E3C_8B2EC, L800F236C_8B81C - -glabel jtbl_8010C608 -.word L800F264C_8BAFC, L800F2658_8BB08, L800F2658_8BB08, L800F2668_8BB18, L800F2678_8BB28, L800F2698_8BB48, L800F264C_8BAFC, L800F264C_8BAFC, L800F2688_8BB38, L800F264C_8BAFC, L800F2668_8BB18, L800F2668_8BB18, L800F264C_8BAFC, L800F2658_8BB08 - -glabel jtbl_8010C640 -.word L800F2708_8BBB8, L800F271C_8BBCC, L800F2708_8BBB8, L800F2708_8BBB8, L800F271C_8BBCC, L800F2708_8BBB8, L800F2708_8BBB8, L800F2708_8BBB8, L800F2708_8BBB8, L800F2708_8BBB8, L800F2730_8BBE0, L800F2730_8BBE0, L800F2708_8BBB8, L800F2730_8BBE0 - -glabel jtbl_8010C678 -.word L800F2764_8BC14, L800F2780_8BC30, L800F2764_8BC14, L800F2764_8BC14, L800F2780_8BC30, L800F2764_8BC14, L800F2764_8BC14, L800F2764_8BC14, L800F2764_8BC14, L800F2764_8BC14, L800F27B4_8BC64, L800F27B4_8BC64, L800F2764_8BC14, L800F27B4_8BC64 - -glabel jtbl_8010C6B0 -.word L800F2BBC_8C06C, L800F2BD4_8C084, L800F2BBC_8C06C, L800F2BBC_8C06C, L800F2BD4_8C084, L800F2BBC_8C06C, L800F2BBC_8C06C, L800F2BBC_8C06C, L800F2BEC_8C09C, L800F2BEC_8C09C, L800F2BEC_8C09C, L800F2BEC_8C09C, L800F2BBC_8C06C, L800F2BEC_8C09C - -glabel jtbl_8010C6E8 -.word L800F2EB0_8C360, L800F2EC4_8C374, L800F2EB0_8C360, L800F2EB0_8C360, L800F2EC4_8C374, L800F2EB0_8C360, L800F2EB0_8C360, L800F2EB0_8C360, L800F2EB0_8C360, L800F2EB0_8C360, L800F2ED8_8C388, L800F2ED8_8C388, L800F2EB0_8C360, L800F2ED8_8C388 - -glabel jtbl_8010C720 -.word L800F3328_8C7D8, L800F333C_8C7EC, L800F3328_8C7D8, L800F3328_8C7D8, L800F333C_8C7EC, L800F3328_8C7D8, L800F3328_8C7D8, L800F3328_8C7D8, L800F3328_8C7D8, L800F3328_8C7D8, L800F3350_8C800, L800F3350_8C800, L800F3328_8C7D8, L800F3350_8C800 - -glabel jtbl_8010C758 -.word L800F3608_8CAB8, L800F361C_8CACC, L800F3608_8CAB8, L800F3608_8CAB8, L800F361C_8CACC, L800F3608_8CAB8, L800F3608_8CAB8, L800F3608_8CAB8, L800F3608_8CAB8, L800F3608_8CAB8, L800F3630_8CAE0, L800F3630_8CAE0, L800F3608_8CAB8, L800F3630_8CAE0 - -glabel jtbl_8010C790 -.word L800F3878_8CD28, L800F38C8_8CD78, L800F3918_8CDC8, L800F3878_8CD28, L800F38C8_8CD78, L800F3878_8CD28, L800F3878_8CD28, L800F3878_8CD28, L800F3878_8CD28, L800F3878_8CD28, L800F3878_8CD28, L800F3878_8CD28, L800F3878_8CD28, L800F3878_8CD28 - -glabel jtbl_8010C7C8 -.word L800F3C8C_8D13C, L800F3CC0_8D170, L800F3C8C_8D13C, L800F3C8C_8D13C, L800F3CC0_8D170, L800F3C8C_8D13C, L800F3C8C_8D13C, L800F3C8C_8D13C, L800F3CF4_8D1A4, L800F3C8C_8D13C, L800F3D38_8D1E8, L800F3D94_8D244, L800F3C8C_8D13C, L800F3C8C_8D13C - -glabel jtbl_8010C800 -.word L800F4000_8D4B0, L800F4000_8D4B0, L800F4000_8D4B0, L800F4000_8D4B0, L800F4000_8D4B0, L800F4000_8D4B0, L800F4000_8D4B0, L800F4000_8D4B0, L800F4000_8D4B0, L800F4000_8D4B0, L800F40E8_8D598, L800F41D0_8D680, L800F4000_8D4B0, L800F4000_8D4B0 - -glabel jtbl_8010C838 -.word L800F4398_8D848, L800F43E8_8D898, L800F4398_8D848, L800F4398_8D848, L800F43E8_8D898, L800F4398_8D848, L800F4398_8D848, L800F4398_8D848, L800F4398_8D848, L800F4398_8D848, L800F4398_8D848, L800F4398_8D848, L800F4398_8D848, L800F4398_8D848 - -glabel jtbl_8010C870 -.word L800F44EC_8D99C, L800F44F4_8D9A4, L800F453C_8D9EC, L800F44F4_8D9A4, L800F4500_8D9B0, L800F4508_8D9B8, L800F4514_8D9C4, L800F4514_8D9C4, L800F4514_8D9C4, L800F4528_8D9D8, L800F4530_8D9E0, L800F451C_8D9CC, L800F453C_8D9EC, 0 - -glabel jtbl_8010C8A8 -.word L800F4694_8DB44, L800F48A4_8DD54, L800F4694_8DB44, L800F47E4_8DC94, L800F48A4_8DD54, L800F4694_8DB44, L800F4694_8DB44, L800F4694_8DB44, L800F4804_8DCB4, L800F4824_8DCD4, L800F4844_8DCF4, L800F4864_8DD14, L800F4884_8DD34, L800F48A4_8DD54 - -glabel jtbl_8010C8E0 -.word L800F4994_8DE44, L800F49B0_8DE60, L800F49E4_8DE94, L800F4A18_8DEC8, L800F4A4C_8DEFC, L800F4A80_8DF30, L800F4AA0_8DF50, L800F4ABC_8DF6C, L800F4B0C_8DFBC, L800F4B40_8DFF0, L800F4B5C_8E00C, L800F4B90_8E040, L800F4BC4_8E074, L800F4AD8_8DF88, 0, 0 diff --git a/ver/us/asm/data/code_E5E40.rodata.s b/ver/us/asm/data/code_E5E40.rodata.s deleted file mode 100644 index 9ae3b0f0b4..0000000000 --- a/ver/us/asm/data/code_E5E40.rodata.s +++ /dev/null @@ -1,498 +0,0 @@ -.include "macro.inc" - -.section .rodata - -glabel jtbl_8014F740 -.word L8010FC18_A6318, L8010FC30_A6330, L8010FC50_A6350, L8010FC6C_A636C, L8010FC90_A6390, L8010FCAC_A63AC, L8010FCCC_A63CC, L8010FCE8_A63E8, L8010FD08_A6408, L8010FD2C_A642C - -glabel jtbl_8014F768 -.word L80110A70_A7170, L80110A70_A7170, L80110A68_A7168, L80110A68_A7168, L80110A70_A7170, L80110A68_A7168, L80110A70_A7170, L80110A70_A7170, L80110A70_A7170, L80110A70_A7170, L80110A70_A7170, L80110A70_A7170, L80110A68_A7168, L80110A70_A7170, L80110A70_A7170, L80110A68_A7168, L80110A68_A7168, L80110A70_A7170, L80110A68_A7168, L80110A68_A7168, L80110A68_A7168, L80110A68_A7168, L80110A68_A7168, L80110A68_A7168, L80110A68_A7168, L80110A68_A7168, L80110A68_A7168, L80110A70_A7170, L80110A68_A7168, L80110A68_A7168, L80110A68_A7168, L80110A70_A7170 - -glabel jtbl_8014F7E8 -.word L80110A70_A7170, L80110A70_A7170, L80110A68_A7168, L80110A68_A7168, L80110A70_A7170, L80110A68_A7168, L80110A70_A7170, L80110A70_A7170, L80110A70_A7170, L80110A70_A7170, L80110A70_A7170, L80110A70_A7170, L80110A68_A7168, L80110A70_A7170, L80110A68_A7168, L80110A68_A7168, L80110A68_A7168, L80110A68_A7168, L80110A68_A7168, L80110A68_A7168, L80110A70_A7170, L80110A70_A7170, L80110A68_A7168, L80110A68_A7168, L80110A68_A7168, L80110A70_A7170, L80110A68_A7168, L80110A70_A7170 - -glabel jtbl_8014F858 -.word L80111478_A7B78, L80111480_A7B80, L80111478_A7B78, L80111480_A7B80, L80111478_A7B78, L80111480_A7B80, L80111478_A7B78, L80111480_A7B80 - -glabel jtbl_8014F878 -.word L80111B80_A8280, L80111B80_A8280, L80111B8C_A828C, L80111B8C_A828C, L80111B8C_A828C, L80111B8C_A828C, L80111B8C_A828C, L80111B8C_A828C, L80111B8C_A828C, L80111B8C_A828C, L80111B8C_A828C, L80111B8C_A828C, L80111B8C_A828C, L80111B8C_A828C, L80111B8C_A828C, L80111B8C_A828C, L80111B8C_A828C, L80111B8C_A828C, L80111B8C_A828C, L80111B8C_A828C, L80111B8C_A828C, L80111B8C_A828C, L80111B8C_A828C, L80111B8C_A828C, L80111B8C_A828C, L80111B8C_A828C, L80111B8C_A828C, L80111B8C_A828C, L80111B8C_A828C, L80111B8C_A828C, L80111B8C_A828C, L80111B8C_A828C, L80111B8C_A828C, L80111B8C_A828C, L80111B8C_A828C, L80111B8C_A828C, L80111B8C_A828C, L80111B8C_A828C, L80111B8C_A828C, L80111B80_A8280, L80111B80_A8280, L80111B8C_A828C, L80111B80_A8280, 0 - -glabel jtbl_8014F928 -.word L801122B0_A89B0, L801122C4_A89C4, L801122AC_A89AC, L801122C0_A89C0, L801122D8_A89D8, L801122D4_A89D4 - -glabel D_8014F940 -.double 0.95 - -glabel D_8014F948 -.double 250.0 - -glabel D_8014F950 -.double 0.13 - -glabel D_8014F958 -.double 0.12 - -glabel D_8014F960 -.double 0.01 - -glabel D_8014F968 -.double 0.13 - -glabel D_8014F970 -.double 0.12 - -glabel D_8014F978 -.double 0.01 - -glabel D_8014F980 -.double 0.01 - -glabel D_8014F988 -.double 0.01 - -glabel jtbl_8014F990 -.word L80113428_A9B28, L80113488_A9B88, L801134E8_A9BE8, L80113568_A9C68, L80113608_A9D08, L801136C8_A9DC8, L801137A8_A9EA8, L801138A8_A9FA8 - -glabel jtbl_8014F9B0 -.word L80113C14_AA314, L80113CD8_AA3D8, L80113D94_AA494, L80113F64_AA664, L80113F64_AA664, L801142F4_AA9F4, L80114690_AAD90, L80114690_AAD90, L80114690_AAD90, L8011460C_AAD0C, L8011460C_AAD0C, 0 - -glabel jtbl_8014F9E0 -.word L80113CD0_AA3D0, L80113CD0_AA3D0, L80113C40_AA340, L80113CA8_AA3A8, L80113C48_AA348, L80113CD0_AA3D0, L80113C50_AA350, L80113CD0_AA3D0, L80113C58_AA358, L80113CD0_AA3D0, L80113CD0_AA3D0, L80113CD0_AA3D0, L80113C60_AA360, L80113CD0_AA3D0, L80113C68_AA368, L80113CB0_AA3B0, L80113C78_AA378, L80113CD0_AA3D0, L80113C80_AA380, L80113CB8_AA3B8, L80113C88_AA388, L80113C78_AA378, L80113CD0_AA3D0, L80113CD0_AA3D0, L80113CD0_AA3D0, L80113C90_AA390, L80113CD0_AA3D0, L80113C98_AA398, L80113CD0_AA3D0, L80113CD0_AA3D0, L80113CD0_AA3D0, L80113CD0_AA3D0, L80113CD0_AA3D0, L80113C78_AA378, L80113CD0_AA3D0, L80113CD0_AA3D0, L80113CD0_AA3D0, L80113CA0_AA3A0, L80113CD0_AA3D0, L80113CD0_AA3D0, L80113C70_AA370, L80113CD0_AA3D0, L80113CD0_AA3D0, L80113CD0_AA3D0, L80113CD0_AA3D0, L80113CC0_AA3C0, L80113CC8_AA3C8, 0 - -glabel jtbl_8014FAA0 -.word L80113D8C_AA48C, L80113D8C_AA48C, L80113D04_AA404, L80113D64_AA464, L80113D0C_AA40C, L80113D8C_AA48C, L80113D14_AA414, L80113D8C_AA48C, L80113D1C_AA41C, L80113D8C_AA48C, L80113D8C_AA48C, L80113D8C_AA48C, L80113D24_AA424, L80113D8C_AA48C, L80113D2C_AA42C, L80113D6C_AA46C, L80113D34_AA434, L80113D8C_AA48C, L80113D44_AA444, L80113D74_AA474, L80113D8C_AA48C, L80113D34_AA434, L80113D8C_AA48C, L80113D8C_AA48C, L80113D8C_AA48C, L80113D4C_AA44C, L80113D8C_AA48C, L80113D54_AA454, L80113D8C_AA48C, L80113D8C_AA48C, L80113D8C_AA48C, L80113D8C_AA48C, L80113D8C_AA48C, L80113D34_AA434, L80113D8C_AA48C, L80113D8C_AA48C, L80113D8C_AA48C, L80113D5C_AA45C, L80113D8C_AA48C, L80113D8C_AA48C, L80113D3C_AA43C, L80113D8C_AA48C, L80113D8C_AA48C, L80113D8C_AA48C, L80113D8C_AA48C, L80113D7C_AA47C, L80113D84_AA484, 0 - -glabel jtbl_8014FB60 -.word L80113E48_AA548, L80113E48_AA548, L80113DC0_AA4C0, L80113E20_AA520, L80113DC8_AA4C8, L80113E48_AA548, L80113DD0_AA4D0, L80113E48_AA548, L80113DD8_AA4D8, L80113E48_AA548, L80113E48_AA548, L80113E48_AA548, L80113DE0_AA4E0, L80113E48_AA548, L80113DE8_AA4E8, L80113E28_AA528, L80113DF0_AA4F0, L80113E48_AA548, L80113E00_AA500, L80113E30_AA530, L80113E48_AA548, L80113DF0_AA4F0, L80113E48_AA548, L80113E48_AA548, L80113E48_AA548, L80113E08_AA508, L80113E48_AA548, L80113E10_AA510, L80113E48_AA548, L80113E48_AA548, L80113E48_AA548, L80113E48_AA548, L80113E48_AA548, L80113DF0_AA4F0, L80113E48_AA548, L80113E48_AA548, L80113E48_AA548, L80113E18_AA518, L80113E48_AA548, L80113E48_AA548, L80113DF8_AA4F8, L80113E48_AA548, L80113E48_AA548, L80113E48_AA548, L80113E48_AA548, L80113E38_AA538, L80113E40_AA540, 0 - -glabel jtbl_8014FC20 -.word L80113FC4_AA6C4, L80114234_AA934, L80113FE4_AA6E4, L80114184_AA884, L80114004_AA704, L80114234_AA934, L80114024_AA724, L80114234_AA934, L80114044_AA744, L80114234_AA934, L80114234_AA934, L80114234_AA934, L80114064_AA764, L80114234_AA934, L80114084_AA784, L801141A4_AA8A4, L801140A4_AA7A4, L80114234_AA934, L80114104_AA804, L801141C4_AA8C4, L80114234_AA934, L801140C4_AA7C4, L80114234_AA934, L80114234_AA934, L80114234_AA934, L80114124_AA824, L80114234_AA934, L80114144_AA844, L80114234_AA934, L80114234_AA934, L80114234_AA934, L80114234_AA934, L80114234_AA934, L801140E4_AA7E4, L80114234_AA934, L80114234_AA934, L80114234_AA934, L80114164_AA864, L80114234_AA934, L80114234_AA934, L80114234_AA934, L80114234_AA934, L80114234_AA934, L80114234_AA934, L80114234_AA934, L801141E4_AA8E4, L80114204_AA904, 0 - -glabel jtbl_8014FCE0 -.word L801143A8_AAAA8, L801143A8_AAAA8, L80114320_AAA20, L80114380_AAA80, L80114328_AAA28, L801143A8_AAAA8, L80114330_AAA30, L801143A8_AAAA8, L80114338_AAA38, L801143A8_AAAA8, L801143A8_AAAA8, L801143A8_AAAA8, L80114340_AAA40, L801143A8_AAAA8, L80114348_AAA48, L80114388_AAA88, L80114350_AAA50, L801143A8_AAAA8, L80114360_AAA60, L80114390_AAA90, L801143A8_AAAA8, L80114350_AAA50, L801143A8_AAAA8, L801143A8_AAAA8, L801143A8_AAAA8, L80114368_AAA68, L801143A8_AAAA8, L80114370_AAA70, L801143A8_AAAA8, L801143A8_AAAA8, L801143A8_AAAA8, L801143A8_AAAA8, L801143A8_AAAA8, L80114350_AAA50, L801143A8_AAAA8, L801143A8_AAAA8, L801143A8_AAAA8, L80114378_AAA78, L801143A8_AAAA8, L801143A8_AAAA8, L80114358_AAA58, L801143A8_AAAA8, L801143A8_AAAA8, L801143A8_AAAA8, L801143A8_AAAA8, L80114398_AAA98, L801143A0_AAAA0, 0 - -glabel jtbl_8014FDA0 -.word L80114660_AAD60, L80114660_AAD60, L80114660_AAD60, L80114660_AAD60, L80114638_AAD38, L80114660_AAD60, L80114660_AAD60, L80114660_AAD60, L80114640_AAD40, L80114660_AAD60, L80114660_AAD60, L80114660_AAD60, L80114648_AAD48, L80114660_AAD60, L80114660_AAD60, L80114660_AAD60, L80114660_AAD60, L80114660_AAD60, L80114660_AAD60, L80114660_AAD60, L80114660_AAD60, L80114660_AAD60, L80114660_AAD60, L80114660_AAD60, L80114660_AAD60, L80114660_AAD60, L80114660_AAD60, L80114660_AAD60, L80114660_AAD60, L80114660_AAD60, L80114660_AAD60, L80114660_AAD60, L80114660_AAD60, L80114660_AAD60, L80114660_AAD60, L80114660_AAD60, L80114660_AAD60, L80114660_AAD60, L80114660_AAD60, L80114660_AAD60, L80114660_AAD60, L80114660_AAD60, L80114660_AAD60, L80114660_AAD60, L80114660_AAD60, L80114650_AAD50, L80114658_AAD58, 0 - -glabel jtbl_8014FE60 -.word L8011EC3C_B533C, L8011EC5C_B535C, L8011F034_B5734, L8011EC7C_B537C, L8011F034_B5734, L8011ED48_B5448, L8011EE10_B5510, L8011F034_B5734, L8011EEF0_B55F0, L8011F034_B5734, L8011EC8C_B538C, L8011F034_B5734, L8011F034_B5734, L8011F034_B5734, L8011EC9C_B539C, L8011ECB8_B53B8, L8011ECEC_B53EC, L8011EF6C_B566C, L8011EC44_B5344, L8011ED2C_B542C - -glabel D_8014FEB0 -.double 180.0 - -glabel D_8014FEB8 -.double 32767.0 - -glabel D_8014FEC0 -.double 180.0 - -glabel D_8014FEC8 -.double 32767.0 - -glabel D_8014FED0 -.double 180.0 - -glabel D_8014FED8 -.double 32767.0 - -glabel jtbl_8014FEE0 -.word L8011F63C_B5D3C, L8011F9FC_B60FC, L8011F9FC_B60FC, L8011F9FC_B60FC, L8011F66C_B5D6C, L8011F9FC_B60FC, L8011F9FC_B60FC, L8011F9FC_B60FC, L8011F69C_B5D9C, L8011F9FC_B60FC, L8011F9FC_B60FC, L8011F9FC_B60FC, L8011F6CC_B5DCC, L8011F9FC_B60FC, L8011F9FC_B60FC, L8011F9FC_B60FC, L8011F6FC_B5DFC, L8011F9FC_B60FC, L8011F9FC_B60FC, L8011F9FC_B60FC, L8011F9FC_B60FC, L8011F9FC_B60FC, L8011F9FC_B60FC, L8011F9FC_B60FC, L8011F9FC_B60FC, L8011F72C_B5E2C, L8011F9FC_B60FC, L8011F9FC_B60FC, L8011F9FC_B60FC, L8011F9FC_B60FC, L8011F9FC_B60FC, L8011F9FC_B60FC, L8011F9FC_B60FC, L8011F9FC_B60FC, L8011F9FC_B60FC, L8011F9FC_B60FC, L8011F9FC_B60FC, L8011F75C_B5E5C - -glabel jtbl_8014FF78 -.word L8011F7BC_B5EBC, L8011F908_B6008, L8011F908_B6008, L8011F908_B6008, L8011F7EC_B5EEC, L8011F908_B6008, L8011F908_B6008, L8011F908_B6008, L8011F81C_B5F1C, L8011F908_B6008, L8011F908_B6008, L8011F908_B6008, L8011F84C_B5F4C, L8011F908_B6008, L8011F908_B6008, L8011F908_B6008, L8011F87C_B5F7C, L8011F908_B6008, L8011F908_B6008, L8011F908_B6008, L8011F908_B6008, L8011F908_B6008, L8011F908_B6008, L8011F908_B6008, L8011F908_B6008, L8011F8AC_B5FAC, L8011F908_B6008, L8011F908_B6008, L8011F908_B6008, L8011F908_B6008, L8011F908_B6008, L8011F908_B6008, L8011F908_B6008, L8011F908_B6008, L8011F908_B6008, L8011F908_B6008, L8011F908_B6008, L8011F8DC_B5FDC - -glabel D_80150010 -.double 180.0 - -glabel D_80150018 -.double 32767.0 - -glabel D_80150020 -.double 180.0 - -glabel D_80150028 -.double 32767.0 - -glabel jtbl_80150030 -.word L80120748_B6E48, L80120768_B6E68, L80120B7C_B727C, L80120778_B6E78, L80120798_B6E98, L80120870_B6F70, L8012093C_B703C, L80120B7C_B727C, L80120A20_B7120, L80120B7C_B727C, L801207AC_B6EAC, L80120B7C_B727C, L80120B7C_B727C, L80120B7C_B727C, L801207C4_B6EC4, L801207E0_B6EE0, L80120814_B6F14, L80120AA0_B71A0, L80120750_B6E50, L80120854_B6F54 - -glabel D_80150080 -.double 180.0 - -glabel D_80150088 -.double 32767.0 - -glabel D_80150090 -.double 180.0 - -glabel D_80150098 -.double 32767.0 - -glabel D_801500A0 -.double 180.0 - -glabel D_801500A8 -.double 32767.0 - -glabel jtbl_801500B0 -.word L80120FF0_B76F0, L80121000_B7700, L80121048_B7748, L80121058_B7758, L80121068_B7768, L80121080_B7780, L801210A0_B77A0, L801210C4_B77C4 - -glabel jtbl_801500D0 -.word L8012136C_B7A6C, L801218AC_B7FAC, L801218AC_B7FAC, L8012157C_B7C7C, L8012139C_B7A9C, L801218AC_B7FAC, L801218AC_B7FAC, L801218AC_B7FAC, L801213CC_B7ACC, L801218AC_B7FAC, L801218AC_B7FAC, L801218AC_B7FAC, L801213FC_B7AFC, L801218AC_B7FAC, L8012154C_B7C4C, L801215AC_B7CAC, L8012142C_B7B2C, L801218AC_B7FAC, L8012145C_B7B5C, L801215DC_B7CDC, L801218AC_B7FAC, L8012142C_B7B2C, L801218AC_B7FAC, L801218AC_B7FAC, L801218AC_B7FAC, L8012148C_B7B8C, L801218AC_B7FAC, L801214BC_B7BBC, L801218AC_B7FAC, L8012148C_B7B8C, L801218AC_B7FAC, L801214BC_B7BBC, L801218AC_B7FAC, L8012142C_B7B2C, L801218AC_B7FAC, L801218AC_B7FAC, L801218AC_B7FAC, L801214EC_B7BEC, L801218AC_B7FAC, L8012151C_B7C1C, L801218AC_B7FAC, L8012157C_B7C7C, L801215AC_B7CAC, L801215DC_B7CDC, L8012160C_B7D0C, 0 - -glabel jtbl_80150188 -.word L8012166C_B7D6C, L801217B8_B7EB8, L801217B8_B7EB8, L801217B8_B7EB8, L8012169C_B7D9C, L801217B8_B7EB8, L801217B8_B7EB8, L801217B8_B7EB8, L801216CC_B7DCC, L801217B8_B7EB8, L801217B8_B7EB8, L801217B8_B7EB8, L801216FC_B7DFC, L801217B8_B7EB8, L801217B8_B7EB8, L801217B8_B7EB8, L8012172C_B7E2C, L801217B8_B7EB8, L801217B8_B7EB8, L801217B8_B7EB8, L801217B8_B7EB8, L801217B8_B7EB8, L801217B8_B7EB8, L801217B8_B7EB8, L801217B8_B7EB8, L8012175C_B7E5C, L801217B8_B7EB8, L801217B8_B7EB8, L801217B8_B7EB8, L801217B8_B7EB8, L801217B8_B7EB8, L801217B8_B7EB8, L801217B8_B7EB8, L801217B8_B7EB8, L801217B8_B7EB8, L801217B8_B7EB8, L801217B8_B7EB8, L8012178C_B7E8C - -glabel jtbl_80150220 -.word L80122440_B8B40, L80122980_B9080, L80122980_B9080, L80122650_B8D50, L80122470_B8B70, L80122980_B9080, L80122980_B9080, L80122980_B9080, L801224A0_B8BA0, L80122980_B9080, L80122980_B9080, L80122980_B9080, L801224D0_B8BD0, L80122980_B9080, L80122620_B8D20, L80122680_B8D80, L80122500_B8C00, L80122980_B9080, L80122530_B8C30, L801226B0_B8DB0, L80122980_B9080, L80122500_B8C00, L80122980_B9080, L80122980_B9080, L80122980_B9080, L80122560_B8C60, L80122980_B9080, L80122590_B8C90, L80122980_B9080, L80122560_B8C60, L80122980_B9080, L80122590_B8C90, L80122980_B9080, L80122500_B8C00, L80122980_B9080, L80122980_B9080, L80122980_B9080, L801225C0_B8CC0, L80122980_B9080, L801225F0_B8CF0, L80122980_B9080, L80122650_B8D50, L80122680_B8D80, L801226B0_B8DB0, L801226E0_B8DE0, 0 - -glabel jtbl_801502D8 -.word L80122740_B8E40, L8012288C_B8F8C, L8012288C_B8F8C, L8012288C_B8F8C, L80122770_B8E70, L8012288C_B8F8C, L8012288C_B8F8C, L8012288C_B8F8C, L801227A0_B8EA0, L8012288C_B8F8C, L8012288C_B8F8C, L8012288C_B8F8C, L801227D0_B8ED0, L8012288C_B8F8C, L8012288C_B8F8C, L8012288C_B8F8C, L80122800_B8F00, L8012288C_B8F8C, L8012288C_B8F8C, L8012288C_B8F8C, L8012288C_B8F8C, L8012288C_B8F8C, L8012288C_B8F8C, L8012288C_B8F8C, L8012288C_B8F8C, L80122830_B8F30, L8012288C_B8F8C, L8012288C_B8F8C, L8012288C_B8F8C, L8012288C_B8F8C, L8012288C_B8F8C, L8012288C_B8F8C, L8012288C_B8F8C, L8012288C_B8F8C, L8012288C_B8F8C, L8012288C_B8F8C, L8012288C_B8F8C, L80122860_B8F60 - -glabel D_80150370 -.double 3.8 - -glabel D_80150378 -.double 122.0 - -glabel jtbl_80150380 -.word L80123E98_BA598, L80124174_BA874, L80124174_BA874, L80123E50_BA550, L80124174_BA874, L80123F2C_BA62C, L80124174_BA874, L80124174_BA874, L80124174_BA874, L80124174_BA874, L80124018_BA718, L80124174_BA874, L80124174_BA874, L80124174_BA874 - -glabel jtbl_801503B8 -.word L80124600_BAD00, L80124664_BAD64, L801246C4_BADC4, L801246EC_BADEC, L801246EC_BADEC, L801246EC_BADEC, L801246EC_BADEC, L80124704_BAE04, L8012470C_BAE0C, L80124714_BAE14, L8012471C_BAE1C, L80124730_BAE30, L801247CC_BAECC, L80124B08_BB208, L801255A4_BBCA4, L80124B7C_BB27C - -glabel jtbl_801503F8 -.word L80124818_BAF18, L80124818_BAF18, L80124818_BAF18, L80124818_BAF18, L80124878_BAF78, L801248BC_BAFBC, L80124990_BB090, L80124984_BB084, L801249B8_BB0B8, L80124AA4_BB1A4, L80124AA4_BB1A4, L80124920_BB020, L801248BC_BAFBC, L80124AE8_BB1E8, L801248BC_BAFBC, 0 - -glabel jtbl_80150438 -.word L80124BA4_BB2A4, L80124BC4_BB2C4, L80125600_BBD00, L80125138_BB838, L80125148_BB848, L80124BE8_BB2E8, L80124BF8_BB2F8, L80124C04_BB304, L80124C18_BB318, L80124C38_BB338, L80124C48_BB348, L80124C28_BB328, L80124C54_BB354, L80124CE8_BB3E8, L80124D54_BB454, L80124D78_BB478, L80124D94_BB494, L80124DB4_BB4B4, L80124DC4_BB4C4, L80124DD4_BB4D4, L80124DE4_BB4E4, L80124DF4_BB4F4, L80124E28_BB528, L80124E7C_BB57C, L80124F18_BB618, L80124FA8_BB6A8, L80124FCC_BB6CC, L80125020_BB720, L80125040_BB740, L80125084_BB784, L801250C4_BB7C4, L801250D4_BB7D4, L80125118_BB818, L80125128_BB828, L80125184_BB884, L80125194_BB894, L801251A4_BB8A4, L801251B4_BB8B4, L801251C4_BB8C4, L80125218_BB918, L80125244_BB944, L8012553C_BBC3C, L80125564_BBC64, L80125594_BBC94, L801254C0_BBBC0, L80125600_BBD00, L801254B0_BBBB0, L8012546C_BBB6C - -glabel jtbl_801504F8 -.word L80125204_BB904, L80125204_BB904, L80125204_BB904, L80125210_BB910, L80125600_BBD00, L80125210_BB910, L80125204_BB904, L80125210_BB910, L80125204_BB904, L80125204_BB904, L80125204_BB904, L80125204_BB904, L80125204_BB904, L80125204_BB904, L80125204_BB904, 0 - -glabel D_80150538 -.word 0x801252CC, 0x801253D4, 0x801253D4, 0x80125300, 0x80125300, 0x80125300, 0x80125300, 0x80125314, 0x801253D4, 0x801253D4, 0x801253D4, 0x801253D4, 0x801253D4, 0x801253D4, 0x801253D4, 0x80125320 - -glabel D_80150578 -.double 0.6 - -glabel D_80150580 -.double 0.6 - -glabel jtbl_80150588 -.word L801260B0_BC7B0, L80126080_BC780, L80126260_BC960, L80126074_BC774, L80126074_BC774, L80126074_BC774, L80126074_BC774, L80126294_BC994, L80126294_BC994, L80126294_BC994, L801262E8_BC9E8, L80126080_BC780, L801260F4_BC7F4, L8012612C_BC82C, L801262A0_BC9A0, L80126158_BC858 - -glabel jtbl_801505C8 -.word L801262E8_BC9E8, L801262E8_BC9E8, L801262E8_BC9E8, L801262E8_BC9E8, L80126124_BC824, L801262E8_BC9E8, L801262E8_BC9E8, L801262E8_BC9E8, L80126260_BC960, L801262E8_BC9E8, L801262E8_BC9E8, 0 - -glabel jtbl_801505F8 -.word L80126184_BC884, L801261D8_BC8D8, L801261D8_BC8D8, L801262E8_BC9E8, L801261C4_BC8C4, L80126260_BC960, L801262E8_BC9E8, L801262E8_BC9E8, L801262E8_BC9E8, L801262E8_BC9E8, L801262E8_BC9E8, L80126260_BC960, L80126260_BC960, L801261E0_BC8E0, L80126224_BC924, L801261A4_BC8A4, L801261A4_BC8A4, L80126260_BC960, L80126260_BC960, L80126260_BC960, L80126260_BC960, L80126260_BC960, L801261A0_BC8A0, L80126260_BC960, L8012619C_BC89C, L80126260_BC960, L801261A0_BC8A0, L801261A4_BC8A4, L80126260_BC960, L801261D8_BC8D8, L80126260_BC960, L80126260_BC960, L80126260_BC960, L80126260_BC960, L801262E8_BC9E8, L801262E8_BC9E8, L801262E8_BC9E8, L801262E8_BC9E8, L80126234_BC934, L80126260_BC960, L80126268_BC968, L801261AC_BC8AC, L80126260_BC960, L801262E8_BC9E8, L80126198_BC898, L801261D8_BC8D8, L801261D8_BC8D8, L80126260_BC960 - -glabel jtbl_801506B8 -.word L801262E8_BC9E8, L801262E8_BC9E8, L801262E8_BC9E8, L80126260_BC960, L801262E8_BC9E8, L80126260_BC960, L801262E8_BC9E8, L80126260_BC960, L801262E8_BC9E8, L801262E8_BC9E8, L801262E8_BC9E8, L801262E8_BC9E8, L801262E8_BC9E8, L801262E8_BC9E8, L801262E8_BC9E8, 0 - -glabel jtbl_801506F8 -.word L80126874_BCF74, L80126884_BCF84, L801268D8_BCFD8, L80126900_BD000, L8012698C_BD08C, 0 - -glabel D_80150710 -.double 0.2 - -glabel D_80150718 -.double 3.2 - -glabel D_80150720 -.double 255.0 - -glabel D_80150728 -.double 14.4 - -glabel jtbl_80150730 -.word L80127FAC_BE6AC, L8012803C_BE73C, L8012803C_BE73C, L8012803C_BE73C, L8012803C_BE73C, L80128068_BE768, L80128068_BE768, L80128068_BE768, L801280A0_BE7A0, L8012A6C4_C0DC4, L80129ADC_C01DC, L80129BF8_C02F8, L8012AB5C_C125C, L8012AB5C_C125C, L8012AB5C_C125C, L80129C04_C0304 - -glabel jtbl_80150770 -.word L801280DC_BE7DC, L801280DC_BE7DC, L801280DC_BE7DC, L801280DC_BE7DC, L8012897C_BF07C, L80128D28_BF428, L80128F34_BF634, L80128F34_BF634, L801296EC_BFDEC, L80129958_C0058, L80129958_C0058, L80128D28_BF428, L80128D28_BF428, L80129A40_C0140, L80128D28_BF428, 0 - -glabel D_801507B0 -.double 0.35 - -glabel D_801507B8 -.double 0.13333333333333333 - -glabel D_801507C0 -.double 0.2 - -glabel D_801507C8 -.double 255.0 - -glabel D_801507D0 -.double 0.6 - -glabel D_801507D8 -.double 0.6 - -glabel jtbl_801507E0 -.word L80129C44_C0344, L80129C7C_C037C, L8012BF70_C2670, L8012BF70_C2670, L80129CA8_C03A8, L80129CE0_C03E0, L80129D00_C0400, L80129E38_C0538, L80129E84_C0584, L80129EBC_C05BC, L80129EE0_C05E0, L80129F14_C0614, L80129F40_C0640, L8012BF70_C2670, L80129F74_C0674, L8012A0C8_C07C8, L8012A21C_C091C, L8012A350_C0A50, L8012A54C_C0C4C, L8012AB44_C1244, L8012A564_C0C64, L8012A5E0_C0CE0, L8012A634_C0D34, L8012A654_C0D54, L8012A664_C0D64, L8012A68C_C0D8C, L8012A6B4_C0DB4, L8012A6DC_C0DDC, L8012A6FC_C0DFC, L8012A960_C1060, L8012AAD8_C11D8, 0 - -glabel D_80150860 -.double 0.7 - -glabel D_80150868 -.double 0.7 - -glabel D_80150870 -.double 0.7 - -glabel jtbl_80150878 -.word L8012A734_C0E34, L8012A74C_C0E4C, L8012A764_C0E64, L8012A7AC_C0EAC, L8012BF70_C2670, L8012A834_C0F34, L8012A864_C0F64, L8012A87C_C0F7C, L8012A8AC_C0FAC, L8012A8C4_C0FC4, L8012A8DC_C0FDC, L8012A8F4_C0FF4, L8012A90C_C100C, L8012A924_C1024, L8012A93C_C103C, 0 - -glabel jtbl_801508B8 -.word L8012A998_C1098, L8012A9AC_C10AC, L8012A9C0_C10C0, L8012A9D4_C10D4, L8012AB44_C1244, L8012A9EC_C10EC, L8012AA00_C1100, L8012AA10_C1110, L8012AA24_C1124, L8012AA38_C1138, L8012AA60_C1160, L8012AA74_C1174, L8012AA88_C1188, L8012AA9C_C119C, L8012AAB8_C11B8, 0 - -glabel D_801508F8 -.double 0.35 - -glabel D_80150900 -.double 45.0 - -glabel D_80150908 -.double 1.6 - -glabel D_80150910 -.double 180.0 - -glabel D_80150918 -.double 90.0 - -glabel D_80150920 -.double 1.6 - -glabel D_80150928 -.double 180.0 - -glabel D_80150930 -.double 90.0 - -glabel D_80150938 -.double 255.0 - -glabel D_80150940 -.double 1.7 - -glabel D_80150948 -.double 1.4 - -glabel D_80150950 -.double 1.2 - -glabel D_80150958 -.double 0.3 - -glabel jtbl_80150960 -.word L8012BC6C_C236C, L8012BC64_C2364, L8012BC64_C2364, L8012BC64_C2364, L8012BC64_C2364, L8012BC64_C2364, L8012BC64_C2364, L8012BC6C_C236C, L8012BC64_C2364, L8012BC64_C2364, L8012BC30_C2330, L8012BC64_C2364, L8012BC64_C2364, L8012BC64_C2364, L8012BC64_C2364, L8012BC64_C2364, L8012BC6C_C236C, L8012BC6C_C236C, L8012BC6C_C236C, L8012BC6C_C236C, L8012BC6C_C236C, L8012BC64_C2364, L8012BC64_C2364, L8012BC64_C2364, L8012BC64_C2364, L8012BC64_C2364, L8012BC64_C2364, L8012BC64_C2364, L8012BC64_C2364, L8012BC64_C2364, L8012BC64_C2364, L8012BC64_C2364, L8012BC3C_C233C, L8012BC64_C2364, L8012BC44_C2344, L8012BC50_C2350, L8012BC64_C2364, L8012BC58_C2358 - -glabel D_801509F8 -.double 255.0 - -glabel D_80150A00 -.double 255.0 - -glabel D_80150A08 -.double 0.7 - -glabel D_80150A10 -.double 0.005 - -glabel D_80150A18 -.double 0.67 - -glabel D_80150A20 -.double 0.3 - -glabel D_80150A28 -.double 0.005 - -glabel D_80150A30 -.double 0.38, 0.0 - -glabel D_80150A40 -.double 0.01 - -glabel D_80150A48 -.double 0.3 - -glabel D_80150A50 -.double 0.01, 0.0 - -glabel jtbl_80150A60 -.word L80130ABC_C71BC, L80130A30_C7130, L80130A50_C7150, L80130A60_C7160, L80130AB4_C71B4, L80130AC4_C71C4, L80130AC4_C71C4, L80130A70_C7170 - -glabel jtbl_80150A80 -.word L801313BC_C7ABC, L801311B8_C78B8, L80131188_C7888, L80131188_C7888, L801311B0_C78B0, 0 - -glabel jtbl_80150A98 -.word L80131468_C7B68, L80131478_C7B78, L80131478_C7B78, L80131478_C7B78, L80131478_C7B78, L80131468_C7B68, L80131468_C7B68, L80131468_C7B68, L80131468_C7B68, L80131478_C7B78, L80131468_C7B68, L80131468_C7B68, L80131478_C7B78, L80131468_C7B68, L80131468_C7B68, L80131468_C7B68, L80131478_C7B78, L80131468_C7B68, L80131468_C7B68, L80131478_C7B78, L80131478_C7B78, L80131468_C7B68, L80131468_C7B68, 0 - -glabel jtbl_80150AF8 -.word L80131620_C7D20, L8013162C_C7D2C, L80131638_C7D38, L8013162C_C7D2C, L80131644_C7D44, L80131660_C7D60, L80131674_C7D74, L80131688_C7D88, L8013169C_C7D9C, L801316B0_C7DB0, L801316C4_C7DC4, L801316E0_C7DE0, L80131708_C7E08, L80131714_C7E14, L80131728_C7E28, L8013173C_C7E3C, L80131750_C7E50, L80131768_C7E68, L80131784_C7E84, L801317A0_C7EA0, L801318B4_C7FB4, L801318C4_C7FC4, L801318E4_C7FE4, L801317BC_C7EBC, L801317E8_C7EE8, L8013181C_C7F1C, L80131850_C7F50, L80131878_C7F78 - -glabel jtbl_80150B68 -.word L8013192C_C802C, L80131A0C_C810C, L80131A0C_C810C, L8013192C_C802C, L80131A0C_C810C, L80131A0C_C810C, L80131A0C_C810C, L80131A0C_C810C, L80131A0C_C810C, L80131A0C_C810C, L80131A0C_C810C, L80131A0C_C810C, L8013192C_C802C, L80131A0C_C810C, L80131A0C_C810C, L80131A0C_C810C, L8013192C_C802C, L80131A0C_C810C, L80131A0C_C810C, L80131A0C_C810C, L8013192C_C802C, 0 - -glabel D_80150BC0 -.word 0x80131E38, 0x80131E44, 0x80131EC4, 0x80131E98, 0x80131EA4, 0x00000000 - -glabel jtbl_80150BD8 -.word L80131FD8_C86D8, L80131FE8_C86E8, L80131FE8_C86E8, L80131FF8_C86F8, L80132010_C8710, L80132010_C8710, L80132010_C8710, L80132010_C8710, L80132010_C8710, L80132010_C8710, L80132010_C8710, L80132010_C8710, L80131FF8_C86F8, L80132010_C8710, L80132010_C8710, L80132010_C8710, L80131FF8_C86F8, L80132010_C8710, L80132010_C8710, L80132010_C8710, L80131FF8_C86F8, L80132010_C8710, L80132010_C8710, L80131FF8_C86F8, L80132010_C8710, L80132010_C8710, L80132010_C8710, L80132010_C8710, L80132008_C8708, 0 - -glabel jtbl_80150C50 -.word L8013204C_C874C, L80132140_C8840, L80132140_C8840, L8013204C_C874C, L80132140_C8840, L80132140_C8840, L80132140_C8840, L80132140_C8840, L80132140_C8840, L80132140_C8840, L80132140_C8840, L80132140_C8840, L8013204C_C874C, L80132140_C8840, L80132140_C8840, L80132140_C8840, L8013204C_C874C, L80132140_C8840, L80132140_C8840, L80132140_C8840, L80132140_C8840, L80132140_C8840, L80132140_C8840, L80132140_C8840, L80132140_C8840, L80132140_C8840, L80132140_C8840, L80132140_C8840, L8013204C_C874C, 0 - -glabel D_80150CC8 -.word 0x80132E08, 0x80132E18, 0x80132E18, 0x80132E28, 0x80132E30, 0x80132E30, 0x80132E30, 0x80132E30, 0x80132E30, 0x80132E30, 0x80132E30, 0x80132E30, 0x80132E28, 0x80132E30, 0x80132E30, 0x80132E30, 0x80132E28, 0x80132E30, 0x80132E30, 0x80132E30, 0x80132E28, 0x80132E30, 0x80132E30, 0x80132E28 - -glabel jtbl_80150D28 -.word L801339B0_CA0B0, L801339B8_CA0B8, L801339B8_CA0B8, L801339B0_CA0B0, L801339B8_CA0B8, L801339B8_CA0B8, L801339B8_CA0B8, L801339B8_CA0B8, L801339B8_CA0B8, L801339B8_CA0B8, L801339B8_CA0B8, L801339B8_CA0B8, L801339B0_CA0B0, L801339B8_CA0B8, L801339B8_CA0B8, L801339B8_CA0B8, L801339B0_CA0B0, L801339B8_CA0B8, L801339B8_CA0B8, L801339B8_CA0B8, L801339B0_CA0B0, L801339B8_CA0B8, L801339B8_CA0B8, L801339B8_CA0B8, L801339B8_CA0B8, L801339B8_CA0B8, L801339B8_CA0B8, L801339B8_CA0B8, L801339B0_CA0B0, 0 - -glabel jtbl_80150DA0 -.word L80133A48_CA148, L80133A50_CA150, L80133A50_CA150, L80133A48_CA148, L80133A50_CA150, L80133A50_CA150, L80133A50_CA150, L80133A50_CA150, L80133A50_CA150, L80133A50_CA150, L80133A50_CA150, L80133A50_CA150, L80133A48_CA148, L80133A50_CA150, L80133A50_CA150, L80133A50_CA150, L80133A48_CA148, L80133A50_CA150, L80133A50_CA150, L80133A50_CA150, L80133A48_CA148, L80133A50_CA150, L80133A50_CA150, L80133A50_CA150, L80133A50_CA150, L80133A50_CA150, L80133A50_CA150, L80133A50_CA150, L80133A48_CA148, 0 - -glabel D_80150E18 -.double 0.6 - -glabel jtbl_80150E20 -.word L801357A8_CBEA8, L80135B24_CC224, L80135E48_CC548, L80135E78_CC578, L80135F08_CC608, L80135F78_CC678, L8013637C_CCA7C, L8013637C_CCA7C, L80135F94_CC694, L80135FE8_CC6E8, L8013610C_CC80C, L8013614C_CC84C, L8013629C_CC99C, L801362D0_CC9D0, L80136310_CCA10, 0 - -glabel jtbl_80150E60 -.word L801367A4_CCEA4, L801367A4_CCEA4, L801369B4_CD0B4, L801369B4_CD0B4, L801369B4_CD0B4, L801369B4_CD0B4, L801369B4_CD0B4, L801369B4_CD0B4, L801367A4_CCEA4, L801367A4_CCEA4, L801369B4_CD0B4, L8013694C_CD04C, L8013694C_CD04C, 0, 0, 0 - -glabel jtbl_80150EA0 -.word L8013722C_CD92C, L80137170_CD870, L80136FE8_CD6E8, L80137098_CD798, L801371D0_CD8D0, L8013704C_CD74C, L801370FC_CD7FC, L8013755C_CDC5C, L80137954_CE054, L80137C8C_CE38C, L80137C9C_CE39C, L80137CBC_CE3BC, L80137D00_CE400, L80137D00_CE400 - -glabel D_80150ED8 -.double 0.8 - -glabel D_80150EE0 -.double 0.8 - -glabel D_80150EE8 -.double 0.8 - -glabel jtbl_80150EF0 -.word L80138358_CEA58, L80138310_CEA10, L801383A4_CEAA4, L80138318_CEA18, L8013838C_CEA8C, L8013838C_CEA8C, L8013834C_CEA4C, L80138360_CEA60, L801383B0_CEAB0, L801383C4_CEAC4, L801383D0_CEAD0, L80138380_CEA80, L801383E8_CEAE8, L80138410_CEB10, L80138398_CEA98, L80138380_CEA80, L80138428_CEB28, 0 - -glabel jtbl_80150F38 -.word L80138658_CED58, L80138658_CED58, L80138640_CED40, L80138624_CED24, L8013864C_CED4C, L8013864C_CED4C, L80138658_CED58, L8013864C_CED4C, L80138660_CED60, L8013864C_CED4C, L8013864C_CED4C, L80138668_CED68, L80138674_CED74, L80138658_CED58, L80138658_CED58, L80138660_CED60, L80138680_CED80, 0 - -glabel D_80150F80 -.double 0.14 - -glabel D_80150F88 -.double 0.9 - -glabel D_80150F90 -.double 0.05 - -glabel D_80150F98 -.double 0.07 - -glabel D_80150FA0 -.double 0.09, 0.0 - -glabel jtbl_80150FB0 -.word L8013AB0C_D120C, L8013AB5C_D125C, L8013AB70_D1270, L8013AB0C_D120C, L8013AC14_D1314, L8013ABDC_D12DC, L8013AC14_D1314, L8013AC14_D1314, L8013AC14_D1314, L8013AC14_D1314, L8013AC14_D1314, L8013AC14_D1314, L8013AC14_D1314, L8013AC14_D1314, L8013AC14_D1314, L8013ABB0_D12B0, L8013ABB0_D12B0, L8013AB84_D1284 - -glabel jtbl_80150FF8 -.word L8013ACD8_D13D8, L8013ACE4_D13E4, L8013AD08_D1408, L8013AD30_D1430, L8013AD30_D1430, L8013AD30_D1430, L8013ADAC_D14AC, L8013ADAC_D14AC, L8013ADE4_D14E4, L8013AE58_D1558, L8013AECC_D15CC, L8013AED8_D15D8, L8013AEE4_D15E4, L8013AEE4_D15E4 - -glabel D_80151030 -.double 255.0 - -glabel jtbl_80151038 -.word L8013B160_D1860, L8013B140_D1840, L8013B150_D1850, L8013B120_D1820, L8013B160_D1860, 0 - -glabel D_80151050 -.double 255.0 - -glabel jtbl_80151058 -.word L8013B350_D1A50, L8013B358_D1A58, L8013B364_D1A64, L8013B364_D1A64, L8013B358_D1A58, L8013B364_D1A64, L8013B364_D1A64, L8013B364_D1A64, L8013B364_D1A64, L8013B360_D1A60, L8013B364_D1A64, L8013B350_D1A50 - -glabel jtbl_80151088 -.word L8013BAEC_D21EC, L8013B484_D1B84, L8013B4B4_D1BB4, L8013B500_D1C00, L8013B56C_D1C6C, L8013B57C_D1C7C, L8013B5E8_D1CE8, L8013B664_D1D64, L8013B678_D1D78, L8013B650_D1D50, L8013B68C_D1D8C, L8013B6F8_D1DF8, L8013B89C_D1F9C, L8013BA84_D2184, L8013BAEC_D21EC, L8013BB20_D2220, L8013BAEC_D21EC, 0 - -glabel jtbl_801510D0 -.word L8013BB8C_D228C, L8013BBA0_D22A0, L8013BBB4_D22B4, L8013BBA0_D22A0, L8013BBC8_D22C8, 0 - -glabel D_801510E8 -.double 0.01 - -glabel D_801510F0 -.double 1.2 - -glabel D_801510F8 -.double 1.2 - -glabel D_80151100 -.double 10.3 - -glabel D_80151108 -.double 360.0 - -glabel D_80151110 -.double 11.2 - -glabel D_80151118 -.double 360.0 - -glabel D_80151120 -.double 10.8 - -glabel D_80151128 -.double 360.0 - -glabel D_80151130 -.double 360.0 - -glabel D_80151138 -.double 255.0 - -glabel jtbl_80151140 -.word L8013F6DC_D5DDC, L8013F418_D5B18, L8013F3B4_D5AB4, L8013F38C_D5A8C, L8013F38C_D5A8C, L8013F3BC_D5ABC, L8013F3C8_D5AC8, L8013F3C8_D5AC8, L8013F38C_D5A8C, L8013F38C_D5A8C, L8013F410_D5B10, L8013F410_D5B10, L8013F418_D5B18, L8013F430_D5B30, L8013F410_D5B10, L8013F410_D5B10, L8013F418_D5B18, L8013F38C_D5A8C, L8013F38C_D5A8C, L8013F3DC_D5ADC, L8013F418_D5B18, L8013F410_D5B10, L8013F38C_D5A8C, L8013F410_D5B10, L8013F410_D5B10, L8013F410_D5B10, L8013F410_D5B10, L8013F418_D5B18 - -glabel jtbl_801511B0 -.word L80141750_D7E50, L80141808_D7F08, L80141920_D8020, L80141C6C_D836C, L80141C7C_D837C, L80141CBC_D83BC, L80141CFC_D83FC, L80141DDC_D84DC, L801417A0_D7EA0, L801417B8_D7EB8, L80141E28_D8528, L80141E48_D8548, L80141E74_D8574, L80141A54_D8154, L80141EA8_D85A8, L80142080_D8780, L801420BC_D87BC, L80141768_D7E68, L80141784_D7E84, L801420E4_D87E4, L80141C8C_D838C, L80142144_D8844, L801421F0_D88F0, L80142174_D8874, L801417CC_D7ECC, L801417EC_D7EEC, L801421A4_D88A4, L801421C0_D88C0 - -glabel jtbl_80151220 -.word L80146030_DC730, L801461A0_DC8A0, L80146044_DC744, L8014607C_DC77C, L801461A0_DC8A0, 0, 0, 0 - -glabel D_80151240 -.double 0.01 - -glabel D_80151248 -.double 0.01 - -glabel D_80151250 -.double 5550.0 - -glabel D_80151258 -.double 127.0 - -glabel D_80151260 -.double 3.6 - -glabel D_80151268 -.double 127.0 - -glabel D_80151270 -.double 127.0 - -glabel D_80151278 -.double 90.0 - -glabel D_80151280 -.double 6.283180236816406 - -glabel D_80151288 -.double 360.0 - -glabel jtbl_80151290 -.word L8014A7A0_E0EA0, L8014A5AC_E0CAC, L8014A64C_E0D4C, L8014A68C_E0D8C, L8014A644_E0D44, L8014A698_E0D98, 0, 0 diff --git a/ver/us/asm/data/si.rodata.s b/ver/us/asm/data/si.rodata.s deleted file mode 100644 index 007531f139..0000000000 --- a/ver/us/asm/data/si.rodata.s +++ /dev/null @@ -1,102 +0,0 @@ -.include "macro.inc" - -.section .rodata - -glabel D_802D9D98 -.ascii "ADDR [%08X]\0" - -glabel D_802D9DA8 -.ascii "FLOAT [%4.2f]\0\0\0\0" - -glabel D_802D9DBC -.ascii "UF(%3d) [%d]\0\0\0" - -glabel D_802D9DCC -.ascii "UW(%3d) [%08X]\0" - -glabel D_802D9DDC -.ascii "UW(%3d) [%4.2f]\0\0\0\0" - -glabel D_802D9DF0 -.ascii "UW(%3d) [%d]\0\0\0" - -glabel D_802D9E00 -.ascii "GSW(%3d) [%08X]\0" - -glabel D_802D9E10 -.ascii "GSW(%3d) [%4.2f]\0\0\0\0" - -glabel D_802D9E24 -.ascii "GSW(%3d) [%d]\0\0\0" - -glabel D_802D9E34 -.ascii "LSW(%3d) [%08X]\0" - -glabel D_802D9E44 -.ascii "LSW(%3d) [%4.2f]\0\0\0" - -glabel D_802D9E58 -.ascii "LSW(%3d) [%d]\0\0\0" - -glabel D_802D9E68 -.ascii "GSWF(%3d)[%d]\0\0\0" - -glabel D_802D9E78 -.ascii "LSWF(%3d)[%d]\0\0\0" - -glabel D_802D9E88 -.ascii "GF(%3d) [%d]\0\0\0" - -glabel D_802D9E98 -.ascii "LF(%3d) [%d]\0\0\0" - -glabel D_802D9EA8 -.ascii "GW(%3d) [%08X]\0" - -glabel D_802D9EB8 -.ascii "GW(%3d) [%4.2f]\0\0\0\0" - -glabel D_802D9ECC -.ascii "GW(%3d) [%d]\0\0\0" - -glabel D_802D9EDC -.ascii "LW(%3d) [%08X]\0" - -glabel D_802D9EEC -.ascii "LW(%3d) [%4.2f]\0\0\0\0" - -glabel D_802D9F00 -.ascii "LW(%3d) [%d]\0\0\0" - -glabel D_802D9F10 -.ascii " [%d]\0\0\0" - -glabel jtbl_802D9F20 -.word L802C743C_EBDEC, L802C7A54_EC404, L802C747C_EBE2C, L802C748C_EBE3C, L802C749C_EBE4C, L802C74AC_EBE5C, L802C74BC_EBE6C, L802C74CC_EBE7C, L802C74DC_EBE8C, L802C74EC_EBE9C, L802C74FC_EBEAC, L802C750C_EBEBC, L802C751C_EBECC, L802C752C_EBEDC, L802C753C_EBEEC, L802C754C_EBEFC, L802C755C_EBF0C, L802C756C_EBF1C, L802C757C_EBF2C, L802C758C_EBF3C, L802C759C_EBF4C, L802C75AC_EBF5C, L802C75BC_EBF6C, L802C75CC_EBF7C, L802C75DC_EBF8C, L802C75FC_EBFAC, L802C75EC_EBF9C, L802C760C_EBFBC, L802C761C_EBFCC, L802C763C_EBFEC, L802C765C_EC00C, L802C766C_EC01C, L802C764C_EBFFC, L802C767C_EC02C, L802C762C_EBFDC, L802C768C_EC03C, L802C769C_EC04C, L802C76AC_EC05C, L802C76BC_EC06C, L802C76CC_EC07C, L802C76DC_EC08C, L802C76EC_EC09C, L802C76FC_EC0AC, L802C770C_EC0BC, L802C771C_EC0CC, L802C772C_EC0DC, L802C773C_EC0EC, L802C774C_EC0FC, L802C775C_EC10C, L802C776C_EC11C, L802C777C_EC12C, L802C778C_EC13C, L802C779C_EC14C, L802C77AC_EC15C, L802C77BC_EC16C, L802C77CC_EC17C, L802C77DC_EC18C, L802C77EC_EC19C, L802C77FC_EC1AC, L802C780C_EC1BC, L802C781C_EC1CC, L802C782C_EC1DC, L802C783C_EC1EC, L802C785C_EC20C, L802C786C_EC21C, L802C787C_EC22C, L802C788C_EC23C, L802C789C_EC24C, L802C78AC_EC25C, L802C78BC_EC26C, L802C78CC_EC27C, L802C78DC_EC28C, L802C78EC_EC29C, L802C784C_EC1FC, L802C792C_EC2DC, L802C78FC_EC2AC, L802C790C_EC2BC, L802C791C_EC2CC, L802C793C_EC2EC, L802C794C_EC2FC, L802C795C_EC30C, L802C796C_EC31C, L802C797C_EC32C, L802C798C_EC33C, L802C799C_EC34C, L802C79AC_EC35C, L802C79BC_EC36C, L802C79CC_EC37C, L802C79DC_EC38C, L802C79EC_EC39C, L802C79FC_EC3AC, L802C7A0C_EC3BC, L802C7A1C_EC3CC, L802C7A2C_EC3DC, L802C7A3C_EC3EC, 0 - -glabel D_802DA0A0 -.word 0x802C8944, 0x802C890C, 0x802C890C, 0x802C890C, 0x802C890C, 0x802C890C, 0x802C890C, 0x802C890C, 0x802C890C, 0x802C8960, 0x802C8960, 0x802C8960, 0x802C8960, 0x802C8960, 0x802C8960, 0x802C8960, 0x802C8960, 0x802C8968, 0x802C894C, 0x00000000 - -glabel D_802DA0F0 -.word 0x802C89C0, 0x802C8988, 0x802C8988, 0x802C8988, 0x802C8988, 0x802C8988, 0x802C8988, 0x802C8988, 0x802C8988, 0x802C89DC, 0x802C89DC, 0x802C89DC, 0x802C89DC, 0x802C89DC, 0x802C89DC, 0x802C89DC, 0x802C89DC, 0x802C8988, 0x802C89C8, 0x00000000 - -glabel D_802DA140 -.word 0x802C8AB0, 0x802C8A74, 0x802C8A74, 0x802C8A74, 0x802C8A74, 0x802C8A74, 0x802C8A74, 0x802C8A74, 0x802C8A74, 0x802C8A74, 0x802C8A74, 0x802C8A74, 0x802C8A74, 0x802C8A74, 0x802C8A74, 0x802C8A74, 0x802C8A74, 0x802C8A74, 0x802C8A74, 0x802C8AB8, 0x802C8A74, 0x802C8AD4, 0x802C8AD4, 0x802C8AD4, 0x802C8AD4, 0x802C8AD4, 0x802C8AD4, 0x802C8AD4, 0x802C8AD4, 0x802C8AD4, 0x802C8A74, 0x802C8AD4, 0x802C8AD4, 0x802C8A74, 0x802C8AC0, 0x00000000 - -glabel D_802DA1D0 -.double -0.8, 0.0 - -glabel D_802DA1E0 -.double 180.0, 0.0 - -glabel jtbl_802DA1F0 -.word L802D0668_F5018, L802D0674_F5024, L802D0680_F5030, L802D068C_F503C, L802D0698_F5048, L802D069C_F504C - -glabel jtbl_802DA208 -.word L802D25A8_F6F58, L802D25DC_F6F8C, L802D25D4_F6F84, L802D25D4_F6F84, L802D2604_F6FB4, L802D2760_F7110, L802D2664_F7014, L802D26C4_F7074, L802D2704_F70B4, L802D283C_F71EC, L802D283C_F71EC, L802D283C_F71EC, L802D283C_F71EC, L802D27C0_F7170 - -glabel jtbl_802DA240 -.word L802D40D4_F8A84, L802D40E0_F8A90, L802D4148_F8AF8, L802D40EC_F8A9C, L802D40F8_F8AA8, L802D4104_F8AB4 - -glabel jtbl_802DA258 -.word L802D8560_FCF10, L802D858C_FCF3C, L802D9688_FE038, L802D9688_FE038, L802D9688_FE038, L802D9688_FE038, L802D85A4_FCF54, L802D85C0_FCF70, L802D85E0_FCF90, L802D85FC_FCFAC, L802D861C_FCFCC, L802D8638_FCFE8, L802D8654_FD004, L802D8674_FD024, L802D8698_FD048, L802D86B4_FD064, L802D86E0_FD090, L802D870C_FD0BC, L802D8728_FD0D8, L802D8750_FD100, L802D8770_FD120, L802D878C_FD13C, L802D87A8_FD158, L802D87C4_FD174, L802D87E0_FD190, L802D8808_FD1B8, L802D8824_FD1D4, L802D8840_FD1F0, L802D8864_FD214, L802D8880_FD230, L802D88A8_FD258, L802D88E8_FD298, L802D8A68_FD418, L802D8914_FD2C4, L802D893C_FD2EC, L802D8968_FD318, L802D8984_FD334, L802D89A4_FD354, L802D89C0_FD370, L802D89DC_FD38C, L802D89FC_FD3AC, L802D8A24_FD3D4, L802D9688_FE038, L802D8A4C_FD3FC, L802D8A8C_FD43C, L802D8AA8_FD458, L802D8AC8_FD478, L802D8AE8_FD498, L802D8B20_FD4D0, L802D8B3C_FD4EC, L802D8B58_FD508, L802D8B74_FD524, L802D8B94_FD544, L802D8BB8_FD568, L802D8BDC_FD58C, L802D8BFC_FD5AC, L802D8C30_FD5E0, L802D8C50_FD600, L802D8C70_FD620, L802D8C9C_FD64C, L802D8CC0_FD670, L802D8CF4_FD6A4, L802D8D34_FD6E4, L802D8D54_FD704, L802D8D70_FD720, L802D8D8C_FD73C, L802D8DA8_FD758, L802D8DC8_FD778, L802D8DE8_FD798, L802D8E08_FD7B8, L802D8E1C_FD7CC, L802D8E30_FD7E0, L802D8E50_FD800, L802D8E70_FD820, L802D8E90_FD840, L802D8EB0_FD860, L802D8ED0_FD880, L802D8F00_FD8B0, L802D8F44_FD8F4, L802D8F60_FD910, L802D9688_FE038, L802D8FBC_FD96C, L802D8F80_FD930, L802D8FA0_FD950, L802D9688_FE038, L802D94A0_FDE50, L802D8FDC_FD98C, L802D8FFC_FD9AC, L802D901C_FD9CC, L802D903C_FD9EC, L802D906C_FDA1C, L802D908C_FDA3C, L802D90AC_FDA5C, L802D90CC_FDA7C, L802D90EC_FDA9C, L802D911C_FDACC, L802D913C_FDAEC, L802D915C_FDB0C, L802D917C_FDB2C, L802D919C_FDB4C, L802D91D4_FDB84, L802D9204_FDBB4, L802D9224_FDBD4, L802D9244_FDBF4, L802D9264_FDC14, L802D9284_FDC34, L802D9688_FE038, L802D92A4_FDC54, L802D92C4_FDC74, L802D92E4_FDC94, L802D9304_FDCB4, L802D932C_FDCDC, L802D934C_FDCFC, L802D9388_FDD38, L802D93A8_FDD58, L802D93D4_FDD84, L802D93FC_FDDAC, L802D9430_FDDE0, L802D9688_FE038, L802D9450_FDE00, L802D9480_FDE30, L802D94BC_FDE6C, L802D94DC_FDE8C, L802D94FC_FDEAC, L802D951C_FDECC, L802D953C_FDEEC, L802D955C_FDF0C, L802D957C_FDF2C, L802D959C_FDF4C, L802D95BC_FDF6C, L802D95DC_FDF8C, L802D95FC_FDFAC, L802D961C_FDFCC, L802D9648_FDFF8, L802D9668_FE018, 0, 0, 0 diff --git a/ver/us/asm/data/world/partner/goombario.rodata.s b/ver/us/asm/data/world/partner/goombario.rodata.s deleted file mode 100644 index 28ddb25673..0000000000 --- a/ver/us/asm/data/world/partner/goombario.rodata.s +++ /dev/null @@ -1,9 +0,0 @@ -.include "macro.inc" - -.section .rodata - -glabel D_802BDE80_317DA0 -.double 0.8 - -glabel D_802BDE88_317DA8 -.word 0x802BD8EC, 0x802BD90C, 0x802BD974, 0x802BD974, 0x802BD974, 0x802BD974, 0x802BD974, 0x802BD974, 0x802BD974, 0x802BD974, 0x802BD974, 0x802BD974, 0x802BD974, 0x802BD858, 0x802BD870, 0x802BD974, 0x802BD858, 0x802BD870, 0x802BD974, 0x802BD974, 0x802BD974, 0x802BD974, 0x802BD974, 0x802BD974, 0x802BD974, 0x802BD974, 0x802BD974, 0x802BD88C, 0x802BD8BC, 0x802BD974, 0x802BD974, 0x802BD974, 0x802BD974, 0x802BD974, 0x802BD974, 0x802BD974, 0x802BD974, 0x802BD974, 0x802BD974, 0x802BD974, 0x802BD92C, 0x802BD94C diff --git a/ver/us/asm/nonmatchings/battle/item/electro_pop_7305A0/func_802A13FC_73099C.s b/ver/us/asm/nonmatchings/battle/item/electro_pop_7305A0/func_802A13FC_73099C.s deleted file mode 100644 index fa3ad0eec3..0000000000 --- a/ver/us/asm/nonmatchings/battle/item/electro_pop_7305A0/func_802A13FC_73099C.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A13FC_73099C -/* 73099C 802A13FC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 7309A0 802A1400 AFBF0014 */ sw $ra, 0x14($sp) -/* 7309A4 802A1404 AFB00010 */ sw $s0, 0x10($sp) -/* 7309A8 802A1408 8C82000C */ lw $v0, 0xc($a0) -/* 7309AC 802A140C 0C0B1EAF */ jal get_variable -/* 7309B0 802A1410 8C450000 */ lw $a1, ($v0) -/* 7309B4 802A1414 3C038011 */ lui $v1, %hi(gPlayerData) -/* 7309B8 802A1418 2463F290 */ addiu $v1, $v1, %lo(gPlayerData) -/* 7309BC 802A141C 80640002 */ lb $a0, 2($v1) -/* 7309C0 802A1420 80650003 */ lb $a1, 3($v1) -/* 7309C4 802A1424 00822021 */ addu $a0, $a0, $v0 -/* 7309C8 802A1428 00A4102A */ slt $v0, $a1, $a0 -/* 7309CC 802A142C 10400002 */ beqz $v0, .L802A1438 -/* 7309D0 802A1430 0060802D */ daddu $s0, $v1, $zero -/* 7309D4 802A1434 00A0202D */ daddu $a0, $a1, $zero -.L802A1438: -/* 7309D8 802A1438 A2040002 */ sb $a0, 2($s0) -/* 7309DC 802A143C 8FBF0014 */ lw $ra, 0x14($sp) -/* 7309E0 802A1440 8FB00010 */ lw $s0, 0x10($sp) -/* 7309E4 802A1444 24020002 */ addiu $v0, $zero, 2 -/* 7309E8 802A1448 03E00008 */ jr $ra -/* 7309EC 802A144C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/battle/item/food_7330D0/func_802A14F8_7335C8.s b/ver/us/asm/nonmatchings/battle/item/food_7330D0/func_802A14F8_7335C8.s deleted file mode 100644 index 31e0868b4e..0000000000 --- a/ver/us/asm/nonmatchings/battle/item/food_7330D0/func_802A14F8_7335C8.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A14F8_7335C8 -/* 7335C8 802A14F8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 7335CC 802A14FC AFBF0014 */ sw $ra, 0x14($sp) -/* 7335D0 802A1500 AFB00010 */ sw $s0, 0x10($sp) -/* 7335D4 802A1504 8C82000C */ lw $v0, 0xc($a0) -/* 7335D8 802A1508 0C0B1EAF */ jal get_variable -/* 7335DC 802A150C 8C450000 */ lw $a1, ($v0) -/* 7335E0 802A1510 3C038011 */ lui $v1, %hi(gPlayerData) -/* 7335E4 802A1514 2463F290 */ addiu $v1, $v1, %lo(gPlayerData) -/* 7335E8 802A1518 80640002 */ lb $a0, 2($v1) -/* 7335EC 802A151C 80650003 */ lb $a1, 3($v1) -/* 7335F0 802A1520 00822021 */ addu $a0, $a0, $v0 -/* 7335F4 802A1524 00A4102A */ slt $v0, $a1, $a0 -/* 7335F8 802A1528 10400002 */ beqz $v0, .L802A1534 -/* 7335FC 802A152C 0060802D */ daddu $s0, $v1, $zero -/* 733600 802A1530 00A0202D */ daddu $a0, $a1, $zero -.L802A1534: -/* 733604 802A1534 A2040002 */ sb $a0, 2($s0) -/* 733608 802A1538 8FBF0014 */ lw $ra, 0x14($sp) -/* 73360C 802A153C 8FB00010 */ lw $s0, 0x10($sp) -/* 733610 802A1540 24020002 */ addiu $v0, $zero, 2 -/* 733614 802A1544 03E00008 */ jr $ra -/* 733618 802A1548 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/battle/item/food_7330D0/func_802A154C_73361C.s b/ver/us/asm/nonmatchings/battle/item/food_7330D0/func_802A154C_73361C.s deleted file mode 100644 index 667743b803..0000000000 --- a/ver/us/asm/nonmatchings/battle/item/food_7330D0/func_802A154C_73361C.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A154C_73361C -/* 73361C 802A154C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 733620 802A1550 AFBF0014 */ sw $ra, 0x14($sp) -/* 733624 802A1554 AFB00010 */ sw $s0, 0x10($sp) -/* 733628 802A1558 8C82000C */ lw $v0, 0xc($a0) -/* 73362C 802A155C 0C0B1EAF */ jal get_variable -/* 733630 802A1560 8C450000 */ lw $a1, ($v0) -/* 733634 802A1564 3C038011 */ lui $v1, %hi(gPlayerData) -/* 733638 802A1568 2463F290 */ addiu $v1, $v1, %lo(gPlayerData) -/* 73363C 802A156C 80640005 */ lb $a0, 5($v1) -/* 733640 802A1570 80650006 */ lb $a1, 6($v1) -/* 733644 802A1574 00822021 */ addu $a0, $a0, $v0 -/* 733648 802A1578 00A4102A */ slt $v0, $a1, $a0 -/* 73364C 802A157C 10400002 */ beqz $v0, .L802A1588 -/* 733650 802A1580 0060802D */ daddu $s0, $v1, $zero -/* 733654 802A1584 00A0202D */ daddu $a0, $a1, $zero -.L802A1588: -/* 733658 802A1588 A2040005 */ sb $a0, 5($s0) -/* 73365C 802A158C 8FBF0014 */ lw $ra, 0x14($sp) -/* 733660 802A1590 8FB00010 */ lw $s0, 0x10($sp) -/* 733664 802A1594 24020002 */ addiu $v0, $zero, 2 -/* 733668 802A1598 03E00008 */ jr $ra -/* 73366C 802A159C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/battle/item/mushroom_715850/func_802A14F8_715D48.s b/ver/us/asm/nonmatchings/battle/item/mushroom_715850/func_802A14F8_715D48.s deleted file mode 100644 index 9cec9fefa0..0000000000 --- a/ver/us/asm/nonmatchings/battle/item/mushroom_715850/func_802A14F8_715D48.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A14F8_715D48 -/* 715D48 802A14F8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 715D4C 802A14FC AFBF0014 */ sw $ra, 0x14($sp) -/* 715D50 802A1500 AFB00010 */ sw $s0, 0x10($sp) -/* 715D54 802A1504 8C82000C */ lw $v0, 0xc($a0) -/* 715D58 802A1508 0C0B1EAF */ jal get_variable -/* 715D5C 802A150C 8C450000 */ lw $a1, ($v0) -/* 715D60 802A1510 3C038011 */ lui $v1, %hi(gPlayerData) -/* 715D64 802A1514 2463F290 */ addiu $v1, $v1, %lo(gPlayerData) -/* 715D68 802A1518 80640002 */ lb $a0, 2($v1) -/* 715D6C 802A151C 80650003 */ lb $a1, 3($v1) -/* 715D70 802A1520 00822021 */ addu $a0, $a0, $v0 -/* 715D74 802A1524 00A4102A */ slt $v0, $a1, $a0 -/* 715D78 802A1528 10400002 */ beqz $v0, .L802A1534 -/* 715D7C 802A152C 0060802D */ daddu $s0, $v1, $zero -/* 715D80 802A1530 00A0202D */ daddu $a0, $a1, $zero -.L802A1534: -/* 715D84 802A1534 A2040002 */ sb $a0, 2($s0) -/* 715D88 802A1538 8FBF0014 */ lw $ra, 0x14($sp) -/* 715D8C 802A153C 8FB00010 */ lw $s0, 0x10($sp) -/* 715D90 802A1540 24020002 */ addiu $v0, $zero, 2 -/* 715D94 802A1544 03E00008 */ jr $ra -/* 715D98 802A1548 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/battle/item/mushroom_715850/func_802A154C_715D9C.s b/ver/us/asm/nonmatchings/battle/item/mushroom_715850/func_802A154C_715D9C.s deleted file mode 100644 index 002221325b..0000000000 --- a/ver/us/asm/nonmatchings/battle/item/mushroom_715850/func_802A154C_715D9C.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A154C_715D9C -/* 715D9C 802A154C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 715DA0 802A1550 AFBF0014 */ sw $ra, 0x14($sp) -/* 715DA4 802A1554 AFB00010 */ sw $s0, 0x10($sp) -/* 715DA8 802A1558 8C82000C */ lw $v0, 0xc($a0) -/* 715DAC 802A155C 0C0B1EAF */ jal get_variable -/* 715DB0 802A1560 8C450000 */ lw $a1, ($v0) -/* 715DB4 802A1564 3C038011 */ lui $v1, %hi(gPlayerData) -/* 715DB8 802A1568 2463F290 */ addiu $v1, $v1, %lo(gPlayerData) -/* 715DBC 802A156C 80640005 */ lb $a0, 5($v1) -/* 715DC0 802A1570 80650006 */ lb $a1, 6($v1) -/* 715DC4 802A1574 00822021 */ addu $a0, $a0, $v0 -/* 715DC8 802A1578 00A4102A */ slt $v0, $a1, $a0 -/* 715DCC 802A157C 10400002 */ beqz $v0, .L802A1588 -/* 715DD0 802A1580 0060802D */ daddu $s0, $v1, $zero -/* 715DD4 802A1584 00A0202D */ daddu $a0, $a1, $zero -.L802A1588: -/* 715DD8 802A1588 A2040005 */ sb $a0, 5($s0) -/* 715DDC 802A158C 8FBF0014 */ lw $ra, 0x14($sp) -/* 715DE0 802A1590 8FB00010 */ lw $s0, 0x10($sp) -/* 715DE4 802A1594 24020002 */ addiu $v0, $zero, 2 -/* 715DE8 802A1598 03E00008 */ jr $ra -/* 715DEC 802A159C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/battle/item/strange_cake_731300/func_802A1998_731C98.s b/ver/us/asm/nonmatchings/battle/item/strange_cake_731300/func_802A1998_731C98.s deleted file mode 100644 index d6bc57513d..0000000000 --- a/ver/us/asm/nonmatchings/battle/item/strange_cake_731300/func_802A1998_731C98.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1998_731C98 -/* 731C98 802A1998 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 731C9C 802A199C AFBF0014 */ sw $ra, 0x14($sp) -/* 731CA0 802A19A0 AFB00010 */ sw $s0, 0x10($sp) -/* 731CA4 802A19A4 8C82000C */ lw $v0, 0xc($a0) -/* 731CA8 802A19A8 0C0B1EAF */ jal get_variable -/* 731CAC 802A19AC 8C450000 */ lw $a1, ($v0) -/* 731CB0 802A19B0 3C038011 */ lui $v1, %hi(gPlayerData) -/* 731CB4 802A19B4 2463F290 */ addiu $v1, $v1, %lo(gPlayerData) -/* 731CB8 802A19B8 80640002 */ lb $a0, 2($v1) -/* 731CBC 802A19BC 80650003 */ lb $a1, 3($v1) -/* 731CC0 802A19C0 00822021 */ addu $a0, $a0, $v0 -/* 731CC4 802A19C4 00A4102A */ slt $v0, $a1, $a0 -/* 731CC8 802A19C8 10400002 */ beqz $v0, .L802A19D4 -/* 731CCC 802A19CC 0060802D */ daddu $s0, $v1, $zero -/* 731CD0 802A19D0 00A0202D */ daddu $a0, $a1, $zero -.L802A19D4: -/* 731CD4 802A19D4 A2040002 */ sb $a0, 2($s0) -/* 731CD8 802A19D8 8FBF0014 */ lw $ra, 0x14($sp) -/* 731CDC 802A19DC 8FB00010 */ lw $s0, 0x10($sp) -/* 731CE0 802A19E0 24020002 */ addiu $v0, $zero, 2 -/* 731CE4 802A19E4 03E00008 */ jr $ra -/* 731CE8 802A19E8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/battle/item/strange_cake_731300/func_802A19EC_731CEC.s b/ver/us/asm/nonmatchings/battle/item/strange_cake_731300/func_802A19EC_731CEC.s deleted file mode 100644 index 486c84774d..0000000000 --- a/ver/us/asm/nonmatchings/battle/item/strange_cake_731300/func_802A19EC_731CEC.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A19EC_731CEC -/* 731CEC 802A19EC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 731CF0 802A19F0 AFBF0014 */ sw $ra, 0x14($sp) -/* 731CF4 802A19F4 AFB00010 */ sw $s0, 0x10($sp) -/* 731CF8 802A19F8 8C82000C */ lw $v0, 0xc($a0) -/* 731CFC 802A19FC 0C0B1EAF */ jal get_variable -/* 731D00 802A1A00 8C450000 */ lw $a1, ($v0) -/* 731D04 802A1A04 3C038011 */ lui $v1, %hi(gPlayerData) -/* 731D08 802A1A08 2463F290 */ addiu $v1, $v1, %lo(gPlayerData) -/* 731D0C 802A1A0C 80640005 */ lb $a0, 5($v1) -/* 731D10 802A1A10 80650006 */ lb $a1, 6($v1) -/* 731D14 802A1A14 00822021 */ addu $a0, $a0, $v0 -/* 731D18 802A1A18 00A4102A */ slt $v0, $a1, $a0 -/* 731D1C 802A1A1C 10400002 */ beqz $v0, .L802A1A28 -/* 731D20 802A1A20 0060802D */ daddu $s0, $v1, $zero -/* 731D24 802A1A24 00A0202D */ daddu $a0, $a1, $zero -.L802A1A28: -/* 731D28 802A1A28 A2040005 */ sb $a0, 5($s0) -/* 731D2C 802A1A2C 8FBF0014 */ lw $ra, 0x14($sp) -/* 731D30 802A1A30 8FB00010 */ lw $s0, 0x10($sp) -/* 731D34 802A1A34 24020002 */ addiu $v0, $zero, 2 -/* 731D38 802A1A38 03E00008 */ jr $ra -/* 731D3C 802A1A3C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/battle/item/super_soda_724CE0/func_802A14D8_7251B8.s b/ver/us/asm/nonmatchings/battle/item/super_soda_724CE0/func_802A14D8_7251B8.s deleted file mode 100644 index d61b02c6c3..0000000000 --- a/ver/us/asm/nonmatchings/battle/item/super_soda_724CE0/func_802A14D8_7251B8.s +++ /dev/null @@ -1,27 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A14D8_7251B8 -/* 7251B8 802A14D8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 7251BC 802A14DC AFBF0014 */ sw $ra, 0x14($sp) -/* 7251C0 802A14E0 AFB00010 */ sw $s0, 0x10($sp) -/* 7251C4 802A14E4 8C82000C */ lw $v0, 0xc($a0) -/* 7251C8 802A14E8 0C0B1EAF */ jal get_variable -/* 7251CC 802A14EC 8C450000 */ lw $a1, ($v0) -/* 7251D0 802A14F0 3C038011 */ lui $v1, %hi(gPlayerData) -/* 7251D4 802A14F4 2463F290 */ addiu $v1, $v1, %lo(gPlayerData) -/* 7251D8 802A14F8 80640005 */ lb $a0, 5($v1) -/* 7251DC 802A14FC 80650006 */ lb $a1, 6($v1) -/* 7251E0 802A1500 00822021 */ addu $a0, $a0, $v0 -/* 7251E4 802A1504 00A4102A */ slt $v0, $a1, $a0 -/* 7251E8 802A1508 10400002 */ beqz $v0, .L802A1514 -/* 7251EC 802A150C 0060802D */ daddu $s0, $v1, $zero -/* 7251F0 802A1510 00A0202D */ daddu $a0, $a1, $zero -.L802A1514: -/* 7251F4 802A1514 A2040005 */ sb $a0, 5($s0) -/* 7251F8 802A1518 8FBF0014 */ lw $ra, 0x14($sp) -/* 7251FC 802A151C 8FB00010 */ lw $s0, 0x10($sp) -/* 725200 802A1520 24020002 */ addiu $v0, $zero, 2 -/* 725204 802A1524 03E00008 */ jr $ra -/* 725208 802A1528 27BD0018 */ addiu $sp, $sp, 0x18 -/* 72520C 802A152C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/battle/star/chill_out_7900D0/func_802A1218_7902E8.s b/ver/us/asm/nonmatchings/battle/star/chill_out_7900D0/func_802A1218_7902E8.s deleted file mode 100644 index ef617e8282..0000000000 --- a/ver/us/asm/nonmatchings/battle/star/chill_out_7900D0/func_802A1218_7902E8.s +++ /dev/null @@ -1,55 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1218_7902E8 -/* 7902E8 802A1218 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* 7902EC 802A121C AFB1002C */ sw $s1, 0x2c($sp) -/* 7902F0 802A1220 0080882D */ daddu $s1, $a0, $zero -/* 7902F4 802A1224 AFBF0034 */ sw $ra, 0x34($sp) -/* 7902F8 802A1228 AFB20030 */ sw $s2, 0x30($sp) -/* 7902FC 802A122C AFB00028 */ sw $s0, 0x28($sp) -/* 790300 802A1230 8E30000C */ lw $s0, 0xc($s1) -/* 790304 802A1234 8E050000 */ lw $a1, ($s0) -/* 790308 802A1238 0C0B1EAF */ jal get_variable -/* 79030C 802A123C 26100004 */ addiu $s0, $s0, 4 -/* 790310 802A1240 8E050000 */ lw $a1, ($s0) -/* 790314 802A1244 26100004 */ addiu $s0, $s0, 4 -/* 790318 802A1248 0220202D */ daddu $a0, $s1, $zero -/* 79031C 802A124C 0C0B1EAF */ jal get_variable -/* 790320 802A1250 0040902D */ daddu $s2, $v0, $zero -/* 790324 802A1254 0220202D */ daddu $a0, $s1, $zero -/* 790328 802A1258 8E050000 */ lw $a1, ($s0) -/* 79032C 802A125C 0C0B1EAF */ jal get_variable -/* 790330 802A1260 0040802D */ daddu $s0, $v0, $zero -/* 790334 802A1264 24040004 */ addiu $a0, $zero, 4 -/* 790338 802A1268 44922000 */ mtc1 $s2, $f4 -/* 79033C 802A126C 00000000 */ nop -/* 790340 802A1270 46802120 */ cvt.s.w $f4, $f4 -/* 790344 802A1274 44052000 */ mfc1 $a1, $f4 -/* 790348 802A1278 44902000 */ mtc1 $s0, $f4 -/* 79034C 802A127C 00000000 */ nop -/* 790350 802A1280 46802120 */ cvt.s.w $f4, $f4 -/* 790354 802A1284 44062000 */ mfc1 $a2, $f4 -/* 790358 802A1288 44822000 */ mtc1 $v0, $f4 -/* 79035C 802A128C 00000000 */ nop -/* 790360 802A1290 46802120 */ cvt.s.w $f4, $f4 -/* 790364 802A1294 3C0141A0 */ lui $at, 0x41a0 -/* 790368 802A1298 44810000 */ mtc1 $at, $f0 -/* 79036C 802A129C 3C013F80 */ lui $at, 0x3f80 -/* 790370 802A12A0 44811000 */ mtc1 $at, $f2 -/* 790374 802A12A4 44072000 */ mfc1 $a3, $f4 -/* 790378 802A12A8 2403000A */ addiu $v1, $zero, 0xa -/* 79037C 802A12AC AFA3001C */ sw $v1, 0x1c($sp) -/* 790380 802A12B0 2403000F */ addiu $v1, $zero, 0xf -/* 790384 802A12B4 AFA30020 */ sw $v1, 0x20($sp) -/* 790388 802A12B8 E7A00010 */ swc1 $f0, 0x10($sp) -/* 79038C 802A12BC E7A00014 */ swc1 $f0, 0x14($sp) -/* 790390 802A12C0 0C01C8D4 */ jal func_80072350 -/* 790394 802A12C4 E7A20018 */ swc1 $f2, 0x18($sp) -/* 790398 802A12C8 8FBF0034 */ lw $ra, 0x34($sp) -/* 79039C 802A12CC 8FB20030 */ lw $s2, 0x30($sp) -/* 7903A0 802A12D0 8FB1002C */ lw $s1, 0x2c($sp) -/* 7903A4 802A12D4 8FB00028 */ lw $s0, 0x28($sp) -/* 7903A8 802A12D8 24020002 */ addiu $v0, $zero, 2 -/* 7903AC 802A12DC 03E00008 */ jr $ra -/* 7903B0 802A12E0 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/ver/us/asm/nonmatchings/battle/star/chill_out_7900D0/func_802A163C_79070C.s b/ver/us/asm/nonmatchings/battle/star/chill_out_7900D0/func_802A163C_79070C.s deleted file mode 100644 index 005fbce5bd..0000000000 --- a/ver/us/asm/nonmatchings/battle/star/chill_out_7900D0/func_802A163C_79070C.s +++ /dev/null @@ -1,51 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A163C_79070C -/* 79070C 802A163C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 790710 802A1640 AFB20018 */ sw $s2, 0x18($sp) -/* 790714 802A1644 0080902D */ daddu $s2, $a0, $zero -/* 790718 802A1648 AFBF001C */ sw $ra, 0x1c($sp) -/* 79071C 802A164C AFB10014 */ sw $s1, 0x14($sp) -/* 790720 802A1650 AFB00010 */ sw $s0, 0x10($sp) -/* 790724 802A1654 0C09A75B */ jal get_actor -/* 790728 802A1658 8E440148 */ lw $a0, 0x148($s2) -/* 79072C 802A165C 0040802D */ daddu $s0, $v0, $zero -/* 790730 802A1660 0C09A75B */ jal get_actor -/* 790734 802A1664 86040428 */ lh $a0, 0x428($s0) -/* 790738 802A1668 0040882D */ daddu $s1, $v0, $zero -/* 79073C 802A166C 82050426 */ lb $a1, 0x426($s0) -/* 790740 802A1670 0C099117 */ jal get_actor_part -/* 790744 802A1674 0220202D */ daddu $a0, $s1, $zero -/* 790748 802A1678 AE400084 */ sw $zero, 0x84($s2) -/* 79074C 802A167C 8E310000 */ lw $s1, ($s1) -/* 790750 802A1680 0040182D */ daddu $v1, $v0, $zero -/* 790754 802A1684 32224000 */ andi $v0, $s1, 0x4000 -/* 790758 802A1688 14400014 */ bnez $v0, .L802A16DC -/* 79075C 802A168C 24020002 */ addiu $v0, $zero, 2 -/* 790760 802A1690 3C020040 */ lui $v0, 0x40 -/* 790764 802A1694 02221024 */ and $v0, $s1, $v0 -/* 790768 802A1698 14400010 */ bnez $v0, .L802A16DC -/* 79076C 802A169C 24020002 */ addiu $v0, $zero, 2 -/* 790770 802A16A0 32222000 */ andi $v0, $s1, 0x2000 -/* 790774 802A16A4 1440000D */ bnez $v0, .L802A16DC -/* 790778 802A16A8 24020002 */ addiu $v0, $zero, 2 -/* 79077C 802A16AC 8C63007C */ lw $v1, 0x7c($v1) -/* 790780 802A16B0 3C020004 */ lui $v0, 4 -/* 790784 802A16B4 00621024 */ and $v0, $v1, $v0 -/* 790788 802A16B8 14400008 */ bnez $v0, .L802A16DC -/* 79078C 802A16BC 24020002 */ addiu $v0, $zero, 2 -/* 790790 802A16C0 3C020008 */ lui $v0, 8 -/* 790794 802A16C4 00621024 */ and $v0, $v1, $v0 -/* 790798 802A16C8 14400004 */ bnez $v0, .L802A16DC -/* 79079C 802A16CC 24020002 */ addiu $v0, $zero, 2 -/* 7907A0 802A16D0 24020001 */ addiu $v0, $zero, 1 -/* 7907A4 802A16D4 AE420084 */ sw $v0, 0x84($s2) -/* 7907A8 802A16D8 24020002 */ addiu $v0, $zero, 2 -.L802A16DC: -/* 7907AC 802A16DC 8FBF001C */ lw $ra, 0x1c($sp) -/* 7907B0 802A16E0 8FB20018 */ lw $s2, 0x18($sp) -/* 7907B4 802A16E4 8FB10014 */ lw $s1, 0x14($sp) -/* 7907B8 802A16E8 8FB00010 */ lw $s0, 0x10($sp) -/* 7907BC 802A16EC 03E00008 */ jr $ra -/* 7907C0 802A16F0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/battle/star/focus_789E60/func_802A1000_789E60.s b/ver/us/asm/nonmatchings/battle/star/focus_789E60/func_802A1000_789E60.s deleted file mode 100644 index b5215ed984..0000000000 --- a/ver/us/asm/nonmatchings/battle/star/focus_789E60/func_802A1000_789E60.s +++ /dev/null @@ -1,47 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1000_789E60 -/* 789E60 802A1000 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 789E64 802A1004 AFB1001C */ sw $s1, 0x1c($sp) -/* 789E68 802A1008 0080882D */ daddu $s1, $a0, $zero -/* 789E6C 802A100C AFBF0024 */ sw $ra, 0x24($sp) -/* 789E70 802A1010 AFB20020 */ sw $s2, 0x20($sp) -/* 789E74 802A1014 AFB00018 */ sw $s0, 0x18($sp) -/* 789E78 802A1018 8E30000C */ lw $s0, 0xc($s1) -/* 789E7C 802A101C 8E050000 */ lw $a1, ($s0) -/* 789E80 802A1020 0C0B1EAF */ jal get_variable -/* 789E84 802A1024 26100004 */ addiu $s0, $s0, 4 -/* 789E88 802A1028 8E050000 */ lw $a1, ($s0) -/* 789E8C 802A102C 26100004 */ addiu $s0, $s0, 4 -/* 789E90 802A1030 0220202D */ daddu $a0, $s1, $zero -/* 789E94 802A1034 0C0B1EAF */ jal get_variable -/* 789E98 802A1038 0040902D */ daddu $s2, $v0, $zero -/* 789E9C 802A103C 0220202D */ daddu $a0, $s1, $zero -/* 789EA0 802A1040 8E050000 */ lw $a1, ($s0) -/* 789EA4 802A1044 0C0B1EAF */ jal get_variable -/* 789EA8 802A1048 0040802D */ daddu $s0, $v0, $zero -/* 789EAC 802A104C 44921000 */ mtc1 $s2, $f2 -/* 789EB0 802A1050 00000000 */ nop -/* 789EB4 802A1054 468010A0 */ cvt.s.w $f2, $f2 -/* 789EB8 802A1058 44051000 */ mfc1 $a1, $f2 -/* 789EBC 802A105C 44901000 */ mtc1 $s0, $f2 -/* 789EC0 802A1060 00000000 */ nop -/* 789EC4 802A1064 468010A0 */ cvt.s.w $f2, $f2 -/* 789EC8 802A1068 44061000 */ mfc1 $a2, $f2 -/* 789ECC 802A106C 44821000 */ mtc1 $v0, $f2 -/* 789ED0 802A1070 00000000 */ nop -/* 789ED4 802A1074 468010A0 */ cvt.s.w $f2, $f2 -/* 789ED8 802A1078 3C014220 */ lui $at, 0x4220 -/* 789EDC 802A107C 44810000 */ mtc1 $at, $f0 -/* 789EE0 802A1080 44071000 */ mfc1 $a3, $f2 -/* 789EE4 802A1084 0000202D */ daddu $a0, $zero, $zero -/* 789EE8 802A1088 0C01BFBC */ jal func_8006FEF0 -/* 789EEC 802A108C E7A00010 */ swc1 $f0, 0x10($sp) -/* 789EF0 802A1090 8FBF0024 */ lw $ra, 0x24($sp) -/* 789EF4 802A1094 8FB20020 */ lw $s2, 0x20($sp) -/* 789EF8 802A1098 8FB1001C */ lw $s1, 0x1c($sp) -/* 789EFC 802A109C 8FB00018 */ lw $s0, 0x18($sp) -/* 789F00 802A10A0 24020002 */ addiu $v0, $zero, 2 -/* 789F04 802A10A4 03E00008 */ jr $ra -/* 789F08 802A10A8 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/battle/star/focus_789E60/func_802A10AC_789F0C.s b/ver/us/asm/nonmatchings/battle/star/focus_789E60/func_802A10AC_789F0C.s deleted file mode 100644 index 4d952c1357..0000000000 --- a/ver/us/asm/nonmatchings/battle/star/focus_789E60/func_802A10AC_789F0C.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A10AC_789F0C -/* 789F0C 802A10AC 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 789F10 802A10B0 AFB10024 */ sw $s1, 0x24($sp) -/* 789F14 802A10B4 0080882D */ daddu $s1, $a0, $zero -/* 789F18 802A10B8 AFBF002C */ sw $ra, 0x2c($sp) -/* 789F1C 802A10BC AFB20028 */ sw $s2, 0x28($sp) -/* 789F20 802A10C0 AFB00020 */ sw $s0, 0x20($sp) -/* 789F24 802A10C4 8E30000C */ lw $s0, 0xc($s1) -/* 789F28 802A10C8 8E050000 */ lw $a1, ($s0) -/* 789F2C 802A10CC 0C0B1EAF */ jal get_variable -/* 789F30 802A10D0 26100004 */ addiu $s0, $s0, 4 -/* 789F34 802A10D4 8E050000 */ lw $a1, ($s0) -/* 789F38 802A10D8 26100004 */ addiu $s0, $s0, 4 -/* 789F3C 802A10DC 0220202D */ daddu $a0, $s1, $zero -/* 789F40 802A10E0 0C0B1EAF */ jal get_variable -/* 789F44 802A10E4 0040902D */ daddu $s2, $v0, $zero -/* 789F48 802A10E8 0220202D */ daddu $a0, $s1, $zero -/* 789F4C 802A10EC 8E050000 */ lw $a1, ($s0) -/* 789F50 802A10F0 0C0B1EAF */ jal get_variable -/* 789F54 802A10F4 0040802D */ daddu $s0, $v0, $zero -/* 789F58 802A10F8 24040005 */ addiu $a0, $zero, 5 -/* 789F5C 802A10FC 44921000 */ mtc1 $s2, $f2 -/* 789F60 802A1100 00000000 */ nop -/* 789F64 802A1104 468010A0 */ cvt.s.w $f2, $f2 -/* 789F68 802A1108 44051000 */ mfc1 $a1, $f2 -/* 789F6C 802A110C 44901000 */ mtc1 $s0, $f2 -/* 789F70 802A1110 00000000 */ nop -/* 789F74 802A1114 468010A0 */ cvt.s.w $f2, $f2 -/* 789F78 802A1118 44061000 */ mfc1 $a2, $f2 -/* 789F7C 802A111C 44821000 */ mtc1 $v0, $f2 -/* 789F80 802A1120 00000000 */ nop -/* 789F84 802A1124 468010A0 */ cvt.s.w $f2, $f2 -/* 789F88 802A1128 3C014248 */ lui $at, 0x4248 -/* 789F8C 802A112C 44810000 */ mtc1 $at, $f0 -/* 789F90 802A1130 44071000 */ mfc1 $a3, $f2 -/* 789F94 802A1134 24030028 */ addiu $v1, $zero, 0x28 -/* 789F98 802A1138 AFA30018 */ sw $v1, 0x18($sp) -/* 789F9C 802A113C 2403001E */ addiu $v1, $zero, 0x1e -/* 789FA0 802A1140 AFA3001C */ sw $v1, 0x1c($sp) -/* 789FA4 802A1144 E7A00010 */ swc1 $f0, 0x10($sp) -/* 789FA8 802A1148 0C01C154 */ jal func_80070550 -/* 789FAC 802A114C E7A00014 */ swc1 $f0, 0x14($sp) -/* 789FB0 802A1150 8FBF002C */ lw $ra, 0x2c($sp) -/* 789FB4 802A1154 8FB20028 */ lw $s2, 0x28($sp) -/* 789FB8 802A1158 8FB10024 */ lw $s1, 0x24($sp) -/* 789FBC 802A115C 8FB00020 */ lw $s0, 0x20($sp) -/* 789FC0 802A1160 24020002 */ addiu $v0, $zero, 2 -/* 789FC4 802A1164 03E00008 */ jr $ra -/* 789FC8 802A1168 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/battle/star/focus_789E60/func_802A116C_789FCC.s b/ver/us/asm/nonmatchings/battle/star/focus_789E60/func_802A116C_789FCC.s deleted file mode 100644 index 434c11a7ca..0000000000 --- a/ver/us/asm/nonmatchings/battle/star/focus_789E60/func_802A116C_789FCC.s +++ /dev/null @@ -1,47 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A116C_789FCC -/* 789FCC 802A116C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 789FD0 802A1170 AFB1001C */ sw $s1, 0x1c($sp) -/* 789FD4 802A1174 0080882D */ daddu $s1, $a0, $zero -/* 789FD8 802A1178 AFBF0024 */ sw $ra, 0x24($sp) -/* 789FDC 802A117C AFB20020 */ sw $s2, 0x20($sp) -/* 789FE0 802A1180 AFB00018 */ sw $s0, 0x18($sp) -/* 789FE4 802A1184 8E30000C */ lw $s0, 0xc($s1) -/* 789FE8 802A1188 8E050000 */ lw $a1, ($s0) -/* 789FEC 802A118C 0C0B1EAF */ jal get_variable -/* 789FF0 802A1190 26100004 */ addiu $s0, $s0, 4 -/* 789FF4 802A1194 8E050000 */ lw $a1, ($s0) -/* 789FF8 802A1198 26100004 */ addiu $s0, $s0, 4 -/* 789FFC 802A119C 0220202D */ daddu $a0, $s1, $zero -/* 78A000 802A11A0 0C0B1EAF */ jal get_variable -/* 78A004 802A11A4 0040902D */ daddu $s2, $v0, $zero -/* 78A008 802A11A8 0220202D */ daddu $a0, $s1, $zero -/* 78A00C 802A11AC 8E050000 */ lw $a1, ($s0) -/* 78A010 802A11B0 0C0B1EAF */ jal get_variable -/* 78A014 802A11B4 0040802D */ daddu $s0, $v0, $zero -/* 78A018 802A11B8 44921000 */ mtc1 $s2, $f2 -/* 78A01C 802A11BC 00000000 */ nop -/* 78A020 802A11C0 468010A0 */ cvt.s.w $f2, $f2 -/* 78A024 802A11C4 44051000 */ mfc1 $a1, $f2 -/* 78A028 802A11C8 44901000 */ mtc1 $s0, $f2 -/* 78A02C 802A11CC 00000000 */ nop -/* 78A030 802A11D0 468010A0 */ cvt.s.w $f2, $f2 -/* 78A034 802A11D4 44061000 */ mfc1 $a2, $f2 -/* 78A038 802A11D8 44821000 */ mtc1 $v0, $f2 -/* 78A03C 802A11DC 00000000 */ nop -/* 78A040 802A11E0 468010A0 */ cvt.s.w $f2, $f2 -/* 78A044 802A11E4 3C0141F0 */ lui $at, 0x41f0 -/* 78A048 802A11E8 44810000 */ mtc1 $at, $f0 -/* 78A04C 802A11EC 44071000 */ mfc1 $a3, $f2 -/* 78A050 802A11F0 0000202D */ daddu $a0, $zero, $zero -/* 78A054 802A11F4 0C01BFBC */ jal func_8006FEF0 -/* 78A058 802A11F8 E7A00010 */ swc1 $f0, 0x10($sp) -/* 78A05C 802A11FC 8FBF0024 */ lw $ra, 0x24($sp) -/* 78A060 802A1200 8FB20020 */ lw $s2, 0x20($sp) -/* 78A064 802A1204 8FB1001C */ lw $s1, 0x1c($sp) -/* 78A068 802A1208 8FB00018 */ lw $s0, 0x18($sp) -/* 78A06C 802A120C 24020002 */ addiu $v0, $zero, 2 -/* 78A070 802A1210 03E00008 */ jr $ra -/* 78A074 802A1214 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/battle/star/focus_789E60/func_802A1218_78A078.s b/ver/us/asm/nonmatchings/battle/star/focus_789E60/func_802A1218_78A078.s deleted file mode 100644 index 4e7814cc54..0000000000 --- a/ver/us/asm/nonmatchings/battle/star/focus_789E60/func_802A1218_78A078.s +++ /dev/null @@ -1,55 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1218_78A078 -/* 78A078 802A1218 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* 78A07C 802A121C AFB1002C */ sw $s1, 0x2c($sp) -/* 78A080 802A1220 0080882D */ daddu $s1, $a0, $zero -/* 78A084 802A1224 AFBF0034 */ sw $ra, 0x34($sp) -/* 78A088 802A1228 AFB20030 */ sw $s2, 0x30($sp) -/* 78A08C 802A122C AFB00028 */ sw $s0, 0x28($sp) -/* 78A090 802A1230 8E30000C */ lw $s0, 0xc($s1) -/* 78A094 802A1234 8E050000 */ lw $a1, ($s0) -/* 78A098 802A1238 0C0B1EAF */ jal get_variable -/* 78A09C 802A123C 26100004 */ addiu $s0, $s0, 4 -/* 78A0A0 802A1240 8E050000 */ lw $a1, ($s0) -/* 78A0A4 802A1244 26100004 */ addiu $s0, $s0, 4 -/* 78A0A8 802A1248 0220202D */ daddu $a0, $s1, $zero -/* 78A0AC 802A124C 0C0B1EAF */ jal get_variable -/* 78A0B0 802A1250 0040902D */ daddu $s2, $v0, $zero -/* 78A0B4 802A1254 0220202D */ daddu $a0, $s1, $zero -/* 78A0B8 802A1258 8E050000 */ lw $a1, ($s0) -/* 78A0BC 802A125C 0C0B1EAF */ jal get_variable -/* 78A0C0 802A1260 0040802D */ daddu $s0, $v0, $zero -/* 78A0C4 802A1264 24040004 */ addiu $a0, $zero, 4 -/* 78A0C8 802A1268 44922000 */ mtc1 $s2, $f4 -/* 78A0CC 802A126C 00000000 */ nop -/* 78A0D0 802A1270 46802120 */ cvt.s.w $f4, $f4 -/* 78A0D4 802A1274 44052000 */ mfc1 $a1, $f4 -/* 78A0D8 802A1278 44902000 */ mtc1 $s0, $f4 -/* 78A0DC 802A127C 00000000 */ nop -/* 78A0E0 802A1280 46802120 */ cvt.s.w $f4, $f4 -/* 78A0E4 802A1284 44062000 */ mfc1 $a2, $f4 -/* 78A0E8 802A1288 44822000 */ mtc1 $v0, $f4 -/* 78A0EC 802A128C 00000000 */ nop -/* 78A0F0 802A1290 46802120 */ cvt.s.w $f4, $f4 -/* 78A0F4 802A1294 3C0141A0 */ lui $at, 0x41a0 -/* 78A0F8 802A1298 44810000 */ mtc1 $at, $f0 -/* 78A0FC 802A129C 3C013F80 */ lui $at, 0x3f80 -/* 78A100 802A12A0 44811000 */ mtc1 $at, $f2 -/* 78A104 802A12A4 44072000 */ mfc1 $a3, $f4 -/* 78A108 802A12A8 2403000A */ addiu $v1, $zero, 0xa -/* 78A10C 802A12AC AFA3001C */ sw $v1, 0x1c($sp) -/* 78A110 802A12B0 2403000F */ addiu $v1, $zero, 0xf -/* 78A114 802A12B4 AFA30020 */ sw $v1, 0x20($sp) -/* 78A118 802A12B8 E7A00010 */ swc1 $f0, 0x10($sp) -/* 78A11C 802A12BC E7A00014 */ swc1 $f0, 0x14($sp) -/* 78A120 802A12C0 0C01C8D4 */ jal func_80072350 -/* 78A124 802A12C4 E7A20018 */ swc1 $f2, 0x18($sp) -/* 78A128 802A12C8 8FBF0034 */ lw $ra, 0x34($sp) -/* 78A12C 802A12CC 8FB20030 */ lw $s2, 0x30($sp) -/* 78A130 802A12D0 8FB1002C */ lw $s1, 0x2c($sp) -/* 78A134 802A12D4 8FB00028 */ lw $s0, 0x28($sp) -/* 78A138 802A12D8 24020002 */ addiu $v0, $zero, 2 -/* 78A13C 802A12DC 03E00008 */ jr $ra -/* 78A140 802A12E0 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/ver/us/asm/nonmatchings/battle/star/focus_789E60/func_802A137C_78A1DC.s b/ver/us/asm/nonmatchings/battle/star/focus_789E60/func_802A137C_78A1DC.s deleted file mode 100644 index 31766cb159..0000000000 --- a/ver/us/asm/nonmatchings/battle/star/focus_789E60/func_802A137C_78A1DC.s +++ /dev/null @@ -1,44 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A137C_78A1DC -/* 78A1DC 802A137C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 78A1E0 802A1380 AFB00010 */ sw $s0, 0x10($sp) -/* 78A1E4 802A1384 0080802D */ daddu $s0, $a0, $zero -/* 78A1E8 802A1388 10A0000D */ beqz $a1, .L802A13C0 -/* 78A1EC 802A138C AFBF0014 */ sw $ra, 0x14($sp) -/* 78A1F0 802A1390 0C04760B */ jal func_8011D82C -/* 78A1F4 802A1394 24040001 */ addiu $a0, $zero, 1 -/* 78A1F8 802A1398 0000202D */ daddu $a0, $zero, $zero -/* 78A1FC 802A139C 0080282D */ daddu $a1, $a0, $zero -/* 78A200 802A13A0 0080302D */ daddu $a2, $a0, $zero -/* 78A204 802A13A4 0080382D */ daddu $a3, $a0, $zero -/* 78A208 802A13A8 3C038015 */ lui $v1, %hi(D_801512F0) -/* 78A20C 802A13AC 8C6312F0 */ lw $v1, %lo(D_801512F0)($v1) -/* 78A210 802A13B0 24020001 */ addiu $v0, $zero, 1 -/* 78A214 802A13B4 0C046F97 */ jal set_background_color_blend -/* 78A218 802A13B8 A0620000 */ sb $v0, ($v1) -/* 78A21C 802A13BC AE000070 */ sw $zero, 0x70($s0) -.L802A13C0: -/* 78A220 802A13C0 0000202D */ daddu $a0, $zero, $zero -/* 78A224 802A13C4 0080282D */ daddu $a1, $a0, $zero -/* 78A228 802A13C8 92070073 */ lbu $a3, 0x73($s0) -/* 78A22C 802A13CC 0C046F97 */ jal set_background_color_blend -/* 78A230 802A13D0 0080302D */ daddu $a2, $a0, $zero -/* 78A234 802A13D4 8E020070 */ lw $v0, 0x70($s0) -/* 78A238 802A13D8 2442000A */ addiu $v0, $v0, 0xa -/* 78A23C 802A13DC AE020070 */ sw $v0, 0x70($s0) -/* 78A240 802A13E0 284200E6 */ slti $v0, $v0, 0xe6 -/* 78A244 802A13E4 14400007 */ bnez $v0, .L802A1404 -/* 78A248 802A13E8 0000102D */ daddu $v0, $zero, $zero -/* 78A24C 802A13EC 0000202D */ daddu $a0, $zero, $zero -/* 78A250 802A13F0 0080282D */ daddu $a1, $a0, $zero -/* 78A254 802A13F4 0080302D */ daddu $a2, $a0, $zero -/* 78A258 802A13F8 0C046F97 */ jal set_background_color_blend -/* 78A25C 802A13FC 240700E6 */ addiu $a3, $zero, 0xe6 -/* 78A260 802A1400 24020002 */ addiu $v0, $zero, 2 -.L802A1404: -/* 78A264 802A1404 8FBF0014 */ lw $ra, 0x14($sp) -/* 78A268 802A1408 8FB00010 */ lw $s0, 0x10($sp) -/* 78A26C 802A140C 03E00008 */ jr $ra -/* 78A270 802A1410 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/battle/star/focus_789E60/func_802A1414_78A274.s b/ver/us/asm/nonmatchings/battle/star/focus_789E60/func_802A1414_78A274.s deleted file mode 100644 index 61f3effe1f..0000000000 --- a/ver/us/asm/nonmatchings/battle/star/focus_789E60/func_802A1414_78A274.s +++ /dev/null @@ -1,39 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1414_78A274 -/* 78A274 802A1414 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 78A278 802A1418 AFB00010 */ sw $s0, 0x10($sp) -/* 78A27C 802A141C 0080802D */ daddu $s0, $a0, $zero -/* 78A280 802A1420 10A00003 */ beqz $a1, .L802A1430 -/* 78A284 802A1424 AFBF0014 */ sw $ra, 0x14($sp) -/* 78A288 802A1428 24020014 */ addiu $v0, $zero, 0x14 -/* 78A28C 802A142C AE020070 */ sw $v0, 0x70($s0) -.L802A1430: -/* 78A290 802A1430 0000202D */ daddu $a0, $zero, $zero -/* 78A294 802A1434 0080282D */ daddu $a1, $a0, $zero -/* 78A298 802A1438 8E020070 */ lw $v0, 0x70($s0) -/* 78A29C 802A143C 0080302D */ daddu $a2, $a0, $zero -/* 78A2A0 802A1440 00023880 */ sll $a3, $v0, 2 -/* 78A2A4 802A1444 00E23821 */ addu $a3, $a3, $v0 -/* 78A2A8 802A1448 00073840 */ sll $a3, $a3, 1 -/* 78A2AC 802A144C 0C046F97 */ jal set_background_color_blend -/* 78A2B0 802A1450 30E700FE */ andi $a3, $a3, 0xfe -/* 78A2B4 802A1454 8E020070 */ lw $v0, 0x70($s0) -/* 78A2B8 802A1458 2442FFFF */ addiu $v0, $v0, -1 -/* 78A2BC 802A145C 10400003 */ beqz $v0, .L802A146C -/* 78A2C0 802A1460 AE020070 */ sw $v0, 0x70($s0) -/* 78A2C4 802A1464 080A8521 */ j .L802A1484 -/* 78A2C8 802A1468 0000102D */ daddu $v0, $zero, $zero -.L802A146C: -/* 78A2CC 802A146C 0000202D */ daddu $a0, $zero, $zero -/* 78A2D0 802A1470 0080282D */ daddu $a1, $a0, $zero -/* 78A2D4 802A1474 0080302D */ daddu $a2, $a0, $zero -/* 78A2D8 802A1478 0C046F97 */ jal set_background_color_blend -/* 78A2DC 802A147C 0080382D */ daddu $a3, $a0, $zero -/* 78A2E0 802A1480 24020002 */ addiu $v0, $zero, 2 -.L802A1484: -/* 78A2E4 802A1484 8FBF0014 */ lw $ra, 0x14($sp) -/* 78A2E8 802A1488 8FB00010 */ lw $s0, 0x10($sp) -/* 78A2EC 802A148C 03E00008 */ jr $ra -/* 78A2F0 802A1490 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/battle/star/focus_789E60/func_802A14E8_78A348.s b/ver/us/asm/nonmatchings/battle/star/focus_789E60/func_802A14E8_78A348.s deleted file mode 100644 index 58c5192cbf..0000000000 --- a/ver/us/asm/nonmatchings/battle/star/focus_789E60/func_802A14E8_78A348.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A14E8_78A348 -/* 78A348 802A14E8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 78A34C 802A14EC AFBF0010 */ sw $ra, 0x10($sp) -/* 78A350 802A14F0 0C00EABB */ jal get_npc_unsafe -/* 78A354 802A14F4 24040064 */ addiu $a0, $zero, 0x64 -/* 78A358 802A14F8 0040202D */ daddu $a0, $v0, $zero -/* 78A35C 802A14FC 24030020 */ addiu $v1, $zero, 0x20 -/* 78A360 802A1500 A48300A8 */ sh $v1, 0xa8($a0) -/* 78A364 802A1504 A48300A6 */ sh $v1, 0xa6($a0) -/* 78A368 802A1508 8FBF0010 */ lw $ra, 0x10($sp) -/* 78A36C 802A150C 24020002 */ addiu $v0, $zero, 2 -/* 78A370 802A1510 03E00008 */ jr $ra -/* 78A374 802A1514 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/battle/star/focus_789E60/func_802A1518_78A378.s b/ver/us/asm/nonmatchings/battle/star/focus_789E60/func_802A1518_78A378.s deleted file mode 100644 index 8f5b8bbe5d..0000000000 --- a/ver/us/asm/nonmatchings/battle/star/focus_789E60/func_802A1518_78A378.s +++ /dev/null @@ -1,44 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1518_78A378 -/* 78A378 802A1518 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 78A37C 802A151C AFB20018 */ sw $s2, 0x18($sp) -/* 78A380 802A1520 0080902D */ daddu $s2, $a0, $zero -/* 78A384 802A1524 3C028011 */ lui $v0, %hi(gPlayerData) -/* 78A388 802A1528 2442F290 */ addiu $v0, $v0, %lo(gPlayerData) -/* 78A38C 802A152C AFB10014 */ sw $s1, 0x14($sp) -/* 78A390 802A1530 0040882D */ daddu $s1, $v0, $zero -/* 78A394 802A1534 AFBF001C */ sw $ra, 0x1c($sp) -/* 78A398 802A1538 AFB00010 */ sw $s0, 0x10($sp) -/* 78A39C 802A153C AE400084 */ sw $zero, 0x84($s2) -/* 78A3A0 802A1540 8222028E */ lb $v0, 0x28e($s1) -/* 78A3A4 802A1544 86230290 */ lh $v1, 0x290($s1) -/* 78A3A8 802A1548 00021200 */ sll $v0, $v0, 8 -/* 78A3AC 802A154C 0062182A */ slt $v1, $v1, $v0 -/* 78A3B0 802A1550 1060000F */ beqz $v1, .L802A1590 -/* 78A3B4 802A1554 24020001 */ addiu $v0, $zero, 1 -/* 78A3B8 802A1558 0C03A752 */ jal is_ability_active -/* 78A3BC 802A155C 24040030 */ addiu $a0, $zero, 0x30 -/* 78A3C0 802A1560 24040031 */ addiu $a0, $zero, 0x31 -/* 78A3C4 802A1564 0C03A752 */ jal is_ability_active -/* 78A3C8 802A1568 00028180 */ sll $s0, $v0, 6 -/* 78A3CC 802A156C 000211C0 */ sll $v0, $v0, 7 -/* 78A3D0 802A1570 02028021 */ addu $s0, $s0, $v0 -/* 78A3D4 802A1574 0C03A87D */ jal add_SP -/* 78A3D8 802A1578 26040080 */ addiu $a0, $s0, 0x80 -/* 78A3DC 802A157C 8222028E */ lb $v0, 0x28e($s1) -/* 78A3E0 802A1580 86230290 */ lh $v1, 0x290($s1) -/* 78A3E4 802A1584 00021200 */ sll $v0, $v0, 8 -/* 78A3E8 802A1588 14620003 */ bne $v1, $v0, .L802A1598 -/* 78A3EC 802A158C 24020002 */ addiu $v0, $zero, 2 -.L802A1590: -/* 78A3F0 802A1590 AE420084 */ sw $v0, 0x84($s2) -/* 78A3F4 802A1594 24020002 */ addiu $v0, $zero, 2 -.L802A1598: -/* 78A3F8 802A1598 8FBF001C */ lw $ra, 0x1c($sp) -/* 78A3FC 802A159C 8FB20018 */ lw $s2, 0x18($sp) -/* 78A400 802A15A0 8FB10014 */ lw $s1, 0x14($sp) -/* 78A404 802A15A4 8FB00010 */ lw $s0, 0x10($sp) -/* 78A408 802A15A8 03E00008 */ jr $ra -/* 78A40C 802A15AC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/battle/star/focus_789E60/func_802A15B0_78A410.s b/ver/us/asm/nonmatchings/battle/star/focus_789E60/func_802A15B0_78A410.s deleted file mode 100644 index bcb92a2bd9..0000000000 --- a/ver/us/asm/nonmatchings/battle/star/focus_789E60/func_802A15B0_78A410.s +++ /dev/null @@ -1,34 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A15B0_78A410 -/* 78A410 802A15B0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 78A414 802A15B4 AFB10014 */ sw $s1, 0x14($sp) -/* 78A418 802A15B8 0080882D */ daddu $s1, $a0, $zero -/* 78A41C 802A15BC 3C028011 */ lui $v0, %hi(gPlayerData) -/* 78A420 802A15C0 2442F290 */ addiu $v0, $v0, %lo(gPlayerData) -/* 78A424 802A15C4 AFB00010 */ sw $s0, 0x10($sp) -/* 78A428 802A15C8 0040802D */ daddu $s0, $v0, $zero -/* 78A42C 802A15CC AFBF0018 */ sw $ra, 0x18($sp) -/* 78A430 802A15D0 AE200084 */ sw $zero, 0x84($s1) -/* 78A434 802A15D4 8202028E */ lb $v0, 0x28e($s0) -/* 78A438 802A15D8 86030290 */ lh $v1, 0x290($s0) -/* 78A43C 802A15DC 00021200 */ sll $v0, $v0, 8 -/* 78A440 802A15E0 0062182A */ slt $v1, $v1, $v0 -/* 78A444 802A15E4 10600008 */ beqz $v1, .L802A1608 -/* 78A448 802A15E8 24020001 */ addiu $v0, $zero, 1 -/* 78A44C 802A15EC 0C03A87D */ jal add_SP -/* 78A450 802A15F0 24040080 */ addiu $a0, $zero, 0x80 -/* 78A454 802A15F4 8202028E */ lb $v0, 0x28e($s0) -/* 78A458 802A15F8 86030290 */ lh $v1, 0x290($s0) -/* 78A45C 802A15FC 00021200 */ sll $v0, $v0, 8 -/* 78A460 802A1600 14620003 */ bne $v1, $v0, .L802A1610 -/* 78A464 802A1604 24020002 */ addiu $v0, $zero, 2 -.L802A1608: -/* 78A468 802A1608 AE220084 */ sw $v0, 0x84($s1) -/* 78A46C 802A160C 24020002 */ addiu $v0, $zero, 2 -.L802A1610: -/* 78A470 802A1610 8FBF0018 */ lw $ra, 0x18($sp) -/* 78A474 802A1614 8FB10014 */ lw $s1, 0x14($sp) -/* 78A478 802A1618 8FB00010 */ lw $s0, 0x10($sp) -/* 78A47C 802A161C 03E00008 */ jr $ra diff --git a/ver/us/asm/nonmatchings/battle/star/lullaby_78D150/func_802A1000_78D150.s b/ver/us/asm/nonmatchings/battle/star/lullaby_78D150/func_802A1000_78D150.s deleted file mode 100644 index 1ac1e8882a..0000000000 --- a/ver/us/asm/nonmatchings/battle/star/lullaby_78D150/func_802A1000_78D150.s +++ /dev/null @@ -1,47 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1000_78D150 -/* 78D150 802A1000 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 78D154 802A1004 AFB1001C */ sw $s1, 0x1c($sp) -/* 78D158 802A1008 0080882D */ daddu $s1, $a0, $zero -/* 78D15C 802A100C AFBF0024 */ sw $ra, 0x24($sp) -/* 78D160 802A1010 AFB20020 */ sw $s2, 0x20($sp) -/* 78D164 802A1014 AFB00018 */ sw $s0, 0x18($sp) -/* 78D168 802A1018 8E30000C */ lw $s0, 0xc($s1) -/* 78D16C 802A101C 8E050000 */ lw $a1, ($s0) -/* 78D170 802A1020 0C0B1EAF */ jal get_variable -/* 78D174 802A1024 26100004 */ addiu $s0, $s0, 4 -/* 78D178 802A1028 8E050000 */ lw $a1, ($s0) -/* 78D17C 802A102C 26100004 */ addiu $s0, $s0, 4 -/* 78D180 802A1030 0220202D */ daddu $a0, $s1, $zero -/* 78D184 802A1034 0C0B1EAF */ jal get_variable -/* 78D188 802A1038 0040902D */ daddu $s2, $v0, $zero -/* 78D18C 802A103C 0220202D */ daddu $a0, $s1, $zero -/* 78D190 802A1040 8E050000 */ lw $a1, ($s0) -/* 78D194 802A1044 0C0B1EAF */ jal get_variable -/* 78D198 802A1048 0040802D */ daddu $s0, $v0, $zero -/* 78D19C 802A104C 44921000 */ mtc1 $s2, $f2 -/* 78D1A0 802A1050 00000000 */ nop -/* 78D1A4 802A1054 468010A0 */ cvt.s.w $f2, $f2 -/* 78D1A8 802A1058 44051000 */ mfc1 $a1, $f2 -/* 78D1AC 802A105C 44901000 */ mtc1 $s0, $f2 -/* 78D1B0 802A1060 00000000 */ nop -/* 78D1B4 802A1064 468010A0 */ cvt.s.w $f2, $f2 -/* 78D1B8 802A1068 44061000 */ mfc1 $a2, $f2 -/* 78D1BC 802A106C 44821000 */ mtc1 $v0, $f2 -/* 78D1C0 802A1070 00000000 */ nop -/* 78D1C4 802A1074 468010A0 */ cvt.s.w $f2, $f2 -/* 78D1C8 802A1078 3C014220 */ lui $at, 0x4220 -/* 78D1CC 802A107C 44810000 */ mtc1 $at, $f0 -/* 78D1D0 802A1080 44071000 */ mfc1 $a3, $f2 -/* 78D1D4 802A1084 0000202D */ daddu $a0, $zero, $zero -/* 78D1D8 802A1088 0C01BFBC */ jal func_8006FEF0 -/* 78D1DC 802A108C E7A00010 */ swc1 $f0, 0x10($sp) -/* 78D1E0 802A1090 8FBF0024 */ lw $ra, 0x24($sp) -/* 78D1E4 802A1094 8FB20020 */ lw $s2, 0x20($sp) -/* 78D1E8 802A1098 8FB1001C */ lw $s1, 0x1c($sp) -/* 78D1EC 802A109C 8FB00018 */ lw $s0, 0x18($sp) -/* 78D1F0 802A10A0 24020002 */ addiu $v0, $zero, 2 -/* 78D1F4 802A10A4 03E00008 */ jr $ra -/* 78D1F8 802A10A8 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/battle/star/lullaby_78D150/func_802A10AC_78D1FC.s b/ver/us/asm/nonmatchings/battle/star/lullaby_78D150/func_802A10AC_78D1FC.s deleted file mode 100644 index df10e81e72..0000000000 --- a/ver/us/asm/nonmatchings/battle/star/lullaby_78D150/func_802A10AC_78D1FC.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A10AC_78D1FC -/* 78D1FC 802A10AC 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 78D200 802A10B0 AFB10024 */ sw $s1, 0x24($sp) -/* 78D204 802A10B4 0080882D */ daddu $s1, $a0, $zero -/* 78D208 802A10B8 AFBF002C */ sw $ra, 0x2c($sp) -/* 78D20C 802A10BC AFB20028 */ sw $s2, 0x28($sp) -/* 78D210 802A10C0 AFB00020 */ sw $s0, 0x20($sp) -/* 78D214 802A10C4 8E30000C */ lw $s0, 0xc($s1) -/* 78D218 802A10C8 8E050000 */ lw $a1, ($s0) -/* 78D21C 802A10CC 0C0B1EAF */ jal get_variable -/* 78D220 802A10D0 26100004 */ addiu $s0, $s0, 4 -/* 78D224 802A10D4 8E050000 */ lw $a1, ($s0) -/* 78D228 802A10D8 26100004 */ addiu $s0, $s0, 4 -/* 78D22C 802A10DC 0220202D */ daddu $a0, $s1, $zero -/* 78D230 802A10E0 0C0B1EAF */ jal get_variable -/* 78D234 802A10E4 0040902D */ daddu $s2, $v0, $zero -/* 78D238 802A10E8 0220202D */ daddu $a0, $s1, $zero -/* 78D23C 802A10EC 8E050000 */ lw $a1, ($s0) -/* 78D240 802A10F0 0C0B1EAF */ jal get_variable -/* 78D244 802A10F4 0040802D */ daddu $s0, $v0, $zero -/* 78D248 802A10F8 24040005 */ addiu $a0, $zero, 5 -/* 78D24C 802A10FC 44921000 */ mtc1 $s2, $f2 -/* 78D250 802A1100 00000000 */ nop -/* 78D254 802A1104 468010A0 */ cvt.s.w $f2, $f2 -/* 78D258 802A1108 44051000 */ mfc1 $a1, $f2 -/* 78D25C 802A110C 44901000 */ mtc1 $s0, $f2 -/* 78D260 802A1110 00000000 */ nop -/* 78D264 802A1114 468010A0 */ cvt.s.w $f2, $f2 -/* 78D268 802A1118 44061000 */ mfc1 $a2, $f2 -/* 78D26C 802A111C 44821000 */ mtc1 $v0, $f2 -/* 78D270 802A1120 00000000 */ nop -/* 78D274 802A1124 468010A0 */ cvt.s.w $f2, $f2 -/* 78D278 802A1128 3C014248 */ lui $at, 0x4248 -/* 78D27C 802A112C 44810000 */ mtc1 $at, $f0 -/* 78D280 802A1130 44071000 */ mfc1 $a3, $f2 -/* 78D284 802A1134 24030028 */ addiu $v1, $zero, 0x28 -/* 78D288 802A1138 AFA30018 */ sw $v1, 0x18($sp) -/* 78D28C 802A113C 2403001E */ addiu $v1, $zero, 0x1e -/* 78D290 802A1140 AFA3001C */ sw $v1, 0x1c($sp) -/* 78D294 802A1144 E7A00010 */ swc1 $f0, 0x10($sp) -/* 78D298 802A1148 0C01C154 */ jal func_80070550 -/* 78D29C 802A114C E7A00014 */ swc1 $f0, 0x14($sp) -/* 78D2A0 802A1150 8FBF002C */ lw $ra, 0x2c($sp) -/* 78D2A4 802A1154 8FB20028 */ lw $s2, 0x28($sp) -/* 78D2A8 802A1158 8FB10024 */ lw $s1, 0x24($sp) -/* 78D2AC 802A115C 8FB00020 */ lw $s0, 0x20($sp) -/* 78D2B0 802A1160 24020002 */ addiu $v0, $zero, 2 -/* 78D2B4 802A1164 03E00008 */ jr $ra -/* 78D2B8 802A1168 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/battle/star/lullaby_78D150/func_802A116C_78D2BC.s b/ver/us/asm/nonmatchings/battle/star/lullaby_78D150/func_802A116C_78D2BC.s deleted file mode 100644 index 6e5398975d..0000000000 --- a/ver/us/asm/nonmatchings/battle/star/lullaby_78D150/func_802A116C_78D2BC.s +++ /dev/null @@ -1,47 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A116C_78D2BC -/* 78D2BC 802A116C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 78D2C0 802A1170 AFB1001C */ sw $s1, 0x1c($sp) -/* 78D2C4 802A1174 0080882D */ daddu $s1, $a0, $zero -/* 78D2C8 802A1178 AFBF0024 */ sw $ra, 0x24($sp) -/* 78D2CC 802A117C AFB20020 */ sw $s2, 0x20($sp) -/* 78D2D0 802A1180 AFB00018 */ sw $s0, 0x18($sp) -/* 78D2D4 802A1184 8E30000C */ lw $s0, 0xc($s1) -/* 78D2D8 802A1188 8E050000 */ lw $a1, ($s0) -/* 78D2DC 802A118C 0C0B1EAF */ jal get_variable -/* 78D2E0 802A1190 26100004 */ addiu $s0, $s0, 4 -/* 78D2E4 802A1194 8E050000 */ lw $a1, ($s0) -/* 78D2E8 802A1198 26100004 */ addiu $s0, $s0, 4 -/* 78D2EC 802A119C 0220202D */ daddu $a0, $s1, $zero -/* 78D2F0 802A11A0 0C0B1EAF */ jal get_variable -/* 78D2F4 802A11A4 0040902D */ daddu $s2, $v0, $zero -/* 78D2F8 802A11A8 0220202D */ daddu $a0, $s1, $zero -/* 78D2FC 802A11AC 8E050000 */ lw $a1, ($s0) -/* 78D300 802A11B0 0C0B1EAF */ jal get_variable -/* 78D304 802A11B4 0040802D */ daddu $s0, $v0, $zero -/* 78D308 802A11B8 44921000 */ mtc1 $s2, $f2 -/* 78D30C 802A11BC 00000000 */ nop -/* 78D310 802A11C0 468010A0 */ cvt.s.w $f2, $f2 -/* 78D314 802A11C4 44051000 */ mfc1 $a1, $f2 -/* 78D318 802A11C8 44901000 */ mtc1 $s0, $f2 -/* 78D31C 802A11CC 00000000 */ nop -/* 78D320 802A11D0 468010A0 */ cvt.s.w $f2, $f2 -/* 78D324 802A11D4 44061000 */ mfc1 $a2, $f2 -/* 78D328 802A11D8 44821000 */ mtc1 $v0, $f2 -/* 78D32C 802A11DC 00000000 */ nop -/* 78D330 802A11E0 468010A0 */ cvt.s.w $f2, $f2 -/* 78D334 802A11E4 3C0141F0 */ lui $at, 0x41f0 -/* 78D338 802A11E8 44810000 */ mtc1 $at, $f0 -/* 78D33C 802A11EC 44071000 */ mfc1 $a3, $f2 -/* 78D340 802A11F0 0000202D */ daddu $a0, $zero, $zero -/* 78D344 802A11F4 0C01BFBC */ jal func_8006FEF0 -/* 78D348 802A11F8 E7A00010 */ swc1 $f0, 0x10($sp) -/* 78D34C 802A11FC 8FBF0024 */ lw $ra, 0x24($sp) -/* 78D350 802A1200 8FB20020 */ lw $s2, 0x20($sp) -/* 78D354 802A1204 8FB1001C */ lw $s1, 0x1c($sp) -/* 78D358 802A1208 8FB00018 */ lw $s0, 0x18($sp) -/* 78D35C 802A120C 24020002 */ addiu $v0, $zero, 2 -/* 78D360 802A1210 03E00008 */ jr $ra -/* 78D364 802A1214 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/battle/star/lullaby_78D150/func_802A1218_78D368.s b/ver/us/asm/nonmatchings/battle/star/lullaby_78D150/func_802A1218_78D368.s deleted file mode 100644 index 24cd003581..0000000000 --- a/ver/us/asm/nonmatchings/battle/star/lullaby_78D150/func_802A1218_78D368.s +++ /dev/null @@ -1,55 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1218_78D368 -/* 78D368 802A1218 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* 78D36C 802A121C AFB1002C */ sw $s1, 0x2c($sp) -/* 78D370 802A1220 0080882D */ daddu $s1, $a0, $zero -/* 78D374 802A1224 AFBF0034 */ sw $ra, 0x34($sp) -/* 78D378 802A1228 AFB20030 */ sw $s2, 0x30($sp) -/* 78D37C 802A122C AFB00028 */ sw $s0, 0x28($sp) -/* 78D380 802A1230 8E30000C */ lw $s0, 0xc($s1) -/* 78D384 802A1234 8E050000 */ lw $a1, ($s0) -/* 78D388 802A1238 0C0B1EAF */ jal get_variable -/* 78D38C 802A123C 26100004 */ addiu $s0, $s0, 4 -/* 78D390 802A1240 8E050000 */ lw $a1, ($s0) -/* 78D394 802A1244 26100004 */ addiu $s0, $s0, 4 -/* 78D398 802A1248 0220202D */ daddu $a0, $s1, $zero -/* 78D39C 802A124C 0C0B1EAF */ jal get_variable -/* 78D3A0 802A1250 0040902D */ daddu $s2, $v0, $zero -/* 78D3A4 802A1254 0220202D */ daddu $a0, $s1, $zero -/* 78D3A8 802A1258 8E050000 */ lw $a1, ($s0) -/* 78D3AC 802A125C 0C0B1EAF */ jal get_variable -/* 78D3B0 802A1260 0040802D */ daddu $s0, $v0, $zero -/* 78D3B4 802A1264 24040004 */ addiu $a0, $zero, 4 -/* 78D3B8 802A1268 44922000 */ mtc1 $s2, $f4 -/* 78D3BC 802A126C 00000000 */ nop -/* 78D3C0 802A1270 46802120 */ cvt.s.w $f4, $f4 -/* 78D3C4 802A1274 44052000 */ mfc1 $a1, $f4 -/* 78D3C8 802A1278 44902000 */ mtc1 $s0, $f4 -/* 78D3CC 802A127C 00000000 */ nop -/* 78D3D0 802A1280 46802120 */ cvt.s.w $f4, $f4 -/* 78D3D4 802A1284 44062000 */ mfc1 $a2, $f4 -/* 78D3D8 802A1288 44822000 */ mtc1 $v0, $f4 -/* 78D3DC 802A128C 00000000 */ nop -/* 78D3E0 802A1290 46802120 */ cvt.s.w $f4, $f4 -/* 78D3E4 802A1294 3C0141A0 */ lui $at, 0x41a0 -/* 78D3E8 802A1298 44810000 */ mtc1 $at, $f0 -/* 78D3EC 802A129C 3C013F80 */ lui $at, 0x3f80 -/* 78D3F0 802A12A0 44811000 */ mtc1 $at, $f2 -/* 78D3F4 802A12A4 44072000 */ mfc1 $a3, $f4 -/* 78D3F8 802A12A8 2403000A */ addiu $v1, $zero, 0xa -/* 78D3FC 802A12AC AFA3001C */ sw $v1, 0x1c($sp) -/* 78D400 802A12B0 2403000F */ addiu $v1, $zero, 0xf -/* 78D404 802A12B4 AFA30020 */ sw $v1, 0x20($sp) -/* 78D408 802A12B8 E7A00010 */ swc1 $f0, 0x10($sp) -/* 78D40C 802A12BC E7A00014 */ swc1 $f0, 0x14($sp) -/* 78D410 802A12C0 0C01C8D4 */ jal func_80072350 -/* 78D414 802A12C4 E7A20018 */ swc1 $f2, 0x18($sp) -/* 78D418 802A12C8 8FBF0034 */ lw $ra, 0x34($sp) -/* 78D41C 802A12CC 8FB20030 */ lw $s2, 0x30($sp) -/* 78D420 802A12D0 8FB1002C */ lw $s1, 0x2c($sp) -/* 78D424 802A12D4 8FB00028 */ lw $s0, 0x28($sp) -/* 78D428 802A12D8 24020002 */ addiu $v0, $zero, 2 -/* 78D42C 802A12DC 03E00008 */ jr $ra -/* 78D430 802A12E0 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/ver/us/asm/nonmatchings/battle/star/lullaby_78D150/func_802A137C_78D4CC.s b/ver/us/asm/nonmatchings/battle/star/lullaby_78D150/func_802A137C_78D4CC.s deleted file mode 100644 index bc8605dc5c..0000000000 --- a/ver/us/asm/nonmatchings/battle/star/lullaby_78D150/func_802A137C_78D4CC.s +++ /dev/null @@ -1,44 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A137C_78D4CC -/* 78D4CC 802A137C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 78D4D0 802A1380 AFB00010 */ sw $s0, 0x10($sp) -/* 78D4D4 802A1384 0080802D */ daddu $s0, $a0, $zero -/* 78D4D8 802A1388 10A0000D */ beqz $a1, .L802A13C0 -/* 78D4DC 802A138C AFBF0014 */ sw $ra, 0x14($sp) -/* 78D4E0 802A1390 0C04760B */ jal func_8011D82C -/* 78D4E4 802A1394 24040001 */ addiu $a0, $zero, 1 -/* 78D4E8 802A1398 0000202D */ daddu $a0, $zero, $zero -/* 78D4EC 802A139C 0080282D */ daddu $a1, $a0, $zero -/* 78D4F0 802A13A0 0080302D */ daddu $a2, $a0, $zero -/* 78D4F4 802A13A4 0080382D */ daddu $a3, $a0, $zero -/* 78D4F8 802A13A8 3C038015 */ lui $v1, %hi(D_801512F0) -/* 78D4FC 802A13AC 8C6312F0 */ lw $v1, %lo(D_801512F0)($v1) -/* 78D500 802A13B0 24020001 */ addiu $v0, $zero, 1 -/* 78D504 802A13B4 0C046F97 */ jal set_background_color_blend -/* 78D508 802A13B8 A0620000 */ sb $v0, ($v1) -/* 78D50C 802A13BC AE000070 */ sw $zero, 0x70($s0) -.L802A13C0: -/* 78D510 802A13C0 0000202D */ daddu $a0, $zero, $zero -/* 78D514 802A13C4 0080282D */ daddu $a1, $a0, $zero -/* 78D518 802A13C8 92070073 */ lbu $a3, 0x73($s0) -/* 78D51C 802A13CC 0C046F97 */ jal set_background_color_blend -/* 78D520 802A13D0 0080302D */ daddu $a2, $a0, $zero -/* 78D524 802A13D4 8E020070 */ lw $v0, 0x70($s0) -/* 78D528 802A13D8 2442000A */ addiu $v0, $v0, 0xa -/* 78D52C 802A13DC AE020070 */ sw $v0, 0x70($s0) -/* 78D530 802A13E0 284200E6 */ slti $v0, $v0, 0xe6 -/* 78D534 802A13E4 14400007 */ bnez $v0, .L802A1404 -/* 78D538 802A13E8 0000102D */ daddu $v0, $zero, $zero -/* 78D53C 802A13EC 0000202D */ daddu $a0, $zero, $zero -/* 78D540 802A13F0 0080282D */ daddu $a1, $a0, $zero -/* 78D544 802A13F4 0080302D */ daddu $a2, $a0, $zero -/* 78D548 802A13F8 0C046F97 */ jal set_background_color_blend -/* 78D54C 802A13FC 240700E6 */ addiu $a3, $zero, 0xe6 -/* 78D550 802A1400 24020002 */ addiu $v0, $zero, 2 -.L802A1404: -/* 78D554 802A1404 8FBF0014 */ lw $ra, 0x14($sp) -/* 78D558 802A1408 8FB00010 */ lw $s0, 0x10($sp) -/* 78D55C 802A140C 03E00008 */ jr $ra -/* 78D560 802A1410 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/battle/star/lullaby_78D150/func_802A1414_78D564.s b/ver/us/asm/nonmatchings/battle/star/lullaby_78D150/func_802A1414_78D564.s deleted file mode 100644 index e23ea05451..0000000000 --- a/ver/us/asm/nonmatchings/battle/star/lullaby_78D150/func_802A1414_78D564.s +++ /dev/null @@ -1,39 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1414_78D564 -/* 78D564 802A1414 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 78D568 802A1418 AFB00010 */ sw $s0, 0x10($sp) -/* 78D56C 802A141C 0080802D */ daddu $s0, $a0, $zero -/* 78D570 802A1420 10A00003 */ beqz $a1, .L802A1430 -/* 78D574 802A1424 AFBF0014 */ sw $ra, 0x14($sp) -/* 78D578 802A1428 24020014 */ addiu $v0, $zero, 0x14 -/* 78D57C 802A142C AE020070 */ sw $v0, 0x70($s0) -.L802A1430: -/* 78D580 802A1430 0000202D */ daddu $a0, $zero, $zero -/* 78D584 802A1434 0080282D */ daddu $a1, $a0, $zero -/* 78D588 802A1438 8E020070 */ lw $v0, 0x70($s0) -/* 78D58C 802A143C 0080302D */ daddu $a2, $a0, $zero -/* 78D590 802A1440 00023880 */ sll $a3, $v0, 2 -/* 78D594 802A1444 00E23821 */ addu $a3, $a3, $v0 -/* 78D598 802A1448 00073840 */ sll $a3, $a3, 1 -/* 78D59C 802A144C 0C046F97 */ jal set_background_color_blend -/* 78D5A0 802A1450 30E700FE */ andi $a3, $a3, 0xfe -/* 78D5A4 802A1454 8E020070 */ lw $v0, 0x70($s0) -/* 78D5A8 802A1458 2442FFFF */ addiu $v0, $v0, -1 -/* 78D5AC 802A145C 10400003 */ beqz $v0, .L802A146C -/* 78D5B0 802A1460 AE020070 */ sw $v0, 0x70($s0) -/* 78D5B4 802A1464 080A8521 */ j .L802A1484 -/* 78D5B8 802A1468 0000102D */ daddu $v0, $zero, $zero -.L802A146C: -/* 78D5BC 802A146C 0000202D */ daddu $a0, $zero, $zero -/* 78D5C0 802A1470 0080282D */ daddu $a1, $a0, $zero -/* 78D5C4 802A1474 0080302D */ daddu $a2, $a0, $zero -/* 78D5C8 802A1478 0C046F97 */ jal set_background_color_blend -/* 78D5CC 802A147C 0080382D */ daddu $a3, $a0, $zero -/* 78D5D0 802A1480 24020002 */ addiu $v0, $zero, 2 -.L802A1484: -/* 78D5D4 802A1484 8FBF0014 */ lw $ra, 0x14($sp) -/* 78D5D8 802A1488 8FB00010 */ lw $s0, 0x10($sp) -/* 78D5DC 802A148C 03E00008 */ jr $ra -/* 78D5E0 802A1490 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/battle/star/lullaby_78D150/func_802A14E8_78D638.s b/ver/us/asm/nonmatchings/battle/star/lullaby_78D150/func_802A14E8_78D638.s deleted file mode 100644 index 71e35a68c5..0000000000 --- a/ver/us/asm/nonmatchings/battle/star/lullaby_78D150/func_802A14E8_78D638.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A14E8_78D638 -/* 78D638 802A14E8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 78D63C 802A14EC AFBF0010 */ sw $ra, 0x10($sp) -/* 78D640 802A14F0 0C00EABB */ jal get_npc_unsafe -/* 78D644 802A14F4 24040064 */ addiu $a0, $zero, 0x64 -/* 78D648 802A14F8 0040202D */ daddu $a0, $v0, $zero -/* 78D64C 802A14FC 24030020 */ addiu $v1, $zero, 0x20 -/* 78D650 802A1500 A48300A8 */ sh $v1, 0xa8($a0) -/* 78D654 802A1504 A48300A6 */ sh $v1, 0xa6($a0) -/* 78D658 802A1508 8FBF0010 */ lw $ra, 0x10($sp) -/* 78D65C 802A150C 24020002 */ addiu $v0, $zero, 2 -/* 78D660 802A1510 03E00008 */ jr $ra -/* 78D664 802A1514 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/battle/star/lullaby_78D150/func_802A1518_78D668.s b/ver/us/asm/nonmatchings/battle/star/lullaby_78D150/func_802A1518_78D668.s deleted file mode 100644 index c0bda46592..0000000000 --- a/ver/us/asm/nonmatchings/battle/star/lullaby_78D150/func_802A1518_78D668.s +++ /dev/null @@ -1,74 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1518_78D668 -/* 78D668 802A1518 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 78D66C 802A151C AFB10014 */ sw $s1, 0x14($sp) -/* 78D670 802A1520 0080882D */ daddu $s1, $a0, $zero -/* 78D674 802A1524 AFBF0018 */ sw $ra, 0x18($sp) -/* 78D678 802A1528 10A00002 */ beqz $a1, .L802A1534 -/* 78D67C 802A152C AFB00010 */ sw $s0, 0x10($sp) -/* 78D680 802A1530 AE200070 */ sw $zero, 0x70($s1) -.L802A1534: -/* 78D684 802A1534 8E230070 */ lw $v1, 0x70($s1) -/* 78D688 802A1538 10600005 */ beqz $v1, .L802A1550 -/* 78D68C 802A153C 24020001 */ addiu $v0, $zero, 1 -/* 78D690 802A1540 10620008 */ beq $v1, $v0, .L802A1564 -/* 78D694 802A1544 0000102D */ daddu $v0, $zero, $zero -/* 78D698 802A1548 080A8582 */ j .L802A1608 -/* 78D69C 802A154C 00000000 */ nop -.L802A1550: -/* 78D6A0 802A1550 2402FFB0 */ addiu $v0, $zero, -0x50 -/* 78D6A4 802A1554 AE220078 */ sw $v0, 0x78($s1) -/* 78D6A8 802A1558 24020001 */ addiu $v0, $zero, 1 -/* 78D6AC 802A155C AE200074 */ sw $zero, 0x74($s1) -/* 78D6B0 802A1560 AE220070 */ sw $v0, 0x70($s1) -.L802A1564: -/* 78D6B4 802A1564 3C0140C9 */ lui $at, 0x40c9 -/* 78D6B8 802A1568 34210FD0 */ ori $at, $at, 0xfd0 -/* 78D6BC 802A156C 44810000 */ mtc1 $at, $f0 -/* 78D6C0 802A1570 C62C0074 */ lwc1 $f12, 0x74($s1) -/* 78D6C4 802A1574 46806320 */ cvt.s.w $f12, $f12 -/* 78D6C8 802A1578 46006302 */ mul.s $f12, $f12, $f0 -/* 78D6CC 802A157C 00000000 */ nop -/* 78D6D0 802A1580 3C0143B4 */ lui $at, 0x43b4 -/* 78D6D4 802A1584 44810000 */ mtc1 $at, $f0 -/* 78D6D8 802A1588 8E300078 */ lw $s0, 0x78($s1) -/* 78D6DC 802A158C 0C00A85B */ jal sin_rad -/* 78D6E0 802A1590 46006303 */ div.s $f12, $f12, $f0 -/* 78D6E4 802A1594 3C0141F0 */ lui $at, 0x41f0 -/* 78D6E8 802A1598 44811000 */ mtc1 $at, $f2 -/* 78D6EC 802A159C 00000000 */ nop -/* 78D6F0 802A15A0 46020002 */ mul.s $f0, $f0, $f2 -/* 78D6F4 802A15A4 00000000 */ nop -/* 78D6F8 802A15A8 46020000 */ add.s $f0, $f0, $f2 -/* 78D6FC 802A15AC 3C074248 */ lui $a3, 0x4248 -/* 78D700 802A15B0 4600010D */ trunc.w.s $f4, $f0 -/* 78D704 802A15B4 44022000 */ mfc1 $v0, $f4 -/* 78D708 802A15B8 44902000 */ mtc1 $s0, $f4 -/* 78D70C 802A15BC 00000000 */ nop -/* 78D710 802A15C0 46802120 */ cvt.s.w $f4, $f4 -/* 78D714 802A15C4 44052000 */ mfc1 $a1, $f4 -/* 78D718 802A15C8 44822000 */ mtc1 $v0, $f4 -/* 78D71C 802A15CC 00000000 */ nop -/* 78D720 802A15D0 46802120 */ cvt.s.w $f4, $f4 -/* 78D724 802A15D4 44062000 */ mfc1 $a2, $f4 -/* 78D728 802A15D8 0C01C1B4 */ jal func_800706D0 -/* 78D72C 802A15DC 0000202D */ daddu $a0, $zero, $zero -/* 78D730 802A15E0 24020002 */ addiu $v0, $zero, 2 -/* 78D734 802A15E4 8E230078 */ lw $v1, 0x78($s1) -/* 78D738 802A15E8 8E240074 */ lw $a0, 0x74($s1) -/* 78D73C 802A15EC 2463000E */ addiu $v1, $v1, 0xe -/* 78D740 802A15F0 24840014 */ addiu $a0, $a0, 0x14 -/* 78D744 802A15F4 AE240074 */ sw $a0, 0x74($s1) -/* 78D748 802A15F8 28840168 */ slti $a0, $a0, 0x168 -/* 78D74C 802A15FC 10800002 */ beqz $a0, .L802A1608 -/* 78D750 802A1600 AE230078 */ sw $v1, 0x78($s1) -/* 78D754 802A1604 0000102D */ daddu $v0, $zero, $zero -.L802A1608: -/* 78D758 802A1608 8FBF0018 */ lw $ra, 0x18($sp) -/* 78D75C 802A160C 8FB10014 */ lw $s1, 0x14($sp) -/* 78D760 802A1610 8FB00010 */ lw $s0, 0x10($sp) -/* 78D764 802A1614 03E00008 */ jr $ra -/* 78D768 802A1618 27BD0020 */ addiu $sp, $sp, 0x20 -/* 78D76C 802A161C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/battle/star/peach_beam_7997B0/func_802A1000_7997B0.s b/ver/us/asm/nonmatchings/battle/star/peach_beam_7997B0/func_802A1000_7997B0.s deleted file mode 100644 index 6c2d867d4f..0000000000 --- a/ver/us/asm/nonmatchings/battle/star/peach_beam_7997B0/func_802A1000_7997B0.s +++ /dev/null @@ -1,47 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1000_7997B0 -/* 7997B0 802A1000 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 7997B4 802A1004 AFB1001C */ sw $s1, 0x1c($sp) -/* 7997B8 802A1008 0080882D */ daddu $s1, $a0, $zero -/* 7997BC 802A100C AFBF0024 */ sw $ra, 0x24($sp) -/* 7997C0 802A1010 AFB20020 */ sw $s2, 0x20($sp) -/* 7997C4 802A1014 AFB00018 */ sw $s0, 0x18($sp) -/* 7997C8 802A1018 8E30000C */ lw $s0, 0xc($s1) -/* 7997CC 802A101C 8E050000 */ lw $a1, ($s0) -/* 7997D0 802A1020 0C0B1EAF */ jal get_variable -/* 7997D4 802A1024 26100004 */ addiu $s0, $s0, 4 -/* 7997D8 802A1028 8E050000 */ lw $a1, ($s0) -/* 7997DC 802A102C 26100004 */ addiu $s0, $s0, 4 -/* 7997E0 802A1030 0220202D */ daddu $a0, $s1, $zero -/* 7997E4 802A1034 0C0B1EAF */ jal get_variable -/* 7997E8 802A1038 0040902D */ daddu $s2, $v0, $zero -/* 7997EC 802A103C 0220202D */ daddu $a0, $s1, $zero -/* 7997F0 802A1040 8E050000 */ lw $a1, ($s0) -/* 7997F4 802A1044 0C0B1EAF */ jal get_variable -/* 7997F8 802A1048 0040802D */ daddu $s0, $v0, $zero -/* 7997FC 802A104C 44921000 */ mtc1 $s2, $f2 -/* 799800 802A1050 00000000 */ nop -/* 799804 802A1054 468010A0 */ cvt.s.w $f2, $f2 -/* 799808 802A1058 44051000 */ mfc1 $a1, $f2 -/* 79980C 802A105C 44901000 */ mtc1 $s0, $f2 -/* 799810 802A1060 00000000 */ nop -/* 799814 802A1064 468010A0 */ cvt.s.w $f2, $f2 -/* 799818 802A1068 44061000 */ mfc1 $a2, $f2 -/* 79981C 802A106C 44821000 */ mtc1 $v0, $f2 -/* 799820 802A1070 00000000 */ nop -/* 799824 802A1074 468010A0 */ cvt.s.w $f2, $f2 -/* 799828 802A1078 3C014220 */ lui $at, 0x4220 -/* 79982C 802A107C 44810000 */ mtc1 $at, $f0 -/* 799830 802A1080 44071000 */ mfc1 $a3, $f2 -/* 799834 802A1084 0000202D */ daddu $a0, $zero, $zero -/* 799838 802A1088 0C01BFBC */ jal func_8006FEF0 -/* 79983C 802A108C E7A00010 */ swc1 $f0, 0x10($sp) -/* 799840 802A1090 8FBF0024 */ lw $ra, 0x24($sp) -/* 799844 802A1094 8FB20020 */ lw $s2, 0x20($sp) -/* 799848 802A1098 8FB1001C */ lw $s1, 0x1c($sp) -/* 79984C 802A109C 8FB00018 */ lw $s0, 0x18($sp) -/* 799850 802A10A0 24020002 */ addiu $v0, $zero, 2 -/* 799854 802A10A4 03E00008 */ jr $ra -/* 799858 802A10A8 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/battle/star/peach_beam_7997B0/func_802A10AC_79985C.s b/ver/us/asm/nonmatchings/battle/star/peach_beam_7997B0/func_802A10AC_79985C.s deleted file mode 100644 index 30a8dd2802..0000000000 --- a/ver/us/asm/nonmatchings/battle/star/peach_beam_7997B0/func_802A10AC_79985C.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A10AC_79985C -/* 79985C 802A10AC 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 799860 802A10B0 AFB10024 */ sw $s1, 0x24($sp) -/* 799864 802A10B4 0080882D */ daddu $s1, $a0, $zero -/* 799868 802A10B8 AFBF002C */ sw $ra, 0x2c($sp) -/* 79986C 802A10BC AFB20028 */ sw $s2, 0x28($sp) -/* 799870 802A10C0 AFB00020 */ sw $s0, 0x20($sp) -/* 799874 802A10C4 8E30000C */ lw $s0, 0xc($s1) -/* 799878 802A10C8 8E050000 */ lw $a1, ($s0) -/* 79987C 802A10CC 0C0B1EAF */ jal get_variable -/* 799880 802A10D0 26100004 */ addiu $s0, $s0, 4 -/* 799884 802A10D4 8E050000 */ lw $a1, ($s0) -/* 799888 802A10D8 26100004 */ addiu $s0, $s0, 4 -/* 79988C 802A10DC 0220202D */ daddu $a0, $s1, $zero -/* 799890 802A10E0 0C0B1EAF */ jal get_variable -/* 799894 802A10E4 0040902D */ daddu $s2, $v0, $zero -/* 799898 802A10E8 0220202D */ daddu $a0, $s1, $zero -/* 79989C 802A10EC 8E050000 */ lw $a1, ($s0) -/* 7998A0 802A10F0 0C0B1EAF */ jal get_variable -/* 7998A4 802A10F4 0040802D */ daddu $s0, $v0, $zero -/* 7998A8 802A10F8 24040005 */ addiu $a0, $zero, 5 -/* 7998AC 802A10FC 44921000 */ mtc1 $s2, $f2 -/* 7998B0 802A1100 00000000 */ nop -/* 7998B4 802A1104 468010A0 */ cvt.s.w $f2, $f2 -/* 7998B8 802A1108 44051000 */ mfc1 $a1, $f2 -/* 7998BC 802A110C 44901000 */ mtc1 $s0, $f2 -/* 7998C0 802A1110 00000000 */ nop -/* 7998C4 802A1114 468010A0 */ cvt.s.w $f2, $f2 -/* 7998C8 802A1118 44061000 */ mfc1 $a2, $f2 -/* 7998CC 802A111C 44821000 */ mtc1 $v0, $f2 -/* 7998D0 802A1120 00000000 */ nop -/* 7998D4 802A1124 468010A0 */ cvt.s.w $f2, $f2 -/* 7998D8 802A1128 3C014248 */ lui $at, 0x4248 -/* 7998DC 802A112C 44810000 */ mtc1 $at, $f0 -/* 7998E0 802A1130 44071000 */ mfc1 $a3, $f2 -/* 7998E4 802A1134 24030028 */ addiu $v1, $zero, 0x28 -/* 7998E8 802A1138 AFA30018 */ sw $v1, 0x18($sp) -/* 7998EC 802A113C 2403001E */ addiu $v1, $zero, 0x1e -/* 7998F0 802A1140 AFA3001C */ sw $v1, 0x1c($sp) -/* 7998F4 802A1144 E7A00010 */ swc1 $f0, 0x10($sp) -/* 7998F8 802A1148 0C01C154 */ jal func_80070550 -/* 7998FC 802A114C E7A00014 */ swc1 $f0, 0x14($sp) -/* 799900 802A1150 8FBF002C */ lw $ra, 0x2c($sp) -/* 799904 802A1154 8FB20028 */ lw $s2, 0x28($sp) -/* 799908 802A1158 8FB10024 */ lw $s1, 0x24($sp) -/* 79990C 802A115C 8FB00020 */ lw $s0, 0x20($sp) -/* 799910 802A1160 24020002 */ addiu $v0, $zero, 2 -/* 799914 802A1164 03E00008 */ jr $ra -/* 799918 802A1168 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/battle/star/peach_beam_7997B0/func_802A116C_79991C.s b/ver/us/asm/nonmatchings/battle/star/peach_beam_7997B0/func_802A116C_79991C.s deleted file mode 100644 index 57b95963d2..0000000000 --- a/ver/us/asm/nonmatchings/battle/star/peach_beam_7997B0/func_802A116C_79991C.s +++ /dev/null @@ -1,47 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A116C_79991C -/* 79991C 802A116C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 799920 802A1170 AFB1001C */ sw $s1, 0x1c($sp) -/* 799924 802A1174 0080882D */ daddu $s1, $a0, $zero -/* 799928 802A1178 AFBF0024 */ sw $ra, 0x24($sp) -/* 79992C 802A117C AFB20020 */ sw $s2, 0x20($sp) -/* 799930 802A1180 AFB00018 */ sw $s0, 0x18($sp) -/* 799934 802A1184 8E30000C */ lw $s0, 0xc($s1) -/* 799938 802A1188 8E050000 */ lw $a1, ($s0) -/* 79993C 802A118C 0C0B1EAF */ jal get_variable -/* 799940 802A1190 26100004 */ addiu $s0, $s0, 4 -/* 799944 802A1194 8E050000 */ lw $a1, ($s0) -/* 799948 802A1198 26100004 */ addiu $s0, $s0, 4 -/* 79994C 802A119C 0220202D */ daddu $a0, $s1, $zero -/* 799950 802A11A0 0C0B1EAF */ jal get_variable -/* 799954 802A11A4 0040902D */ daddu $s2, $v0, $zero -/* 799958 802A11A8 0220202D */ daddu $a0, $s1, $zero -/* 79995C 802A11AC 8E050000 */ lw $a1, ($s0) -/* 799960 802A11B0 0C0B1EAF */ jal get_variable -/* 799964 802A11B4 0040802D */ daddu $s0, $v0, $zero -/* 799968 802A11B8 44921000 */ mtc1 $s2, $f2 -/* 79996C 802A11BC 00000000 */ nop -/* 799970 802A11C0 468010A0 */ cvt.s.w $f2, $f2 -/* 799974 802A11C4 44051000 */ mfc1 $a1, $f2 -/* 799978 802A11C8 44901000 */ mtc1 $s0, $f2 -/* 79997C 802A11CC 00000000 */ nop -/* 799980 802A11D0 468010A0 */ cvt.s.w $f2, $f2 -/* 799984 802A11D4 44061000 */ mfc1 $a2, $f2 -/* 799988 802A11D8 44821000 */ mtc1 $v0, $f2 -/* 79998C 802A11DC 00000000 */ nop -/* 799990 802A11E0 468010A0 */ cvt.s.w $f2, $f2 -/* 799994 802A11E4 3C0141F0 */ lui $at, 0x41f0 -/* 799998 802A11E8 44810000 */ mtc1 $at, $f0 -/* 79999C 802A11EC 44071000 */ mfc1 $a3, $f2 -/* 7999A0 802A11F0 0000202D */ daddu $a0, $zero, $zero -/* 7999A4 802A11F4 0C01BFBC */ jal func_8006FEF0 -/* 7999A8 802A11F8 E7A00010 */ swc1 $f0, 0x10($sp) -/* 7999AC 802A11FC 8FBF0024 */ lw $ra, 0x24($sp) -/* 7999B0 802A1200 8FB20020 */ lw $s2, 0x20($sp) -/* 7999B4 802A1204 8FB1001C */ lw $s1, 0x1c($sp) -/* 7999B8 802A1208 8FB00018 */ lw $s0, 0x18($sp) -/* 7999BC 802A120C 24020002 */ addiu $v0, $zero, 2 -/* 7999C0 802A1210 03E00008 */ jr $ra -/* 7999C4 802A1214 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/battle/star/peach_beam_7997B0/func_802A1218_7999C8.s b/ver/us/asm/nonmatchings/battle/star/peach_beam_7997B0/func_802A1218_7999C8.s deleted file mode 100644 index 9a05c56611..0000000000 --- a/ver/us/asm/nonmatchings/battle/star/peach_beam_7997B0/func_802A1218_7999C8.s +++ /dev/null @@ -1,55 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1218_7999C8 -/* 7999C8 802A1218 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* 7999CC 802A121C AFB1002C */ sw $s1, 0x2c($sp) -/* 7999D0 802A1220 0080882D */ daddu $s1, $a0, $zero -/* 7999D4 802A1224 AFBF0034 */ sw $ra, 0x34($sp) -/* 7999D8 802A1228 AFB20030 */ sw $s2, 0x30($sp) -/* 7999DC 802A122C AFB00028 */ sw $s0, 0x28($sp) -/* 7999E0 802A1230 8E30000C */ lw $s0, 0xc($s1) -/* 7999E4 802A1234 8E050000 */ lw $a1, ($s0) -/* 7999E8 802A1238 0C0B1EAF */ jal get_variable -/* 7999EC 802A123C 26100004 */ addiu $s0, $s0, 4 -/* 7999F0 802A1240 8E050000 */ lw $a1, ($s0) -/* 7999F4 802A1244 26100004 */ addiu $s0, $s0, 4 -/* 7999F8 802A1248 0220202D */ daddu $a0, $s1, $zero -/* 7999FC 802A124C 0C0B1EAF */ jal get_variable -/* 799A00 802A1250 0040902D */ daddu $s2, $v0, $zero -/* 799A04 802A1254 0220202D */ daddu $a0, $s1, $zero -/* 799A08 802A1258 8E050000 */ lw $a1, ($s0) -/* 799A0C 802A125C 0C0B1EAF */ jal get_variable -/* 799A10 802A1260 0040802D */ daddu $s0, $v0, $zero -/* 799A14 802A1264 24040004 */ addiu $a0, $zero, 4 -/* 799A18 802A1268 44922000 */ mtc1 $s2, $f4 -/* 799A1C 802A126C 00000000 */ nop -/* 799A20 802A1270 46802120 */ cvt.s.w $f4, $f4 -/* 799A24 802A1274 44052000 */ mfc1 $a1, $f4 -/* 799A28 802A1278 44902000 */ mtc1 $s0, $f4 -/* 799A2C 802A127C 00000000 */ nop -/* 799A30 802A1280 46802120 */ cvt.s.w $f4, $f4 -/* 799A34 802A1284 44062000 */ mfc1 $a2, $f4 -/* 799A38 802A1288 44822000 */ mtc1 $v0, $f4 -/* 799A3C 802A128C 00000000 */ nop -/* 799A40 802A1290 46802120 */ cvt.s.w $f4, $f4 -/* 799A44 802A1294 3C0141A0 */ lui $at, 0x41a0 -/* 799A48 802A1298 44810000 */ mtc1 $at, $f0 -/* 799A4C 802A129C 3C013F80 */ lui $at, 0x3f80 -/* 799A50 802A12A0 44811000 */ mtc1 $at, $f2 -/* 799A54 802A12A4 44072000 */ mfc1 $a3, $f4 -/* 799A58 802A12A8 2403000A */ addiu $v1, $zero, 0xa -/* 799A5C 802A12AC AFA3001C */ sw $v1, 0x1c($sp) -/* 799A60 802A12B0 2403000F */ addiu $v1, $zero, 0xf -/* 799A64 802A12B4 AFA30020 */ sw $v1, 0x20($sp) -/* 799A68 802A12B8 E7A00010 */ swc1 $f0, 0x10($sp) -/* 799A6C 802A12BC E7A00014 */ swc1 $f0, 0x14($sp) -/* 799A70 802A12C0 0C01C8D4 */ jal func_80072350 -/* 799A74 802A12C4 E7A20018 */ swc1 $f2, 0x18($sp) -/* 799A78 802A12C8 8FBF0034 */ lw $ra, 0x34($sp) -/* 799A7C 802A12CC 8FB20030 */ lw $s2, 0x30($sp) -/* 799A80 802A12D0 8FB1002C */ lw $s1, 0x2c($sp) -/* 799A84 802A12D4 8FB00028 */ lw $s0, 0x28($sp) -/* 799A88 802A12D8 24020002 */ addiu $v0, $zero, 2 -/* 799A8C 802A12DC 03E00008 */ jr $ra -/* 799A90 802A12E0 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/ver/us/asm/nonmatchings/battle/star/peach_beam_7997B0/func_802A137C_799B2C.s b/ver/us/asm/nonmatchings/battle/star/peach_beam_7997B0/func_802A137C_799B2C.s deleted file mode 100644 index ced30c2da4..0000000000 --- a/ver/us/asm/nonmatchings/battle/star/peach_beam_7997B0/func_802A137C_799B2C.s +++ /dev/null @@ -1,44 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A137C_799B2C -/* 799B2C 802A137C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 799B30 802A1380 AFB00010 */ sw $s0, 0x10($sp) -/* 799B34 802A1384 0080802D */ daddu $s0, $a0, $zero -/* 799B38 802A1388 10A0000D */ beqz $a1, .L802A13C0 -/* 799B3C 802A138C AFBF0014 */ sw $ra, 0x14($sp) -/* 799B40 802A1390 0C04760B */ jal func_8011D82C -/* 799B44 802A1394 24040001 */ addiu $a0, $zero, 1 -/* 799B48 802A1398 0000202D */ daddu $a0, $zero, $zero -/* 799B4C 802A139C 0080282D */ daddu $a1, $a0, $zero -/* 799B50 802A13A0 0080302D */ daddu $a2, $a0, $zero -/* 799B54 802A13A4 0080382D */ daddu $a3, $a0, $zero -/* 799B58 802A13A8 3C038015 */ lui $v1, %hi(D_801512F0) -/* 799B5C 802A13AC 8C6312F0 */ lw $v1, %lo(D_801512F0)($v1) -/* 799B60 802A13B0 24020001 */ addiu $v0, $zero, 1 -/* 799B64 802A13B4 0C046F97 */ jal set_background_color_blend -/* 799B68 802A13B8 A0620000 */ sb $v0, ($v1) -/* 799B6C 802A13BC AE000070 */ sw $zero, 0x70($s0) -.L802A13C0: -/* 799B70 802A13C0 0000202D */ daddu $a0, $zero, $zero -/* 799B74 802A13C4 0080282D */ daddu $a1, $a0, $zero -/* 799B78 802A13C8 92070073 */ lbu $a3, 0x73($s0) -/* 799B7C 802A13CC 0C046F97 */ jal set_background_color_blend -/* 799B80 802A13D0 0080302D */ daddu $a2, $a0, $zero -/* 799B84 802A13D4 8E020070 */ lw $v0, 0x70($s0) -/* 799B88 802A13D8 2442000A */ addiu $v0, $v0, 0xa -/* 799B8C 802A13DC AE020070 */ sw $v0, 0x70($s0) -/* 799B90 802A13E0 284200E6 */ slti $v0, $v0, 0xe6 -/* 799B94 802A13E4 14400007 */ bnez $v0, .L802A1404 -/* 799B98 802A13E8 0000102D */ daddu $v0, $zero, $zero -/* 799B9C 802A13EC 0000202D */ daddu $a0, $zero, $zero -/* 799BA0 802A13F0 0080282D */ daddu $a1, $a0, $zero -/* 799BA4 802A13F4 0080302D */ daddu $a2, $a0, $zero -/* 799BA8 802A13F8 0C046F97 */ jal set_background_color_blend -/* 799BAC 802A13FC 240700E6 */ addiu $a3, $zero, 0xe6 -/* 799BB0 802A1400 24020002 */ addiu $v0, $zero, 2 -.L802A1404: -/* 799BB4 802A1404 8FBF0014 */ lw $ra, 0x14($sp) -/* 799BB8 802A1408 8FB00010 */ lw $s0, 0x10($sp) -/* 799BBC 802A140C 03E00008 */ jr $ra -/* 799BC0 802A1410 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/battle/star/peach_beam_7997B0/func_802A1414_799BC4.s b/ver/us/asm/nonmatchings/battle/star/peach_beam_7997B0/func_802A1414_799BC4.s deleted file mode 100644 index 09eb179f84..0000000000 --- a/ver/us/asm/nonmatchings/battle/star/peach_beam_7997B0/func_802A1414_799BC4.s +++ /dev/null @@ -1,39 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1414_799BC4 -/* 799BC4 802A1414 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 799BC8 802A1418 AFB00010 */ sw $s0, 0x10($sp) -/* 799BCC 802A141C 0080802D */ daddu $s0, $a0, $zero -/* 799BD0 802A1420 10A00003 */ beqz $a1, .L802A1430 -/* 799BD4 802A1424 AFBF0014 */ sw $ra, 0x14($sp) -/* 799BD8 802A1428 24020014 */ addiu $v0, $zero, 0x14 -/* 799BDC 802A142C AE020070 */ sw $v0, 0x70($s0) -.L802A1430: -/* 799BE0 802A1430 0000202D */ daddu $a0, $zero, $zero -/* 799BE4 802A1434 0080282D */ daddu $a1, $a0, $zero -/* 799BE8 802A1438 8E020070 */ lw $v0, 0x70($s0) -/* 799BEC 802A143C 0080302D */ daddu $a2, $a0, $zero -/* 799BF0 802A1440 00023880 */ sll $a3, $v0, 2 -/* 799BF4 802A1444 00E23821 */ addu $a3, $a3, $v0 -/* 799BF8 802A1448 00073840 */ sll $a3, $a3, 1 -/* 799BFC 802A144C 0C046F97 */ jal set_background_color_blend -/* 799C00 802A1450 30E700FE */ andi $a3, $a3, 0xfe -/* 799C04 802A1454 8E020070 */ lw $v0, 0x70($s0) -/* 799C08 802A1458 2442FFFF */ addiu $v0, $v0, -1 -/* 799C0C 802A145C 10400003 */ beqz $v0, .L802A146C -/* 799C10 802A1460 AE020070 */ sw $v0, 0x70($s0) -/* 799C14 802A1464 080A8521 */ j .L802A1484 -/* 799C18 802A1468 0000102D */ daddu $v0, $zero, $zero -.L802A146C: -/* 799C1C 802A146C 0000202D */ daddu $a0, $zero, $zero -/* 799C20 802A1470 0080282D */ daddu $a1, $a0, $zero -/* 799C24 802A1474 0080302D */ daddu $a2, $a0, $zero -/* 799C28 802A1478 0C046F97 */ jal set_background_color_blend -/* 799C2C 802A147C 0080382D */ daddu $a3, $a0, $zero -/* 799C30 802A1480 24020002 */ addiu $v0, $zero, 2 -.L802A1484: -/* 799C34 802A1484 8FBF0014 */ lw $ra, 0x14($sp) -/* 799C38 802A1488 8FB00010 */ lw $s0, 0x10($sp) -/* 799C3C 802A148C 03E00008 */ jr $ra -/* 799C40 802A1490 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/battle/star/peach_beam_7997B0/func_802A14E8_799C98.s b/ver/us/asm/nonmatchings/battle/star/peach_beam_7997B0/func_802A14E8_799C98.s deleted file mode 100644 index 60417c330a..0000000000 --- a/ver/us/asm/nonmatchings/battle/star/peach_beam_7997B0/func_802A14E8_799C98.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A14E8_799C98 -/* 799C98 802A14E8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 799C9C 802A14EC AFBF0010 */ sw $ra, 0x10($sp) -/* 799CA0 802A14F0 0C00EABB */ jal get_npc_unsafe -/* 799CA4 802A14F4 24040064 */ addiu $a0, $zero, 0x64 -/* 799CA8 802A14F8 0040202D */ daddu $a0, $v0, $zero -/* 799CAC 802A14FC 24030020 */ addiu $v1, $zero, 0x20 -/* 799CB0 802A1500 A48300A8 */ sh $v1, 0xa8($a0) -/* 799CB4 802A1504 A48300A6 */ sh $v1, 0xa6($a0) -/* 799CB8 802A1508 8FBF0010 */ lw $ra, 0x10($sp) -/* 799CBC 802A150C 24020002 */ addiu $v0, $zero, 2 -/* 799CC0 802A1510 03E00008 */ jr $ra -/* 799CC4 802A1514 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/battle/star/peach_beam_7997B0/func_802A2468_79AC18.s b/ver/us/asm/nonmatchings/battle/star/peach_beam_7997B0/func_802A2468_79AC18.s deleted file mode 100644 index 7a0e2931e6..0000000000 --- a/ver/us/asm/nonmatchings/battle/star/peach_beam_7997B0/func_802A2468_79AC18.s +++ /dev/null @@ -1,9 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A2468_79AC18 -/* 79AC18 802A2468 3C02802A */ lui $v0, %hi(D_802A3838) -/* 79AC1C 802A246C 8C423838 */ lw $v0, %lo(D_802A3838)($v0) -/* 79AC20 802A2470 AC820084 */ sw $v0, 0x84($a0) -/* 79AC24 802A2474 03E00008 */ jr $ra -/* 79AC28 802A2478 24020002 */ addiu $v0, $zero, 2 diff --git a/ver/us/asm/nonmatchings/battle/star/peach_beam_7997B0/func_802A247C_79AC2C.s b/ver/us/asm/nonmatchings/battle/star/peach_beam_7997B0/func_802A247C_79AC2C.s deleted file mode 100644 index db773de1b2..0000000000 --- a/ver/us/asm/nonmatchings/battle/star/peach_beam_7997B0/func_802A247C_79AC2C.s +++ /dev/null @@ -1,36 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A247C_79AC2C -/* 79AC2C 802A247C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 79AC30 802A2480 AFB00010 */ sw $s0, 0x10($sp) -/* 79AC34 802A2484 0080802D */ daddu $s0, $a0, $zero -/* 79AC38 802A2488 10A00003 */ beqz $a1, .L802A2498 -/* 79AC3C 802A248C AFBF0014 */ sw $ra, 0x14($sp) -/* 79AC40 802A2490 240200E6 */ addiu $v0, $zero, 0xe6 -/* 79AC44 802A2494 AE020070 */ sw $v0, 0x70($s0) -.L802A2498: -/* 79AC48 802A2498 0000202D */ daddu $a0, $zero, $zero -/* 79AC4C 802A249C 0080282D */ daddu $a1, $a0, $zero -/* 79AC50 802A24A0 92070073 */ lbu $a3, 0x73($s0) -/* 79AC54 802A24A4 0C046F97 */ jal set_background_color_blend -/* 79AC58 802A24A8 0080302D */ daddu $a2, $a0, $zero -/* 79AC5C 802A24AC 8E020070 */ lw $v0, 0x70($s0) -/* 79AC60 802A24B0 2442FFFB */ addiu $v0, $v0, -5 -/* 79AC64 802A24B4 AE020070 */ sw $v0, 0x70($s0) -/* 79AC68 802A24B8 284200C9 */ slti $v0, $v0, 0xc9 -/* 79AC6C 802A24BC 14400003 */ bnez $v0, .L802A24CC -/* 79AC70 802A24C0 0000202D */ daddu $a0, $zero, $zero -/* 79AC74 802A24C4 080A8938 */ j .L802A24E0 -/* 79AC78 802A24C8 0000102D */ daddu $v0, $zero, $zero -.L802A24CC: -/* 79AC7C 802A24CC 0080282D */ daddu $a1, $a0, $zero -/* 79AC80 802A24D0 0080302D */ daddu $a2, $a0, $zero -/* 79AC84 802A24D4 0C046F97 */ jal set_background_color_blend -/* 79AC88 802A24D8 240700C8 */ addiu $a3, $zero, 0xc8 -/* 79AC8C 802A24DC 24020002 */ addiu $v0, $zero, 2 -.L802A24E0: -/* 79AC90 802A24E0 8FBF0014 */ lw $ra, 0x14($sp) -/* 79AC94 802A24E4 8FB00010 */ lw $s0, 0x10($sp) -/* 79AC98 802A24E8 03E00008 */ jr $ra -/* 79AC9C 802A24EC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/battle/star/peach_dash_79D8A0/func_802A1000_79D8A0.s b/ver/us/asm/nonmatchings/battle/star/peach_dash_79D8A0/func_802A1000_79D8A0.s deleted file mode 100644 index 8af54feca0..0000000000 --- a/ver/us/asm/nonmatchings/battle/star/peach_dash_79D8A0/func_802A1000_79D8A0.s +++ /dev/null @@ -1,47 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1000_79D8A0 -/* 79D8A0 802A1000 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 79D8A4 802A1004 AFB1001C */ sw $s1, 0x1c($sp) -/* 79D8A8 802A1008 0080882D */ daddu $s1, $a0, $zero -/* 79D8AC 802A100C AFBF0024 */ sw $ra, 0x24($sp) -/* 79D8B0 802A1010 AFB20020 */ sw $s2, 0x20($sp) -/* 79D8B4 802A1014 AFB00018 */ sw $s0, 0x18($sp) -/* 79D8B8 802A1018 8E30000C */ lw $s0, 0xc($s1) -/* 79D8BC 802A101C 8E050000 */ lw $a1, ($s0) -/* 79D8C0 802A1020 0C0B1EAF */ jal get_variable -/* 79D8C4 802A1024 26100004 */ addiu $s0, $s0, 4 -/* 79D8C8 802A1028 8E050000 */ lw $a1, ($s0) -/* 79D8CC 802A102C 26100004 */ addiu $s0, $s0, 4 -/* 79D8D0 802A1030 0220202D */ daddu $a0, $s1, $zero -/* 79D8D4 802A1034 0C0B1EAF */ jal get_variable -/* 79D8D8 802A1038 0040902D */ daddu $s2, $v0, $zero -/* 79D8DC 802A103C 0220202D */ daddu $a0, $s1, $zero -/* 79D8E0 802A1040 8E050000 */ lw $a1, ($s0) -/* 79D8E4 802A1044 0C0B1EAF */ jal get_variable -/* 79D8E8 802A1048 0040802D */ daddu $s0, $v0, $zero -/* 79D8EC 802A104C 44921000 */ mtc1 $s2, $f2 -/* 79D8F0 802A1050 00000000 */ nop -/* 79D8F4 802A1054 468010A0 */ cvt.s.w $f2, $f2 -/* 79D8F8 802A1058 44051000 */ mfc1 $a1, $f2 -/* 79D8FC 802A105C 44901000 */ mtc1 $s0, $f2 -/* 79D900 802A1060 00000000 */ nop -/* 79D904 802A1064 468010A0 */ cvt.s.w $f2, $f2 -/* 79D908 802A1068 44061000 */ mfc1 $a2, $f2 -/* 79D90C 802A106C 44821000 */ mtc1 $v0, $f2 -/* 79D910 802A1070 00000000 */ nop -/* 79D914 802A1074 468010A0 */ cvt.s.w $f2, $f2 -/* 79D918 802A1078 3C014220 */ lui $at, 0x4220 -/* 79D91C 802A107C 44810000 */ mtc1 $at, $f0 -/* 79D920 802A1080 44071000 */ mfc1 $a3, $f2 -/* 79D924 802A1084 0000202D */ daddu $a0, $zero, $zero -/* 79D928 802A1088 0C01BFBC */ jal func_8006FEF0 -/* 79D92C 802A108C E7A00010 */ swc1 $f0, 0x10($sp) -/* 79D930 802A1090 8FBF0024 */ lw $ra, 0x24($sp) -/* 79D934 802A1094 8FB20020 */ lw $s2, 0x20($sp) -/* 79D938 802A1098 8FB1001C */ lw $s1, 0x1c($sp) -/* 79D93C 802A109C 8FB00018 */ lw $s0, 0x18($sp) -/* 79D940 802A10A0 24020002 */ addiu $v0, $zero, 2 -/* 79D944 802A10A4 03E00008 */ jr $ra -/* 79D948 802A10A8 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/battle/star/peach_dash_79D8A0/func_802A10AC_79D94C.s b/ver/us/asm/nonmatchings/battle/star/peach_dash_79D8A0/func_802A10AC_79D94C.s deleted file mode 100644 index 02d2415923..0000000000 --- a/ver/us/asm/nonmatchings/battle/star/peach_dash_79D8A0/func_802A10AC_79D94C.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A10AC_79D94C -/* 79D94C 802A10AC 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 79D950 802A10B0 AFB10024 */ sw $s1, 0x24($sp) -/* 79D954 802A10B4 0080882D */ daddu $s1, $a0, $zero -/* 79D958 802A10B8 AFBF002C */ sw $ra, 0x2c($sp) -/* 79D95C 802A10BC AFB20028 */ sw $s2, 0x28($sp) -/* 79D960 802A10C0 AFB00020 */ sw $s0, 0x20($sp) -/* 79D964 802A10C4 8E30000C */ lw $s0, 0xc($s1) -/* 79D968 802A10C8 8E050000 */ lw $a1, ($s0) -/* 79D96C 802A10CC 0C0B1EAF */ jal get_variable -/* 79D970 802A10D0 26100004 */ addiu $s0, $s0, 4 -/* 79D974 802A10D4 8E050000 */ lw $a1, ($s0) -/* 79D978 802A10D8 26100004 */ addiu $s0, $s0, 4 -/* 79D97C 802A10DC 0220202D */ daddu $a0, $s1, $zero -/* 79D980 802A10E0 0C0B1EAF */ jal get_variable -/* 79D984 802A10E4 0040902D */ daddu $s2, $v0, $zero -/* 79D988 802A10E8 0220202D */ daddu $a0, $s1, $zero -/* 79D98C 802A10EC 8E050000 */ lw $a1, ($s0) -/* 79D990 802A10F0 0C0B1EAF */ jal get_variable -/* 79D994 802A10F4 0040802D */ daddu $s0, $v0, $zero -/* 79D998 802A10F8 24040005 */ addiu $a0, $zero, 5 -/* 79D99C 802A10FC 44921000 */ mtc1 $s2, $f2 -/* 79D9A0 802A1100 00000000 */ nop -/* 79D9A4 802A1104 468010A0 */ cvt.s.w $f2, $f2 -/* 79D9A8 802A1108 44051000 */ mfc1 $a1, $f2 -/* 79D9AC 802A110C 44901000 */ mtc1 $s0, $f2 -/* 79D9B0 802A1110 00000000 */ nop -/* 79D9B4 802A1114 468010A0 */ cvt.s.w $f2, $f2 -/* 79D9B8 802A1118 44061000 */ mfc1 $a2, $f2 -/* 79D9BC 802A111C 44821000 */ mtc1 $v0, $f2 -/* 79D9C0 802A1120 00000000 */ nop -/* 79D9C4 802A1124 468010A0 */ cvt.s.w $f2, $f2 -/* 79D9C8 802A1128 3C014248 */ lui $at, 0x4248 -/* 79D9CC 802A112C 44810000 */ mtc1 $at, $f0 -/* 79D9D0 802A1130 44071000 */ mfc1 $a3, $f2 -/* 79D9D4 802A1134 24030028 */ addiu $v1, $zero, 0x28 -/* 79D9D8 802A1138 AFA30018 */ sw $v1, 0x18($sp) -/* 79D9DC 802A113C 2403001E */ addiu $v1, $zero, 0x1e -/* 79D9E0 802A1140 AFA3001C */ sw $v1, 0x1c($sp) -/* 79D9E4 802A1144 E7A00010 */ swc1 $f0, 0x10($sp) -/* 79D9E8 802A1148 0C01C154 */ jal func_80070550 -/* 79D9EC 802A114C E7A00014 */ swc1 $f0, 0x14($sp) -/* 79D9F0 802A1150 8FBF002C */ lw $ra, 0x2c($sp) -/* 79D9F4 802A1154 8FB20028 */ lw $s2, 0x28($sp) -/* 79D9F8 802A1158 8FB10024 */ lw $s1, 0x24($sp) -/* 79D9FC 802A115C 8FB00020 */ lw $s0, 0x20($sp) -/* 79DA00 802A1160 24020002 */ addiu $v0, $zero, 2 -/* 79DA04 802A1164 03E00008 */ jr $ra -/* 79DA08 802A1168 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/battle/star/peach_dash_79D8A0/func_802A116C_79DA0C.s b/ver/us/asm/nonmatchings/battle/star/peach_dash_79D8A0/func_802A116C_79DA0C.s deleted file mode 100644 index 790060fc47..0000000000 --- a/ver/us/asm/nonmatchings/battle/star/peach_dash_79D8A0/func_802A116C_79DA0C.s +++ /dev/null @@ -1,47 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A116C_79DA0C -/* 79DA0C 802A116C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 79DA10 802A1170 AFB1001C */ sw $s1, 0x1c($sp) -/* 79DA14 802A1174 0080882D */ daddu $s1, $a0, $zero -/* 79DA18 802A1178 AFBF0024 */ sw $ra, 0x24($sp) -/* 79DA1C 802A117C AFB20020 */ sw $s2, 0x20($sp) -/* 79DA20 802A1180 AFB00018 */ sw $s0, 0x18($sp) -/* 79DA24 802A1184 8E30000C */ lw $s0, 0xc($s1) -/* 79DA28 802A1188 8E050000 */ lw $a1, ($s0) -/* 79DA2C 802A118C 0C0B1EAF */ jal get_variable -/* 79DA30 802A1190 26100004 */ addiu $s0, $s0, 4 -/* 79DA34 802A1194 8E050000 */ lw $a1, ($s0) -/* 79DA38 802A1198 26100004 */ addiu $s0, $s0, 4 -/* 79DA3C 802A119C 0220202D */ daddu $a0, $s1, $zero -/* 79DA40 802A11A0 0C0B1EAF */ jal get_variable -/* 79DA44 802A11A4 0040902D */ daddu $s2, $v0, $zero -/* 79DA48 802A11A8 0220202D */ daddu $a0, $s1, $zero -/* 79DA4C 802A11AC 8E050000 */ lw $a1, ($s0) -/* 79DA50 802A11B0 0C0B1EAF */ jal get_variable -/* 79DA54 802A11B4 0040802D */ daddu $s0, $v0, $zero -/* 79DA58 802A11B8 44921000 */ mtc1 $s2, $f2 -/* 79DA5C 802A11BC 00000000 */ nop -/* 79DA60 802A11C0 468010A0 */ cvt.s.w $f2, $f2 -/* 79DA64 802A11C4 44051000 */ mfc1 $a1, $f2 -/* 79DA68 802A11C8 44901000 */ mtc1 $s0, $f2 -/* 79DA6C 802A11CC 00000000 */ nop -/* 79DA70 802A11D0 468010A0 */ cvt.s.w $f2, $f2 -/* 79DA74 802A11D4 44061000 */ mfc1 $a2, $f2 -/* 79DA78 802A11D8 44821000 */ mtc1 $v0, $f2 -/* 79DA7C 802A11DC 00000000 */ nop -/* 79DA80 802A11E0 468010A0 */ cvt.s.w $f2, $f2 -/* 79DA84 802A11E4 3C0141F0 */ lui $at, 0x41f0 -/* 79DA88 802A11E8 44810000 */ mtc1 $at, $f0 -/* 79DA8C 802A11EC 44071000 */ mfc1 $a3, $f2 -/* 79DA90 802A11F0 0000202D */ daddu $a0, $zero, $zero -/* 79DA94 802A11F4 0C01BFBC */ jal func_8006FEF0 -/* 79DA98 802A11F8 E7A00010 */ swc1 $f0, 0x10($sp) -/* 79DA9C 802A11FC 8FBF0024 */ lw $ra, 0x24($sp) -/* 79DAA0 802A1200 8FB20020 */ lw $s2, 0x20($sp) -/* 79DAA4 802A1204 8FB1001C */ lw $s1, 0x1c($sp) -/* 79DAA8 802A1208 8FB00018 */ lw $s0, 0x18($sp) -/* 79DAAC 802A120C 24020002 */ addiu $v0, $zero, 2 -/* 79DAB0 802A1210 03E00008 */ jr $ra -/* 79DAB4 802A1214 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/battle/star/peach_dash_79D8A0/func_802A1218_79DAB8.s b/ver/us/asm/nonmatchings/battle/star/peach_dash_79D8A0/func_802A1218_79DAB8.s deleted file mode 100644 index c1f5eb7a79..0000000000 --- a/ver/us/asm/nonmatchings/battle/star/peach_dash_79D8A0/func_802A1218_79DAB8.s +++ /dev/null @@ -1,55 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1218_79DAB8 -/* 79DAB8 802A1218 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* 79DABC 802A121C AFB1002C */ sw $s1, 0x2c($sp) -/* 79DAC0 802A1220 0080882D */ daddu $s1, $a0, $zero -/* 79DAC4 802A1224 AFBF0034 */ sw $ra, 0x34($sp) -/* 79DAC8 802A1228 AFB20030 */ sw $s2, 0x30($sp) -/* 79DACC 802A122C AFB00028 */ sw $s0, 0x28($sp) -/* 79DAD0 802A1230 8E30000C */ lw $s0, 0xc($s1) -/* 79DAD4 802A1234 8E050000 */ lw $a1, ($s0) -/* 79DAD8 802A1238 0C0B1EAF */ jal get_variable -/* 79DADC 802A123C 26100004 */ addiu $s0, $s0, 4 -/* 79DAE0 802A1240 8E050000 */ lw $a1, ($s0) -/* 79DAE4 802A1244 26100004 */ addiu $s0, $s0, 4 -/* 79DAE8 802A1248 0220202D */ daddu $a0, $s1, $zero -/* 79DAEC 802A124C 0C0B1EAF */ jal get_variable -/* 79DAF0 802A1250 0040902D */ daddu $s2, $v0, $zero -/* 79DAF4 802A1254 0220202D */ daddu $a0, $s1, $zero -/* 79DAF8 802A1258 8E050000 */ lw $a1, ($s0) -/* 79DAFC 802A125C 0C0B1EAF */ jal get_variable -/* 79DB00 802A1260 0040802D */ daddu $s0, $v0, $zero -/* 79DB04 802A1264 24040004 */ addiu $a0, $zero, 4 -/* 79DB08 802A1268 44922000 */ mtc1 $s2, $f4 -/* 79DB0C 802A126C 00000000 */ nop -/* 79DB10 802A1270 46802120 */ cvt.s.w $f4, $f4 -/* 79DB14 802A1274 44052000 */ mfc1 $a1, $f4 -/* 79DB18 802A1278 44902000 */ mtc1 $s0, $f4 -/* 79DB1C 802A127C 00000000 */ nop -/* 79DB20 802A1280 46802120 */ cvt.s.w $f4, $f4 -/* 79DB24 802A1284 44062000 */ mfc1 $a2, $f4 -/* 79DB28 802A1288 44822000 */ mtc1 $v0, $f4 -/* 79DB2C 802A128C 00000000 */ nop -/* 79DB30 802A1290 46802120 */ cvt.s.w $f4, $f4 -/* 79DB34 802A1294 3C0141A0 */ lui $at, 0x41a0 -/* 79DB38 802A1298 44810000 */ mtc1 $at, $f0 -/* 79DB3C 802A129C 3C013F80 */ lui $at, 0x3f80 -/* 79DB40 802A12A0 44811000 */ mtc1 $at, $f2 -/* 79DB44 802A12A4 44072000 */ mfc1 $a3, $f4 -/* 79DB48 802A12A8 2403000A */ addiu $v1, $zero, 0xa -/* 79DB4C 802A12AC AFA3001C */ sw $v1, 0x1c($sp) -/* 79DB50 802A12B0 2403000F */ addiu $v1, $zero, 0xf -/* 79DB54 802A12B4 AFA30020 */ sw $v1, 0x20($sp) -/* 79DB58 802A12B8 E7A00010 */ swc1 $f0, 0x10($sp) -/* 79DB5C 802A12BC E7A00014 */ swc1 $f0, 0x14($sp) -/* 79DB60 802A12C0 0C01C8D4 */ jal func_80072350 -/* 79DB64 802A12C4 E7A20018 */ swc1 $f2, 0x18($sp) -/* 79DB68 802A12C8 8FBF0034 */ lw $ra, 0x34($sp) -/* 79DB6C 802A12CC 8FB20030 */ lw $s2, 0x30($sp) -/* 79DB70 802A12D0 8FB1002C */ lw $s1, 0x2c($sp) -/* 79DB74 802A12D4 8FB00028 */ lw $s0, 0x28($sp) -/* 79DB78 802A12D8 24020002 */ addiu $v0, $zero, 2 -/* 79DB7C 802A12DC 03E00008 */ jr $ra -/* 79DB80 802A12E0 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/ver/us/asm/nonmatchings/battle/star/peach_dash_79D8A0/func_802A137C_79DC1C.s b/ver/us/asm/nonmatchings/battle/star/peach_dash_79D8A0/func_802A137C_79DC1C.s deleted file mode 100644 index b5f69a283b..0000000000 --- a/ver/us/asm/nonmatchings/battle/star/peach_dash_79D8A0/func_802A137C_79DC1C.s +++ /dev/null @@ -1,44 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A137C_79DC1C -/* 79DC1C 802A137C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 79DC20 802A1380 AFB00010 */ sw $s0, 0x10($sp) -/* 79DC24 802A1384 0080802D */ daddu $s0, $a0, $zero -/* 79DC28 802A1388 10A0000D */ beqz $a1, .L802A13C0 -/* 79DC2C 802A138C AFBF0014 */ sw $ra, 0x14($sp) -/* 79DC30 802A1390 0C04760B */ jal func_8011D82C -/* 79DC34 802A1394 24040001 */ addiu $a0, $zero, 1 -/* 79DC38 802A1398 0000202D */ daddu $a0, $zero, $zero -/* 79DC3C 802A139C 0080282D */ daddu $a1, $a0, $zero -/* 79DC40 802A13A0 0080302D */ daddu $a2, $a0, $zero -/* 79DC44 802A13A4 0080382D */ daddu $a3, $a0, $zero -/* 79DC48 802A13A8 3C038015 */ lui $v1, %hi(D_801512F0) -/* 79DC4C 802A13AC 8C6312F0 */ lw $v1, %lo(D_801512F0)($v1) -/* 79DC50 802A13B0 24020001 */ addiu $v0, $zero, 1 -/* 79DC54 802A13B4 0C046F97 */ jal set_background_color_blend -/* 79DC58 802A13B8 A0620000 */ sb $v0, ($v1) -/* 79DC5C 802A13BC AE000070 */ sw $zero, 0x70($s0) -.L802A13C0: -/* 79DC60 802A13C0 0000202D */ daddu $a0, $zero, $zero -/* 79DC64 802A13C4 0080282D */ daddu $a1, $a0, $zero -/* 79DC68 802A13C8 92070073 */ lbu $a3, 0x73($s0) -/* 79DC6C 802A13CC 0C046F97 */ jal set_background_color_blend -/* 79DC70 802A13D0 0080302D */ daddu $a2, $a0, $zero -/* 79DC74 802A13D4 8E020070 */ lw $v0, 0x70($s0) -/* 79DC78 802A13D8 2442000A */ addiu $v0, $v0, 0xa -/* 79DC7C 802A13DC AE020070 */ sw $v0, 0x70($s0) -/* 79DC80 802A13E0 284200E6 */ slti $v0, $v0, 0xe6 -/* 79DC84 802A13E4 14400007 */ bnez $v0, .L802A1404 -/* 79DC88 802A13E8 0000102D */ daddu $v0, $zero, $zero -/* 79DC8C 802A13EC 0000202D */ daddu $a0, $zero, $zero -/* 79DC90 802A13F0 0080282D */ daddu $a1, $a0, $zero -/* 79DC94 802A13F4 0080302D */ daddu $a2, $a0, $zero -/* 79DC98 802A13F8 0C046F97 */ jal set_background_color_blend -/* 79DC9C 802A13FC 240700E6 */ addiu $a3, $zero, 0xe6 -/* 79DCA0 802A1400 24020002 */ addiu $v0, $zero, 2 -.L802A1404: -/* 79DCA4 802A1404 8FBF0014 */ lw $ra, 0x14($sp) -/* 79DCA8 802A1408 8FB00010 */ lw $s0, 0x10($sp) -/* 79DCAC 802A140C 03E00008 */ jr $ra -/* 79DCB0 802A1410 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/battle/star/peach_dash_79D8A0/func_802A1414_79DCB4.s b/ver/us/asm/nonmatchings/battle/star/peach_dash_79D8A0/func_802A1414_79DCB4.s deleted file mode 100644 index 98a31379d2..0000000000 --- a/ver/us/asm/nonmatchings/battle/star/peach_dash_79D8A0/func_802A1414_79DCB4.s +++ /dev/null @@ -1,39 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1414_79DCB4 -/* 79DCB4 802A1414 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 79DCB8 802A1418 AFB00010 */ sw $s0, 0x10($sp) -/* 79DCBC 802A141C 0080802D */ daddu $s0, $a0, $zero -/* 79DCC0 802A1420 10A00003 */ beqz $a1, .L802A1430 -/* 79DCC4 802A1424 AFBF0014 */ sw $ra, 0x14($sp) -/* 79DCC8 802A1428 24020014 */ addiu $v0, $zero, 0x14 -/* 79DCCC 802A142C AE020070 */ sw $v0, 0x70($s0) -.L802A1430: -/* 79DCD0 802A1430 0000202D */ daddu $a0, $zero, $zero -/* 79DCD4 802A1434 0080282D */ daddu $a1, $a0, $zero -/* 79DCD8 802A1438 8E020070 */ lw $v0, 0x70($s0) -/* 79DCDC 802A143C 0080302D */ daddu $a2, $a0, $zero -/* 79DCE0 802A1440 00023880 */ sll $a3, $v0, 2 -/* 79DCE4 802A1444 00E23821 */ addu $a3, $a3, $v0 -/* 79DCE8 802A1448 00073840 */ sll $a3, $a3, 1 -/* 79DCEC 802A144C 0C046F97 */ jal set_background_color_blend -/* 79DCF0 802A1450 30E700FE */ andi $a3, $a3, 0xfe -/* 79DCF4 802A1454 8E020070 */ lw $v0, 0x70($s0) -/* 79DCF8 802A1458 2442FFFF */ addiu $v0, $v0, -1 -/* 79DCFC 802A145C 10400003 */ beqz $v0, .L802A146C -/* 79DD00 802A1460 AE020070 */ sw $v0, 0x70($s0) -/* 79DD04 802A1464 080A8521 */ j .L802A1484 -/* 79DD08 802A1468 0000102D */ daddu $v0, $zero, $zero -.L802A146C: -/* 79DD0C 802A146C 0000202D */ daddu $a0, $zero, $zero -/* 79DD10 802A1470 0080282D */ daddu $a1, $a0, $zero -/* 79DD14 802A1474 0080302D */ daddu $a2, $a0, $zero -/* 79DD18 802A1478 0C046F97 */ jal set_background_color_blend -/* 79DD1C 802A147C 0080382D */ daddu $a3, $a0, $zero -/* 79DD20 802A1480 24020002 */ addiu $v0, $zero, 2 -.L802A1484: -/* 79DD24 802A1484 8FBF0014 */ lw $ra, 0x14($sp) -/* 79DD28 802A1488 8FB00010 */ lw $s0, 0x10($sp) -/* 79DD2C 802A148C 03E00008 */ jr $ra -/* 79DD30 802A1490 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/battle/star/peach_dash_79D8A0/func_802A14E8_79DD88.s b/ver/us/asm/nonmatchings/battle/star/peach_dash_79D8A0/func_802A14E8_79DD88.s deleted file mode 100644 index 57b4a98bc2..0000000000 --- a/ver/us/asm/nonmatchings/battle/star/peach_dash_79D8A0/func_802A14E8_79DD88.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A14E8_79DD88 -/* 79DD88 802A14E8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 79DD8C 802A14EC AFBF0010 */ sw $ra, 0x10($sp) -/* 79DD90 802A14F0 0C00EABB */ jal get_npc_unsafe -/* 79DD94 802A14F4 24040064 */ addiu $a0, $zero, 0x64 -/* 79DD98 802A14F8 0040202D */ daddu $a0, $v0, $zero -/* 79DD9C 802A14FC 24030020 */ addiu $v1, $zero, 0x20 -/* 79DDA0 802A1500 A48300A8 */ sh $v1, 0xa8($a0) -/* 79DDA4 802A1504 A48300A6 */ sh $v1, 0xa6($a0) -/* 79DDA8 802A1508 8FBF0010 */ lw $ra, 0x10($sp) -/* 79DDAC 802A150C 24020002 */ addiu $v0, $zero, 2 -/* 79DDB0 802A1510 03E00008 */ jr $ra -/* 79DDB4 802A1514 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/battle/star/peach_dash_79D8A0/func_802A1518_79DDB8.s b/ver/us/asm/nonmatchings/battle/star/peach_dash_79D8A0/func_802A1518_79DDB8.s deleted file mode 100644 index aeef15e727..0000000000 --- a/ver/us/asm/nonmatchings/battle/star/peach_dash_79D8A0/func_802A1518_79DDB8.s +++ /dev/null @@ -1,45 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1518_79DDB8 -/* 79DDB8 802A1518 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 79DDBC 802A151C 24040030 */ addiu $a0, $zero, 0x30 -/* 79DDC0 802A1520 AFB00010 */ sw $s0, 0x10($sp) -/* 79DDC4 802A1524 3C108011 */ lui $s0, %hi(gPlayerData) -/* 79DDC8 802A1528 2610F290 */ addiu $s0, $s0, %lo(gPlayerData) -/* 79DDCC 802A152C AFB10014 */ sw $s1, 0x14($sp) -/* 79DDD0 802A1530 AFBF0018 */ sw $ra, 0x18($sp) -/* 79DDD4 802A1534 0C03A752 */ jal is_ability_active -/* 79DDD8 802A1538 0200882D */ daddu $s1, $s0, $zero -/* 79DDDC 802A153C 10400004 */ beqz $v0, .L802A1550 -/* 79DDE0 802A1540 00000000 */ nop -/* 79DDE4 802A1544 96020290 */ lhu $v0, 0x290($s0) -/* 79DDE8 802A1548 24420080 */ addiu $v0, $v0, 0x80 -/* 79DDEC 802A154C A6020290 */ sh $v0, 0x290($s0) -.L802A1550: -/* 79DDF0 802A1550 0C03A752 */ jal is_ability_active -/* 79DDF4 802A1554 24040031 */ addiu $a0, $zero, 0x31 -/* 79DDF8 802A1558 10400004 */ beqz $v0, .L802A156C -/* 79DDFC 802A155C 00000000 */ nop -/* 79DE00 802A1560 96020290 */ lhu $v0, 0x290($s0) -/* 79DE04 802A1564 24420100 */ addiu $v0, $v0, 0x100 -/* 79DE08 802A1568 A6020290 */ sh $v0, 0x290($s0) -.L802A156C: -/* 79DE0C 802A156C 96220290 */ lhu $v0, 0x290($s1) -/* 79DE10 802A1570 8223028E */ lb $v1, 0x28e($s1) -/* 79DE14 802A1574 24420080 */ addiu $v0, $v0, 0x80 -/* 79DE18 802A1578 A6220290 */ sh $v0, 0x290($s1) -/* 79DE1C 802A157C 00021400 */ sll $v0, $v0, 0x10 -/* 79DE20 802A1580 00021403 */ sra $v0, $v0, 0x10 -/* 79DE24 802A1584 00031A00 */ sll $v1, $v1, 8 -/* 79DE28 802A1588 0043102A */ slt $v0, $v0, $v1 -/* 79DE2C 802A158C 50400001 */ beql $v0, $zero, .L802A1594 -/* 79DE30 802A1590 A6230290 */ sh $v1, 0x290($s1) -.L802A1594: -/* 79DE34 802A1594 8FBF0018 */ lw $ra, 0x18($sp) -/* 79DE38 802A1598 8FB10014 */ lw $s1, 0x14($sp) -/* 79DE3C 802A159C 8FB00010 */ lw $s0, 0x10($sp) -/* 79DE40 802A15A0 24020002 */ addiu $v0, $zero, 2 -/* 79DE44 802A15A4 03E00008 */ jr $ra -/* 79DE48 802A15A8 27BD0020 */ addiu $sp, $sp, 0x20 -/* 79DE4C 802A15AC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/battle/star/peach_focus_79BFA0/func_802A1000_79BFA0.s b/ver/us/asm/nonmatchings/battle/star/peach_focus_79BFA0/func_802A1000_79BFA0.s deleted file mode 100644 index f2b5fffd2d..0000000000 --- a/ver/us/asm/nonmatchings/battle/star/peach_focus_79BFA0/func_802A1000_79BFA0.s +++ /dev/null @@ -1,47 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1000_79BFA0 -/* 79BFA0 802A1000 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 79BFA4 802A1004 AFB1001C */ sw $s1, 0x1c($sp) -/* 79BFA8 802A1008 0080882D */ daddu $s1, $a0, $zero -/* 79BFAC 802A100C AFBF0024 */ sw $ra, 0x24($sp) -/* 79BFB0 802A1010 AFB20020 */ sw $s2, 0x20($sp) -/* 79BFB4 802A1014 AFB00018 */ sw $s0, 0x18($sp) -/* 79BFB8 802A1018 8E30000C */ lw $s0, 0xc($s1) -/* 79BFBC 802A101C 8E050000 */ lw $a1, ($s0) -/* 79BFC0 802A1020 0C0B1EAF */ jal get_variable -/* 79BFC4 802A1024 26100004 */ addiu $s0, $s0, 4 -/* 79BFC8 802A1028 8E050000 */ lw $a1, ($s0) -/* 79BFCC 802A102C 26100004 */ addiu $s0, $s0, 4 -/* 79BFD0 802A1030 0220202D */ daddu $a0, $s1, $zero -/* 79BFD4 802A1034 0C0B1EAF */ jal get_variable -/* 79BFD8 802A1038 0040902D */ daddu $s2, $v0, $zero -/* 79BFDC 802A103C 0220202D */ daddu $a0, $s1, $zero -/* 79BFE0 802A1040 8E050000 */ lw $a1, ($s0) -/* 79BFE4 802A1044 0C0B1EAF */ jal get_variable -/* 79BFE8 802A1048 0040802D */ daddu $s0, $v0, $zero -/* 79BFEC 802A104C 44921000 */ mtc1 $s2, $f2 -/* 79BFF0 802A1050 00000000 */ nop -/* 79BFF4 802A1054 468010A0 */ cvt.s.w $f2, $f2 -/* 79BFF8 802A1058 44051000 */ mfc1 $a1, $f2 -/* 79BFFC 802A105C 44901000 */ mtc1 $s0, $f2 -/* 79C000 802A1060 00000000 */ nop -/* 79C004 802A1064 468010A0 */ cvt.s.w $f2, $f2 -/* 79C008 802A1068 44061000 */ mfc1 $a2, $f2 -/* 79C00C 802A106C 44821000 */ mtc1 $v0, $f2 -/* 79C010 802A1070 00000000 */ nop -/* 79C014 802A1074 468010A0 */ cvt.s.w $f2, $f2 -/* 79C018 802A1078 3C014220 */ lui $at, 0x4220 -/* 79C01C 802A107C 44810000 */ mtc1 $at, $f0 -/* 79C020 802A1080 44071000 */ mfc1 $a3, $f2 -/* 79C024 802A1084 0000202D */ daddu $a0, $zero, $zero -/* 79C028 802A1088 0C01BFBC */ jal func_8006FEF0 -/* 79C02C 802A108C E7A00010 */ swc1 $f0, 0x10($sp) -/* 79C030 802A1090 8FBF0024 */ lw $ra, 0x24($sp) -/* 79C034 802A1094 8FB20020 */ lw $s2, 0x20($sp) -/* 79C038 802A1098 8FB1001C */ lw $s1, 0x1c($sp) -/* 79C03C 802A109C 8FB00018 */ lw $s0, 0x18($sp) -/* 79C040 802A10A0 24020002 */ addiu $v0, $zero, 2 -/* 79C044 802A10A4 03E00008 */ jr $ra -/* 79C048 802A10A8 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/battle/star/peach_focus_79BFA0/func_802A10AC_79C04C.s b/ver/us/asm/nonmatchings/battle/star/peach_focus_79BFA0/func_802A10AC_79C04C.s deleted file mode 100644 index d333785388..0000000000 --- a/ver/us/asm/nonmatchings/battle/star/peach_focus_79BFA0/func_802A10AC_79C04C.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A10AC_79C04C -/* 79C04C 802A10AC 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 79C050 802A10B0 AFB10024 */ sw $s1, 0x24($sp) -/* 79C054 802A10B4 0080882D */ daddu $s1, $a0, $zero -/* 79C058 802A10B8 AFBF002C */ sw $ra, 0x2c($sp) -/* 79C05C 802A10BC AFB20028 */ sw $s2, 0x28($sp) -/* 79C060 802A10C0 AFB00020 */ sw $s0, 0x20($sp) -/* 79C064 802A10C4 8E30000C */ lw $s0, 0xc($s1) -/* 79C068 802A10C8 8E050000 */ lw $a1, ($s0) -/* 79C06C 802A10CC 0C0B1EAF */ jal get_variable -/* 79C070 802A10D0 26100004 */ addiu $s0, $s0, 4 -/* 79C074 802A10D4 8E050000 */ lw $a1, ($s0) -/* 79C078 802A10D8 26100004 */ addiu $s0, $s0, 4 -/* 79C07C 802A10DC 0220202D */ daddu $a0, $s1, $zero -/* 79C080 802A10E0 0C0B1EAF */ jal get_variable -/* 79C084 802A10E4 0040902D */ daddu $s2, $v0, $zero -/* 79C088 802A10E8 0220202D */ daddu $a0, $s1, $zero -/* 79C08C 802A10EC 8E050000 */ lw $a1, ($s0) -/* 79C090 802A10F0 0C0B1EAF */ jal get_variable -/* 79C094 802A10F4 0040802D */ daddu $s0, $v0, $zero -/* 79C098 802A10F8 24040005 */ addiu $a0, $zero, 5 -/* 79C09C 802A10FC 44921000 */ mtc1 $s2, $f2 -/* 79C0A0 802A1100 00000000 */ nop -/* 79C0A4 802A1104 468010A0 */ cvt.s.w $f2, $f2 -/* 79C0A8 802A1108 44051000 */ mfc1 $a1, $f2 -/* 79C0AC 802A110C 44901000 */ mtc1 $s0, $f2 -/* 79C0B0 802A1110 00000000 */ nop -/* 79C0B4 802A1114 468010A0 */ cvt.s.w $f2, $f2 -/* 79C0B8 802A1118 44061000 */ mfc1 $a2, $f2 -/* 79C0BC 802A111C 44821000 */ mtc1 $v0, $f2 -/* 79C0C0 802A1120 00000000 */ nop -/* 79C0C4 802A1124 468010A0 */ cvt.s.w $f2, $f2 -/* 79C0C8 802A1128 3C014248 */ lui $at, 0x4248 -/* 79C0CC 802A112C 44810000 */ mtc1 $at, $f0 -/* 79C0D0 802A1130 44071000 */ mfc1 $a3, $f2 -/* 79C0D4 802A1134 24030028 */ addiu $v1, $zero, 0x28 -/* 79C0D8 802A1138 AFA30018 */ sw $v1, 0x18($sp) -/* 79C0DC 802A113C 2403001E */ addiu $v1, $zero, 0x1e -/* 79C0E0 802A1140 AFA3001C */ sw $v1, 0x1c($sp) -/* 79C0E4 802A1144 E7A00010 */ swc1 $f0, 0x10($sp) -/* 79C0E8 802A1148 0C01C154 */ jal func_80070550 -/* 79C0EC 802A114C E7A00014 */ swc1 $f0, 0x14($sp) -/* 79C0F0 802A1150 8FBF002C */ lw $ra, 0x2c($sp) -/* 79C0F4 802A1154 8FB20028 */ lw $s2, 0x28($sp) -/* 79C0F8 802A1158 8FB10024 */ lw $s1, 0x24($sp) -/* 79C0FC 802A115C 8FB00020 */ lw $s0, 0x20($sp) -/* 79C100 802A1160 24020002 */ addiu $v0, $zero, 2 -/* 79C104 802A1164 03E00008 */ jr $ra -/* 79C108 802A1168 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/battle/star/peach_focus_79BFA0/func_802A116C_79C10C.s b/ver/us/asm/nonmatchings/battle/star/peach_focus_79BFA0/func_802A116C_79C10C.s deleted file mode 100644 index 0189e3a3b9..0000000000 --- a/ver/us/asm/nonmatchings/battle/star/peach_focus_79BFA0/func_802A116C_79C10C.s +++ /dev/null @@ -1,47 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A116C_79C10C -/* 79C10C 802A116C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 79C110 802A1170 AFB1001C */ sw $s1, 0x1c($sp) -/* 79C114 802A1174 0080882D */ daddu $s1, $a0, $zero -/* 79C118 802A1178 AFBF0024 */ sw $ra, 0x24($sp) -/* 79C11C 802A117C AFB20020 */ sw $s2, 0x20($sp) -/* 79C120 802A1180 AFB00018 */ sw $s0, 0x18($sp) -/* 79C124 802A1184 8E30000C */ lw $s0, 0xc($s1) -/* 79C128 802A1188 8E050000 */ lw $a1, ($s0) -/* 79C12C 802A118C 0C0B1EAF */ jal get_variable -/* 79C130 802A1190 26100004 */ addiu $s0, $s0, 4 -/* 79C134 802A1194 8E050000 */ lw $a1, ($s0) -/* 79C138 802A1198 26100004 */ addiu $s0, $s0, 4 -/* 79C13C 802A119C 0220202D */ daddu $a0, $s1, $zero -/* 79C140 802A11A0 0C0B1EAF */ jal get_variable -/* 79C144 802A11A4 0040902D */ daddu $s2, $v0, $zero -/* 79C148 802A11A8 0220202D */ daddu $a0, $s1, $zero -/* 79C14C 802A11AC 8E050000 */ lw $a1, ($s0) -/* 79C150 802A11B0 0C0B1EAF */ jal get_variable -/* 79C154 802A11B4 0040802D */ daddu $s0, $v0, $zero -/* 79C158 802A11B8 44921000 */ mtc1 $s2, $f2 -/* 79C15C 802A11BC 00000000 */ nop -/* 79C160 802A11C0 468010A0 */ cvt.s.w $f2, $f2 -/* 79C164 802A11C4 44051000 */ mfc1 $a1, $f2 -/* 79C168 802A11C8 44901000 */ mtc1 $s0, $f2 -/* 79C16C 802A11CC 00000000 */ nop -/* 79C170 802A11D0 468010A0 */ cvt.s.w $f2, $f2 -/* 79C174 802A11D4 44061000 */ mfc1 $a2, $f2 -/* 79C178 802A11D8 44821000 */ mtc1 $v0, $f2 -/* 79C17C 802A11DC 00000000 */ nop -/* 79C180 802A11E0 468010A0 */ cvt.s.w $f2, $f2 -/* 79C184 802A11E4 3C0141F0 */ lui $at, 0x41f0 -/* 79C188 802A11E8 44810000 */ mtc1 $at, $f0 -/* 79C18C 802A11EC 44071000 */ mfc1 $a3, $f2 -/* 79C190 802A11F0 0000202D */ daddu $a0, $zero, $zero -/* 79C194 802A11F4 0C01BFBC */ jal func_8006FEF0 -/* 79C198 802A11F8 E7A00010 */ swc1 $f0, 0x10($sp) -/* 79C19C 802A11FC 8FBF0024 */ lw $ra, 0x24($sp) -/* 79C1A0 802A1200 8FB20020 */ lw $s2, 0x20($sp) -/* 79C1A4 802A1204 8FB1001C */ lw $s1, 0x1c($sp) -/* 79C1A8 802A1208 8FB00018 */ lw $s0, 0x18($sp) -/* 79C1AC 802A120C 24020002 */ addiu $v0, $zero, 2 -/* 79C1B0 802A1210 03E00008 */ jr $ra -/* 79C1B4 802A1214 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/battle/star/peach_focus_79BFA0/func_802A1218_79C1B8.s b/ver/us/asm/nonmatchings/battle/star/peach_focus_79BFA0/func_802A1218_79C1B8.s deleted file mode 100644 index bec665a6a3..0000000000 --- a/ver/us/asm/nonmatchings/battle/star/peach_focus_79BFA0/func_802A1218_79C1B8.s +++ /dev/null @@ -1,55 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1218_79C1B8 -/* 79C1B8 802A1218 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* 79C1BC 802A121C AFB1002C */ sw $s1, 0x2c($sp) -/* 79C1C0 802A1220 0080882D */ daddu $s1, $a0, $zero -/* 79C1C4 802A1224 AFBF0034 */ sw $ra, 0x34($sp) -/* 79C1C8 802A1228 AFB20030 */ sw $s2, 0x30($sp) -/* 79C1CC 802A122C AFB00028 */ sw $s0, 0x28($sp) -/* 79C1D0 802A1230 8E30000C */ lw $s0, 0xc($s1) -/* 79C1D4 802A1234 8E050000 */ lw $a1, ($s0) -/* 79C1D8 802A1238 0C0B1EAF */ jal get_variable -/* 79C1DC 802A123C 26100004 */ addiu $s0, $s0, 4 -/* 79C1E0 802A1240 8E050000 */ lw $a1, ($s0) -/* 79C1E4 802A1244 26100004 */ addiu $s0, $s0, 4 -/* 79C1E8 802A1248 0220202D */ daddu $a0, $s1, $zero -/* 79C1EC 802A124C 0C0B1EAF */ jal get_variable -/* 79C1F0 802A1250 0040902D */ daddu $s2, $v0, $zero -/* 79C1F4 802A1254 0220202D */ daddu $a0, $s1, $zero -/* 79C1F8 802A1258 8E050000 */ lw $a1, ($s0) -/* 79C1FC 802A125C 0C0B1EAF */ jal get_variable -/* 79C200 802A1260 0040802D */ daddu $s0, $v0, $zero -/* 79C204 802A1264 24040004 */ addiu $a0, $zero, 4 -/* 79C208 802A1268 44922000 */ mtc1 $s2, $f4 -/* 79C20C 802A126C 00000000 */ nop -/* 79C210 802A1270 46802120 */ cvt.s.w $f4, $f4 -/* 79C214 802A1274 44052000 */ mfc1 $a1, $f4 -/* 79C218 802A1278 44902000 */ mtc1 $s0, $f4 -/* 79C21C 802A127C 00000000 */ nop -/* 79C220 802A1280 46802120 */ cvt.s.w $f4, $f4 -/* 79C224 802A1284 44062000 */ mfc1 $a2, $f4 -/* 79C228 802A1288 44822000 */ mtc1 $v0, $f4 -/* 79C22C 802A128C 00000000 */ nop -/* 79C230 802A1290 46802120 */ cvt.s.w $f4, $f4 -/* 79C234 802A1294 3C0141A0 */ lui $at, 0x41a0 -/* 79C238 802A1298 44810000 */ mtc1 $at, $f0 -/* 79C23C 802A129C 3C013F80 */ lui $at, 0x3f80 -/* 79C240 802A12A0 44811000 */ mtc1 $at, $f2 -/* 79C244 802A12A4 44072000 */ mfc1 $a3, $f4 -/* 79C248 802A12A8 2403000A */ addiu $v1, $zero, 0xa -/* 79C24C 802A12AC AFA3001C */ sw $v1, 0x1c($sp) -/* 79C250 802A12B0 2403000F */ addiu $v1, $zero, 0xf -/* 79C254 802A12B4 AFA30020 */ sw $v1, 0x20($sp) -/* 79C258 802A12B8 E7A00010 */ swc1 $f0, 0x10($sp) -/* 79C25C 802A12BC E7A00014 */ swc1 $f0, 0x14($sp) -/* 79C260 802A12C0 0C01C8D4 */ jal func_80072350 -/* 79C264 802A12C4 E7A20018 */ swc1 $f2, 0x18($sp) -/* 79C268 802A12C8 8FBF0034 */ lw $ra, 0x34($sp) -/* 79C26C 802A12CC 8FB20030 */ lw $s2, 0x30($sp) -/* 79C270 802A12D0 8FB1002C */ lw $s1, 0x2c($sp) -/* 79C274 802A12D4 8FB00028 */ lw $s0, 0x28($sp) -/* 79C278 802A12D8 24020002 */ addiu $v0, $zero, 2 -/* 79C27C 802A12DC 03E00008 */ jr $ra -/* 79C280 802A12E0 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/ver/us/asm/nonmatchings/battle/star/peach_focus_79BFA0/func_802A137C_79C31C.s b/ver/us/asm/nonmatchings/battle/star/peach_focus_79BFA0/func_802A137C_79C31C.s deleted file mode 100644 index 2f355df1c3..0000000000 --- a/ver/us/asm/nonmatchings/battle/star/peach_focus_79BFA0/func_802A137C_79C31C.s +++ /dev/null @@ -1,44 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A137C_79C31C -/* 79C31C 802A137C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 79C320 802A1380 AFB00010 */ sw $s0, 0x10($sp) -/* 79C324 802A1384 0080802D */ daddu $s0, $a0, $zero -/* 79C328 802A1388 10A0000D */ beqz $a1, .L802A13C0 -/* 79C32C 802A138C AFBF0014 */ sw $ra, 0x14($sp) -/* 79C330 802A1390 0C04760B */ jal func_8011D82C -/* 79C334 802A1394 24040001 */ addiu $a0, $zero, 1 -/* 79C338 802A1398 0000202D */ daddu $a0, $zero, $zero -/* 79C33C 802A139C 0080282D */ daddu $a1, $a0, $zero -/* 79C340 802A13A0 0080302D */ daddu $a2, $a0, $zero -/* 79C344 802A13A4 0080382D */ daddu $a3, $a0, $zero -/* 79C348 802A13A8 3C038015 */ lui $v1, %hi(D_801512F0) -/* 79C34C 802A13AC 8C6312F0 */ lw $v1, %lo(D_801512F0)($v1) -/* 79C350 802A13B0 24020001 */ addiu $v0, $zero, 1 -/* 79C354 802A13B4 0C046F97 */ jal set_background_color_blend -/* 79C358 802A13B8 A0620000 */ sb $v0, ($v1) -/* 79C35C 802A13BC AE000070 */ sw $zero, 0x70($s0) -.L802A13C0: -/* 79C360 802A13C0 0000202D */ daddu $a0, $zero, $zero -/* 79C364 802A13C4 0080282D */ daddu $a1, $a0, $zero -/* 79C368 802A13C8 92070073 */ lbu $a3, 0x73($s0) -/* 79C36C 802A13CC 0C046F97 */ jal set_background_color_blend -/* 79C370 802A13D0 0080302D */ daddu $a2, $a0, $zero -/* 79C374 802A13D4 8E020070 */ lw $v0, 0x70($s0) -/* 79C378 802A13D8 2442000A */ addiu $v0, $v0, 0xa -/* 79C37C 802A13DC AE020070 */ sw $v0, 0x70($s0) -/* 79C380 802A13E0 284200E6 */ slti $v0, $v0, 0xe6 -/* 79C384 802A13E4 14400007 */ bnez $v0, .L802A1404 -/* 79C388 802A13E8 0000102D */ daddu $v0, $zero, $zero -/* 79C38C 802A13EC 0000202D */ daddu $a0, $zero, $zero -/* 79C390 802A13F0 0080282D */ daddu $a1, $a0, $zero -/* 79C394 802A13F4 0080302D */ daddu $a2, $a0, $zero -/* 79C398 802A13F8 0C046F97 */ jal set_background_color_blend -/* 79C39C 802A13FC 240700E6 */ addiu $a3, $zero, 0xe6 -/* 79C3A0 802A1400 24020002 */ addiu $v0, $zero, 2 -.L802A1404: -/* 79C3A4 802A1404 8FBF0014 */ lw $ra, 0x14($sp) -/* 79C3A8 802A1408 8FB00010 */ lw $s0, 0x10($sp) -/* 79C3AC 802A140C 03E00008 */ jr $ra -/* 79C3B0 802A1410 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/battle/star/peach_focus_79BFA0/func_802A1414_79C3B4.s b/ver/us/asm/nonmatchings/battle/star/peach_focus_79BFA0/func_802A1414_79C3B4.s deleted file mode 100644 index 8207aa615f..0000000000 --- a/ver/us/asm/nonmatchings/battle/star/peach_focus_79BFA0/func_802A1414_79C3B4.s +++ /dev/null @@ -1,39 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1414_79C3B4 -/* 79C3B4 802A1414 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 79C3B8 802A1418 AFB00010 */ sw $s0, 0x10($sp) -/* 79C3BC 802A141C 0080802D */ daddu $s0, $a0, $zero -/* 79C3C0 802A1420 10A00003 */ beqz $a1, .L802A1430 -/* 79C3C4 802A1424 AFBF0014 */ sw $ra, 0x14($sp) -/* 79C3C8 802A1428 24020014 */ addiu $v0, $zero, 0x14 -/* 79C3CC 802A142C AE020070 */ sw $v0, 0x70($s0) -.L802A1430: -/* 79C3D0 802A1430 0000202D */ daddu $a0, $zero, $zero -/* 79C3D4 802A1434 0080282D */ daddu $a1, $a0, $zero -/* 79C3D8 802A1438 8E020070 */ lw $v0, 0x70($s0) -/* 79C3DC 802A143C 0080302D */ daddu $a2, $a0, $zero -/* 79C3E0 802A1440 00023880 */ sll $a3, $v0, 2 -/* 79C3E4 802A1444 00E23821 */ addu $a3, $a3, $v0 -/* 79C3E8 802A1448 00073840 */ sll $a3, $a3, 1 -/* 79C3EC 802A144C 0C046F97 */ jal set_background_color_blend -/* 79C3F0 802A1450 30E700FE */ andi $a3, $a3, 0xfe -/* 79C3F4 802A1454 8E020070 */ lw $v0, 0x70($s0) -/* 79C3F8 802A1458 2442FFFF */ addiu $v0, $v0, -1 -/* 79C3FC 802A145C 10400003 */ beqz $v0, .L802A146C -/* 79C400 802A1460 AE020070 */ sw $v0, 0x70($s0) -/* 79C404 802A1464 080A8521 */ j .L802A1484 -/* 79C408 802A1468 0000102D */ daddu $v0, $zero, $zero -.L802A146C: -/* 79C40C 802A146C 0000202D */ daddu $a0, $zero, $zero -/* 79C410 802A1470 0080282D */ daddu $a1, $a0, $zero -/* 79C414 802A1474 0080302D */ daddu $a2, $a0, $zero -/* 79C418 802A1478 0C046F97 */ jal set_background_color_blend -/* 79C41C 802A147C 0080382D */ daddu $a3, $a0, $zero -/* 79C420 802A1480 24020002 */ addiu $v0, $zero, 2 -.L802A1484: -/* 79C424 802A1484 8FBF0014 */ lw $ra, 0x14($sp) -/* 79C428 802A1488 8FB00010 */ lw $s0, 0x10($sp) -/* 79C42C 802A148C 03E00008 */ jr $ra -/* 79C430 802A1490 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/battle/star/peach_focus_79BFA0/func_802A14E8_79C488.s b/ver/us/asm/nonmatchings/battle/star/peach_focus_79BFA0/func_802A14E8_79C488.s deleted file mode 100644 index 2f12beac8d..0000000000 --- a/ver/us/asm/nonmatchings/battle/star/peach_focus_79BFA0/func_802A14E8_79C488.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A14E8_79C488 -/* 79C488 802A14E8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 79C48C 802A14EC AFBF0010 */ sw $ra, 0x10($sp) -/* 79C490 802A14F0 0C00EABB */ jal get_npc_unsafe -/* 79C494 802A14F4 24040064 */ addiu $a0, $zero, 0x64 -/* 79C498 802A14F8 0040202D */ daddu $a0, $v0, $zero -/* 79C49C 802A14FC 24030020 */ addiu $v1, $zero, 0x20 -/* 79C4A0 802A1500 A48300A8 */ sh $v1, 0xa8($a0) -/* 79C4A4 802A1504 A48300A6 */ sh $v1, 0xa6($a0) -/* 79C4A8 802A1508 8FBF0010 */ lw $ra, 0x10($sp) -/* 79C4AC 802A150C 24020002 */ addiu $v0, $zero, 2 -/* 79C4B0 802A1510 03E00008 */ jr $ra -/* 79C4B4 802A1514 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/battle/star/peach_focus_79BFA0/func_802A1518_79C4B8.s b/ver/us/asm/nonmatchings/battle/star/peach_focus_79BFA0/func_802A1518_79C4B8.s deleted file mode 100644 index 65b7e49e1c..0000000000 --- a/ver/us/asm/nonmatchings/battle/star/peach_focus_79BFA0/func_802A1518_79C4B8.s +++ /dev/null @@ -1,10 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1518_79C4B8 -/* 79C4B8 802A1518 8C830084 */ lw $v1, 0x84($a0) -/* 79C4BC 802A151C 8C620004 */ lw $v0, 4($v1) -/* 79C4C0 802A1520 24420001 */ addiu $v0, $v0, 1 -/* 79C4C4 802A1524 AC620004 */ sw $v0, 4($v1) -/* 79C4C8 802A1528 03E00008 */ jr $ra -/* 79C4CC 802A152C 24020002 */ addiu $v0, $zero, 2 diff --git a/ver/us/asm/nonmatchings/battle/star/refresh_78B600/func_802A1000_78B600.s b/ver/us/asm/nonmatchings/battle/star/refresh_78B600/func_802A1000_78B600.s deleted file mode 100644 index bbd32d5922..0000000000 --- a/ver/us/asm/nonmatchings/battle/star/refresh_78B600/func_802A1000_78B600.s +++ /dev/null @@ -1,47 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1000_78B600 -/* 78B600 802A1000 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 78B604 802A1004 AFB1001C */ sw $s1, 0x1c($sp) -/* 78B608 802A1008 0080882D */ daddu $s1, $a0, $zero -/* 78B60C 802A100C AFBF0024 */ sw $ra, 0x24($sp) -/* 78B610 802A1010 AFB20020 */ sw $s2, 0x20($sp) -/* 78B614 802A1014 AFB00018 */ sw $s0, 0x18($sp) -/* 78B618 802A1018 8E30000C */ lw $s0, 0xc($s1) -/* 78B61C 802A101C 8E050000 */ lw $a1, ($s0) -/* 78B620 802A1020 0C0B1EAF */ jal get_variable -/* 78B624 802A1024 26100004 */ addiu $s0, $s0, 4 -/* 78B628 802A1028 8E050000 */ lw $a1, ($s0) -/* 78B62C 802A102C 26100004 */ addiu $s0, $s0, 4 -/* 78B630 802A1030 0220202D */ daddu $a0, $s1, $zero -/* 78B634 802A1034 0C0B1EAF */ jal get_variable -/* 78B638 802A1038 0040902D */ daddu $s2, $v0, $zero -/* 78B63C 802A103C 0220202D */ daddu $a0, $s1, $zero -/* 78B640 802A1040 8E050000 */ lw $a1, ($s0) -/* 78B644 802A1044 0C0B1EAF */ jal get_variable -/* 78B648 802A1048 0040802D */ daddu $s0, $v0, $zero -/* 78B64C 802A104C 44921000 */ mtc1 $s2, $f2 -/* 78B650 802A1050 00000000 */ nop -/* 78B654 802A1054 468010A0 */ cvt.s.w $f2, $f2 -/* 78B658 802A1058 44051000 */ mfc1 $a1, $f2 -/* 78B65C 802A105C 44901000 */ mtc1 $s0, $f2 -/* 78B660 802A1060 00000000 */ nop -/* 78B664 802A1064 468010A0 */ cvt.s.w $f2, $f2 -/* 78B668 802A1068 44061000 */ mfc1 $a2, $f2 -/* 78B66C 802A106C 44821000 */ mtc1 $v0, $f2 -/* 78B670 802A1070 00000000 */ nop -/* 78B674 802A1074 468010A0 */ cvt.s.w $f2, $f2 -/* 78B678 802A1078 3C014220 */ lui $at, 0x4220 -/* 78B67C 802A107C 44810000 */ mtc1 $at, $f0 -/* 78B680 802A1080 44071000 */ mfc1 $a3, $f2 -/* 78B684 802A1084 0000202D */ daddu $a0, $zero, $zero -/* 78B688 802A1088 0C01BFBC */ jal func_8006FEF0 -/* 78B68C 802A108C E7A00010 */ swc1 $f0, 0x10($sp) -/* 78B690 802A1090 8FBF0024 */ lw $ra, 0x24($sp) -/* 78B694 802A1094 8FB20020 */ lw $s2, 0x20($sp) -/* 78B698 802A1098 8FB1001C */ lw $s1, 0x1c($sp) -/* 78B69C 802A109C 8FB00018 */ lw $s0, 0x18($sp) -/* 78B6A0 802A10A0 24020002 */ addiu $v0, $zero, 2 -/* 78B6A4 802A10A4 03E00008 */ jr $ra -/* 78B6A8 802A10A8 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/battle/star/refresh_78B600/func_802A10AC_78B6AC.s b/ver/us/asm/nonmatchings/battle/star/refresh_78B600/func_802A10AC_78B6AC.s deleted file mode 100644 index 9e49d55f6f..0000000000 --- a/ver/us/asm/nonmatchings/battle/star/refresh_78B600/func_802A10AC_78B6AC.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A10AC_78B6AC -/* 78B6AC 802A10AC 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 78B6B0 802A10B0 AFB10024 */ sw $s1, 0x24($sp) -/* 78B6B4 802A10B4 0080882D */ daddu $s1, $a0, $zero -/* 78B6B8 802A10B8 AFBF002C */ sw $ra, 0x2c($sp) -/* 78B6BC 802A10BC AFB20028 */ sw $s2, 0x28($sp) -/* 78B6C0 802A10C0 AFB00020 */ sw $s0, 0x20($sp) -/* 78B6C4 802A10C4 8E30000C */ lw $s0, 0xc($s1) -/* 78B6C8 802A10C8 8E050000 */ lw $a1, ($s0) -/* 78B6CC 802A10CC 0C0B1EAF */ jal get_variable -/* 78B6D0 802A10D0 26100004 */ addiu $s0, $s0, 4 -/* 78B6D4 802A10D4 8E050000 */ lw $a1, ($s0) -/* 78B6D8 802A10D8 26100004 */ addiu $s0, $s0, 4 -/* 78B6DC 802A10DC 0220202D */ daddu $a0, $s1, $zero -/* 78B6E0 802A10E0 0C0B1EAF */ jal get_variable -/* 78B6E4 802A10E4 0040902D */ daddu $s2, $v0, $zero -/* 78B6E8 802A10E8 0220202D */ daddu $a0, $s1, $zero -/* 78B6EC 802A10EC 8E050000 */ lw $a1, ($s0) -/* 78B6F0 802A10F0 0C0B1EAF */ jal get_variable -/* 78B6F4 802A10F4 0040802D */ daddu $s0, $v0, $zero -/* 78B6F8 802A10F8 24040005 */ addiu $a0, $zero, 5 -/* 78B6FC 802A10FC 44921000 */ mtc1 $s2, $f2 -/* 78B700 802A1100 00000000 */ nop -/* 78B704 802A1104 468010A0 */ cvt.s.w $f2, $f2 -/* 78B708 802A1108 44051000 */ mfc1 $a1, $f2 -/* 78B70C 802A110C 44901000 */ mtc1 $s0, $f2 -/* 78B710 802A1110 00000000 */ nop -/* 78B714 802A1114 468010A0 */ cvt.s.w $f2, $f2 -/* 78B718 802A1118 44061000 */ mfc1 $a2, $f2 -/* 78B71C 802A111C 44821000 */ mtc1 $v0, $f2 -/* 78B720 802A1120 00000000 */ nop -/* 78B724 802A1124 468010A0 */ cvt.s.w $f2, $f2 -/* 78B728 802A1128 3C014248 */ lui $at, 0x4248 -/* 78B72C 802A112C 44810000 */ mtc1 $at, $f0 -/* 78B730 802A1130 44071000 */ mfc1 $a3, $f2 -/* 78B734 802A1134 24030028 */ addiu $v1, $zero, 0x28 -/* 78B738 802A1138 AFA30018 */ sw $v1, 0x18($sp) -/* 78B73C 802A113C 2403001E */ addiu $v1, $zero, 0x1e -/* 78B740 802A1140 AFA3001C */ sw $v1, 0x1c($sp) -/* 78B744 802A1144 E7A00010 */ swc1 $f0, 0x10($sp) -/* 78B748 802A1148 0C01C154 */ jal func_80070550 -/* 78B74C 802A114C E7A00014 */ swc1 $f0, 0x14($sp) -/* 78B750 802A1150 8FBF002C */ lw $ra, 0x2c($sp) -/* 78B754 802A1154 8FB20028 */ lw $s2, 0x28($sp) -/* 78B758 802A1158 8FB10024 */ lw $s1, 0x24($sp) -/* 78B75C 802A115C 8FB00020 */ lw $s0, 0x20($sp) -/* 78B760 802A1160 24020002 */ addiu $v0, $zero, 2 -/* 78B764 802A1164 03E00008 */ jr $ra -/* 78B768 802A1168 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/battle/star/refresh_78B600/func_802A116C_78B76C.s b/ver/us/asm/nonmatchings/battle/star/refresh_78B600/func_802A116C_78B76C.s deleted file mode 100644 index c53e2ab073..0000000000 --- a/ver/us/asm/nonmatchings/battle/star/refresh_78B600/func_802A116C_78B76C.s +++ /dev/null @@ -1,47 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A116C_78B76C -/* 78B76C 802A116C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 78B770 802A1170 AFB1001C */ sw $s1, 0x1c($sp) -/* 78B774 802A1174 0080882D */ daddu $s1, $a0, $zero -/* 78B778 802A1178 AFBF0024 */ sw $ra, 0x24($sp) -/* 78B77C 802A117C AFB20020 */ sw $s2, 0x20($sp) -/* 78B780 802A1180 AFB00018 */ sw $s0, 0x18($sp) -/* 78B784 802A1184 8E30000C */ lw $s0, 0xc($s1) -/* 78B788 802A1188 8E050000 */ lw $a1, ($s0) -/* 78B78C 802A118C 0C0B1EAF */ jal get_variable -/* 78B790 802A1190 26100004 */ addiu $s0, $s0, 4 -/* 78B794 802A1194 8E050000 */ lw $a1, ($s0) -/* 78B798 802A1198 26100004 */ addiu $s0, $s0, 4 -/* 78B79C 802A119C 0220202D */ daddu $a0, $s1, $zero -/* 78B7A0 802A11A0 0C0B1EAF */ jal get_variable -/* 78B7A4 802A11A4 0040902D */ daddu $s2, $v0, $zero -/* 78B7A8 802A11A8 0220202D */ daddu $a0, $s1, $zero -/* 78B7AC 802A11AC 8E050000 */ lw $a1, ($s0) -/* 78B7B0 802A11B0 0C0B1EAF */ jal get_variable -/* 78B7B4 802A11B4 0040802D */ daddu $s0, $v0, $zero -/* 78B7B8 802A11B8 44921000 */ mtc1 $s2, $f2 -/* 78B7BC 802A11BC 00000000 */ nop -/* 78B7C0 802A11C0 468010A0 */ cvt.s.w $f2, $f2 -/* 78B7C4 802A11C4 44051000 */ mfc1 $a1, $f2 -/* 78B7C8 802A11C8 44901000 */ mtc1 $s0, $f2 -/* 78B7CC 802A11CC 00000000 */ nop -/* 78B7D0 802A11D0 468010A0 */ cvt.s.w $f2, $f2 -/* 78B7D4 802A11D4 44061000 */ mfc1 $a2, $f2 -/* 78B7D8 802A11D8 44821000 */ mtc1 $v0, $f2 -/* 78B7DC 802A11DC 00000000 */ nop -/* 78B7E0 802A11E0 468010A0 */ cvt.s.w $f2, $f2 -/* 78B7E4 802A11E4 3C0141F0 */ lui $at, 0x41f0 -/* 78B7E8 802A11E8 44810000 */ mtc1 $at, $f0 -/* 78B7EC 802A11EC 44071000 */ mfc1 $a3, $f2 -/* 78B7F0 802A11F0 0000202D */ daddu $a0, $zero, $zero -/* 78B7F4 802A11F4 0C01BFBC */ jal func_8006FEF0 -/* 78B7F8 802A11F8 E7A00010 */ swc1 $f0, 0x10($sp) -/* 78B7FC 802A11FC 8FBF0024 */ lw $ra, 0x24($sp) -/* 78B800 802A1200 8FB20020 */ lw $s2, 0x20($sp) -/* 78B804 802A1204 8FB1001C */ lw $s1, 0x1c($sp) -/* 78B808 802A1208 8FB00018 */ lw $s0, 0x18($sp) -/* 78B80C 802A120C 24020002 */ addiu $v0, $zero, 2 -/* 78B810 802A1210 03E00008 */ jr $ra -/* 78B814 802A1214 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/battle/star/refresh_78B600/func_802A1218_78B818.s b/ver/us/asm/nonmatchings/battle/star/refresh_78B600/func_802A1218_78B818.s deleted file mode 100644 index 9223211c70..0000000000 --- a/ver/us/asm/nonmatchings/battle/star/refresh_78B600/func_802A1218_78B818.s +++ /dev/null @@ -1,55 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1218_78B818 -/* 78B818 802A1218 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* 78B81C 802A121C AFB1002C */ sw $s1, 0x2c($sp) -/* 78B820 802A1220 0080882D */ daddu $s1, $a0, $zero -/* 78B824 802A1224 AFBF0034 */ sw $ra, 0x34($sp) -/* 78B828 802A1228 AFB20030 */ sw $s2, 0x30($sp) -/* 78B82C 802A122C AFB00028 */ sw $s0, 0x28($sp) -/* 78B830 802A1230 8E30000C */ lw $s0, 0xc($s1) -/* 78B834 802A1234 8E050000 */ lw $a1, ($s0) -/* 78B838 802A1238 0C0B1EAF */ jal get_variable -/* 78B83C 802A123C 26100004 */ addiu $s0, $s0, 4 -/* 78B840 802A1240 8E050000 */ lw $a1, ($s0) -/* 78B844 802A1244 26100004 */ addiu $s0, $s0, 4 -/* 78B848 802A1248 0220202D */ daddu $a0, $s1, $zero -/* 78B84C 802A124C 0C0B1EAF */ jal get_variable -/* 78B850 802A1250 0040902D */ daddu $s2, $v0, $zero -/* 78B854 802A1254 0220202D */ daddu $a0, $s1, $zero -/* 78B858 802A1258 8E050000 */ lw $a1, ($s0) -/* 78B85C 802A125C 0C0B1EAF */ jal get_variable -/* 78B860 802A1260 0040802D */ daddu $s0, $v0, $zero -/* 78B864 802A1264 24040004 */ addiu $a0, $zero, 4 -/* 78B868 802A1268 44922000 */ mtc1 $s2, $f4 -/* 78B86C 802A126C 00000000 */ nop -/* 78B870 802A1270 46802120 */ cvt.s.w $f4, $f4 -/* 78B874 802A1274 44052000 */ mfc1 $a1, $f4 -/* 78B878 802A1278 44902000 */ mtc1 $s0, $f4 -/* 78B87C 802A127C 00000000 */ nop -/* 78B880 802A1280 46802120 */ cvt.s.w $f4, $f4 -/* 78B884 802A1284 44062000 */ mfc1 $a2, $f4 -/* 78B888 802A1288 44822000 */ mtc1 $v0, $f4 -/* 78B88C 802A128C 00000000 */ nop -/* 78B890 802A1290 46802120 */ cvt.s.w $f4, $f4 -/* 78B894 802A1294 3C0141A0 */ lui $at, 0x41a0 -/* 78B898 802A1298 44810000 */ mtc1 $at, $f0 -/* 78B89C 802A129C 3C013F80 */ lui $at, 0x3f80 -/* 78B8A0 802A12A0 44811000 */ mtc1 $at, $f2 -/* 78B8A4 802A12A4 44072000 */ mfc1 $a3, $f4 -/* 78B8A8 802A12A8 2403000A */ addiu $v1, $zero, 0xa -/* 78B8AC 802A12AC AFA3001C */ sw $v1, 0x1c($sp) -/* 78B8B0 802A12B0 2403000F */ addiu $v1, $zero, 0xf -/* 78B8B4 802A12B4 AFA30020 */ sw $v1, 0x20($sp) -/* 78B8B8 802A12B8 E7A00010 */ swc1 $f0, 0x10($sp) -/* 78B8BC 802A12BC E7A00014 */ swc1 $f0, 0x14($sp) -/* 78B8C0 802A12C0 0C01C8D4 */ jal func_80072350 -/* 78B8C4 802A12C4 E7A20018 */ swc1 $f2, 0x18($sp) -/* 78B8C8 802A12C8 8FBF0034 */ lw $ra, 0x34($sp) -/* 78B8CC 802A12CC 8FB20030 */ lw $s2, 0x30($sp) -/* 78B8D0 802A12D0 8FB1002C */ lw $s1, 0x2c($sp) -/* 78B8D4 802A12D4 8FB00028 */ lw $s0, 0x28($sp) -/* 78B8D8 802A12D8 24020002 */ addiu $v0, $zero, 2 -/* 78B8DC 802A12DC 03E00008 */ jr $ra -/* 78B8E0 802A12E0 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/ver/us/asm/nonmatchings/battle/star/refresh_78B600/func_802A137C_78B97C.s b/ver/us/asm/nonmatchings/battle/star/refresh_78B600/func_802A137C_78B97C.s deleted file mode 100644 index 8a5cb2dbed..0000000000 --- a/ver/us/asm/nonmatchings/battle/star/refresh_78B600/func_802A137C_78B97C.s +++ /dev/null @@ -1,44 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A137C_78B97C -/* 78B97C 802A137C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 78B980 802A1380 AFB00010 */ sw $s0, 0x10($sp) -/* 78B984 802A1384 0080802D */ daddu $s0, $a0, $zero -/* 78B988 802A1388 10A0000D */ beqz $a1, .L802A13C0 -/* 78B98C 802A138C AFBF0014 */ sw $ra, 0x14($sp) -/* 78B990 802A1390 0C04760B */ jal func_8011D82C -/* 78B994 802A1394 24040001 */ addiu $a0, $zero, 1 -/* 78B998 802A1398 0000202D */ daddu $a0, $zero, $zero -/* 78B99C 802A139C 0080282D */ daddu $a1, $a0, $zero -/* 78B9A0 802A13A0 0080302D */ daddu $a2, $a0, $zero -/* 78B9A4 802A13A4 0080382D */ daddu $a3, $a0, $zero -/* 78B9A8 802A13A8 3C038015 */ lui $v1, %hi(D_801512F0) -/* 78B9AC 802A13AC 8C6312F0 */ lw $v1, %lo(D_801512F0)($v1) -/* 78B9B0 802A13B0 24020001 */ addiu $v0, $zero, 1 -/* 78B9B4 802A13B4 0C046F97 */ jal set_background_color_blend -/* 78B9B8 802A13B8 A0620000 */ sb $v0, ($v1) -/* 78B9BC 802A13BC AE000070 */ sw $zero, 0x70($s0) -.L802A13C0: -/* 78B9C0 802A13C0 0000202D */ daddu $a0, $zero, $zero -/* 78B9C4 802A13C4 0080282D */ daddu $a1, $a0, $zero -/* 78B9C8 802A13C8 92070073 */ lbu $a3, 0x73($s0) -/* 78B9CC 802A13CC 0C046F97 */ jal set_background_color_blend -/* 78B9D0 802A13D0 0080302D */ daddu $a2, $a0, $zero -/* 78B9D4 802A13D4 8E020070 */ lw $v0, 0x70($s0) -/* 78B9D8 802A13D8 2442000A */ addiu $v0, $v0, 0xa -/* 78B9DC 802A13DC AE020070 */ sw $v0, 0x70($s0) -/* 78B9E0 802A13E0 284200E6 */ slti $v0, $v0, 0xe6 -/* 78B9E4 802A13E4 14400007 */ bnez $v0, .L802A1404 -/* 78B9E8 802A13E8 0000102D */ daddu $v0, $zero, $zero -/* 78B9EC 802A13EC 0000202D */ daddu $a0, $zero, $zero -/* 78B9F0 802A13F0 0080282D */ daddu $a1, $a0, $zero -/* 78B9F4 802A13F4 0080302D */ daddu $a2, $a0, $zero -/* 78B9F8 802A13F8 0C046F97 */ jal set_background_color_blend -/* 78B9FC 802A13FC 240700E6 */ addiu $a3, $zero, 0xe6 -/* 78BA00 802A1400 24020002 */ addiu $v0, $zero, 2 -.L802A1404: -/* 78BA04 802A1404 8FBF0014 */ lw $ra, 0x14($sp) -/* 78BA08 802A1408 8FB00010 */ lw $s0, 0x10($sp) -/* 78BA0C 802A140C 03E00008 */ jr $ra -/* 78BA10 802A1410 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/battle/star/refresh_78B600/func_802A1414_78BA14.s b/ver/us/asm/nonmatchings/battle/star/refresh_78B600/func_802A1414_78BA14.s deleted file mode 100644 index 2fff20fbcf..0000000000 --- a/ver/us/asm/nonmatchings/battle/star/refresh_78B600/func_802A1414_78BA14.s +++ /dev/null @@ -1,39 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1414_78BA14 -/* 78BA14 802A1414 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 78BA18 802A1418 AFB00010 */ sw $s0, 0x10($sp) -/* 78BA1C 802A141C 0080802D */ daddu $s0, $a0, $zero -/* 78BA20 802A1420 10A00003 */ beqz $a1, .L802A1430 -/* 78BA24 802A1424 AFBF0014 */ sw $ra, 0x14($sp) -/* 78BA28 802A1428 24020014 */ addiu $v0, $zero, 0x14 -/* 78BA2C 802A142C AE020070 */ sw $v0, 0x70($s0) -.L802A1430: -/* 78BA30 802A1430 0000202D */ daddu $a0, $zero, $zero -/* 78BA34 802A1434 0080282D */ daddu $a1, $a0, $zero -/* 78BA38 802A1438 8E020070 */ lw $v0, 0x70($s0) -/* 78BA3C 802A143C 0080302D */ daddu $a2, $a0, $zero -/* 78BA40 802A1440 00023880 */ sll $a3, $v0, 2 -/* 78BA44 802A1444 00E23821 */ addu $a3, $a3, $v0 -/* 78BA48 802A1448 00073840 */ sll $a3, $a3, 1 -/* 78BA4C 802A144C 0C046F97 */ jal set_background_color_blend -/* 78BA50 802A1450 30E700FE */ andi $a3, $a3, 0xfe -/* 78BA54 802A1454 8E020070 */ lw $v0, 0x70($s0) -/* 78BA58 802A1458 2442FFFF */ addiu $v0, $v0, -1 -/* 78BA5C 802A145C 10400003 */ beqz $v0, .L802A146C -/* 78BA60 802A1460 AE020070 */ sw $v0, 0x70($s0) -/* 78BA64 802A1464 080A8521 */ j .L802A1484 -/* 78BA68 802A1468 0000102D */ daddu $v0, $zero, $zero -.L802A146C: -/* 78BA6C 802A146C 0000202D */ daddu $a0, $zero, $zero -/* 78BA70 802A1470 0080282D */ daddu $a1, $a0, $zero -/* 78BA74 802A1474 0080302D */ daddu $a2, $a0, $zero -/* 78BA78 802A1478 0C046F97 */ jal set_background_color_blend -/* 78BA7C 802A147C 0080382D */ daddu $a3, $a0, $zero -/* 78BA80 802A1480 24020002 */ addiu $v0, $zero, 2 -.L802A1484: -/* 78BA84 802A1484 8FBF0014 */ lw $ra, 0x14($sp) -/* 78BA88 802A1488 8FB00010 */ lw $s0, 0x10($sp) -/* 78BA8C 802A148C 03E00008 */ jr $ra -/* 78BA90 802A1490 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/battle/star/refresh_78B600/func_802A14E8_78BAE8.s b/ver/us/asm/nonmatchings/battle/star/refresh_78B600/func_802A14E8_78BAE8.s deleted file mode 100644 index faaa817754..0000000000 --- a/ver/us/asm/nonmatchings/battle/star/refresh_78B600/func_802A14E8_78BAE8.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A14E8_78BAE8 -/* 78BAE8 802A14E8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 78BAEC 802A14EC AFBF0010 */ sw $ra, 0x10($sp) -/* 78BAF0 802A14F0 0C00EABB */ jal get_npc_unsafe -/* 78BAF4 802A14F4 24040064 */ addiu $a0, $zero, 0x64 -/* 78BAF8 802A14F8 0040202D */ daddu $a0, $v0, $zero -/* 78BAFC 802A14FC 24030020 */ addiu $v1, $zero, 0x20 -/* 78BB00 802A1500 A48300A8 */ sh $v1, 0xa8($a0) -/* 78BB04 802A1504 A48300A6 */ sh $v1, 0xa6($a0) -/* 78BB08 802A1508 8FBF0010 */ lw $ra, 0x10($sp) -/* 78BB0C 802A150C 24020002 */ addiu $v0, $zero, 2 -/* 78BB10 802A1510 03E00008 */ jr $ra -/* 78BB14 802A1514 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/battle/star/refresh_78B600/func_802A17D4_78BDD4.s b/ver/us/asm/nonmatchings/battle/star/refresh_78B600/func_802A17D4_78BDD4.s deleted file mode 100644 index 7744a8c4fc..0000000000 --- a/ver/us/asm/nonmatchings/battle/star/refresh_78B600/func_802A17D4_78BDD4.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A17D4_78BDD4 -/* 78BDD4 802A17D4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 78BDD8 802A17D8 AFB00010 */ sw $s0, 0x10($sp) -/* 78BDDC 802A17DC 3C10800E */ lui $s0, %hi(gBattleStatus+0xD8) -/* 78BDE0 802A17E0 8E10C148 */ lw $s0, %lo(gBattleStatus+0xD8)($s0) -/* 78BDE4 802A17E4 AFBF0014 */ sw $ra, 0x14($sp) -/* 78BDE8 802A17E8 82020210 */ lb $v0, 0x210($s0) -/* 78BDEC 802A17EC 10400005 */ beqz $v0, .L802A1804 -/* 78BDF0 802A17F0 00000000 */ nop -/* 78BDF4 802A17F4 86040436 */ lh $a0, 0x436($s0) -/* 78BDF8 802A17F8 A2000211 */ sb $zero, 0x211($s0) -/* 78BDFC 802A17FC 0C011E26 */ jal func_80047898 -/* 78BE00 802A1800 A2000210 */ sb $zero, 0x210($s0) -.L802A1804: -/* 78BE04 802A1804 82020216 */ lb $v0, 0x216($s0) -/* 78BE08 802A1808 10400006 */ beqz $v0, .L802A1824 -/* 78BE0C 802A180C 00000000 */ nop -/* 78BE10 802A1810 8E020440 */ lw $v0, 0x440($s0) -/* 78BE14 802A1814 A2000217 */ sb $zero, 0x217($s0) -/* 78BE18 802A1818 A2000216 */ sb $zero, 0x216($s0) -/* 78BE1C 802A181C 8C42000C */ lw $v0, 0xc($v0) -/* 78BE20 802A1820 AC40003C */ sw $zero, 0x3c($v0) -.L802A1824: -/* 78BE24 802A1824 0C099DDF */ jal func_8026777C -/* 78BE28 802A1828 00000000 */ nop -/* 78BE2C 802A182C 8FBF0014 */ lw $ra, 0x14($sp) -/* 78BE30 802A1830 8FB00010 */ lw $s0, 0x10($sp) -/* 78BE34 802A1834 24020002 */ addiu $v0, $zero, 2 -/* 78BE38 802A1838 03E00008 */ jr $ra -/* 78BE3C 802A183C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/battle/star/refresh_78B600/func_802A1840_78BE40.s b/ver/us/asm/nonmatchings/battle/star/refresh_78B600/func_802A1840_78BE40.s deleted file mode 100644 index f1d3350323..0000000000 --- a/ver/us/asm/nonmatchings/battle/star/refresh_78B600/func_802A1840_78BE40.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1840_78BE40 -/* 78BE40 802A1840 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 78BE44 802A1844 AFBF0014 */ sw $ra, 0x14($sp) -/* 78BE48 802A1848 AFB00010 */ sw $s0, 0x10($sp) -/* 78BE4C 802A184C 8C82000C */ lw $v0, 0xc($a0) -/* 78BE50 802A1850 0C0B1EAF */ jal get_variable -/* 78BE54 802A1854 8C450000 */ lw $a1, ($v0) -/* 78BE58 802A1858 3C038011 */ lui $v1, %hi(gPlayerData) -/* 78BE5C 802A185C 2463F290 */ addiu $v1, $v1, %lo(gPlayerData) -/* 78BE60 802A1860 80640002 */ lb $a0, 2($v1) -/* 78BE64 802A1864 80650003 */ lb $a1, 3($v1) -/* 78BE68 802A1868 00822021 */ addu $a0, $a0, $v0 -/* 78BE6C 802A186C 00A4102A */ slt $v0, $a1, $a0 -/* 78BE70 802A1870 10400002 */ beqz $v0, .L802A187C -/* 78BE74 802A1874 0060802D */ daddu $s0, $v1, $zero -/* 78BE78 802A1878 00A0202D */ daddu $a0, $a1, $zero -.L802A187C: -/* 78BE7C 802A187C A2040002 */ sb $a0, 2($s0) -/* 78BE80 802A1880 8FBF0014 */ lw $ra, 0x14($sp) -/* 78BE84 802A1884 8FB00010 */ lw $s0, 0x10($sp) -/* 78BE88 802A1888 24020002 */ addiu $v0, $zero, 2 -/* 78BE8C 802A188C 03E00008 */ jr $ra -/* 78BE90 802A1890 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/battle/star/refresh_78B600/func_802A1894_78BE94.s b/ver/us/asm/nonmatchings/battle/star/refresh_78B600/func_802A1894_78BE94.s deleted file mode 100644 index e6a9a61513..0000000000 --- a/ver/us/asm/nonmatchings/battle/star/refresh_78B600/func_802A1894_78BE94.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1894_78BE94 -/* 78BE94 802A1894 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 78BE98 802A1898 AFBF0014 */ sw $ra, 0x14($sp) -/* 78BE9C 802A189C AFB00010 */ sw $s0, 0x10($sp) -/* 78BEA0 802A18A0 8C82000C */ lw $v0, 0xc($a0) -/* 78BEA4 802A18A4 0C0B1EAF */ jal get_variable -/* 78BEA8 802A18A8 8C450000 */ lw $a1, ($v0) -/* 78BEAC 802A18AC 3C038011 */ lui $v1, %hi(gPlayerData) -/* 78BEB0 802A18B0 2463F290 */ addiu $v1, $v1, %lo(gPlayerData) -/* 78BEB4 802A18B4 80640005 */ lb $a0, 5($v1) -/* 78BEB8 802A18B8 80650006 */ lb $a1, 6($v1) -/* 78BEBC 802A18BC 00822021 */ addu $a0, $a0, $v0 -/* 78BEC0 802A18C0 00A4102A */ slt $v0, $a1, $a0 -/* 78BEC4 802A18C4 10400002 */ beqz $v0, .L802A18D0 -/* 78BEC8 802A18C8 0060802D */ daddu $s0, $v1, $zero -/* 78BECC 802A18CC 00A0202D */ daddu $a0, $a1, $zero -.L802A18D0: -/* 78BED0 802A18D0 A2040005 */ sb $a0, 5($s0) -/* 78BED4 802A18D4 8FBF0014 */ lw $ra, 0x14($sp) -/* 78BED8 802A18D8 8FB00010 */ lw $s0, 0x10($sp) -/* 78BEDC 802A18DC 24020002 */ addiu $v0, $zero, 2 -/* 78BEE0 802A18E0 03E00008 */ jr $ra -/* 78BEE4 802A18E4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/battle/star/smooch_791D90/func_802A1000_791D90.s b/ver/us/asm/nonmatchings/battle/star/smooch_791D90/func_802A1000_791D90.s deleted file mode 100644 index b8f0b1b092..0000000000 --- a/ver/us/asm/nonmatchings/battle/star/smooch_791D90/func_802A1000_791D90.s +++ /dev/null @@ -1,47 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1000_791D90 -/* 791D90 802A1000 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 791D94 802A1004 AFB1001C */ sw $s1, 0x1c($sp) -/* 791D98 802A1008 0080882D */ daddu $s1, $a0, $zero -/* 791D9C 802A100C AFBF0024 */ sw $ra, 0x24($sp) -/* 791DA0 802A1010 AFB20020 */ sw $s2, 0x20($sp) -/* 791DA4 802A1014 AFB00018 */ sw $s0, 0x18($sp) -/* 791DA8 802A1018 8E30000C */ lw $s0, 0xc($s1) -/* 791DAC 802A101C 8E050000 */ lw $a1, ($s0) -/* 791DB0 802A1020 0C0B1EAF */ jal get_variable -/* 791DB4 802A1024 26100004 */ addiu $s0, $s0, 4 -/* 791DB8 802A1028 8E050000 */ lw $a1, ($s0) -/* 791DBC 802A102C 26100004 */ addiu $s0, $s0, 4 -/* 791DC0 802A1030 0220202D */ daddu $a0, $s1, $zero -/* 791DC4 802A1034 0C0B1EAF */ jal get_variable -/* 791DC8 802A1038 0040902D */ daddu $s2, $v0, $zero -/* 791DCC 802A103C 0220202D */ daddu $a0, $s1, $zero -/* 791DD0 802A1040 8E050000 */ lw $a1, ($s0) -/* 791DD4 802A1044 0C0B1EAF */ jal get_variable -/* 791DD8 802A1048 0040802D */ daddu $s0, $v0, $zero -/* 791DDC 802A104C 44921000 */ mtc1 $s2, $f2 -/* 791DE0 802A1050 00000000 */ nop -/* 791DE4 802A1054 468010A0 */ cvt.s.w $f2, $f2 -/* 791DE8 802A1058 44051000 */ mfc1 $a1, $f2 -/* 791DEC 802A105C 44901000 */ mtc1 $s0, $f2 -/* 791DF0 802A1060 00000000 */ nop -/* 791DF4 802A1064 468010A0 */ cvt.s.w $f2, $f2 -/* 791DF8 802A1068 44061000 */ mfc1 $a2, $f2 -/* 791DFC 802A106C 44821000 */ mtc1 $v0, $f2 -/* 791E00 802A1070 00000000 */ nop -/* 791E04 802A1074 468010A0 */ cvt.s.w $f2, $f2 -/* 791E08 802A1078 3C014220 */ lui $at, 0x4220 -/* 791E0C 802A107C 44810000 */ mtc1 $at, $f0 -/* 791E10 802A1080 44071000 */ mfc1 $a3, $f2 -/* 791E14 802A1084 0000202D */ daddu $a0, $zero, $zero -/* 791E18 802A1088 0C01BFBC */ jal func_8006FEF0 -/* 791E1C 802A108C E7A00010 */ swc1 $f0, 0x10($sp) -/* 791E20 802A1090 8FBF0024 */ lw $ra, 0x24($sp) -/* 791E24 802A1094 8FB20020 */ lw $s2, 0x20($sp) -/* 791E28 802A1098 8FB1001C */ lw $s1, 0x1c($sp) -/* 791E2C 802A109C 8FB00018 */ lw $s0, 0x18($sp) -/* 791E30 802A10A0 24020002 */ addiu $v0, $zero, 2 -/* 791E34 802A10A4 03E00008 */ jr $ra -/* 791E38 802A10A8 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/battle/star/smooch_791D90/func_802A10AC_791E3C.s b/ver/us/asm/nonmatchings/battle/star/smooch_791D90/func_802A10AC_791E3C.s deleted file mode 100644 index a369397ea1..0000000000 --- a/ver/us/asm/nonmatchings/battle/star/smooch_791D90/func_802A10AC_791E3C.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A10AC_791E3C -/* 791E3C 802A10AC 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 791E40 802A10B0 AFB10024 */ sw $s1, 0x24($sp) -/* 791E44 802A10B4 0080882D */ daddu $s1, $a0, $zero -/* 791E48 802A10B8 AFBF002C */ sw $ra, 0x2c($sp) -/* 791E4C 802A10BC AFB20028 */ sw $s2, 0x28($sp) -/* 791E50 802A10C0 AFB00020 */ sw $s0, 0x20($sp) -/* 791E54 802A10C4 8E30000C */ lw $s0, 0xc($s1) -/* 791E58 802A10C8 8E050000 */ lw $a1, ($s0) -/* 791E5C 802A10CC 0C0B1EAF */ jal get_variable -/* 791E60 802A10D0 26100004 */ addiu $s0, $s0, 4 -/* 791E64 802A10D4 8E050000 */ lw $a1, ($s0) -/* 791E68 802A10D8 26100004 */ addiu $s0, $s0, 4 -/* 791E6C 802A10DC 0220202D */ daddu $a0, $s1, $zero -/* 791E70 802A10E0 0C0B1EAF */ jal get_variable -/* 791E74 802A10E4 0040902D */ daddu $s2, $v0, $zero -/* 791E78 802A10E8 0220202D */ daddu $a0, $s1, $zero -/* 791E7C 802A10EC 8E050000 */ lw $a1, ($s0) -/* 791E80 802A10F0 0C0B1EAF */ jal get_variable -/* 791E84 802A10F4 0040802D */ daddu $s0, $v0, $zero -/* 791E88 802A10F8 24040005 */ addiu $a0, $zero, 5 -/* 791E8C 802A10FC 44921000 */ mtc1 $s2, $f2 -/* 791E90 802A1100 00000000 */ nop -/* 791E94 802A1104 468010A0 */ cvt.s.w $f2, $f2 -/* 791E98 802A1108 44051000 */ mfc1 $a1, $f2 -/* 791E9C 802A110C 44901000 */ mtc1 $s0, $f2 -/* 791EA0 802A1110 00000000 */ nop -/* 791EA4 802A1114 468010A0 */ cvt.s.w $f2, $f2 -/* 791EA8 802A1118 44061000 */ mfc1 $a2, $f2 -/* 791EAC 802A111C 44821000 */ mtc1 $v0, $f2 -/* 791EB0 802A1120 00000000 */ nop -/* 791EB4 802A1124 468010A0 */ cvt.s.w $f2, $f2 -/* 791EB8 802A1128 3C014248 */ lui $at, 0x4248 -/* 791EBC 802A112C 44810000 */ mtc1 $at, $f0 -/* 791EC0 802A1130 44071000 */ mfc1 $a3, $f2 -/* 791EC4 802A1134 24030028 */ addiu $v1, $zero, 0x28 -/* 791EC8 802A1138 AFA30018 */ sw $v1, 0x18($sp) -/* 791ECC 802A113C 2403001E */ addiu $v1, $zero, 0x1e -/* 791ED0 802A1140 AFA3001C */ sw $v1, 0x1c($sp) -/* 791ED4 802A1144 E7A00010 */ swc1 $f0, 0x10($sp) -/* 791ED8 802A1148 0C01C154 */ jal func_80070550 -/* 791EDC 802A114C E7A00014 */ swc1 $f0, 0x14($sp) -/* 791EE0 802A1150 8FBF002C */ lw $ra, 0x2c($sp) -/* 791EE4 802A1154 8FB20028 */ lw $s2, 0x28($sp) -/* 791EE8 802A1158 8FB10024 */ lw $s1, 0x24($sp) -/* 791EEC 802A115C 8FB00020 */ lw $s0, 0x20($sp) -/* 791EF0 802A1160 24020002 */ addiu $v0, $zero, 2 -/* 791EF4 802A1164 03E00008 */ jr $ra -/* 791EF8 802A1168 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/battle/star/smooch_791D90/func_802A116C_791EFC.s b/ver/us/asm/nonmatchings/battle/star/smooch_791D90/func_802A116C_791EFC.s deleted file mode 100644 index 078584a464..0000000000 --- a/ver/us/asm/nonmatchings/battle/star/smooch_791D90/func_802A116C_791EFC.s +++ /dev/null @@ -1,47 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A116C_791EFC -/* 791EFC 802A116C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 791F00 802A1170 AFB1001C */ sw $s1, 0x1c($sp) -/* 791F04 802A1174 0080882D */ daddu $s1, $a0, $zero -/* 791F08 802A1178 AFBF0024 */ sw $ra, 0x24($sp) -/* 791F0C 802A117C AFB20020 */ sw $s2, 0x20($sp) -/* 791F10 802A1180 AFB00018 */ sw $s0, 0x18($sp) -/* 791F14 802A1184 8E30000C */ lw $s0, 0xc($s1) -/* 791F18 802A1188 8E050000 */ lw $a1, ($s0) -/* 791F1C 802A118C 0C0B1EAF */ jal get_variable -/* 791F20 802A1190 26100004 */ addiu $s0, $s0, 4 -/* 791F24 802A1194 8E050000 */ lw $a1, ($s0) -/* 791F28 802A1198 26100004 */ addiu $s0, $s0, 4 -/* 791F2C 802A119C 0220202D */ daddu $a0, $s1, $zero -/* 791F30 802A11A0 0C0B1EAF */ jal get_variable -/* 791F34 802A11A4 0040902D */ daddu $s2, $v0, $zero -/* 791F38 802A11A8 0220202D */ daddu $a0, $s1, $zero -/* 791F3C 802A11AC 8E050000 */ lw $a1, ($s0) -/* 791F40 802A11B0 0C0B1EAF */ jal get_variable -/* 791F44 802A11B4 0040802D */ daddu $s0, $v0, $zero -/* 791F48 802A11B8 44921000 */ mtc1 $s2, $f2 -/* 791F4C 802A11BC 00000000 */ nop -/* 791F50 802A11C0 468010A0 */ cvt.s.w $f2, $f2 -/* 791F54 802A11C4 44051000 */ mfc1 $a1, $f2 -/* 791F58 802A11C8 44901000 */ mtc1 $s0, $f2 -/* 791F5C 802A11CC 00000000 */ nop -/* 791F60 802A11D0 468010A0 */ cvt.s.w $f2, $f2 -/* 791F64 802A11D4 44061000 */ mfc1 $a2, $f2 -/* 791F68 802A11D8 44821000 */ mtc1 $v0, $f2 -/* 791F6C 802A11DC 00000000 */ nop -/* 791F70 802A11E0 468010A0 */ cvt.s.w $f2, $f2 -/* 791F74 802A11E4 3C0141F0 */ lui $at, 0x41f0 -/* 791F78 802A11E8 44810000 */ mtc1 $at, $f0 -/* 791F7C 802A11EC 44071000 */ mfc1 $a3, $f2 -/* 791F80 802A11F0 0000202D */ daddu $a0, $zero, $zero -/* 791F84 802A11F4 0C01BFBC */ jal func_8006FEF0 -/* 791F88 802A11F8 E7A00010 */ swc1 $f0, 0x10($sp) -/* 791F8C 802A11FC 8FBF0024 */ lw $ra, 0x24($sp) -/* 791F90 802A1200 8FB20020 */ lw $s2, 0x20($sp) -/* 791F94 802A1204 8FB1001C */ lw $s1, 0x1c($sp) -/* 791F98 802A1208 8FB00018 */ lw $s0, 0x18($sp) -/* 791F9C 802A120C 24020002 */ addiu $v0, $zero, 2 -/* 791FA0 802A1210 03E00008 */ jr $ra -/* 791FA4 802A1214 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/battle/star/smooch_791D90/func_802A1218_791FA8.s b/ver/us/asm/nonmatchings/battle/star/smooch_791D90/func_802A1218_791FA8.s deleted file mode 100644 index a2e240b711..0000000000 --- a/ver/us/asm/nonmatchings/battle/star/smooch_791D90/func_802A1218_791FA8.s +++ /dev/null @@ -1,55 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1218_791FA8 -/* 791FA8 802A1218 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* 791FAC 802A121C AFB1002C */ sw $s1, 0x2c($sp) -/* 791FB0 802A1220 0080882D */ daddu $s1, $a0, $zero -/* 791FB4 802A1224 AFBF0034 */ sw $ra, 0x34($sp) -/* 791FB8 802A1228 AFB20030 */ sw $s2, 0x30($sp) -/* 791FBC 802A122C AFB00028 */ sw $s0, 0x28($sp) -/* 791FC0 802A1230 8E30000C */ lw $s0, 0xc($s1) -/* 791FC4 802A1234 8E050000 */ lw $a1, ($s0) -/* 791FC8 802A1238 0C0B1EAF */ jal get_variable -/* 791FCC 802A123C 26100004 */ addiu $s0, $s0, 4 -/* 791FD0 802A1240 8E050000 */ lw $a1, ($s0) -/* 791FD4 802A1244 26100004 */ addiu $s0, $s0, 4 -/* 791FD8 802A1248 0220202D */ daddu $a0, $s1, $zero -/* 791FDC 802A124C 0C0B1EAF */ jal get_variable -/* 791FE0 802A1250 0040902D */ daddu $s2, $v0, $zero -/* 791FE4 802A1254 0220202D */ daddu $a0, $s1, $zero -/* 791FE8 802A1258 8E050000 */ lw $a1, ($s0) -/* 791FEC 802A125C 0C0B1EAF */ jal get_variable -/* 791FF0 802A1260 0040802D */ daddu $s0, $v0, $zero -/* 791FF4 802A1264 24040004 */ addiu $a0, $zero, 4 -/* 791FF8 802A1268 44922000 */ mtc1 $s2, $f4 -/* 791FFC 802A126C 00000000 */ nop -/* 792000 802A1270 46802120 */ cvt.s.w $f4, $f4 -/* 792004 802A1274 44052000 */ mfc1 $a1, $f4 -/* 792008 802A1278 44902000 */ mtc1 $s0, $f4 -/* 79200C 802A127C 00000000 */ nop -/* 792010 802A1280 46802120 */ cvt.s.w $f4, $f4 -/* 792014 802A1284 44062000 */ mfc1 $a2, $f4 -/* 792018 802A1288 44822000 */ mtc1 $v0, $f4 -/* 79201C 802A128C 00000000 */ nop -/* 792020 802A1290 46802120 */ cvt.s.w $f4, $f4 -/* 792024 802A1294 3C0141A0 */ lui $at, 0x41a0 -/* 792028 802A1298 44810000 */ mtc1 $at, $f0 -/* 79202C 802A129C 3C013F80 */ lui $at, 0x3f80 -/* 792030 802A12A0 44811000 */ mtc1 $at, $f2 -/* 792034 802A12A4 44072000 */ mfc1 $a3, $f4 -/* 792038 802A12A8 2403000A */ addiu $v1, $zero, 0xa -/* 79203C 802A12AC AFA3001C */ sw $v1, 0x1c($sp) -/* 792040 802A12B0 2403000F */ addiu $v1, $zero, 0xf -/* 792044 802A12B4 AFA30020 */ sw $v1, 0x20($sp) -/* 792048 802A12B8 E7A00010 */ swc1 $f0, 0x10($sp) -/* 79204C 802A12BC E7A00014 */ swc1 $f0, 0x14($sp) -/* 792050 802A12C0 0C01C8D4 */ jal func_80072350 -/* 792054 802A12C4 E7A20018 */ swc1 $f2, 0x18($sp) -/* 792058 802A12C8 8FBF0034 */ lw $ra, 0x34($sp) -/* 79205C 802A12CC 8FB20030 */ lw $s2, 0x30($sp) -/* 792060 802A12D0 8FB1002C */ lw $s1, 0x2c($sp) -/* 792064 802A12D4 8FB00028 */ lw $s0, 0x28($sp) -/* 792068 802A12D8 24020002 */ addiu $v0, $zero, 2 -/* 79206C 802A12DC 03E00008 */ jr $ra -/* 792070 802A12E0 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/ver/us/asm/nonmatchings/battle/star/smooch_791D90/func_802A137C_79210C.s b/ver/us/asm/nonmatchings/battle/star/smooch_791D90/func_802A137C_79210C.s deleted file mode 100644 index ffc0f1213e..0000000000 --- a/ver/us/asm/nonmatchings/battle/star/smooch_791D90/func_802A137C_79210C.s +++ /dev/null @@ -1,44 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A137C_79210C -/* 79210C 802A137C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 792110 802A1380 AFB00010 */ sw $s0, 0x10($sp) -/* 792114 802A1384 0080802D */ daddu $s0, $a0, $zero -/* 792118 802A1388 10A0000D */ beqz $a1, .L802A13C0 -/* 79211C 802A138C AFBF0014 */ sw $ra, 0x14($sp) -/* 792120 802A1390 0C04760B */ jal func_8011D82C -/* 792124 802A1394 24040001 */ addiu $a0, $zero, 1 -/* 792128 802A1398 0000202D */ daddu $a0, $zero, $zero -/* 79212C 802A139C 0080282D */ daddu $a1, $a0, $zero -/* 792130 802A13A0 0080302D */ daddu $a2, $a0, $zero -/* 792134 802A13A4 0080382D */ daddu $a3, $a0, $zero -/* 792138 802A13A8 3C038015 */ lui $v1, %hi(D_801512F0) -/* 79213C 802A13AC 8C6312F0 */ lw $v1, %lo(D_801512F0)($v1) -/* 792140 802A13B0 24020001 */ addiu $v0, $zero, 1 -/* 792144 802A13B4 0C046F97 */ jal set_background_color_blend -/* 792148 802A13B8 A0620000 */ sb $v0, ($v1) -/* 79214C 802A13BC AE000070 */ sw $zero, 0x70($s0) -.L802A13C0: -/* 792150 802A13C0 0000202D */ daddu $a0, $zero, $zero -/* 792154 802A13C4 0080282D */ daddu $a1, $a0, $zero -/* 792158 802A13C8 92070073 */ lbu $a3, 0x73($s0) -/* 79215C 802A13CC 0C046F97 */ jal set_background_color_blend -/* 792160 802A13D0 0080302D */ daddu $a2, $a0, $zero -/* 792164 802A13D4 8E020070 */ lw $v0, 0x70($s0) -/* 792168 802A13D8 2442000A */ addiu $v0, $v0, 0xa -/* 79216C 802A13DC AE020070 */ sw $v0, 0x70($s0) -/* 792170 802A13E0 284200E6 */ slti $v0, $v0, 0xe6 -/* 792174 802A13E4 14400007 */ bnez $v0, .L802A1404 -/* 792178 802A13E8 0000102D */ daddu $v0, $zero, $zero -/* 79217C 802A13EC 0000202D */ daddu $a0, $zero, $zero -/* 792180 802A13F0 0080282D */ daddu $a1, $a0, $zero -/* 792184 802A13F4 0080302D */ daddu $a2, $a0, $zero -/* 792188 802A13F8 0C046F97 */ jal set_background_color_blend -/* 79218C 802A13FC 240700E6 */ addiu $a3, $zero, 0xe6 -/* 792190 802A1400 24020002 */ addiu $v0, $zero, 2 -.L802A1404: -/* 792194 802A1404 8FBF0014 */ lw $ra, 0x14($sp) -/* 792198 802A1408 8FB00010 */ lw $s0, 0x10($sp) -/* 79219C 802A140C 03E00008 */ jr $ra -/* 7921A0 802A1410 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/battle/star/smooch_791D90/func_802A1414_7921A4.s b/ver/us/asm/nonmatchings/battle/star/smooch_791D90/func_802A1414_7921A4.s deleted file mode 100644 index 1ab6e734f8..0000000000 --- a/ver/us/asm/nonmatchings/battle/star/smooch_791D90/func_802A1414_7921A4.s +++ /dev/null @@ -1,39 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1414_7921A4 -/* 7921A4 802A1414 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 7921A8 802A1418 AFB00010 */ sw $s0, 0x10($sp) -/* 7921AC 802A141C 0080802D */ daddu $s0, $a0, $zero -/* 7921B0 802A1420 10A00003 */ beqz $a1, .L802A1430 -/* 7921B4 802A1424 AFBF0014 */ sw $ra, 0x14($sp) -/* 7921B8 802A1428 24020014 */ addiu $v0, $zero, 0x14 -/* 7921BC 802A142C AE020070 */ sw $v0, 0x70($s0) -.L802A1430: -/* 7921C0 802A1430 0000202D */ daddu $a0, $zero, $zero -/* 7921C4 802A1434 0080282D */ daddu $a1, $a0, $zero -/* 7921C8 802A1438 8E020070 */ lw $v0, 0x70($s0) -/* 7921CC 802A143C 0080302D */ daddu $a2, $a0, $zero -/* 7921D0 802A1440 00023880 */ sll $a3, $v0, 2 -/* 7921D4 802A1444 00E23821 */ addu $a3, $a3, $v0 -/* 7921D8 802A1448 00073840 */ sll $a3, $a3, 1 -/* 7921DC 802A144C 0C046F97 */ jal set_background_color_blend -/* 7921E0 802A1450 30E700FE */ andi $a3, $a3, 0xfe -/* 7921E4 802A1454 8E020070 */ lw $v0, 0x70($s0) -/* 7921E8 802A1458 2442FFFF */ addiu $v0, $v0, -1 -/* 7921EC 802A145C 10400003 */ beqz $v0, .L802A146C -/* 7921F0 802A1460 AE020070 */ sw $v0, 0x70($s0) -/* 7921F4 802A1464 080A8521 */ j .L802A1484 -/* 7921F8 802A1468 0000102D */ daddu $v0, $zero, $zero -.L802A146C: -/* 7921FC 802A146C 0000202D */ daddu $a0, $zero, $zero -/* 792200 802A1470 0080282D */ daddu $a1, $a0, $zero -/* 792204 802A1474 0080302D */ daddu $a2, $a0, $zero -/* 792208 802A1478 0C046F97 */ jal set_background_color_blend -/* 79220C 802A147C 0080382D */ daddu $a3, $a0, $zero -/* 792210 802A1480 24020002 */ addiu $v0, $zero, 2 -.L802A1484: -/* 792214 802A1484 8FBF0014 */ lw $ra, 0x14($sp) -/* 792218 802A1488 8FB00010 */ lw $s0, 0x10($sp) -/* 79221C 802A148C 03E00008 */ jr $ra -/* 792220 802A1490 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/battle/star/smooch_791D90/func_802A14E8_792278.s b/ver/us/asm/nonmatchings/battle/star/smooch_791D90/func_802A14E8_792278.s deleted file mode 100644 index 103b429af3..0000000000 --- a/ver/us/asm/nonmatchings/battle/star/smooch_791D90/func_802A14E8_792278.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A14E8_792278 -/* 792278 802A14E8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 79227C 802A14EC AFBF0010 */ sw $ra, 0x10($sp) -/* 792280 802A14F0 0C00EABB */ jal get_npc_unsafe -/* 792284 802A14F4 24040064 */ addiu $a0, $zero, 0x64 -/* 792288 802A14F8 0040202D */ daddu $a0, $v0, $zero -/* 79228C 802A14FC 24030020 */ addiu $v1, $zero, 0x20 -/* 792290 802A1500 A48300A8 */ sh $v1, 0xa8($a0) -/* 792294 802A1504 A48300A6 */ sh $v1, 0xa6($a0) -/* 792298 802A1508 8FBF0010 */ lw $ra, 0x10($sp) -/* 79229C 802A150C 24020002 */ addiu $v0, $zero, 2 -/* 7922A0 802A1510 03E00008 */ jr $ra -/* 7922A4 802A1514 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/battle/star/smooch_791D90/func_802A1518_7922A8.s b/ver/us/asm/nonmatchings/battle/star/smooch_791D90/func_802A1518_7922A8.s deleted file mode 100644 index 25bbfb6b42..0000000000 --- a/ver/us/asm/nonmatchings/battle/star/smooch_791D90/func_802A1518_7922A8.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1518_7922A8 -/* 7922A8 802A1518 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 7922AC 802A151C AFBF0014 */ sw $ra, 0x14($sp) -/* 7922B0 802A1520 AFB00010 */ sw $s0, 0x10($sp) -/* 7922B4 802A1524 8C82000C */ lw $v0, 0xc($a0) -/* 7922B8 802A1528 0C0B1EAF */ jal get_variable -/* 7922BC 802A152C 8C450000 */ lw $a1, ($v0) -/* 7922C0 802A1530 3C038011 */ lui $v1, %hi(gPlayerData) -/* 7922C4 802A1534 2463F290 */ addiu $v1, $v1, %lo(gPlayerData) -/* 7922C8 802A1538 80640002 */ lb $a0, 2($v1) -/* 7922CC 802A153C 80650003 */ lb $a1, 3($v1) -/* 7922D0 802A1540 00822021 */ addu $a0, $a0, $v0 -/* 7922D4 802A1544 00A4102A */ slt $v0, $a1, $a0 -/* 7922D8 802A1548 10400002 */ beqz $v0, .L802A1554 -/* 7922DC 802A154C 0060802D */ daddu $s0, $v1, $zero -/* 7922E0 802A1550 00A0202D */ daddu $a0, $a1, $zero -.L802A1554: -/* 7922E4 802A1554 A2040002 */ sb $a0, 2($s0) -/* 7922E8 802A1558 8FBF0014 */ lw $ra, 0x14($sp) -/* 7922EC 802A155C 8FB00010 */ lw $s0, 0x10($sp) -/* 7922F0 802A1560 24020002 */ addiu $v0, $zero, 2 -/* 7922F4 802A1564 03E00008 */ jr $ra -/* 7922F8 802A1568 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/battle/star/star_beam_796FC0/func_802A1000_796FC0.s b/ver/us/asm/nonmatchings/battle/star/star_beam_796FC0/func_802A1000_796FC0.s deleted file mode 100644 index b2bb6aafb4..0000000000 --- a/ver/us/asm/nonmatchings/battle/star/star_beam_796FC0/func_802A1000_796FC0.s +++ /dev/null @@ -1,47 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1000_796FC0 -/* 796FC0 802A1000 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 796FC4 802A1004 AFB1001C */ sw $s1, 0x1c($sp) -/* 796FC8 802A1008 0080882D */ daddu $s1, $a0, $zero -/* 796FCC 802A100C AFBF0024 */ sw $ra, 0x24($sp) -/* 796FD0 802A1010 AFB20020 */ sw $s2, 0x20($sp) -/* 796FD4 802A1014 AFB00018 */ sw $s0, 0x18($sp) -/* 796FD8 802A1018 8E30000C */ lw $s0, 0xc($s1) -/* 796FDC 802A101C 8E050000 */ lw $a1, ($s0) -/* 796FE0 802A1020 0C0B1EAF */ jal get_variable -/* 796FE4 802A1024 26100004 */ addiu $s0, $s0, 4 -/* 796FE8 802A1028 8E050000 */ lw $a1, ($s0) -/* 796FEC 802A102C 26100004 */ addiu $s0, $s0, 4 -/* 796FF0 802A1030 0220202D */ daddu $a0, $s1, $zero -/* 796FF4 802A1034 0C0B1EAF */ jal get_variable -/* 796FF8 802A1038 0040902D */ daddu $s2, $v0, $zero -/* 796FFC 802A103C 0220202D */ daddu $a0, $s1, $zero -/* 797000 802A1040 8E050000 */ lw $a1, ($s0) -/* 797004 802A1044 0C0B1EAF */ jal get_variable -/* 797008 802A1048 0040802D */ daddu $s0, $v0, $zero -/* 79700C 802A104C 44921000 */ mtc1 $s2, $f2 -/* 797010 802A1050 00000000 */ nop -/* 797014 802A1054 468010A0 */ cvt.s.w $f2, $f2 -/* 797018 802A1058 44051000 */ mfc1 $a1, $f2 -/* 79701C 802A105C 44901000 */ mtc1 $s0, $f2 -/* 797020 802A1060 00000000 */ nop -/* 797024 802A1064 468010A0 */ cvt.s.w $f2, $f2 -/* 797028 802A1068 44061000 */ mfc1 $a2, $f2 -/* 79702C 802A106C 44821000 */ mtc1 $v0, $f2 -/* 797030 802A1070 00000000 */ nop -/* 797034 802A1074 468010A0 */ cvt.s.w $f2, $f2 -/* 797038 802A1078 3C014220 */ lui $at, 0x4220 -/* 79703C 802A107C 44810000 */ mtc1 $at, $f0 -/* 797040 802A1080 44071000 */ mfc1 $a3, $f2 -/* 797044 802A1084 0000202D */ daddu $a0, $zero, $zero -/* 797048 802A1088 0C01BFBC */ jal func_8006FEF0 -/* 79704C 802A108C E7A00010 */ swc1 $f0, 0x10($sp) -/* 797050 802A1090 8FBF0024 */ lw $ra, 0x24($sp) -/* 797054 802A1094 8FB20020 */ lw $s2, 0x20($sp) -/* 797058 802A1098 8FB1001C */ lw $s1, 0x1c($sp) -/* 79705C 802A109C 8FB00018 */ lw $s0, 0x18($sp) -/* 797060 802A10A0 24020002 */ addiu $v0, $zero, 2 -/* 797064 802A10A4 03E00008 */ jr $ra -/* 797068 802A10A8 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/battle/star/star_beam_796FC0/func_802A10AC_79706C.s b/ver/us/asm/nonmatchings/battle/star/star_beam_796FC0/func_802A10AC_79706C.s deleted file mode 100644 index 91323d6d4f..0000000000 --- a/ver/us/asm/nonmatchings/battle/star/star_beam_796FC0/func_802A10AC_79706C.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A10AC_79706C -/* 79706C 802A10AC 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 797070 802A10B0 AFB10024 */ sw $s1, 0x24($sp) -/* 797074 802A10B4 0080882D */ daddu $s1, $a0, $zero -/* 797078 802A10B8 AFBF002C */ sw $ra, 0x2c($sp) -/* 79707C 802A10BC AFB20028 */ sw $s2, 0x28($sp) -/* 797080 802A10C0 AFB00020 */ sw $s0, 0x20($sp) -/* 797084 802A10C4 8E30000C */ lw $s0, 0xc($s1) -/* 797088 802A10C8 8E050000 */ lw $a1, ($s0) -/* 79708C 802A10CC 0C0B1EAF */ jal get_variable -/* 797090 802A10D0 26100004 */ addiu $s0, $s0, 4 -/* 797094 802A10D4 8E050000 */ lw $a1, ($s0) -/* 797098 802A10D8 26100004 */ addiu $s0, $s0, 4 -/* 79709C 802A10DC 0220202D */ daddu $a0, $s1, $zero -/* 7970A0 802A10E0 0C0B1EAF */ jal get_variable -/* 7970A4 802A10E4 0040902D */ daddu $s2, $v0, $zero -/* 7970A8 802A10E8 0220202D */ daddu $a0, $s1, $zero -/* 7970AC 802A10EC 8E050000 */ lw $a1, ($s0) -/* 7970B0 802A10F0 0C0B1EAF */ jal get_variable -/* 7970B4 802A10F4 0040802D */ daddu $s0, $v0, $zero -/* 7970B8 802A10F8 24040005 */ addiu $a0, $zero, 5 -/* 7970BC 802A10FC 44921000 */ mtc1 $s2, $f2 -/* 7970C0 802A1100 00000000 */ nop -/* 7970C4 802A1104 468010A0 */ cvt.s.w $f2, $f2 -/* 7970C8 802A1108 44051000 */ mfc1 $a1, $f2 -/* 7970CC 802A110C 44901000 */ mtc1 $s0, $f2 -/* 7970D0 802A1110 00000000 */ nop -/* 7970D4 802A1114 468010A0 */ cvt.s.w $f2, $f2 -/* 7970D8 802A1118 44061000 */ mfc1 $a2, $f2 -/* 7970DC 802A111C 44821000 */ mtc1 $v0, $f2 -/* 7970E0 802A1120 00000000 */ nop -/* 7970E4 802A1124 468010A0 */ cvt.s.w $f2, $f2 -/* 7970E8 802A1128 3C014248 */ lui $at, 0x4248 -/* 7970EC 802A112C 44810000 */ mtc1 $at, $f0 -/* 7970F0 802A1130 44071000 */ mfc1 $a3, $f2 -/* 7970F4 802A1134 24030028 */ addiu $v1, $zero, 0x28 -/* 7970F8 802A1138 AFA30018 */ sw $v1, 0x18($sp) -/* 7970FC 802A113C 2403001E */ addiu $v1, $zero, 0x1e -/* 797100 802A1140 AFA3001C */ sw $v1, 0x1c($sp) -/* 797104 802A1144 E7A00010 */ swc1 $f0, 0x10($sp) -/* 797108 802A1148 0C01C154 */ jal func_80070550 -/* 79710C 802A114C E7A00014 */ swc1 $f0, 0x14($sp) -/* 797110 802A1150 8FBF002C */ lw $ra, 0x2c($sp) -/* 797114 802A1154 8FB20028 */ lw $s2, 0x28($sp) -/* 797118 802A1158 8FB10024 */ lw $s1, 0x24($sp) -/* 79711C 802A115C 8FB00020 */ lw $s0, 0x20($sp) -/* 797120 802A1160 24020002 */ addiu $v0, $zero, 2 -/* 797124 802A1164 03E00008 */ jr $ra -/* 797128 802A1168 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/battle/star/star_beam_796FC0/func_802A116C_79712C.s b/ver/us/asm/nonmatchings/battle/star/star_beam_796FC0/func_802A116C_79712C.s deleted file mode 100644 index a547d453ac..0000000000 --- a/ver/us/asm/nonmatchings/battle/star/star_beam_796FC0/func_802A116C_79712C.s +++ /dev/null @@ -1,47 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A116C_79712C -/* 79712C 802A116C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 797130 802A1170 AFB1001C */ sw $s1, 0x1c($sp) -/* 797134 802A1174 0080882D */ daddu $s1, $a0, $zero -/* 797138 802A1178 AFBF0024 */ sw $ra, 0x24($sp) -/* 79713C 802A117C AFB20020 */ sw $s2, 0x20($sp) -/* 797140 802A1180 AFB00018 */ sw $s0, 0x18($sp) -/* 797144 802A1184 8E30000C */ lw $s0, 0xc($s1) -/* 797148 802A1188 8E050000 */ lw $a1, ($s0) -/* 79714C 802A118C 0C0B1EAF */ jal get_variable -/* 797150 802A1190 26100004 */ addiu $s0, $s0, 4 -/* 797154 802A1194 8E050000 */ lw $a1, ($s0) -/* 797158 802A1198 26100004 */ addiu $s0, $s0, 4 -/* 79715C 802A119C 0220202D */ daddu $a0, $s1, $zero -/* 797160 802A11A0 0C0B1EAF */ jal get_variable -/* 797164 802A11A4 0040902D */ daddu $s2, $v0, $zero -/* 797168 802A11A8 0220202D */ daddu $a0, $s1, $zero -/* 79716C 802A11AC 8E050000 */ lw $a1, ($s0) -/* 797170 802A11B0 0C0B1EAF */ jal get_variable -/* 797174 802A11B4 0040802D */ daddu $s0, $v0, $zero -/* 797178 802A11B8 44921000 */ mtc1 $s2, $f2 -/* 79717C 802A11BC 00000000 */ nop -/* 797180 802A11C0 468010A0 */ cvt.s.w $f2, $f2 -/* 797184 802A11C4 44051000 */ mfc1 $a1, $f2 -/* 797188 802A11C8 44901000 */ mtc1 $s0, $f2 -/* 79718C 802A11CC 00000000 */ nop -/* 797190 802A11D0 468010A0 */ cvt.s.w $f2, $f2 -/* 797194 802A11D4 44061000 */ mfc1 $a2, $f2 -/* 797198 802A11D8 44821000 */ mtc1 $v0, $f2 -/* 79719C 802A11DC 00000000 */ nop -/* 7971A0 802A11E0 468010A0 */ cvt.s.w $f2, $f2 -/* 7971A4 802A11E4 3C0141F0 */ lui $at, 0x41f0 -/* 7971A8 802A11E8 44810000 */ mtc1 $at, $f0 -/* 7971AC 802A11EC 44071000 */ mfc1 $a3, $f2 -/* 7971B0 802A11F0 0000202D */ daddu $a0, $zero, $zero -/* 7971B4 802A11F4 0C01BFBC */ jal func_8006FEF0 -/* 7971B8 802A11F8 E7A00010 */ swc1 $f0, 0x10($sp) -/* 7971BC 802A11FC 8FBF0024 */ lw $ra, 0x24($sp) -/* 7971C0 802A1200 8FB20020 */ lw $s2, 0x20($sp) -/* 7971C4 802A1204 8FB1001C */ lw $s1, 0x1c($sp) -/* 7971C8 802A1208 8FB00018 */ lw $s0, 0x18($sp) -/* 7971CC 802A120C 24020002 */ addiu $v0, $zero, 2 -/* 7971D0 802A1210 03E00008 */ jr $ra -/* 7971D4 802A1214 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/battle/star/star_beam_796FC0/func_802A1218_7971D8.s b/ver/us/asm/nonmatchings/battle/star/star_beam_796FC0/func_802A1218_7971D8.s deleted file mode 100644 index a707b21699..0000000000 --- a/ver/us/asm/nonmatchings/battle/star/star_beam_796FC0/func_802A1218_7971D8.s +++ /dev/null @@ -1,55 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1218_7971D8 -/* 7971D8 802A1218 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* 7971DC 802A121C AFB1002C */ sw $s1, 0x2c($sp) -/* 7971E0 802A1220 0080882D */ daddu $s1, $a0, $zero -/* 7971E4 802A1224 AFBF0034 */ sw $ra, 0x34($sp) -/* 7971E8 802A1228 AFB20030 */ sw $s2, 0x30($sp) -/* 7971EC 802A122C AFB00028 */ sw $s0, 0x28($sp) -/* 7971F0 802A1230 8E30000C */ lw $s0, 0xc($s1) -/* 7971F4 802A1234 8E050000 */ lw $a1, ($s0) -/* 7971F8 802A1238 0C0B1EAF */ jal get_variable -/* 7971FC 802A123C 26100004 */ addiu $s0, $s0, 4 -/* 797200 802A1240 8E050000 */ lw $a1, ($s0) -/* 797204 802A1244 26100004 */ addiu $s0, $s0, 4 -/* 797208 802A1248 0220202D */ daddu $a0, $s1, $zero -/* 79720C 802A124C 0C0B1EAF */ jal get_variable -/* 797210 802A1250 0040902D */ daddu $s2, $v0, $zero -/* 797214 802A1254 0220202D */ daddu $a0, $s1, $zero -/* 797218 802A1258 8E050000 */ lw $a1, ($s0) -/* 79721C 802A125C 0C0B1EAF */ jal get_variable -/* 797220 802A1260 0040802D */ daddu $s0, $v0, $zero -/* 797224 802A1264 24040004 */ addiu $a0, $zero, 4 -/* 797228 802A1268 44922000 */ mtc1 $s2, $f4 -/* 79722C 802A126C 00000000 */ nop -/* 797230 802A1270 46802120 */ cvt.s.w $f4, $f4 -/* 797234 802A1274 44052000 */ mfc1 $a1, $f4 -/* 797238 802A1278 44902000 */ mtc1 $s0, $f4 -/* 79723C 802A127C 00000000 */ nop -/* 797240 802A1280 46802120 */ cvt.s.w $f4, $f4 -/* 797244 802A1284 44062000 */ mfc1 $a2, $f4 -/* 797248 802A1288 44822000 */ mtc1 $v0, $f4 -/* 79724C 802A128C 00000000 */ nop -/* 797250 802A1290 46802120 */ cvt.s.w $f4, $f4 -/* 797254 802A1294 3C0141A0 */ lui $at, 0x41a0 -/* 797258 802A1298 44810000 */ mtc1 $at, $f0 -/* 79725C 802A129C 3C013F80 */ lui $at, 0x3f80 -/* 797260 802A12A0 44811000 */ mtc1 $at, $f2 -/* 797264 802A12A4 44072000 */ mfc1 $a3, $f4 -/* 797268 802A12A8 2403000A */ addiu $v1, $zero, 0xa -/* 79726C 802A12AC AFA3001C */ sw $v1, 0x1c($sp) -/* 797270 802A12B0 2403000F */ addiu $v1, $zero, 0xf -/* 797274 802A12B4 AFA30020 */ sw $v1, 0x20($sp) -/* 797278 802A12B8 E7A00010 */ swc1 $f0, 0x10($sp) -/* 79727C 802A12BC E7A00014 */ swc1 $f0, 0x14($sp) -/* 797280 802A12C0 0C01C8D4 */ jal func_80072350 -/* 797284 802A12C4 E7A20018 */ swc1 $f2, 0x18($sp) -/* 797288 802A12C8 8FBF0034 */ lw $ra, 0x34($sp) -/* 79728C 802A12CC 8FB20030 */ lw $s2, 0x30($sp) -/* 797290 802A12D0 8FB1002C */ lw $s1, 0x2c($sp) -/* 797294 802A12D4 8FB00028 */ lw $s0, 0x28($sp) -/* 797298 802A12D8 24020002 */ addiu $v0, $zero, 2 -/* 79729C 802A12DC 03E00008 */ jr $ra -/* 7972A0 802A12E0 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/ver/us/asm/nonmatchings/battle/star/star_beam_796FC0/func_802A137C_79733C.s b/ver/us/asm/nonmatchings/battle/star/star_beam_796FC0/func_802A137C_79733C.s deleted file mode 100644 index c025bc983b..0000000000 --- a/ver/us/asm/nonmatchings/battle/star/star_beam_796FC0/func_802A137C_79733C.s +++ /dev/null @@ -1,44 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A137C_79733C -/* 79733C 802A137C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 797340 802A1380 AFB00010 */ sw $s0, 0x10($sp) -/* 797344 802A1384 0080802D */ daddu $s0, $a0, $zero -/* 797348 802A1388 10A0000D */ beqz $a1, .L802A13C0 -/* 79734C 802A138C AFBF0014 */ sw $ra, 0x14($sp) -/* 797350 802A1390 0C04760B */ jal func_8011D82C -/* 797354 802A1394 24040001 */ addiu $a0, $zero, 1 -/* 797358 802A1398 0000202D */ daddu $a0, $zero, $zero -/* 79735C 802A139C 0080282D */ daddu $a1, $a0, $zero -/* 797360 802A13A0 0080302D */ daddu $a2, $a0, $zero -/* 797364 802A13A4 0080382D */ daddu $a3, $a0, $zero -/* 797368 802A13A8 3C038015 */ lui $v1, %hi(D_801512F0) -/* 79736C 802A13AC 8C6312F0 */ lw $v1, %lo(D_801512F0)($v1) -/* 797370 802A13B0 24020001 */ addiu $v0, $zero, 1 -/* 797374 802A13B4 0C046F97 */ jal set_background_color_blend -/* 797378 802A13B8 A0620000 */ sb $v0, ($v1) -/* 79737C 802A13BC AE000070 */ sw $zero, 0x70($s0) -.L802A13C0: -/* 797380 802A13C0 0000202D */ daddu $a0, $zero, $zero -/* 797384 802A13C4 0080282D */ daddu $a1, $a0, $zero -/* 797388 802A13C8 92070073 */ lbu $a3, 0x73($s0) -/* 79738C 802A13CC 0C046F97 */ jal set_background_color_blend -/* 797390 802A13D0 0080302D */ daddu $a2, $a0, $zero -/* 797394 802A13D4 8E020070 */ lw $v0, 0x70($s0) -/* 797398 802A13D8 2442000A */ addiu $v0, $v0, 0xa -/* 79739C 802A13DC AE020070 */ sw $v0, 0x70($s0) -/* 7973A0 802A13E0 284200E6 */ slti $v0, $v0, 0xe6 -/* 7973A4 802A13E4 14400007 */ bnez $v0, .L802A1404 -/* 7973A8 802A13E8 0000102D */ daddu $v0, $zero, $zero -/* 7973AC 802A13EC 0000202D */ daddu $a0, $zero, $zero -/* 7973B0 802A13F0 0080282D */ daddu $a1, $a0, $zero -/* 7973B4 802A13F4 0080302D */ daddu $a2, $a0, $zero -/* 7973B8 802A13F8 0C046F97 */ jal set_background_color_blend -/* 7973BC 802A13FC 240700E6 */ addiu $a3, $zero, 0xe6 -/* 7973C0 802A1400 24020002 */ addiu $v0, $zero, 2 -.L802A1404: -/* 7973C4 802A1404 8FBF0014 */ lw $ra, 0x14($sp) -/* 7973C8 802A1408 8FB00010 */ lw $s0, 0x10($sp) -/* 7973CC 802A140C 03E00008 */ jr $ra -/* 7973D0 802A1410 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/battle/star/star_beam_796FC0/func_802A1414_7973D4.s b/ver/us/asm/nonmatchings/battle/star/star_beam_796FC0/func_802A1414_7973D4.s deleted file mode 100644 index e92b1c710f..0000000000 --- a/ver/us/asm/nonmatchings/battle/star/star_beam_796FC0/func_802A1414_7973D4.s +++ /dev/null @@ -1,39 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1414_7973D4 -/* 7973D4 802A1414 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 7973D8 802A1418 AFB00010 */ sw $s0, 0x10($sp) -/* 7973DC 802A141C 0080802D */ daddu $s0, $a0, $zero -/* 7973E0 802A1420 10A00003 */ beqz $a1, .L802A1430 -/* 7973E4 802A1424 AFBF0014 */ sw $ra, 0x14($sp) -/* 7973E8 802A1428 24020014 */ addiu $v0, $zero, 0x14 -/* 7973EC 802A142C AE020070 */ sw $v0, 0x70($s0) -.L802A1430: -/* 7973F0 802A1430 0000202D */ daddu $a0, $zero, $zero -/* 7973F4 802A1434 0080282D */ daddu $a1, $a0, $zero -/* 7973F8 802A1438 8E020070 */ lw $v0, 0x70($s0) -/* 7973FC 802A143C 0080302D */ daddu $a2, $a0, $zero -/* 797400 802A1440 00023880 */ sll $a3, $v0, 2 -/* 797404 802A1444 00E23821 */ addu $a3, $a3, $v0 -/* 797408 802A1448 00073840 */ sll $a3, $a3, 1 -/* 79740C 802A144C 0C046F97 */ jal set_background_color_blend -/* 797410 802A1450 30E700FE */ andi $a3, $a3, 0xfe -/* 797414 802A1454 8E020070 */ lw $v0, 0x70($s0) -/* 797418 802A1458 2442FFFF */ addiu $v0, $v0, -1 -/* 79741C 802A145C 10400003 */ beqz $v0, .L802A146C -/* 797420 802A1460 AE020070 */ sw $v0, 0x70($s0) -/* 797424 802A1464 080A8521 */ j .L802A1484 -/* 797428 802A1468 0000102D */ daddu $v0, $zero, $zero -.L802A146C: -/* 79742C 802A146C 0000202D */ daddu $a0, $zero, $zero -/* 797430 802A1470 0080282D */ daddu $a1, $a0, $zero -/* 797434 802A1474 0080302D */ daddu $a2, $a0, $zero -/* 797438 802A1478 0C046F97 */ jal set_background_color_blend -/* 79743C 802A147C 0080382D */ daddu $a3, $a0, $zero -/* 797440 802A1480 24020002 */ addiu $v0, $zero, 2 -.L802A1484: -/* 797444 802A1484 8FBF0014 */ lw $ra, 0x14($sp) -/* 797448 802A1488 8FB00010 */ lw $s0, 0x10($sp) -/* 79744C 802A148C 03E00008 */ jr $ra -/* 797450 802A1490 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/battle/star/star_beam_796FC0/func_802A14E8_7974A8.s b/ver/us/asm/nonmatchings/battle/star/star_beam_796FC0/func_802A14E8_7974A8.s deleted file mode 100644 index f9539b1fc1..0000000000 --- a/ver/us/asm/nonmatchings/battle/star/star_beam_796FC0/func_802A14E8_7974A8.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A14E8_7974A8 -/* 7974A8 802A14E8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 7974AC 802A14EC AFBF0010 */ sw $ra, 0x10($sp) -/* 7974B0 802A14F0 0C00EABB */ jal get_npc_unsafe -/* 7974B4 802A14F4 24040064 */ addiu $a0, $zero, 0x64 -/* 7974B8 802A14F8 0040202D */ daddu $a0, $v0, $zero -/* 7974BC 802A14FC 24030020 */ addiu $v1, $zero, 0x20 -/* 7974C0 802A1500 A48300A8 */ sh $v1, 0xa8($a0) -/* 7974C4 802A1504 A48300A6 */ sh $v1, 0xa6($a0) -/* 7974C8 802A1508 8FBF0010 */ lw $ra, 0x10($sp) -/* 7974CC 802A150C 24020002 */ addiu $v0, $zero, 2 -/* 7974D0 802A1510 03E00008 */ jr $ra -/* 7974D4 802A1514 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/battle/star/star_beam_796FC0/func_802A2468_798428.s b/ver/us/asm/nonmatchings/battle/star/star_beam_796FC0/func_802A2468_798428.s deleted file mode 100644 index a48a6e4424..0000000000 --- a/ver/us/asm/nonmatchings/battle/star/star_beam_796FC0/func_802A2468_798428.s +++ /dev/null @@ -1,9 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A2468_798428 -/* 798428 802A2468 3C02802A */ lui $v0, %hi(D_802A3838) -/* 79842C 802A246C 8C423838 */ lw $v0, %lo(D_802A3838)($v0) -/* 798430 802A2470 AC820084 */ sw $v0, 0x84($a0) -/* 798434 802A2474 03E00008 */ jr $ra -/* 798438 802A2478 24020002 */ addiu $v0, $zero, 2 diff --git a/ver/us/asm/nonmatchings/battle/star/star_beam_796FC0/func_802A247C_79843C.s b/ver/us/asm/nonmatchings/battle/star/star_beam_796FC0/func_802A247C_79843C.s deleted file mode 100644 index 8bd0c66984..0000000000 --- a/ver/us/asm/nonmatchings/battle/star/star_beam_796FC0/func_802A247C_79843C.s +++ /dev/null @@ -1,36 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A247C_79843C -/* 79843C 802A247C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 798440 802A2480 AFB00010 */ sw $s0, 0x10($sp) -/* 798444 802A2484 0080802D */ daddu $s0, $a0, $zero -/* 798448 802A2488 10A00003 */ beqz $a1, .L802A2498 -/* 79844C 802A248C AFBF0014 */ sw $ra, 0x14($sp) -/* 798450 802A2490 240200E6 */ addiu $v0, $zero, 0xe6 -/* 798454 802A2494 AE020070 */ sw $v0, 0x70($s0) -.L802A2498: -/* 798458 802A2498 0000202D */ daddu $a0, $zero, $zero -/* 79845C 802A249C 0080282D */ daddu $a1, $a0, $zero -/* 798460 802A24A0 92070073 */ lbu $a3, 0x73($s0) -/* 798464 802A24A4 0C046F97 */ jal set_background_color_blend -/* 798468 802A24A8 0080302D */ daddu $a2, $a0, $zero -/* 79846C 802A24AC 8E020070 */ lw $v0, 0x70($s0) -/* 798470 802A24B0 2442FFFB */ addiu $v0, $v0, -5 -/* 798474 802A24B4 AE020070 */ sw $v0, 0x70($s0) -/* 798478 802A24B8 284200C9 */ slti $v0, $v0, 0xc9 -/* 79847C 802A24BC 14400003 */ bnez $v0, .L802A24CC -/* 798480 802A24C0 0000202D */ daddu $a0, $zero, $zero -/* 798484 802A24C4 080A8938 */ j .L802A24E0 -/* 798488 802A24C8 0000102D */ daddu $v0, $zero, $zero -.L802A24CC: -/* 79848C 802A24CC 0080282D */ daddu $a1, $a0, $zero -/* 798490 802A24D0 0080302D */ daddu $a2, $a0, $zero -/* 798494 802A24D4 0C046F97 */ jal set_background_color_blend -/* 798498 802A24D8 240700C8 */ addiu $a3, $zero, 0xc8 -/* 79849C 802A24DC 24020002 */ addiu $v0, $zero, 2 -.L802A24E0: -/* 7984A0 802A24E0 8FBF0014 */ lw $ra, 0x14($sp) -/* 7984A4 802A24E4 8FB00010 */ lw $s0, 0x10($sp) -/* 7984A8 802A24E8 03E00008 */ jr $ra -/* 7984AC 802A24EC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/battle/star/star_storm_78E7D0/func_802A1000_78E7D0.s b/ver/us/asm/nonmatchings/battle/star/star_storm_78E7D0/func_802A1000_78E7D0.s deleted file mode 100644 index 6595f9cbef..0000000000 --- a/ver/us/asm/nonmatchings/battle/star/star_storm_78E7D0/func_802A1000_78E7D0.s +++ /dev/null @@ -1,47 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1000_78E7D0 -/* 78E7D0 802A1000 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 78E7D4 802A1004 AFB1001C */ sw $s1, 0x1c($sp) -/* 78E7D8 802A1008 0080882D */ daddu $s1, $a0, $zero -/* 78E7DC 802A100C AFBF0024 */ sw $ra, 0x24($sp) -/* 78E7E0 802A1010 AFB20020 */ sw $s2, 0x20($sp) -/* 78E7E4 802A1014 AFB00018 */ sw $s0, 0x18($sp) -/* 78E7E8 802A1018 8E30000C */ lw $s0, 0xc($s1) -/* 78E7EC 802A101C 8E050000 */ lw $a1, ($s0) -/* 78E7F0 802A1020 0C0B1EAF */ jal get_variable -/* 78E7F4 802A1024 26100004 */ addiu $s0, $s0, 4 -/* 78E7F8 802A1028 8E050000 */ lw $a1, ($s0) -/* 78E7FC 802A102C 26100004 */ addiu $s0, $s0, 4 -/* 78E800 802A1030 0220202D */ daddu $a0, $s1, $zero -/* 78E804 802A1034 0C0B1EAF */ jal get_variable -/* 78E808 802A1038 0040902D */ daddu $s2, $v0, $zero -/* 78E80C 802A103C 0220202D */ daddu $a0, $s1, $zero -/* 78E810 802A1040 8E050000 */ lw $a1, ($s0) -/* 78E814 802A1044 0C0B1EAF */ jal get_variable -/* 78E818 802A1048 0040802D */ daddu $s0, $v0, $zero -/* 78E81C 802A104C 44921000 */ mtc1 $s2, $f2 -/* 78E820 802A1050 00000000 */ nop -/* 78E824 802A1054 468010A0 */ cvt.s.w $f2, $f2 -/* 78E828 802A1058 44051000 */ mfc1 $a1, $f2 -/* 78E82C 802A105C 44901000 */ mtc1 $s0, $f2 -/* 78E830 802A1060 00000000 */ nop -/* 78E834 802A1064 468010A0 */ cvt.s.w $f2, $f2 -/* 78E838 802A1068 44061000 */ mfc1 $a2, $f2 -/* 78E83C 802A106C 44821000 */ mtc1 $v0, $f2 -/* 78E840 802A1070 00000000 */ nop -/* 78E844 802A1074 468010A0 */ cvt.s.w $f2, $f2 -/* 78E848 802A1078 3C014220 */ lui $at, 0x4220 -/* 78E84C 802A107C 44810000 */ mtc1 $at, $f0 -/* 78E850 802A1080 44071000 */ mfc1 $a3, $f2 -/* 78E854 802A1084 0000202D */ daddu $a0, $zero, $zero -/* 78E858 802A1088 0C01BFBC */ jal func_8006FEF0 -/* 78E85C 802A108C E7A00010 */ swc1 $f0, 0x10($sp) -/* 78E860 802A1090 8FBF0024 */ lw $ra, 0x24($sp) -/* 78E864 802A1094 8FB20020 */ lw $s2, 0x20($sp) -/* 78E868 802A1098 8FB1001C */ lw $s1, 0x1c($sp) -/* 78E86C 802A109C 8FB00018 */ lw $s0, 0x18($sp) -/* 78E870 802A10A0 24020002 */ addiu $v0, $zero, 2 -/* 78E874 802A10A4 03E00008 */ jr $ra -/* 78E878 802A10A8 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/battle/star/star_storm_78E7D0/func_802A10AC_78E87C.s b/ver/us/asm/nonmatchings/battle/star/star_storm_78E7D0/func_802A10AC_78E87C.s deleted file mode 100644 index 8f7b64f7c1..0000000000 --- a/ver/us/asm/nonmatchings/battle/star/star_storm_78E7D0/func_802A10AC_78E87C.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A10AC_78E87C -/* 78E87C 802A10AC 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 78E880 802A10B0 AFB10024 */ sw $s1, 0x24($sp) -/* 78E884 802A10B4 0080882D */ daddu $s1, $a0, $zero -/* 78E888 802A10B8 AFBF002C */ sw $ra, 0x2c($sp) -/* 78E88C 802A10BC AFB20028 */ sw $s2, 0x28($sp) -/* 78E890 802A10C0 AFB00020 */ sw $s0, 0x20($sp) -/* 78E894 802A10C4 8E30000C */ lw $s0, 0xc($s1) -/* 78E898 802A10C8 8E050000 */ lw $a1, ($s0) -/* 78E89C 802A10CC 0C0B1EAF */ jal get_variable -/* 78E8A0 802A10D0 26100004 */ addiu $s0, $s0, 4 -/* 78E8A4 802A10D4 8E050000 */ lw $a1, ($s0) -/* 78E8A8 802A10D8 26100004 */ addiu $s0, $s0, 4 -/* 78E8AC 802A10DC 0220202D */ daddu $a0, $s1, $zero -/* 78E8B0 802A10E0 0C0B1EAF */ jal get_variable -/* 78E8B4 802A10E4 0040902D */ daddu $s2, $v0, $zero -/* 78E8B8 802A10E8 0220202D */ daddu $a0, $s1, $zero -/* 78E8BC 802A10EC 8E050000 */ lw $a1, ($s0) -/* 78E8C0 802A10F0 0C0B1EAF */ jal get_variable -/* 78E8C4 802A10F4 0040802D */ daddu $s0, $v0, $zero -/* 78E8C8 802A10F8 24040005 */ addiu $a0, $zero, 5 -/* 78E8CC 802A10FC 44921000 */ mtc1 $s2, $f2 -/* 78E8D0 802A1100 00000000 */ nop -/* 78E8D4 802A1104 468010A0 */ cvt.s.w $f2, $f2 -/* 78E8D8 802A1108 44051000 */ mfc1 $a1, $f2 -/* 78E8DC 802A110C 44901000 */ mtc1 $s0, $f2 -/* 78E8E0 802A1110 00000000 */ nop -/* 78E8E4 802A1114 468010A0 */ cvt.s.w $f2, $f2 -/* 78E8E8 802A1118 44061000 */ mfc1 $a2, $f2 -/* 78E8EC 802A111C 44821000 */ mtc1 $v0, $f2 -/* 78E8F0 802A1120 00000000 */ nop -/* 78E8F4 802A1124 468010A0 */ cvt.s.w $f2, $f2 -/* 78E8F8 802A1128 3C014248 */ lui $at, 0x4248 -/* 78E8FC 802A112C 44810000 */ mtc1 $at, $f0 -/* 78E900 802A1130 44071000 */ mfc1 $a3, $f2 -/* 78E904 802A1134 24030028 */ addiu $v1, $zero, 0x28 -/* 78E908 802A1138 AFA30018 */ sw $v1, 0x18($sp) -/* 78E90C 802A113C 2403001E */ addiu $v1, $zero, 0x1e -/* 78E910 802A1140 AFA3001C */ sw $v1, 0x1c($sp) -/* 78E914 802A1144 E7A00010 */ swc1 $f0, 0x10($sp) -/* 78E918 802A1148 0C01C154 */ jal func_80070550 -/* 78E91C 802A114C E7A00014 */ swc1 $f0, 0x14($sp) -/* 78E920 802A1150 8FBF002C */ lw $ra, 0x2c($sp) -/* 78E924 802A1154 8FB20028 */ lw $s2, 0x28($sp) -/* 78E928 802A1158 8FB10024 */ lw $s1, 0x24($sp) -/* 78E92C 802A115C 8FB00020 */ lw $s0, 0x20($sp) -/* 78E930 802A1160 24020002 */ addiu $v0, $zero, 2 -/* 78E934 802A1164 03E00008 */ jr $ra -/* 78E938 802A1168 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/battle/star/star_storm_78E7D0/func_802A116C_78E93C.s b/ver/us/asm/nonmatchings/battle/star/star_storm_78E7D0/func_802A116C_78E93C.s deleted file mode 100644 index 9ab088fa7d..0000000000 --- a/ver/us/asm/nonmatchings/battle/star/star_storm_78E7D0/func_802A116C_78E93C.s +++ /dev/null @@ -1,47 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A116C_78E93C -/* 78E93C 802A116C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 78E940 802A1170 AFB1001C */ sw $s1, 0x1c($sp) -/* 78E944 802A1174 0080882D */ daddu $s1, $a0, $zero -/* 78E948 802A1178 AFBF0024 */ sw $ra, 0x24($sp) -/* 78E94C 802A117C AFB20020 */ sw $s2, 0x20($sp) -/* 78E950 802A1180 AFB00018 */ sw $s0, 0x18($sp) -/* 78E954 802A1184 8E30000C */ lw $s0, 0xc($s1) -/* 78E958 802A1188 8E050000 */ lw $a1, ($s0) -/* 78E95C 802A118C 0C0B1EAF */ jal get_variable -/* 78E960 802A1190 26100004 */ addiu $s0, $s0, 4 -/* 78E964 802A1194 8E050000 */ lw $a1, ($s0) -/* 78E968 802A1198 26100004 */ addiu $s0, $s0, 4 -/* 78E96C 802A119C 0220202D */ daddu $a0, $s1, $zero -/* 78E970 802A11A0 0C0B1EAF */ jal get_variable -/* 78E974 802A11A4 0040902D */ daddu $s2, $v0, $zero -/* 78E978 802A11A8 0220202D */ daddu $a0, $s1, $zero -/* 78E97C 802A11AC 8E050000 */ lw $a1, ($s0) -/* 78E980 802A11B0 0C0B1EAF */ jal get_variable -/* 78E984 802A11B4 0040802D */ daddu $s0, $v0, $zero -/* 78E988 802A11B8 44921000 */ mtc1 $s2, $f2 -/* 78E98C 802A11BC 00000000 */ nop -/* 78E990 802A11C0 468010A0 */ cvt.s.w $f2, $f2 -/* 78E994 802A11C4 44051000 */ mfc1 $a1, $f2 -/* 78E998 802A11C8 44901000 */ mtc1 $s0, $f2 -/* 78E99C 802A11CC 00000000 */ nop -/* 78E9A0 802A11D0 468010A0 */ cvt.s.w $f2, $f2 -/* 78E9A4 802A11D4 44061000 */ mfc1 $a2, $f2 -/* 78E9A8 802A11D8 44821000 */ mtc1 $v0, $f2 -/* 78E9AC 802A11DC 00000000 */ nop -/* 78E9B0 802A11E0 468010A0 */ cvt.s.w $f2, $f2 -/* 78E9B4 802A11E4 3C0141F0 */ lui $at, 0x41f0 -/* 78E9B8 802A11E8 44810000 */ mtc1 $at, $f0 -/* 78E9BC 802A11EC 44071000 */ mfc1 $a3, $f2 -/* 78E9C0 802A11F0 0000202D */ daddu $a0, $zero, $zero -/* 78E9C4 802A11F4 0C01BFBC */ jal func_8006FEF0 -/* 78E9C8 802A11F8 E7A00010 */ swc1 $f0, 0x10($sp) -/* 78E9CC 802A11FC 8FBF0024 */ lw $ra, 0x24($sp) -/* 78E9D0 802A1200 8FB20020 */ lw $s2, 0x20($sp) -/* 78E9D4 802A1204 8FB1001C */ lw $s1, 0x1c($sp) -/* 78E9D8 802A1208 8FB00018 */ lw $s0, 0x18($sp) -/* 78E9DC 802A120C 24020002 */ addiu $v0, $zero, 2 -/* 78E9E0 802A1210 03E00008 */ jr $ra -/* 78E9E4 802A1214 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/battle/star/star_storm_78E7D0/func_802A1218_78E9E8.s b/ver/us/asm/nonmatchings/battle/star/star_storm_78E7D0/func_802A1218_78E9E8.s deleted file mode 100644 index 0185b61401..0000000000 --- a/ver/us/asm/nonmatchings/battle/star/star_storm_78E7D0/func_802A1218_78E9E8.s +++ /dev/null @@ -1,55 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1218_78E9E8 -/* 78E9E8 802A1218 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* 78E9EC 802A121C AFB1002C */ sw $s1, 0x2c($sp) -/* 78E9F0 802A1220 0080882D */ daddu $s1, $a0, $zero -/* 78E9F4 802A1224 AFBF0034 */ sw $ra, 0x34($sp) -/* 78E9F8 802A1228 AFB20030 */ sw $s2, 0x30($sp) -/* 78E9FC 802A122C AFB00028 */ sw $s0, 0x28($sp) -/* 78EA00 802A1230 8E30000C */ lw $s0, 0xc($s1) -/* 78EA04 802A1234 8E050000 */ lw $a1, ($s0) -/* 78EA08 802A1238 0C0B1EAF */ jal get_variable -/* 78EA0C 802A123C 26100004 */ addiu $s0, $s0, 4 -/* 78EA10 802A1240 8E050000 */ lw $a1, ($s0) -/* 78EA14 802A1244 26100004 */ addiu $s0, $s0, 4 -/* 78EA18 802A1248 0220202D */ daddu $a0, $s1, $zero -/* 78EA1C 802A124C 0C0B1EAF */ jal get_variable -/* 78EA20 802A1250 0040902D */ daddu $s2, $v0, $zero -/* 78EA24 802A1254 0220202D */ daddu $a0, $s1, $zero -/* 78EA28 802A1258 8E050000 */ lw $a1, ($s0) -/* 78EA2C 802A125C 0C0B1EAF */ jal get_variable -/* 78EA30 802A1260 0040802D */ daddu $s0, $v0, $zero -/* 78EA34 802A1264 24040004 */ addiu $a0, $zero, 4 -/* 78EA38 802A1268 44922000 */ mtc1 $s2, $f4 -/* 78EA3C 802A126C 00000000 */ nop -/* 78EA40 802A1270 46802120 */ cvt.s.w $f4, $f4 -/* 78EA44 802A1274 44052000 */ mfc1 $a1, $f4 -/* 78EA48 802A1278 44902000 */ mtc1 $s0, $f4 -/* 78EA4C 802A127C 00000000 */ nop -/* 78EA50 802A1280 46802120 */ cvt.s.w $f4, $f4 -/* 78EA54 802A1284 44062000 */ mfc1 $a2, $f4 -/* 78EA58 802A1288 44822000 */ mtc1 $v0, $f4 -/* 78EA5C 802A128C 00000000 */ nop -/* 78EA60 802A1290 46802120 */ cvt.s.w $f4, $f4 -/* 78EA64 802A1294 3C0141A0 */ lui $at, 0x41a0 -/* 78EA68 802A1298 44810000 */ mtc1 $at, $f0 -/* 78EA6C 802A129C 3C013F80 */ lui $at, 0x3f80 -/* 78EA70 802A12A0 44811000 */ mtc1 $at, $f2 -/* 78EA74 802A12A4 44072000 */ mfc1 $a3, $f4 -/* 78EA78 802A12A8 2403000A */ addiu $v1, $zero, 0xa -/* 78EA7C 802A12AC AFA3001C */ sw $v1, 0x1c($sp) -/* 78EA80 802A12B0 2403000F */ addiu $v1, $zero, 0xf -/* 78EA84 802A12B4 AFA30020 */ sw $v1, 0x20($sp) -/* 78EA88 802A12B8 E7A00010 */ swc1 $f0, 0x10($sp) -/* 78EA8C 802A12BC E7A00014 */ swc1 $f0, 0x14($sp) -/* 78EA90 802A12C0 0C01C8D4 */ jal func_80072350 -/* 78EA94 802A12C4 E7A20018 */ swc1 $f2, 0x18($sp) -/* 78EA98 802A12C8 8FBF0034 */ lw $ra, 0x34($sp) -/* 78EA9C 802A12CC 8FB20030 */ lw $s2, 0x30($sp) -/* 78EAA0 802A12D0 8FB1002C */ lw $s1, 0x2c($sp) -/* 78EAA4 802A12D4 8FB00028 */ lw $s0, 0x28($sp) -/* 78EAA8 802A12D8 24020002 */ addiu $v0, $zero, 2 -/* 78EAAC 802A12DC 03E00008 */ jr $ra -/* 78EAB0 802A12E0 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/ver/us/asm/nonmatchings/battle/star/star_storm_78E7D0/func_802A137C_78EB4C.s b/ver/us/asm/nonmatchings/battle/star/star_storm_78E7D0/func_802A137C_78EB4C.s deleted file mode 100644 index 0ae3657ab1..0000000000 --- a/ver/us/asm/nonmatchings/battle/star/star_storm_78E7D0/func_802A137C_78EB4C.s +++ /dev/null @@ -1,44 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A137C_78EB4C -/* 78EB4C 802A137C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 78EB50 802A1380 AFB00010 */ sw $s0, 0x10($sp) -/* 78EB54 802A1384 0080802D */ daddu $s0, $a0, $zero -/* 78EB58 802A1388 10A0000D */ beqz $a1, .L802A13C0 -/* 78EB5C 802A138C AFBF0014 */ sw $ra, 0x14($sp) -/* 78EB60 802A1390 0C04760B */ jal func_8011D82C -/* 78EB64 802A1394 24040001 */ addiu $a0, $zero, 1 -/* 78EB68 802A1398 0000202D */ daddu $a0, $zero, $zero -/* 78EB6C 802A139C 0080282D */ daddu $a1, $a0, $zero -/* 78EB70 802A13A0 0080302D */ daddu $a2, $a0, $zero -/* 78EB74 802A13A4 0080382D */ daddu $a3, $a0, $zero -/* 78EB78 802A13A8 3C038015 */ lui $v1, %hi(D_801512F0) -/* 78EB7C 802A13AC 8C6312F0 */ lw $v1, %lo(D_801512F0)($v1) -/* 78EB80 802A13B0 24020001 */ addiu $v0, $zero, 1 -/* 78EB84 802A13B4 0C046F97 */ jal set_background_color_blend -/* 78EB88 802A13B8 A0620000 */ sb $v0, ($v1) -/* 78EB8C 802A13BC AE000070 */ sw $zero, 0x70($s0) -.L802A13C0: -/* 78EB90 802A13C0 0000202D */ daddu $a0, $zero, $zero -/* 78EB94 802A13C4 0080282D */ daddu $a1, $a0, $zero -/* 78EB98 802A13C8 92070073 */ lbu $a3, 0x73($s0) -/* 78EB9C 802A13CC 0C046F97 */ jal set_background_color_blend -/* 78EBA0 802A13D0 0080302D */ daddu $a2, $a0, $zero -/* 78EBA4 802A13D4 8E020070 */ lw $v0, 0x70($s0) -/* 78EBA8 802A13D8 2442000A */ addiu $v0, $v0, 0xa -/* 78EBAC 802A13DC AE020070 */ sw $v0, 0x70($s0) -/* 78EBB0 802A13E0 284200E6 */ slti $v0, $v0, 0xe6 -/* 78EBB4 802A13E4 14400007 */ bnez $v0, .L802A1404 -/* 78EBB8 802A13E8 0000102D */ daddu $v0, $zero, $zero -/* 78EBBC 802A13EC 0000202D */ daddu $a0, $zero, $zero -/* 78EBC0 802A13F0 0080282D */ daddu $a1, $a0, $zero -/* 78EBC4 802A13F4 0080302D */ daddu $a2, $a0, $zero -/* 78EBC8 802A13F8 0C046F97 */ jal set_background_color_blend -/* 78EBCC 802A13FC 240700E6 */ addiu $a3, $zero, 0xe6 -/* 78EBD0 802A1400 24020002 */ addiu $v0, $zero, 2 -.L802A1404: -/* 78EBD4 802A1404 8FBF0014 */ lw $ra, 0x14($sp) -/* 78EBD8 802A1408 8FB00010 */ lw $s0, 0x10($sp) -/* 78EBDC 802A140C 03E00008 */ jr $ra -/* 78EBE0 802A1410 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/battle/star/star_storm_78E7D0/func_802A1414_78EBE4.s b/ver/us/asm/nonmatchings/battle/star/star_storm_78E7D0/func_802A1414_78EBE4.s deleted file mode 100644 index aeec74857c..0000000000 --- a/ver/us/asm/nonmatchings/battle/star/star_storm_78E7D0/func_802A1414_78EBE4.s +++ /dev/null @@ -1,39 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1414_78EBE4 -/* 78EBE4 802A1414 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 78EBE8 802A1418 AFB00010 */ sw $s0, 0x10($sp) -/* 78EBEC 802A141C 0080802D */ daddu $s0, $a0, $zero -/* 78EBF0 802A1420 10A00003 */ beqz $a1, .L802A1430 -/* 78EBF4 802A1424 AFBF0014 */ sw $ra, 0x14($sp) -/* 78EBF8 802A1428 24020014 */ addiu $v0, $zero, 0x14 -/* 78EBFC 802A142C AE020070 */ sw $v0, 0x70($s0) -.L802A1430: -/* 78EC00 802A1430 0000202D */ daddu $a0, $zero, $zero -/* 78EC04 802A1434 0080282D */ daddu $a1, $a0, $zero -/* 78EC08 802A1438 8E020070 */ lw $v0, 0x70($s0) -/* 78EC0C 802A143C 0080302D */ daddu $a2, $a0, $zero -/* 78EC10 802A1440 00023880 */ sll $a3, $v0, 2 -/* 78EC14 802A1444 00E23821 */ addu $a3, $a3, $v0 -/* 78EC18 802A1448 00073840 */ sll $a3, $a3, 1 -/* 78EC1C 802A144C 0C046F97 */ jal set_background_color_blend -/* 78EC20 802A1450 30E700FE */ andi $a3, $a3, 0xfe -/* 78EC24 802A1454 8E020070 */ lw $v0, 0x70($s0) -/* 78EC28 802A1458 2442FFFF */ addiu $v0, $v0, -1 -/* 78EC2C 802A145C 10400003 */ beqz $v0, .L802A146C -/* 78EC30 802A1460 AE020070 */ sw $v0, 0x70($s0) -/* 78EC34 802A1464 080A8521 */ j .L802A1484 -/* 78EC38 802A1468 0000102D */ daddu $v0, $zero, $zero -.L802A146C: -/* 78EC3C 802A146C 0000202D */ daddu $a0, $zero, $zero -/* 78EC40 802A1470 0080282D */ daddu $a1, $a0, $zero -/* 78EC44 802A1474 0080302D */ daddu $a2, $a0, $zero -/* 78EC48 802A1478 0C046F97 */ jal set_background_color_blend -/* 78EC4C 802A147C 0080382D */ daddu $a3, $a0, $zero -/* 78EC50 802A1480 24020002 */ addiu $v0, $zero, 2 -.L802A1484: -/* 78EC54 802A1484 8FBF0014 */ lw $ra, 0x14($sp) -/* 78EC58 802A1488 8FB00010 */ lw $s0, 0x10($sp) -/* 78EC5C 802A148C 03E00008 */ jr $ra -/* 78EC60 802A1490 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/battle/star/star_storm_78E7D0/func_802A14E8_78ECB8.s b/ver/us/asm/nonmatchings/battle/star/star_storm_78E7D0/func_802A14E8_78ECB8.s deleted file mode 100644 index d91b25431c..0000000000 --- a/ver/us/asm/nonmatchings/battle/star/star_storm_78E7D0/func_802A14E8_78ECB8.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A14E8_78ECB8 -/* 78ECB8 802A14E8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 78ECBC 802A14EC AFBF0010 */ sw $ra, 0x10($sp) -/* 78ECC0 802A14F0 0C00EABB */ jal get_npc_unsafe -/* 78ECC4 802A14F4 24040064 */ addiu $a0, $zero, 0x64 -/* 78ECC8 802A14F8 0040202D */ daddu $a0, $v0, $zero -/* 78ECCC 802A14FC 24030020 */ addiu $v1, $zero, 0x20 -/* 78ECD0 802A1500 A48300A8 */ sh $v1, 0xa8($a0) -/* 78ECD4 802A1504 A48300A6 */ sh $v1, 0xa6($a0) -/* 78ECD8 802A1508 8FBF0010 */ lw $ra, 0x10($sp) -/* 78ECDC 802A150C 24020002 */ addiu $v0, $zero, 2 -/* 78ECE0 802A1510 03E00008 */ jr $ra -/* 78ECE4 802A1514 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/battle/star/star_storm_78E7D0/func_802A1628_78EDF8.s b/ver/us/asm/nonmatchings/battle/star/star_storm_78E7D0/func_802A1628_78EDF8.s index c37799f6c4..3a0d378f02 100644 --- a/ver/us/asm/nonmatchings/battle/star/star_storm_78E7D0/func_802A1628_78EDF8.s +++ b/ver/us/asm/nonmatchings/battle/star/star_storm_78E7D0/func_802A1628_78EDF8.s @@ -48,3 +48,7 @@ glabel func_802A1628_78EDF8 /* 78EEA4 802A16D4 8FB00020 */ lw $s0, 0x20($sp) /* 78EEA8 802A16D8 24020002 */ addiu $v0, $zero, 2 /* 78EEAC 802A16DC 03E00008 */ jr $ra +/* 78EEB0 802A16E0 27BD0030 */ addiu $sp, $sp, 0x30 +/* 78EEB4 802A16E4 00000000 */ nop +/* 78EEB8 802A16E8 00000000 */ nop +/* 78EEBC 802A16EC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/battle/star/time_out_793D20/func_802A1000_793D20.s b/ver/us/asm/nonmatchings/battle/star/time_out_793D20/func_802A1000_793D20.s deleted file mode 100644 index 61121132dd..0000000000 --- a/ver/us/asm/nonmatchings/battle/star/time_out_793D20/func_802A1000_793D20.s +++ /dev/null @@ -1,47 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1000_793D20 -/* 793D20 802A1000 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 793D24 802A1004 AFB1001C */ sw $s1, 0x1c($sp) -/* 793D28 802A1008 0080882D */ daddu $s1, $a0, $zero -/* 793D2C 802A100C AFBF0024 */ sw $ra, 0x24($sp) -/* 793D30 802A1010 AFB20020 */ sw $s2, 0x20($sp) -/* 793D34 802A1014 AFB00018 */ sw $s0, 0x18($sp) -/* 793D38 802A1018 8E30000C */ lw $s0, 0xc($s1) -/* 793D3C 802A101C 8E050000 */ lw $a1, ($s0) -/* 793D40 802A1020 0C0B1EAF */ jal get_variable -/* 793D44 802A1024 26100004 */ addiu $s0, $s0, 4 -/* 793D48 802A1028 8E050000 */ lw $a1, ($s0) -/* 793D4C 802A102C 26100004 */ addiu $s0, $s0, 4 -/* 793D50 802A1030 0220202D */ daddu $a0, $s1, $zero -/* 793D54 802A1034 0C0B1EAF */ jal get_variable -/* 793D58 802A1038 0040902D */ daddu $s2, $v0, $zero -/* 793D5C 802A103C 0220202D */ daddu $a0, $s1, $zero -/* 793D60 802A1040 8E050000 */ lw $a1, ($s0) -/* 793D64 802A1044 0C0B1EAF */ jal get_variable -/* 793D68 802A1048 0040802D */ daddu $s0, $v0, $zero -/* 793D6C 802A104C 44921000 */ mtc1 $s2, $f2 -/* 793D70 802A1050 00000000 */ nop -/* 793D74 802A1054 468010A0 */ cvt.s.w $f2, $f2 -/* 793D78 802A1058 44051000 */ mfc1 $a1, $f2 -/* 793D7C 802A105C 44901000 */ mtc1 $s0, $f2 -/* 793D80 802A1060 00000000 */ nop -/* 793D84 802A1064 468010A0 */ cvt.s.w $f2, $f2 -/* 793D88 802A1068 44061000 */ mfc1 $a2, $f2 -/* 793D8C 802A106C 44821000 */ mtc1 $v0, $f2 -/* 793D90 802A1070 00000000 */ nop -/* 793D94 802A1074 468010A0 */ cvt.s.w $f2, $f2 -/* 793D98 802A1078 3C014220 */ lui $at, 0x4220 -/* 793D9C 802A107C 44810000 */ mtc1 $at, $f0 -/* 793DA0 802A1080 44071000 */ mfc1 $a3, $f2 -/* 793DA4 802A1084 0000202D */ daddu $a0, $zero, $zero -/* 793DA8 802A1088 0C01BFBC */ jal func_8006FEF0 -/* 793DAC 802A108C E7A00010 */ swc1 $f0, 0x10($sp) -/* 793DB0 802A1090 8FBF0024 */ lw $ra, 0x24($sp) -/* 793DB4 802A1094 8FB20020 */ lw $s2, 0x20($sp) -/* 793DB8 802A1098 8FB1001C */ lw $s1, 0x1c($sp) -/* 793DBC 802A109C 8FB00018 */ lw $s0, 0x18($sp) -/* 793DC0 802A10A0 24020002 */ addiu $v0, $zero, 2 -/* 793DC4 802A10A4 03E00008 */ jr $ra -/* 793DC8 802A10A8 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/battle/star/time_out_793D20/func_802A10AC_793DCC.s b/ver/us/asm/nonmatchings/battle/star/time_out_793D20/func_802A10AC_793DCC.s deleted file mode 100644 index 6ed98faf1c..0000000000 --- a/ver/us/asm/nonmatchings/battle/star/time_out_793D20/func_802A10AC_793DCC.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A10AC_793DCC -/* 793DCC 802A10AC 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 793DD0 802A10B0 AFB10024 */ sw $s1, 0x24($sp) -/* 793DD4 802A10B4 0080882D */ daddu $s1, $a0, $zero -/* 793DD8 802A10B8 AFBF002C */ sw $ra, 0x2c($sp) -/* 793DDC 802A10BC AFB20028 */ sw $s2, 0x28($sp) -/* 793DE0 802A10C0 AFB00020 */ sw $s0, 0x20($sp) -/* 793DE4 802A10C4 8E30000C */ lw $s0, 0xc($s1) -/* 793DE8 802A10C8 8E050000 */ lw $a1, ($s0) -/* 793DEC 802A10CC 0C0B1EAF */ jal get_variable -/* 793DF0 802A10D0 26100004 */ addiu $s0, $s0, 4 -/* 793DF4 802A10D4 8E050000 */ lw $a1, ($s0) -/* 793DF8 802A10D8 26100004 */ addiu $s0, $s0, 4 -/* 793DFC 802A10DC 0220202D */ daddu $a0, $s1, $zero -/* 793E00 802A10E0 0C0B1EAF */ jal get_variable -/* 793E04 802A10E4 0040902D */ daddu $s2, $v0, $zero -/* 793E08 802A10E8 0220202D */ daddu $a0, $s1, $zero -/* 793E0C 802A10EC 8E050000 */ lw $a1, ($s0) -/* 793E10 802A10F0 0C0B1EAF */ jal get_variable -/* 793E14 802A10F4 0040802D */ daddu $s0, $v0, $zero -/* 793E18 802A10F8 24040005 */ addiu $a0, $zero, 5 -/* 793E1C 802A10FC 44921000 */ mtc1 $s2, $f2 -/* 793E20 802A1100 00000000 */ nop -/* 793E24 802A1104 468010A0 */ cvt.s.w $f2, $f2 -/* 793E28 802A1108 44051000 */ mfc1 $a1, $f2 -/* 793E2C 802A110C 44901000 */ mtc1 $s0, $f2 -/* 793E30 802A1110 00000000 */ nop -/* 793E34 802A1114 468010A0 */ cvt.s.w $f2, $f2 -/* 793E38 802A1118 44061000 */ mfc1 $a2, $f2 -/* 793E3C 802A111C 44821000 */ mtc1 $v0, $f2 -/* 793E40 802A1120 00000000 */ nop -/* 793E44 802A1124 468010A0 */ cvt.s.w $f2, $f2 -/* 793E48 802A1128 3C014248 */ lui $at, 0x4248 -/* 793E4C 802A112C 44810000 */ mtc1 $at, $f0 -/* 793E50 802A1130 44071000 */ mfc1 $a3, $f2 -/* 793E54 802A1134 24030028 */ addiu $v1, $zero, 0x28 -/* 793E58 802A1138 AFA30018 */ sw $v1, 0x18($sp) -/* 793E5C 802A113C 2403001E */ addiu $v1, $zero, 0x1e -/* 793E60 802A1140 AFA3001C */ sw $v1, 0x1c($sp) -/* 793E64 802A1144 E7A00010 */ swc1 $f0, 0x10($sp) -/* 793E68 802A1148 0C01C154 */ jal func_80070550 -/* 793E6C 802A114C E7A00014 */ swc1 $f0, 0x14($sp) -/* 793E70 802A1150 8FBF002C */ lw $ra, 0x2c($sp) -/* 793E74 802A1154 8FB20028 */ lw $s2, 0x28($sp) -/* 793E78 802A1158 8FB10024 */ lw $s1, 0x24($sp) -/* 793E7C 802A115C 8FB00020 */ lw $s0, 0x20($sp) -/* 793E80 802A1160 24020002 */ addiu $v0, $zero, 2 -/* 793E84 802A1164 03E00008 */ jr $ra -/* 793E88 802A1168 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/battle/star/time_out_793D20/func_802A116C_793E8C.s b/ver/us/asm/nonmatchings/battle/star/time_out_793D20/func_802A116C_793E8C.s deleted file mode 100644 index 14b0235976..0000000000 --- a/ver/us/asm/nonmatchings/battle/star/time_out_793D20/func_802A116C_793E8C.s +++ /dev/null @@ -1,47 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A116C_793E8C -/* 793E8C 802A116C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 793E90 802A1170 AFB1001C */ sw $s1, 0x1c($sp) -/* 793E94 802A1174 0080882D */ daddu $s1, $a0, $zero -/* 793E98 802A1178 AFBF0024 */ sw $ra, 0x24($sp) -/* 793E9C 802A117C AFB20020 */ sw $s2, 0x20($sp) -/* 793EA0 802A1180 AFB00018 */ sw $s0, 0x18($sp) -/* 793EA4 802A1184 8E30000C */ lw $s0, 0xc($s1) -/* 793EA8 802A1188 8E050000 */ lw $a1, ($s0) -/* 793EAC 802A118C 0C0B1EAF */ jal get_variable -/* 793EB0 802A1190 26100004 */ addiu $s0, $s0, 4 -/* 793EB4 802A1194 8E050000 */ lw $a1, ($s0) -/* 793EB8 802A1198 26100004 */ addiu $s0, $s0, 4 -/* 793EBC 802A119C 0220202D */ daddu $a0, $s1, $zero -/* 793EC0 802A11A0 0C0B1EAF */ jal get_variable -/* 793EC4 802A11A4 0040902D */ daddu $s2, $v0, $zero -/* 793EC8 802A11A8 0220202D */ daddu $a0, $s1, $zero -/* 793ECC 802A11AC 8E050000 */ lw $a1, ($s0) -/* 793ED0 802A11B0 0C0B1EAF */ jal get_variable -/* 793ED4 802A11B4 0040802D */ daddu $s0, $v0, $zero -/* 793ED8 802A11B8 44921000 */ mtc1 $s2, $f2 -/* 793EDC 802A11BC 00000000 */ nop -/* 793EE0 802A11C0 468010A0 */ cvt.s.w $f2, $f2 -/* 793EE4 802A11C4 44051000 */ mfc1 $a1, $f2 -/* 793EE8 802A11C8 44901000 */ mtc1 $s0, $f2 -/* 793EEC 802A11CC 00000000 */ nop -/* 793EF0 802A11D0 468010A0 */ cvt.s.w $f2, $f2 -/* 793EF4 802A11D4 44061000 */ mfc1 $a2, $f2 -/* 793EF8 802A11D8 44821000 */ mtc1 $v0, $f2 -/* 793EFC 802A11DC 00000000 */ nop -/* 793F00 802A11E0 468010A0 */ cvt.s.w $f2, $f2 -/* 793F04 802A11E4 3C0141F0 */ lui $at, 0x41f0 -/* 793F08 802A11E8 44810000 */ mtc1 $at, $f0 -/* 793F0C 802A11EC 44071000 */ mfc1 $a3, $f2 -/* 793F10 802A11F0 0000202D */ daddu $a0, $zero, $zero -/* 793F14 802A11F4 0C01BFBC */ jal func_8006FEF0 -/* 793F18 802A11F8 E7A00010 */ swc1 $f0, 0x10($sp) -/* 793F1C 802A11FC 8FBF0024 */ lw $ra, 0x24($sp) -/* 793F20 802A1200 8FB20020 */ lw $s2, 0x20($sp) -/* 793F24 802A1204 8FB1001C */ lw $s1, 0x1c($sp) -/* 793F28 802A1208 8FB00018 */ lw $s0, 0x18($sp) -/* 793F2C 802A120C 24020002 */ addiu $v0, $zero, 2 -/* 793F30 802A1210 03E00008 */ jr $ra -/* 793F34 802A1214 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/battle/star/time_out_793D20/func_802A1218_793F38.s b/ver/us/asm/nonmatchings/battle/star/time_out_793D20/func_802A1218_793F38.s deleted file mode 100644 index bcbdb703d7..0000000000 --- a/ver/us/asm/nonmatchings/battle/star/time_out_793D20/func_802A1218_793F38.s +++ /dev/null @@ -1,55 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1218_793F38 -/* 793F38 802A1218 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* 793F3C 802A121C AFB1002C */ sw $s1, 0x2c($sp) -/* 793F40 802A1220 0080882D */ daddu $s1, $a0, $zero -/* 793F44 802A1224 AFBF0034 */ sw $ra, 0x34($sp) -/* 793F48 802A1228 AFB20030 */ sw $s2, 0x30($sp) -/* 793F4C 802A122C AFB00028 */ sw $s0, 0x28($sp) -/* 793F50 802A1230 8E30000C */ lw $s0, 0xc($s1) -/* 793F54 802A1234 8E050000 */ lw $a1, ($s0) -/* 793F58 802A1238 0C0B1EAF */ jal get_variable -/* 793F5C 802A123C 26100004 */ addiu $s0, $s0, 4 -/* 793F60 802A1240 8E050000 */ lw $a1, ($s0) -/* 793F64 802A1244 26100004 */ addiu $s0, $s0, 4 -/* 793F68 802A1248 0220202D */ daddu $a0, $s1, $zero -/* 793F6C 802A124C 0C0B1EAF */ jal get_variable -/* 793F70 802A1250 0040902D */ daddu $s2, $v0, $zero -/* 793F74 802A1254 0220202D */ daddu $a0, $s1, $zero -/* 793F78 802A1258 8E050000 */ lw $a1, ($s0) -/* 793F7C 802A125C 0C0B1EAF */ jal get_variable -/* 793F80 802A1260 0040802D */ daddu $s0, $v0, $zero -/* 793F84 802A1264 24040004 */ addiu $a0, $zero, 4 -/* 793F88 802A1268 44922000 */ mtc1 $s2, $f4 -/* 793F8C 802A126C 00000000 */ nop -/* 793F90 802A1270 46802120 */ cvt.s.w $f4, $f4 -/* 793F94 802A1274 44052000 */ mfc1 $a1, $f4 -/* 793F98 802A1278 44902000 */ mtc1 $s0, $f4 -/* 793F9C 802A127C 00000000 */ nop -/* 793FA0 802A1280 46802120 */ cvt.s.w $f4, $f4 -/* 793FA4 802A1284 44062000 */ mfc1 $a2, $f4 -/* 793FA8 802A1288 44822000 */ mtc1 $v0, $f4 -/* 793FAC 802A128C 00000000 */ nop -/* 793FB0 802A1290 46802120 */ cvt.s.w $f4, $f4 -/* 793FB4 802A1294 3C0141A0 */ lui $at, 0x41a0 -/* 793FB8 802A1298 44810000 */ mtc1 $at, $f0 -/* 793FBC 802A129C 3C013F80 */ lui $at, 0x3f80 -/* 793FC0 802A12A0 44811000 */ mtc1 $at, $f2 -/* 793FC4 802A12A4 44072000 */ mfc1 $a3, $f4 -/* 793FC8 802A12A8 2403000A */ addiu $v1, $zero, 0xa -/* 793FCC 802A12AC AFA3001C */ sw $v1, 0x1c($sp) -/* 793FD0 802A12B0 2403000F */ addiu $v1, $zero, 0xf -/* 793FD4 802A12B4 AFA30020 */ sw $v1, 0x20($sp) -/* 793FD8 802A12B8 E7A00010 */ swc1 $f0, 0x10($sp) -/* 793FDC 802A12BC E7A00014 */ swc1 $f0, 0x14($sp) -/* 793FE0 802A12C0 0C01C8D4 */ jal func_80072350 -/* 793FE4 802A12C4 E7A20018 */ swc1 $f2, 0x18($sp) -/* 793FE8 802A12C8 8FBF0034 */ lw $ra, 0x34($sp) -/* 793FEC 802A12CC 8FB20030 */ lw $s2, 0x30($sp) -/* 793FF0 802A12D0 8FB1002C */ lw $s1, 0x2c($sp) -/* 793FF4 802A12D4 8FB00028 */ lw $s0, 0x28($sp) -/* 793FF8 802A12D8 24020002 */ addiu $v0, $zero, 2 -/* 793FFC 802A12DC 03E00008 */ jr $ra -/* 794000 802A12E0 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/ver/us/asm/nonmatchings/battle/star/time_out_793D20/func_802A137C_79409C.s b/ver/us/asm/nonmatchings/battle/star/time_out_793D20/func_802A137C_79409C.s deleted file mode 100644 index b74ca71cb9..0000000000 --- a/ver/us/asm/nonmatchings/battle/star/time_out_793D20/func_802A137C_79409C.s +++ /dev/null @@ -1,44 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A137C_79409C -/* 79409C 802A137C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 7940A0 802A1380 AFB00010 */ sw $s0, 0x10($sp) -/* 7940A4 802A1384 0080802D */ daddu $s0, $a0, $zero -/* 7940A8 802A1388 10A0000D */ beqz $a1, .L802A13C0 -/* 7940AC 802A138C AFBF0014 */ sw $ra, 0x14($sp) -/* 7940B0 802A1390 0C04760B */ jal func_8011D82C -/* 7940B4 802A1394 24040001 */ addiu $a0, $zero, 1 -/* 7940B8 802A1398 0000202D */ daddu $a0, $zero, $zero -/* 7940BC 802A139C 0080282D */ daddu $a1, $a0, $zero -/* 7940C0 802A13A0 0080302D */ daddu $a2, $a0, $zero -/* 7940C4 802A13A4 0080382D */ daddu $a3, $a0, $zero -/* 7940C8 802A13A8 3C038015 */ lui $v1, %hi(D_801512F0) -/* 7940CC 802A13AC 8C6312F0 */ lw $v1, %lo(D_801512F0)($v1) -/* 7940D0 802A13B0 24020001 */ addiu $v0, $zero, 1 -/* 7940D4 802A13B4 0C046F97 */ jal set_background_color_blend -/* 7940D8 802A13B8 A0620000 */ sb $v0, ($v1) -/* 7940DC 802A13BC AE000070 */ sw $zero, 0x70($s0) -.L802A13C0: -/* 7940E0 802A13C0 0000202D */ daddu $a0, $zero, $zero -/* 7940E4 802A13C4 0080282D */ daddu $a1, $a0, $zero -/* 7940E8 802A13C8 92070073 */ lbu $a3, 0x73($s0) -/* 7940EC 802A13CC 0C046F97 */ jal set_background_color_blend -/* 7940F0 802A13D0 0080302D */ daddu $a2, $a0, $zero -/* 7940F4 802A13D4 8E020070 */ lw $v0, 0x70($s0) -/* 7940F8 802A13D8 2442000A */ addiu $v0, $v0, 0xa -/* 7940FC 802A13DC AE020070 */ sw $v0, 0x70($s0) -/* 794100 802A13E0 284200E6 */ slti $v0, $v0, 0xe6 -/* 794104 802A13E4 14400007 */ bnez $v0, .L802A1404 -/* 794108 802A13E8 0000102D */ daddu $v0, $zero, $zero -/* 79410C 802A13EC 0000202D */ daddu $a0, $zero, $zero -/* 794110 802A13F0 0080282D */ daddu $a1, $a0, $zero -/* 794114 802A13F4 0080302D */ daddu $a2, $a0, $zero -/* 794118 802A13F8 0C046F97 */ jal set_background_color_blend -/* 79411C 802A13FC 240700E6 */ addiu $a3, $zero, 0xe6 -/* 794120 802A1400 24020002 */ addiu $v0, $zero, 2 -.L802A1404: -/* 794124 802A1404 8FBF0014 */ lw $ra, 0x14($sp) -/* 794128 802A1408 8FB00010 */ lw $s0, 0x10($sp) -/* 79412C 802A140C 03E00008 */ jr $ra -/* 794130 802A1410 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/battle/star/time_out_793D20/func_802A1414_794134.s b/ver/us/asm/nonmatchings/battle/star/time_out_793D20/func_802A1414_794134.s deleted file mode 100644 index 99f6d0af4c..0000000000 --- a/ver/us/asm/nonmatchings/battle/star/time_out_793D20/func_802A1414_794134.s +++ /dev/null @@ -1,39 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1414_794134 -/* 794134 802A1414 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 794138 802A1418 AFB00010 */ sw $s0, 0x10($sp) -/* 79413C 802A141C 0080802D */ daddu $s0, $a0, $zero -/* 794140 802A1420 10A00003 */ beqz $a1, .L802A1430 -/* 794144 802A1424 AFBF0014 */ sw $ra, 0x14($sp) -/* 794148 802A1428 24020014 */ addiu $v0, $zero, 0x14 -/* 79414C 802A142C AE020070 */ sw $v0, 0x70($s0) -.L802A1430: -/* 794150 802A1430 0000202D */ daddu $a0, $zero, $zero -/* 794154 802A1434 0080282D */ daddu $a1, $a0, $zero -/* 794158 802A1438 8E020070 */ lw $v0, 0x70($s0) -/* 79415C 802A143C 0080302D */ daddu $a2, $a0, $zero -/* 794160 802A1440 00023880 */ sll $a3, $v0, 2 -/* 794164 802A1444 00E23821 */ addu $a3, $a3, $v0 -/* 794168 802A1448 00073840 */ sll $a3, $a3, 1 -/* 79416C 802A144C 0C046F97 */ jal set_background_color_blend -/* 794170 802A1450 30E700FE */ andi $a3, $a3, 0xfe -/* 794174 802A1454 8E020070 */ lw $v0, 0x70($s0) -/* 794178 802A1458 2442FFFF */ addiu $v0, $v0, -1 -/* 79417C 802A145C 10400003 */ beqz $v0, .L802A146C -/* 794180 802A1460 AE020070 */ sw $v0, 0x70($s0) -/* 794184 802A1464 080A8521 */ j .L802A1484 -/* 794188 802A1468 0000102D */ daddu $v0, $zero, $zero -.L802A146C: -/* 79418C 802A146C 0000202D */ daddu $a0, $zero, $zero -/* 794190 802A1470 0080282D */ daddu $a1, $a0, $zero -/* 794194 802A1474 0080302D */ daddu $a2, $a0, $zero -/* 794198 802A1478 0C046F97 */ jal set_background_color_blend -/* 79419C 802A147C 0080382D */ daddu $a3, $a0, $zero -/* 7941A0 802A1480 24020002 */ addiu $v0, $zero, 2 -.L802A1484: -/* 7941A4 802A1484 8FBF0014 */ lw $ra, 0x14($sp) -/* 7941A8 802A1488 8FB00010 */ lw $s0, 0x10($sp) -/* 7941AC 802A148C 03E00008 */ jr $ra -/* 7941B0 802A1490 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/battle/star/time_out_793D20/func_802A14E8_794208.s b/ver/us/asm/nonmatchings/battle/star/time_out_793D20/func_802A14E8_794208.s deleted file mode 100644 index 2c849f636f..0000000000 --- a/ver/us/asm/nonmatchings/battle/star/time_out_793D20/func_802A14E8_794208.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A14E8_794208 -/* 794208 802A14E8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 79420C 802A14EC AFBF0010 */ sw $ra, 0x10($sp) -/* 794210 802A14F0 0C00EABB */ jal get_npc_unsafe -/* 794214 802A14F4 24040064 */ addiu $a0, $zero, 0x64 -/* 794218 802A14F8 0040202D */ daddu $a0, $v0, $zero -/* 79421C 802A14FC 24030020 */ addiu $v1, $zero, 0x20 -/* 794220 802A1500 A48300A8 */ sh $v1, 0xa8($a0) -/* 794224 802A1504 A48300A6 */ sh $v1, 0xa6($a0) -/* 794228 802A1508 8FBF0010 */ lw $ra, 0x10($sp) -/* 79422C 802A150C 24020002 */ addiu $v0, $zero, 2 -/* 794230 802A1510 03E00008 */ jr $ra -/* 794234 802A1514 27BD0018 */ addiu $sp, $sp, 0x18 -/* 794238 802A1518 00000000 */ nop -/* 79423C 802A151C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/battle/star/up_and_away_7952E0/func_802A1000_7952E0.s b/ver/us/asm/nonmatchings/battle/star/up_and_away_7952E0/func_802A1000_7952E0.s deleted file mode 100644 index ced1df2af0..0000000000 --- a/ver/us/asm/nonmatchings/battle/star/up_and_away_7952E0/func_802A1000_7952E0.s +++ /dev/null @@ -1,47 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1000_7952E0 -/* 7952E0 802A1000 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 7952E4 802A1004 AFB1001C */ sw $s1, 0x1c($sp) -/* 7952E8 802A1008 0080882D */ daddu $s1, $a0, $zero -/* 7952EC 802A100C AFBF0024 */ sw $ra, 0x24($sp) -/* 7952F0 802A1010 AFB20020 */ sw $s2, 0x20($sp) -/* 7952F4 802A1014 AFB00018 */ sw $s0, 0x18($sp) -/* 7952F8 802A1018 8E30000C */ lw $s0, 0xc($s1) -/* 7952FC 802A101C 8E050000 */ lw $a1, ($s0) -/* 795300 802A1020 0C0B1EAF */ jal get_variable -/* 795304 802A1024 26100004 */ addiu $s0, $s0, 4 -/* 795308 802A1028 8E050000 */ lw $a1, ($s0) -/* 79530C 802A102C 26100004 */ addiu $s0, $s0, 4 -/* 795310 802A1030 0220202D */ daddu $a0, $s1, $zero -/* 795314 802A1034 0C0B1EAF */ jal get_variable -/* 795318 802A1038 0040902D */ daddu $s2, $v0, $zero -/* 79531C 802A103C 0220202D */ daddu $a0, $s1, $zero -/* 795320 802A1040 8E050000 */ lw $a1, ($s0) -/* 795324 802A1044 0C0B1EAF */ jal get_variable -/* 795328 802A1048 0040802D */ daddu $s0, $v0, $zero -/* 79532C 802A104C 44921000 */ mtc1 $s2, $f2 -/* 795330 802A1050 00000000 */ nop -/* 795334 802A1054 468010A0 */ cvt.s.w $f2, $f2 -/* 795338 802A1058 44051000 */ mfc1 $a1, $f2 -/* 79533C 802A105C 44901000 */ mtc1 $s0, $f2 -/* 795340 802A1060 00000000 */ nop -/* 795344 802A1064 468010A0 */ cvt.s.w $f2, $f2 -/* 795348 802A1068 44061000 */ mfc1 $a2, $f2 -/* 79534C 802A106C 44821000 */ mtc1 $v0, $f2 -/* 795350 802A1070 00000000 */ nop -/* 795354 802A1074 468010A0 */ cvt.s.w $f2, $f2 -/* 795358 802A1078 3C014220 */ lui $at, 0x4220 -/* 79535C 802A107C 44810000 */ mtc1 $at, $f0 -/* 795360 802A1080 44071000 */ mfc1 $a3, $f2 -/* 795364 802A1084 0000202D */ daddu $a0, $zero, $zero -/* 795368 802A1088 0C01BFBC */ jal func_8006FEF0 -/* 79536C 802A108C E7A00010 */ swc1 $f0, 0x10($sp) -/* 795370 802A1090 8FBF0024 */ lw $ra, 0x24($sp) -/* 795374 802A1094 8FB20020 */ lw $s2, 0x20($sp) -/* 795378 802A1098 8FB1001C */ lw $s1, 0x1c($sp) -/* 79537C 802A109C 8FB00018 */ lw $s0, 0x18($sp) -/* 795380 802A10A0 24020002 */ addiu $v0, $zero, 2 -/* 795384 802A10A4 03E00008 */ jr $ra -/* 795388 802A10A8 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/battle/star/up_and_away_7952E0/func_802A10AC_79538C.s b/ver/us/asm/nonmatchings/battle/star/up_and_away_7952E0/func_802A10AC_79538C.s deleted file mode 100644 index 51abb48ccc..0000000000 --- a/ver/us/asm/nonmatchings/battle/star/up_and_away_7952E0/func_802A10AC_79538C.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A10AC_79538C -/* 79538C 802A10AC 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 795390 802A10B0 AFB10024 */ sw $s1, 0x24($sp) -/* 795394 802A10B4 0080882D */ daddu $s1, $a0, $zero -/* 795398 802A10B8 AFBF002C */ sw $ra, 0x2c($sp) -/* 79539C 802A10BC AFB20028 */ sw $s2, 0x28($sp) -/* 7953A0 802A10C0 AFB00020 */ sw $s0, 0x20($sp) -/* 7953A4 802A10C4 8E30000C */ lw $s0, 0xc($s1) -/* 7953A8 802A10C8 8E050000 */ lw $a1, ($s0) -/* 7953AC 802A10CC 0C0B1EAF */ jal get_variable -/* 7953B0 802A10D0 26100004 */ addiu $s0, $s0, 4 -/* 7953B4 802A10D4 8E050000 */ lw $a1, ($s0) -/* 7953B8 802A10D8 26100004 */ addiu $s0, $s0, 4 -/* 7953BC 802A10DC 0220202D */ daddu $a0, $s1, $zero -/* 7953C0 802A10E0 0C0B1EAF */ jal get_variable -/* 7953C4 802A10E4 0040902D */ daddu $s2, $v0, $zero -/* 7953C8 802A10E8 0220202D */ daddu $a0, $s1, $zero -/* 7953CC 802A10EC 8E050000 */ lw $a1, ($s0) -/* 7953D0 802A10F0 0C0B1EAF */ jal get_variable -/* 7953D4 802A10F4 0040802D */ daddu $s0, $v0, $zero -/* 7953D8 802A10F8 24040005 */ addiu $a0, $zero, 5 -/* 7953DC 802A10FC 44921000 */ mtc1 $s2, $f2 -/* 7953E0 802A1100 00000000 */ nop -/* 7953E4 802A1104 468010A0 */ cvt.s.w $f2, $f2 -/* 7953E8 802A1108 44051000 */ mfc1 $a1, $f2 -/* 7953EC 802A110C 44901000 */ mtc1 $s0, $f2 -/* 7953F0 802A1110 00000000 */ nop -/* 7953F4 802A1114 468010A0 */ cvt.s.w $f2, $f2 -/* 7953F8 802A1118 44061000 */ mfc1 $a2, $f2 -/* 7953FC 802A111C 44821000 */ mtc1 $v0, $f2 -/* 795400 802A1120 00000000 */ nop -/* 795404 802A1124 468010A0 */ cvt.s.w $f2, $f2 -/* 795408 802A1128 3C014248 */ lui $at, 0x4248 -/* 79540C 802A112C 44810000 */ mtc1 $at, $f0 -/* 795410 802A1130 44071000 */ mfc1 $a3, $f2 -/* 795414 802A1134 24030028 */ addiu $v1, $zero, 0x28 -/* 795418 802A1138 AFA30018 */ sw $v1, 0x18($sp) -/* 79541C 802A113C 2403001E */ addiu $v1, $zero, 0x1e -/* 795420 802A1140 AFA3001C */ sw $v1, 0x1c($sp) -/* 795424 802A1144 E7A00010 */ swc1 $f0, 0x10($sp) -/* 795428 802A1148 0C01C154 */ jal func_80070550 -/* 79542C 802A114C E7A00014 */ swc1 $f0, 0x14($sp) -/* 795430 802A1150 8FBF002C */ lw $ra, 0x2c($sp) -/* 795434 802A1154 8FB20028 */ lw $s2, 0x28($sp) -/* 795438 802A1158 8FB10024 */ lw $s1, 0x24($sp) -/* 79543C 802A115C 8FB00020 */ lw $s0, 0x20($sp) -/* 795440 802A1160 24020002 */ addiu $v0, $zero, 2 -/* 795444 802A1164 03E00008 */ jr $ra -/* 795448 802A1168 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/battle/star/up_and_away_7952E0/func_802A116C_79544C.s b/ver/us/asm/nonmatchings/battle/star/up_and_away_7952E0/func_802A116C_79544C.s deleted file mode 100644 index 185081c341..0000000000 --- a/ver/us/asm/nonmatchings/battle/star/up_and_away_7952E0/func_802A116C_79544C.s +++ /dev/null @@ -1,47 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A116C_79544C -/* 79544C 802A116C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 795450 802A1170 AFB1001C */ sw $s1, 0x1c($sp) -/* 795454 802A1174 0080882D */ daddu $s1, $a0, $zero -/* 795458 802A1178 AFBF0024 */ sw $ra, 0x24($sp) -/* 79545C 802A117C AFB20020 */ sw $s2, 0x20($sp) -/* 795460 802A1180 AFB00018 */ sw $s0, 0x18($sp) -/* 795464 802A1184 8E30000C */ lw $s0, 0xc($s1) -/* 795468 802A1188 8E050000 */ lw $a1, ($s0) -/* 79546C 802A118C 0C0B1EAF */ jal get_variable -/* 795470 802A1190 26100004 */ addiu $s0, $s0, 4 -/* 795474 802A1194 8E050000 */ lw $a1, ($s0) -/* 795478 802A1198 26100004 */ addiu $s0, $s0, 4 -/* 79547C 802A119C 0220202D */ daddu $a0, $s1, $zero -/* 795480 802A11A0 0C0B1EAF */ jal get_variable -/* 795484 802A11A4 0040902D */ daddu $s2, $v0, $zero -/* 795488 802A11A8 0220202D */ daddu $a0, $s1, $zero -/* 79548C 802A11AC 8E050000 */ lw $a1, ($s0) -/* 795490 802A11B0 0C0B1EAF */ jal get_variable -/* 795494 802A11B4 0040802D */ daddu $s0, $v0, $zero -/* 795498 802A11B8 44921000 */ mtc1 $s2, $f2 -/* 79549C 802A11BC 00000000 */ nop -/* 7954A0 802A11C0 468010A0 */ cvt.s.w $f2, $f2 -/* 7954A4 802A11C4 44051000 */ mfc1 $a1, $f2 -/* 7954A8 802A11C8 44901000 */ mtc1 $s0, $f2 -/* 7954AC 802A11CC 00000000 */ nop -/* 7954B0 802A11D0 468010A0 */ cvt.s.w $f2, $f2 -/* 7954B4 802A11D4 44061000 */ mfc1 $a2, $f2 -/* 7954B8 802A11D8 44821000 */ mtc1 $v0, $f2 -/* 7954BC 802A11DC 00000000 */ nop -/* 7954C0 802A11E0 468010A0 */ cvt.s.w $f2, $f2 -/* 7954C4 802A11E4 3C0141F0 */ lui $at, 0x41f0 -/* 7954C8 802A11E8 44810000 */ mtc1 $at, $f0 -/* 7954CC 802A11EC 44071000 */ mfc1 $a3, $f2 -/* 7954D0 802A11F0 0000202D */ daddu $a0, $zero, $zero -/* 7954D4 802A11F4 0C01BFBC */ jal func_8006FEF0 -/* 7954D8 802A11F8 E7A00010 */ swc1 $f0, 0x10($sp) -/* 7954DC 802A11FC 8FBF0024 */ lw $ra, 0x24($sp) -/* 7954E0 802A1200 8FB20020 */ lw $s2, 0x20($sp) -/* 7954E4 802A1204 8FB1001C */ lw $s1, 0x1c($sp) -/* 7954E8 802A1208 8FB00018 */ lw $s0, 0x18($sp) -/* 7954EC 802A120C 24020002 */ addiu $v0, $zero, 2 -/* 7954F0 802A1210 03E00008 */ jr $ra -/* 7954F4 802A1214 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/battle/star/up_and_away_7952E0/func_802A1218_7954F8.s b/ver/us/asm/nonmatchings/battle/star/up_and_away_7952E0/func_802A1218_7954F8.s deleted file mode 100644 index 88ea7f98b4..0000000000 --- a/ver/us/asm/nonmatchings/battle/star/up_and_away_7952E0/func_802A1218_7954F8.s +++ /dev/null @@ -1,55 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1218_7954F8 -/* 7954F8 802A1218 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* 7954FC 802A121C AFB1002C */ sw $s1, 0x2c($sp) -/* 795500 802A1220 0080882D */ daddu $s1, $a0, $zero -/* 795504 802A1224 AFBF0034 */ sw $ra, 0x34($sp) -/* 795508 802A1228 AFB20030 */ sw $s2, 0x30($sp) -/* 79550C 802A122C AFB00028 */ sw $s0, 0x28($sp) -/* 795510 802A1230 8E30000C */ lw $s0, 0xc($s1) -/* 795514 802A1234 8E050000 */ lw $a1, ($s0) -/* 795518 802A1238 0C0B1EAF */ jal get_variable -/* 79551C 802A123C 26100004 */ addiu $s0, $s0, 4 -/* 795520 802A1240 8E050000 */ lw $a1, ($s0) -/* 795524 802A1244 26100004 */ addiu $s0, $s0, 4 -/* 795528 802A1248 0220202D */ daddu $a0, $s1, $zero -/* 79552C 802A124C 0C0B1EAF */ jal get_variable -/* 795530 802A1250 0040902D */ daddu $s2, $v0, $zero -/* 795534 802A1254 0220202D */ daddu $a0, $s1, $zero -/* 795538 802A1258 8E050000 */ lw $a1, ($s0) -/* 79553C 802A125C 0C0B1EAF */ jal get_variable -/* 795540 802A1260 0040802D */ daddu $s0, $v0, $zero -/* 795544 802A1264 24040004 */ addiu $a0, $zero, 4 -/* 795548 802A1268 44922000 */ mtc1 $s2, $f4 -/* 79554C 802A126C 00000000 */ nop -/* 795550 802A1270 46802120 */ cvt.s.w $f4, $f4 -/* 795554 802A1274 44052000 */ mfc1 $a1, $f4 -/* 795558 802A1278 44902000 */ mtc1 $s0, $f4 -/* 79555C 802A127C 00000000 */ nop -/* 795560 802A1280 46802120 */ cvt.s.w $f4, $f4 -/* 795564 802A1284 44062000 */ mfc1 $a2, $f4 -/* 795568 802A1288 44822000 */ mtc1 $v0, $f4 -/* 79556C 802A128C 00000000 */ nop -/* 795570 802A1290 46802120 */ cvt.s.w $f4, $f4 -/* 795574 802A1294 3C0141A0 */ lui $at, 0x41a0 -/* 795578 802A1298 44810000 */ mtc1 $at, $f0 -/* 79557C 802A129C 3C013F80 */ lui $at, 0x3f80 -/* 795580 802A12A0 44811000 */ mtc1 $at, $f2 -/* 795584 802A12A4 44072000 */ mfc1 $a3, $f4 -/* 795588 802A12A8 2403000A */ addiu $v1, $zero, 0xa -/* 79558C 802A12AC AFA3001C */ sw $v1, 0x1c($sp) -/* 795590 802A12B0 2403000F */ addiu $v1, $zero, 0xf -/* 795594 802A12B4 AFA30020 */ sw $v1, 0x20($sp) -/* 795598 802A12B8 E7A00010 */ swc1 $f0, 0x10($sp) -/* 79559C 802A12BC E7A00014 */ swc1 $f0, 0x14($sp) -/* 7955A0 802A12C0 0C01C8D4 */ jal func_80072350 -/* 7955A4 802A12C4 E7A20018 */ swc1 $f2, 0x18($sp) -/* 7955A8 802A12C8 8FBF0034 */ lw $ra, 0x34($sp) -/* 7955AC 802A12CC 8FB20030 */ lw $s2, 0x30($sp) -/* 7955B0 802A12D0 8FB1002C */ lw $s1, 0x2c($sp) -/* 7955B4 802A12D4 8FB00028 */ lw $s0, 0x28($sp) -/* 7955B8 802A12D8 24020002 */ addiu $v0, $zero, 2 -/* 7955BC 802A12DC 03E00008 */ jr $ra -/* 7955C0 802A12E0 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/ver/us/asm/nonmatchings/battle/star/up_and_away_7952E0/func_802A137C_79565C.s b/ver/us/asm/nonmatchings/battle/star/up_and_away_7952E0/func_802A137C_79565C.s deleted file mode 100644 index 5e638105eb..0000000000 --- a/ver/us/asm/nonmatchings/battle/star/up_and_away_7952E0/func_802A137C_79565C.s +++ /dev/null @@ -1,44 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A137C_79565C -/* 79565C 802A137C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 795660 802A1380 AFB00010 */ sw $s0, 0x10($sp) -/* 795664 802A1384 0080802D */ daddu $s0, $a0, $zero -/* 795668 802A1388 10A0000D */ beqz $a1, .L802A13C0 -/* 79566C 802A138C AFBF0014 */ sw $ra, 0x14($sp) -/* 795670 802A1390 0C04760B */ jal func_8011D82C -/* 795674 802A1394 24040001 */ addiu $a0, $zero, 1 -/* 795678 802A1398 0000202D */ daddu $a0, $zero, $zero -/* 79567C 802A139C 0080282D */ daddu $a1, $a0, $zero -/* 795680 802A13A0 0080302D */ daddu $a2, $a0, $zero -/* 795684 802A13A4 0080382D */ daddu $a3, $a0, $zero -/* 795688 802A13A8 3C038015 */ lui $v1, %hi(D_801512F0) -/* 79568C 802A13AC 8C6312F0 */ lw $v1, %lo(D_801512F0)($v1) -/* 795690 802A13B0 24020001 */ addiu $v0, $zero, 1 -/* 795694 802A13B4 0C046F97 */ jal set_background_color_blend -/* 795698 802A13B8 A0620000 */ sb $v0, ($v1) -/* 79569C 802A13BC AE000070 */ sw $zero, 0x70($s0) -.L802A13C0: -/* 7956A0 802A13C0 0000202D */ daddu $a0, $zero, $zero -/* 7956A4 802A13C4 0080282D */ daddu $a1, $a0, $zero -/* 7956A8 802A13C8 92070073 */ lbu $a3, 0x73($s0) -/* 7956AC 802A13CC 0C046F97 */ jal set_background_color_blend -/* 7956B0 802A13D0 0080302D */ daddu $a2, $a0, $zero -/* 7956B4 802A13D4 8E020070 */ lw $v0, 0x70($s0) -/* 7956B8 802A13D8 2442000A */ addiu $v0, $v0, 0xa -/* 7956BC 802A13DC AE020070 */ sw $v0, 0x70($s0) -/* 7956C0 802A13E0 284200E6 */ slti $v0, $v0, 0xe6 -/* 7956C4 802A13E4 14400007 */ bnez $v0, .L802A1404 -/* 7956C8 802A13E8 0000102D */ daddu $v0, $zero, $zero -/* 7956CC 802A13EC 0000202D */ daddu $a0, $zero, $zero -/* 7956D0 802A13F0 0080282D */ daddu $a1, $a0, $zero -/* 7956D4 802A13F4 0080302D */ daddu $a2, $a0, $zero -/* 7956D8 802A13F8 0C046F97 */ jal set_background_color_blend -/* 7956DC 802A13FC 240700E6 */ addiu $a3, $zero, 0xe6 -/* 7956E0 802A1400 24020002 */ addiu $v0, $zero, 2 -.L802A1404: -/* 7956E4 802A1404 8FBF0014 */ lw $ra, 0x14($sp) -/* 7956E8 802A1408 8FB00010 */ lw $s0, 0x10($sp) -/* 7956EC 802A140C 03E00008 */ jr $ra -/* 7956F0 802A1410 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/battle/star/up_and_away_7952E0/func_802A1414_7956F4.s b/ver/us/asm/nonmatchings/battle/star/up_and_away_7952E0/func_802A1414_7956F4.s deleted file mode 100644 index b99b0e3b20..0000000000 --- a/ver/us/asm/nonmatchings/battle/star/up_and_away_7952E0/func_802A1414_7956F4.s +++ /dev/null @@ -1,39 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1414_7956F4 -/* 7956F4 802A1414 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 7956F8 802A1418 AFB00010 */ sw $s0, 0x10($sp) -/* 7956FC 802A141C 0080802D */ daddu $s0, $a0, $zero -/* 795700 802A1420 10A00003 */ beqz $a1, .L802A1430 -/* 795704 802A1424 AFBF0014 */ sw $ra, 0x14($sp) -/* 795708 802A1428 24020014 */ addiu $v0, $zero, 0x14 -/* 79570C 802A142C AE020070 */ sw $v0, 0x70($s0) -.L802A1430: -/* 795710 802A1430 0000202D */ daddu $a0, $zero, $zero -/* 795714 802A1434 0080282D */ daddu $a1, $a0, $zero -/* 795718 802A1438 8E020070 */ lw $v0, 0x70($s0) -/* 79571C 802A143C 0080302D */ daddu $a2, $a0, $zero -/* 795720 802A1440 00023880 */ sll $a3, $v0, 2 -/* 795724 802A1444 00E23821 */ addu $a3, $a3, $v0 -/* 795728 802A1448 00073840 */ sll $a3, $a3, 1 -/* 79572C 802A144C 0C046F97 */ jal set_background_color_blend -/* 795730 802A1450 30E700FE */ andi $a3, $a3, 0xfe -/* 795734 802A1454 8E020070 */ lw $v0, 0x70($s0) -/* 795738 802A1458 2442FFFF */ addiu $v0, $v0, -1 -/* 79573C 802A145C 10400003 */ beqz $v0, .L802A146C -/* 795740 802A1460 AE020070 */ sw $v0, 0x70($s0) -/* 795744 802A1464 080A8521 */ j .L802A1484 -/* 795748 802A1468 0000102D */ daddu $v0, $zero, $zero -.L802A146C: -/* 79574C 802A146C 0000202D */ daddu $a0, $zero, $zero -/* 795750 802A1470 0080282D */ daddu $a1, $a0, $zero -/* 795754 802A1474 0080302D */ daddu $a2, $a0, $zero -/* 795758 802A1478 0C046F97 */ jal set_background_color_blend -/* 79575C 802A147C 0080382D */ daddu $a3, $a0, $zero -/* 795760 802A1480 24020002 */ addiu $v0, $zero, 2 -.L802A1484: -/* 795764 802A1484 8FBF0014 */ lw $ra, 0x14($sp) -/* 795768 802A1488 8FB00010 */ lw $s0, 0x10($sp) -/* 79576C 802A148C 03E00008 */ jr $ra -/* 795770 802A1490 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/battle/star/up_and_away_7952E0/func_802A14E8_7957C8.s b/ver/us/asm/nonmatchings/battle/star/up_and_away_7952E0/func_802A14E8_7957C8.s deleted file mode 100644 index 2f8b8040f4..0000000000 --- a/ver/us/asm/nonmatchings/battle/star/up_and_away_7952E0/func_802A14E8_7957C8.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A14E8_7957C8 -/* 7957C8 802A14E8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 7957CC 802A14EC AFBF0010 */ sw $ra, 0x10($sp) -/* 7957D0 802A14F0 0C00EABB */ jal get_npc_unsafe -/* 7957D4 802A14F4 24040064 */ addiu $a0, $zero, 0x64 -/* 7957D8 802A14F8 0040202D */ daddu $a0, $v0, $zero -/* 7957DC 802A14FC 24030020 */ addiu $v1, $zero, 0x20 -/* 7957E0 802A1500 A48300A8 */ sh $v1, 0xa8($a0) -/* 7957E4 802A1504 A48300A6 */ sh $v1, 0xa6($a0) -/* 7957E8 802A1508 8FBF0010 */ lw $ra, 0x10($sp) -/* 7957EC 802A150C 24020002 */ addiu $v0, $zero, 2 -/* 7957F0 802A1510 03E00008 */ jr $ra -/* 7957F4 802A1514 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/code_102C80/func_802E17A8.s b/ver/us/asm/nonmatchings/code_102C80/func_802E17A8.s index 3b7e62ff72..2255c1848c 100644 --- a/ver/us/asm/nonmatchings/code_102C80/func_802E17A8.s +++ b/ver/us/asm/nonmatchings/code_102C80/func_802E17A8.s @@ -1,6 +1,64 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches +.section .rodata + +glabel jtbl_802EB010 +.word L802E17EC_10306C, L802E1894_103114, L802E1938_1031B8, L802E19E0_103260, L802E1A84_103304, L802E1B18_103398 + +glabel D_802EB028 +.double 0.3 + +glabel D_802EB030 +.double 0.01 + +glabel D_802EB038 +.double -0.2 + +glabel D_802EB040 +.double -0.01 + +glabel D_802EB048 +.double 0.15 + +glabel D_802EB050 +.double 0.01 + +glabel D_802EB058 +.double -0.1 + +glabel D_802EB060 +.double -0.01 + +glabel D_802EB068 +.double 0.01 + +glabel jtbl_802EB070 +.word L802E1B48_1033C8, L802E1BF0_103470, L802E1C94_103514, L802E1D38_1035B8, L802E1DDC_10365C, L802E1E6C_1036EC + +glabel D_802EB088 +.double -0.01 + +glabel D_802EB090 +.double 0.1 + +glabel D_802EB098 +.double 0.01 + +glabel D_802EB0A0 +.double -0.3 + +glabel D_802EB0A8 +.double -0.01 + +glabel D_802EB0B0 +.double 0.01 + +glabel D_802EB0B8 +.double -0.01 + +.section .text + glabel func_802E17A8 /* 103028 802E17A8 27BDFFE0 */ addiu $sp, $sp, -0x20 /* 10302C 802E17AC AFB10014 */ sw $s1, 0x14($sp) diff --git a/ver/us/asm/nonmatchings/code_102C80/func_802E1EDC.s b/ver/us/asm/nonmatchings/code_102C80/func_802E1EDC.s index fe437fb40a..7dc3a1fc1d 100644 --- a/ver/us/asm/nonmatchings/code_102C80/func_802E1EDC.s +++ b/ver/us/asm/nonmatchings/code_102C80/func_802E1EDC.s @@ -1,6 +1,46 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches +.section .rodata + +glabel jtbl_802EB0C0 +.word L802E1F20_1037A0, L802E1FBC_10383C, L802E1FD0_103850, L802E206C_1038EC, L802E211C_10399C, 0 + +glabel D_802EB0D8 +.double 0.3 + +glabel D_802EB0E0 +.double 0.01 + +glabel D_802EB0E8 +.double -0.2 + +glabel D_802EB0F0 +.double 0.15 + +glabel D_802EB0F8 +.double 0.01 + +glabel D_802EB100 +.double -0.1 + +glabel D_802EB108 +.double -0.01 + +glabel D_802EB110 +.double 0.1 + +glabel D_802EB118 +.double 0.01 + +glabel D_802EB120 +.double -0.3 + +glabel D_802EB128 +.double -0.01 + +.section .text + glabel func_802E1EDC /* 10375C 802E1EDC 27BDFFD8 */ addiu $sp, $sp, -0x28 /* 103760 802E1EE0 AFB1001C */ sw $s1, 0x1c($sp) diff --git a/ver/us/asm/nonmatchings/code_102C80/func_802E246C.s b/ver/us/asm/nonmatchings/code_102C80/func_802E246C.s index f2f5be683a..9c70b13f28 100644 --- a/ver/us/asm/nonmatchings/code_102C80/func_802E246C.s +++ b/ver/us/asm/nonmatchings/code_102C80/func_802E246C.s @@ -1,6 +1,13 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches +.section .rodata + +glabel D_802EB130 +.double 2.7 + +.section .text + glabel func_802E246C /* 103CEC 802E246C 27BDFF40 */ addiu $sp, $sp, -0xc0 /* 103CF0 802E2470 AFB500A4 */ sw $s5, 0xa4($sp) diff --git a/ver/us/asm/nonmatchings/code_102C80/func_802E263C.s b/ver/us/asm/nonmatchings/code_102C80/func_802E263C.s index 27cd46979d..e4a63d8f63 100644 --- a/ver/us/asm/nonmatchings/code_102C80/func_802E263C.s +++ b/ver/us/asm/nonmatchings/code_102C80/func_802E263C.s @@ -1,6 +1,25 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches +.section .rodata + +glabel D_802EB138 +.double 360.0 + +glabel D_802EB140 +.double 0.3 + +glabel D_802EB148 +.double 1.2 + +glabel D_802EB150 +.double -12.2 + +glabel D_802EB158 +.double 6.283180236816406 + +.section .text + glabel func_802E263C /* 103EBC 802E263C 27BDFF68 */ addiu $sp, $sp, -0x98 /* 103EC0 802E2640 F7B80078 */ sdc1 $f24, 0x78($sp) diff --git a/ver/us/asm/nonmatchings/code_104940_len_dc0/func_802E3370.s b/ver/us/asm/nonmatchings/code_104940_len_dc0/func_802E3370.s index 94ba4fce2b..85aede212b 100644 --- a/ver/us/asm/nonmatchings/code_104940_len_dc0/func_802E3370.s +++ b/ver/us/asm/nonmatchings/code_104940_len_dc0/func_802E3370.s @@ -1,6 +1,22 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches +.section .rodata + +glabel D_802EB1F0 +.double 1.2 + +glabel D_802EB1F8 +.double 0.3 + +glabel D_802EB200 +.double 1.2 + +glabel D_802EB208 +.double 0.3 + +.section .text + glabel func_802E3370 /* 104BF0 802E3370 27BDFFE0 */ addiu $sp, $sp, -0x20 /* 104BF4 802E3374 AFB00010 */ sw $s0, 0x10($sp) diff --git a/ver/us/asm/nonmatchings/code_104940_len_dc0/func_802E3BA4.s b/ver/us/asm/nonmatchings/code_104940_len_dc0/func_802E3BA4.s index 55d59c128f..75e5e459d2 100644 --- a/ver/us/asm/nonmatchings/code_104940_len_dc0/func_802E3BA4.s +++ b/ver/us/asm/nonmatchings/code_104940_len_dc0/func_802E3BA4.s @@ -1,6 +1,13 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches +.section .rodata + +glabel jtbl_802EB210 +.word L802E3DCC_10564C, L802E3DDC_10565C, L802E3C34_1054B4, L802E3C34_1054B4, L802E3C34_1054B4, L802E3C34_1054B4, L802E3C34_1054B4, L802E3C34_1054B4, L802E3DE4_105664, L802E3C34_1054B4, L802E3CD8_105558, L802E3D2C_1055AC, L802E3D84_105604, L802E3CD8_105558, L802E3D2C_1055AC, L802E3D84_105604, L802E3DCC_10564C, L802E3DCC_10564C, L802E3DCC_10564C, L802E3DCC_10564C, L802E3DCC_10564C, 0, 0, 0 + +.section .text + glabel func_802E3BA4 /* 105424 802E3BA4 27BDFFD8 */ addiu $sp, $sp, -0x28 /* 105428 802E3BA8 AFB1001C */ sw $s1, 0x1c($sp) diff --git a/ver/us/asm/nonmatchings/code_105F90/func_802E4C10.s b/ver/us/asm/nonmatchings/code_105F90/func_802E4C10.s index 42ba0295d6..6663512d1b 100644 --- a/ver/us/asm/nonmatchings/code_105F90/func_802E4C10.s +++ b/ver/us/asm/nonmatchings/code_105F90/func_802E4C10.s @@ -1,6 +1,13 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches +.section .rodata + +glabel D_802EB270 +.double 0.01 + +.section .text + glabel func_802E4C10 /* 106490 802E4C10 27BDFFD0 */ addiu $sp, $sp, -0x30 /* 106494 802E4C14 AFB10024 */ sw $s1, 0x24($sp) diff --git a/ver/us/asm/nonmatchings/code_105F90/func_802E4E04.s b/ver/us/asm/nonmatchings/code_105F90/func_802E4E04.s index 09ba9d2452..c32474b358 100644 --- a/ver/us/asm/nonmatchings/code_105F90/func_802E4E04.s +++ b/ver/us/asm/nonmatchings/code_105F90/func_802E4E04.s @@ -1,6 +1,16 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches +.section .rodata + +glabel jtbl_802EB278 +.word L802E4E54_1066D4, L802E4E98_106718, L802E4F1C_10679C, L802E5018_106898, L802E5170_1069F0, L802E52AC_106B2C + +glabel D_802EB290 +.double 0.7 + +.section .text + glabel func_802E4E04 /* 106684 802E4E04 27BDFFC8 */ addiu $sp, $sp, -0x38 /* 106688 802E4E08 AFB1001C */ sw $s1, 0x1c($sp) @@ -17,11 +27,12 @@ glabel func_802E4E04 /* 1066B4 802E4E34 2C620006 */ sltiu $v0, $v1, 6 /* 1066B8 802E4E38 1040012B */ beqz $v0, .L802E52E8 /* 1066BC 802E4E3C 00031080 */ sll $v0, $v1, 2 -/* 1066C0 802E4E40 3C01802F */ lui $at, %hi(D_802EB278) +/* 1066C0 802E4E40 3C01802F */ lui $at, %hi(jtbl_802EB278) /* 1066C4 802E4E44 00220821 */ addu $at, $at, $v0 -/* 1066C8 802E4E48 8C22B278 */ lw $v0, %lo(D_802EB278)($at) +/* 1066C8 802E4E48 8C22B278 */ lw $v0, %lo(jtbl_802EB278)($at) /* 1066CC 802E4E4C 00400008 */ jr $v0 /* 1066D0 802E4E50 00000000 */ nop +glabel L802E4E54_1066D4 /* 1066D4 802E4E54 3C014000 */ lui $at, 0x4000 /* 1066D8 802E4E58 44810000 */ mtc1 $at, $f0 /* 1066DC 802E4E5C 00000000 */ nop @@ -39,6 +50,7 @@ glabel func_802E4E04 /* 10670C 802E4E8C A2020001 */ sb $v0, 1($s0) /* 106710 802E4E90 080B94BA */ j .L802E52E8 /* 106714 802E4E94 E6000014 */ swc1 $f0, 0x14($s0) +glabel L802E4E98_106718 /* 106718 802E4E98 C620004C */ lwc1 $f0, 0x4c($s1) /* 10671C 802E4E9C C6020014 */ lwc1 $f2, 0x14($s0) /* 106720 802E4EA0 46020000 */ add.s $f0, $f0, $f2 @@ -72,6 +84,7 @@ glabel func_802E4E04 /* 106790 802E4F10 24424AEC */ addiu $v0, $v0, %lo(func_802E4AEC) /* 106794 802E4F14 080B94BA */ j .L802E52E8 /* 106798 802E4F18 AE22003C */ sw $v0, 0x3c($s1) +glabel L802E4F1C_10679C /* 10679C 802E4F1C C60C0020 */ lwc1 $f12, 0x20($s0) /* 1067A0 802E4F20 3C0140C9 */ lui $at, 0x40c9 /* 1067A4 802E4F24 34210FD0 */ ori $at, $at, 0xfd0 @@ -136,6 +149,7 @@ glabel func_802E4E04 /* 10688C 802E500C 24040131 */ addiu $a0, $zero, 0x131 /* 106890 802E5010 080B949D */ j .L802E5274 /* 106894 802E5014 00000000 */ nop +glabel L802E5018_106898 /* 106898 802E5018 C600001C */ lwc1 $f0, 0x1c($s0) /* 10689C 802E501C 3C014000 */ lui $at, 0x4000 /* 1068A0 802E5020 44811800 */ mtc1 $at, $f3 @@ -219,13 +233,13 @@ glabel func_802E4E04 /* 1069CC 802E514C 00000000 */ nop /* 1069D0 802E5150 4602003C */ c.lt.s $f0, $f2 /* 1069D4 802E5154 00000000 */ nop -/* 1069D8 802E5158 45000005 */ bc1f .L802E5170 +/* 1069D8 802E5158 45000005 */ bc1f L802E5170_1069F0 /* 1069DC 802E515C 00000000 */ nop /* 1069E0 802E5160 92020001 */ lbu $v0, 1($s0) /* 1069E4 802E5164 E6020004 */ swc1 $f2, 4($s0) /* 1069E8 802E5168 24420001 */ addiu $v0, $v0, 1 /* 1069EC 802E516C A2020001 */ sb $v0, 1($s0) -.L802E5170: +glabel L802E5170_1069F0 /* 1069F0 802E5170 C60C0020 */ lwc1 $f12, 0x20($s0) /* 1069F4 802E5174 3C0140C9 */ lui $at, 0x40c9 /* 1069F8 802E5178 34210FD0 */ ori $at, $at, 0xfd0 @@ -309,6 +323,7 @@ glabel func_802E4E04 /* 106B20 802E52A0 A6000024 */ sh $zero, 0x24($s0) /* 106B24 802E52A4 080B94BA */ j .L802E52E8 /* 106B28 802E52A8 00000000 */ nop +glabel L802E52AC_106B2C /* 106B2C 802E52AC 8E420004 */ lw $v0, 4($s2) /* 106B30 802E52B0 2403FDFF */ addiu $v1, $zero, -0x201 /* 106B34 802E52B4 00431024 */ and $v0, $v0, $v1 diff --git a/ver/us/asm/nonmatchings/code_105F90/func_802E5324.s b/ver/us/asm/nonmatchings/code_105F90/func_802E5324.s index 8e26870b00..4263d57f54 100644 --- a/ver/us/asm/nonmatchings/code_105F90/func_802E5324.s +++ b/ver/us/asm/nonmatchings/code_105F90/func_802E5324.s @@ -1,6 +1,16 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches +.section .rodata + +glabel D_802EB298 +.double 0.1 + +glabel D_802EB2A0 +.double 0.02, 0.0 + +.section .text + glabel func_802E5324 /* 106BA4 802E5324 27BDFFE0 */ addiu $sp, $sp, -0x20 /* 106BA8 802E5328 AFB10014 */ sw $s1, 0x14($sp) diff --git a/ver/us/asm/nonmatchings/code_107830_len_e70/func_802E6574.s b/ver/us/asm/nonmatchings/code_107830_len_e70/func_802E6574.s index 9624b096a6..8ab74c13b0 100644 --- a/ver/us/asm/nonmatchings/code_107830_len_e70/func_802E6574.s +++ b/ver/us/asm/nonmatchings/code_107830_len_e70/func_802E6574.s @@ -1,6 +1,13 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches +.section .rodata + +glabel jtbl_802EB2B0 +.word L802E663C_107EBC, L802E66F4_107F74, L802E67E8_108068, L802E685C_1080DC, L802E697C_1081FC, L802E698C_10820C, L802E6AD4_108354, L802E6AD4_108354, L802E6AD4_108354, L802E6AD4_108354, L802E69A8_108228, L802E69E0_108260, L802E6A48_1082C8, 0, 0, 0 + +.section .text + glabel func_802E6574 /* 107DF4 802E6574 3C01800B */ lui $at, %hi(gCameras+0x6C) /* 107DF8 802E6578 C4201DEC */ lwc1 $f0, %lo(gCameras+0x6C)($at) @@ -48,13 +55,14 @@ glabel func_802E6574 .L802E6618: /* 107E98 802E6618 82030000 */ lb $v1, ($s0) /* 107E9C 802E661C 2C62000D */ sltiu $v0, $v1, 0xd -/* 107EA0 802E6620 1040012C */ beqz $v0, .L802E6AD4 +/* 107EA0 802E6620 1040012C */ beqz $v0, L802E6AD4_108354 /* 107EA4 802E6624 00031080 */ sll $v0, $v1, 2 -/* 107EA8 802E6628 3C01802F */ lui $at, %hi(D_802EB2B0) +/* 107EA8 802E6628 3C01802F */ lui $at, %hi(jtbl_802EB2B0) /* 107EAC 802E662C 00220821 */ addu $at, $at, $v0 -/* 107EB0 802E6630 8C22B2B0 */ lw $v0, %lo(D_802EB2B0)($at) +/* 107EB0 802E6630 8C22B2B0 */ lw $v0, %lo(jtbl_802EB2B0)($at) /* 107EB4 802E6634 00400008 */ jr $v0 /* 107EB8 802E6638 00000000 */ nop +glabel L802E663C_107EBC /* 107EBC 802E663C 0C05272D */ jal play_sound /* 107EC0 802E6640 240420AB */ addiu $a0, $zero, 0x20ab /* 107EC4 802E6644 24040001 */ addiu $a0, $zero, 1 @@ -100,8 +108,9 @@ glabel func_802E6574 /* 107F60 802E66E0 8E220000 */ lw $v0, ($s1) /* 107F64 802E66E4 2403FFFE */ addiu $v1, $zero, -2 /* 107F68 802E66E8 00431024 */ and $v0, $v0, $v1 -/* 107F6C 802E66EC 080B9AB5 */ j .L802E6AD4 +/* 107F6C 802E66EC 080B9AB5 */ j L802E6AD4_108354 /* 107F70 802E66F0 AE220000 */ sw $v0, ($s1) +glabel L802E66F4_107F74 /* 107F74 802E66F4 C60C002C */ lwc1 $f12, 0x2c($s0) /* 107F78 802E66F8 3C0140C9 */ lui $at, 0x40c9 /* 107F7C 802E66FC 34210FD0 */ ori $at, $at, 0xfd0 @@ -155,16 +164,17 @@ glabel func_802E6574 /* 108034 802E67B4 00000000 */ nop /* 108038 802E67B8 4602003C */ c.lt.s $f0, $f2 /* 10803C 802E67BC 00000000 */ nop -/* 108040 802E67C0 450000C4 */ bc1f .L802E6AD4 +/* 108040 802E67C0 450000C4 */ bc1f L802E6AD4_108354 /* 108044 802E67C4 00000000 */ nop /* 108048 802E67C8 C6000030 */ lwc1 $f0, 0x30($s0) /* 10804C 802E67CC 4600A500 */ add.s $f20, $f20, $f0 /* 108050 802E67D0 4614B03E */ c.le.s $f22, $f20 /* 108054 802E67D4 00000000 */ nop -/* 108058 802E67D8 450300BE */ bc1tl .L802E6AD4 +/* 108058 802E67D8 450300BE */ bc1tl L802E6AD4_108354 /* 10805C 802E67DC 4616A501 */ sub.s $f20, $f20, $f22 -/* 108060 802E67E0 080B9AB5 */ j .L802E6AD4 +/* 108060 802E67E0 080B9AB5 */ j L802E6AD4_108354 /* 108064 802E67E4 00000000 */ nop +glabel L802E67E8_108068 /* 108068 802E67E8 C6000030 */ lwc1 $f0, 0x30($s0) /* 10806C 802E67EC 3C014000 */ lui $at, 0x4000 /* 108070 802E67F0 44811000 */ mtc1 $at, $f2 @@ -192,10 +202,11 @@ glabel func_802E6574 /* 1080C0 802E6840 2442FFFF */ addiu $v0, $v0, -1 /* 1080C4 802E6844 A2020001 */ sb $v0, 1($s0) /* 1080C8 802E6848 00021600 */ sll $v0, $v0, 0x18 -/* 1080CC 802E684C 1840004B */ blez $v0, .L802E697C +/* 1080CC 802E684C 1840004B */ blez $v0, L802E697C_1081FC /* 1080D0 802E6850 00000000 */ nop -/* 1080D4 802E6854 080B9AB5 */ j .L802E6AD4 +/* 1080D4 802E6854 080B9AB5 */ j L802E6AD4_108354 /* 1080D8 802E6858 00000000 */ nop +glabel L802E685C_1080DC /* 1080DC 802E685C C6000030 */ lwc1 $f0, 0x30($s0) /* 1080E0 802E6860 3C0140A0 */ lui $at, 0x40a0 /* 1080E4 802E6864 44811000 */ mtc1 $at, $f2 @@ -251,7 +262,7 @@ glabel func_802E6574 /* 1081A0 802E6920 C6000024 */ lwc1 $f0, 0x24($s0) /* 1081A4 802E6924 4600103E */ c.le.s $f2, $f0 /* 1081A8 802E6928 00000000 */ nop -/* 1081AC 802E692C 45000069 */ bc1f .L802E6AD4 +/* 1081AC 802E692C 45000069 */ bc1f L802E6AD4_108354 /* 1081B0 802E6930 0000202D */ daddu $a0, $zero, $zero /* 1081B4 802E6934 4600B506 */ mov.s $f20, $f22 /* 1081B8 802E6938 24050002 */ addiu $a1, $zero, 2 @@ -269,13 +280,14 @@ glabel func_802E6574 /* 1081E8 802E6968 A2020001 */ sb $v0, 1($s0) /* 1081EC 802E696C 0C05272D */ jal play_sound /* 1081F0 802E6970 240420AC */ addiu $a0, $zero, 0x20ac -/* 1081F4 802E6974 080B9AB5 */ j .L802E6AD4 +/* 1081F4 802E6974 080B9AB5 */ j L802E6AD4_108354 /* 1081F8 802E6978 00000000 */ nop -.L802E697C: +glabel L802E697C_1081FC /* 1081FC 802E697C 92020000 */ lbu $v0, ($s0) /* 108200 802E6980 24420001 */ addiu $v0, $v0, 1 -/* 108204 802E6984 080B9AB5 */ j .L802E6AD4 +/* 108204 802E6984 080B9AB5 */ j L802E6AD4_108354 /* 108208 802E6988 A2020000 */ sb $v0, ($s0) +glabel L802E698C_10820C /* 10820C 802E698C 2402000B */ addiu $v0, $zero, 0xb /* 108210 802E6990 A2020000 */ sb $v0, ($s0) /* 108214 802E6994 C620004C */ lwc1 $f0, 0x4c($s1) @@ -283,6 +295,7 @@ glabel func_802E6574 /* 10821C 802E699C 44811000 */ mtc1 $at, $f2 /* 108220 802E69A0 080B9A76 */ j .L802E69D8 /* 108224 802E69A4 46020000 */ add.s $f0, $f0, $f2 +glabel L802E69A8_108228 /* 108228 802E69A8 2403FFFE */ addiu $v1, $zero, -2 /* 10822C 802E69AC 8E220000 */ lw $v0, ($s1) /* 108230 802E69B0 3C0140C0 */ lui $at, 0x40c0 @@ -296,8 +309,9 @@ glabel func_802E6574 /* 108250 802E69D0 C620004C */ lwc1 $f0, 0x4c($s1) /* 108254 802E69D4 46020000 */ add.s $f0, $f0, $f2 .L802E69D8: -/* 108258 802E69D8 080B9AB5 */ j .L802E6AD4 +/* 108258 802E69D8 080B9AB5 */ j L802E6AD4_108354 /* 10825C 802E69DC E620004C */ swc1 $f0, 0x4c($s1) +glabel L802E69E0_108260 /* 108260 802E69E0 C620004C */ lwc1 $f0, 0x4c($s1) /* 108264 802E69E4 3C013F80 */ lui $at, 0x3f80 /* 108268 802E69E8 44811000 */ mtc1 $at, $f2 @@ -307,7 +321,7 @@ glabel func_802E6574 /* 108278 802E69F8 C6020024 */ lwc1 $f2, 0x24($s0) /* 10827C 802E69FC 4602003E */ c.le.s $f0, $f2 /* 108280 802E6A00 00000000 */ nop -/* 108284 802E6A04 45000033 */ bc1f .L802E6AD4 +/* 108284 802E6A04 45000033 */ bc1f L802E6AD4_108354 /* 108288 802E6A08 24030001 */ addiu $v1, $zero, 1 /* 10828C 802E6A0C E622004C */ swc1 $f2, 0x4c($s1) /* 108290 802E6A10 92020000 */ lbu $v0, ($s0) @@ -318,17 +332,18 @@ glabel func_802E6574 /* 1082A4 802E6A24 34420021 */ ori $v0, $v0, 0x21 /* 1082A8 802E6A28 AE220000 */ sw $v0, ($s1) /* 1082AC 802E6A2C 82020002 */ lb $v0, 2($s0) -/* 1082B0 802E6A30 10400028 */ beqz $v0, .L802E6AD4 +/* 1082B0 802E6A30 10400028 */ beqz $v0, L802E6AD4_108354 /* 1082B4 802E6A34 00000000 */ nop /* 1082B8 802E6A38 0C038050 */ jal enable_player_static_collisions /* 1082BC 802E6A3C 00000000 */ nop -/* 1082C0 802E6A40 080B9AB5 */ j .L802E6AD4 +/* 1082C0 802E6A40 080B9AB5 */ j L802E6AD4_108354 /* 1082C4 802E6A44 00000000 */ nop +glabel L802E6A48_1082C8 /* 1082C8 802E6A48 92020001 */ lbu $v0, 1($s0) /* 1082CC 802E6A4C 2442FFFF */ addiu $v0, $v0, -1 /* 1082D0 802E6A50 A2020001 */ sb $v0, 1($s0) /* 1082D4 802E6A54 00021600 */ sll $v0, $v0, 0x18 -/* 1082D8 802E6A58 0441001E */ bgez $v0, .L802E6AD4 +/* 1082D8 802E6A58 0441001E */ bgez $v0, L802E6AD4_108354 /* 1082DC 802E6A5C 0220202D */ daddu $a0, $s1, $zero /* 1082E0 802E6A60 0C043F5A */ jal exec_entity_updatecmd /* 1082E4 802E6A64 A2000000 */ sb $zero, ($s0) @@ -349,7 +364,7 @@ glabel func_802E6574 /* 10831C 802E6A9C 00431024 */ and $v0, $v0, $v1 /* 108320 802E6AA0 AE220000 */ sw $v0, ($s1) /* 108324 802E6AA4 8E040008 */ lw $a0, 8($s0) -/* 108328 802E6AA8 0480000A */ bltz $a0, .L802E6AD4 +/* 108328 802E6AA8 0480000A */ bltz $a0, L802E6AD4_108354 /* 10832C 802E6AAC 00000000 */ nop /* 108330 802E6AB0 0C00E2B7 */ jal get_npc_by_index /* 108334 802E6AB4 00000000 */ nop @@ -360,7 +375,7 @@ glabel func_802E6574 /* 108348 802E6AC8 8E04000C */ lw $a0, 0xc($s0) /* 10834C 802E6ACC 00641825 */ or $v1, $v1, $a0 /* 108350 802E6AD0 AC430000 */ sw $v1, ($v0) -.L802E6AD4: +glabel L802E6AD4_108354 /* 108354 802E6AD4 56400002 */ bnel $s2, $zero, .L802E6AE0 /* 108358 802E6AD8 E6340068 */ swc1 $f20, 0x68($s1) /* 10835C 802E6ADC E6340060 */ swc1 $f20, 0x60($s1) diff --git a/ver/us/asm/nonmatchings/code_1086a0_len_fc0/func_802E7230.s b/ver/us/asm/nonmatchings/code_1086a0_len_fc0/func_802E7230.s index 5790f6737c..c68d1de57e 100644 --- a/ver/us/asm/nonmatchings/code_1086a0_len_fc0/func_802E7230.s +++ b/ver/us/asm/nonmatchings/code_1086a0_len_fc0/func_802E7230.s @@ -1,6 +1,13 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches +.section .rodata + +glabel jtbl_802EB2F0 +.word L802E7264_108AE4, L802E72B4_108B34, L802E72D8_108B58, L802E7358_108BD8, L802E73DC_108C5C, L802E741C_108C9C + +.section .text + glabel func_802E7230 /* 108AB0 802E7230 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 108AB4 802E7234 AFBF0014 */ sw $ra, 0x14($sp) @@ -8,13 +15,14 @@ glabel func_802E7230 /* 108ABC 802E723C 8C900040 */ lw $s0, 0x40($a0) /* 108AC0 802E7240 92030005 */ lbu $v1, 5($s0) /* 108AC4 802E7244 2C620006 */ sltiu $v0, $v1, 6 -/* 108AC8 802E7248 10400074 */ beqz $v0, .L802E741C +/* 108AC8 802E7248 10400074 */ beqz $v0, L802E741C_108C9C /* 108ACC 802E724C 00031080 */ sll $v0, $v1, 2 -/* 108AD0 802E7250 3C01802F */ lui $at, %hi(D_802EB2F0) +/* 108AD0 802E7250 3C01802F */ lui $at, %hi(jtbl_802EB2F0) /* 108AD4 802E7254 00220821 */ addu $at, $at, $v0 -/* 108AD8 802E7258 8C22B2F0 */ lw $v0, %lo(D_802EB2F0)($at) +/* 108AD8 802E7258 8C22B2F0 */ lw $v0, %lo(jtbl_802EB2F0)($at) /* 108ADC 802E725C 00400008 */ jr $v0 /* 108AE0 802E7260 00000000 */ nop +glabel L802E7264_108AE4 /* 108AE4 802E7264 C6020008 */ lwc1 $f2, 8($s0) /* 108AE8 802E7268 3C013F80 */ lui $at, 0x3f80 /* 108AEC 802E726C 44810000 */ mtc1 $at, $f0 @@ -31,20 +39,22 @@ glabel func_802E7230 /* 108B18 802E7298 E6000008 */ swc1 $f0, 8($s0) .L802E729C: /* 108B1C 802E729C 82020006 */ lb $v0, 6($s0) -/* 108B20 802E72A0 1440005E */ bnez $v0, .L802E741C +/* 108B20 802E72A0 1440005E */ bnez $v0, L802E741C_108C9C /* 108B24 802E72A4 24030008 */ addiu $v1, $zero, 8 /* 108B28 802E72A8 92020005 */ lbu $v0, 5($s0) /* 108B2C 802E72AC 080B9D05 */ j .L802E7414 /* 108B30 802E72B0 A2030006 */ sb $v1, 6($s0) +glabel L802E72B4_108B34 /* 108B34 802E72B4 92020006 */ lbu $v0, 6($s0) /* 108B38 802E72B8 2442FFFF */ addiu $v0, $v0, -1 /* 108B3C 802E72BC A2020006 */ sb $v0, 6($s0) /* 108B40 802E72C0 00021600 */ sll $v0, $v0, 0x18 -/* 108B44 802E72C4 14400055 */ bnez $v0, .L802E741C +/* 108B44 802E72C4 14400055 */ bnez $v0, L802E741C_108C9C /* 108B48 802E72C8 00000000 */ nop /* 108B4C 802E72CC 92020005 */ lbu $v0, 5($s0) /* 108B50 802E72D0 080B9D05 */ j .L802E7414 /* 108B54 802E72D4 AE00000C */ sw $zero, 0xc($s0) +glabel L802E72D8_108B58 /* 108B58 802E72D8 C600000C */ lwc1 $f0, 0xc($s0) /* 108B5C 802E72DC 3C014080 */ lui $at, 0x4080 /* 108B60 802E72E0 44811000 */ mtc1 $at, $f2 @@ -78,6 +88,7 @@ glabel func_802E7230 /* 108BCC 802E734C 46020082 */ mul.s $f2, $f0, $f2 /* 108BD0 802E7350 080B9CF3 */ j .L802E73CC /* 108BD4 802E7354 00000000 */ nop +glabel L802E7358_108BD8 /* 108BD8 802E7358 C600000C */ lwc1 $f0, 0xc($s0) /* 108BDC 802E735C 3C013F80 */ lui $at, 0x3f80 /* 108BE0 802E7360 44811000 */ mtc1 $at, $f2 @@ -111,27 +122,28 @@ glabel func_802E7230 .L802E73CC: /* 108C4C 802E73CC C6000008 */ lwc1 $f0, 8($s0) /* 108C50 802E73D0 46020001 */ sub.s $f0, $f0, $f2 -/* 108C54 802E73D4 080B9D07 */ j .L802E741C +/* 108C54 802E73D4 080B9D07 */ j L802E741C_108C9C /* 108C58 802E73D8 E6000008 */ swc1 $f0, 8($s0) +glabel L802E73DC_108C5C /* 108C5C 802E73DC 92020006 */ lbu $v0, 6($s0) /* 108C60 802E73E0 2442FFFF */ addiu $v0, $v0, -1 /* 108C64 802E73E4 A2020006 */ sb $v0, 6($s0) /* 108C68 802E73E8 00021600 */ sll $v0, $v0, 0x18 -/* 108C6C 802E73EC 1440000B */ bnez $v0, .L802E741C +/* 108C6C 802E73EC 1440000B */ bnez $v0, L802E741C_108C9C /* 108C70 802E73F0 00000000 */ nop /* 108C74 802E73F4 82020007 */ lb $v0, 7($s0) /* 108C78 802E73F8 10400005 */ beqz $v0, .L802E7410 /* 108C7C 802E73FC 00000000 */ nop /* 108C80 802E7400 0C043F5A */ jal exec_entity_updatecmd /* 108C84 802E7404 00000000 */ nop -/* 108C88 802E7408 080B9D07 */ j .L802E741C +/* 108C88 802E7408 080B9D07 */ j L802E741C_108C9C /* 108C8C 802E740C 00000000 */ nop .L802E7410: /* 108C90 802E7410 92020005 */ lbu $v0, 5($s0) .L802E7414: /* 108C94 802E7414 24420001 */ addiu $v0, $v0, 1 /* 108C98 802E7418 A2020005 */ sb $v0, 5($s0) -.L802E741C: +glabel L802E741C_108C9C /* 108C9C 802E741C 8FBF0014 */ lw $ra, 0x14($sp) /* 108CA0 802E7420 8FB00010 */ lw $s0, 0x10($sp) /* 108CA4 802E7424 03E00008 */ jr $ra diff --git a/ver/us/asm/nonmatchings/code_1086a0_len_fc0/func_802E742C.s b/ver/us/asm/nonmatchings/code_1086a0_len_fc0/func_802E742C.s index 39f7c39b90..e252a1dcf6 100644 --- a/ver/us/asm/nonmatchings/code_1086a0_len_fc0/func_802E742C.s +++ b/ver/us/asm/nonmatchings/code_1086a0_len_fc0/func_802E742C.s @@ -1,6 +1,13 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches +.section .rodata + +glabel jtbl_802EB308 +.word L802E7460_108CE0, L802E7470_108CF0, L802E74F8_108D78, L802E7580_108E00, L802E75B0_108E30, 0 + +.section .text + glabel func_802E742C /* 108CAC 802E742C 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 108CB0 802E7430 AFBF0014 */ sw $ra, 0x14($sp) @@ -8,17 +15,19 @@ glabel func_802E742C /* 108CB8 802E7438 8C900040 */ lw $s0, 0x40($a0) /* 108CBC 802E743C 92030004 */ lbu $v1, 4($s0) /* 108CC0 802E7440 2C620005 */ sltiu $v0, $v1, 5 -/* 108CC4 802E7444 1040005A */ beqz $v0, .L802E75B0 +/* 108CC4 802E7444 1040005A */ beqz $v0, L802E75B0_108E30 /* 108CC8 802E7448 00031080 */ sll $v0, $v1, 2 -/* 108CCC 802E744C 3C01802F */ lui $at, %hi(D_802EB308) +/* 108CCC 802E744C 3C01802F */ lui $at, %hi(jtbl_802EB308) /* 108CD0 802E7450 00220821 */ addu $at, $at, $v0 -/* 108CD4 802E7454 8C22B308 */ lw $v0, %lo(D_802EB308)($at) +/* 108CD4 802E7454 8C22B308 */ lw $v0, %lo(jtbl_802EB308)($at) /* 108CD8 802E7458 00400008 */ jr $v0 /* 108CDC 802E745C 00000000 */ nop +glabel L802E7460_108CE0 /* 108CE0 802E7460 92020004 */ lbu $v0, 4($s0) /* 108CE4 802E7464 AE00000C */ sw $zero, 0xc($s0) /* 108CE8 802E7468 24420001 */ addiu $v0, $v0, 1 /* 108CEC 802E746C A2020004 */ sb $v0, 4($s0) +glabel L802E7470_108CF0 /* 108CF0 802E7470 C600000C */ lwc1 $f0, 0xc($s0) /* 108CF4 802E7474 3C0140A0 */ lui $at, 0x40a0 /* 108CF8 802E7478 44811000 */ mtc1 $at, $f2 @@ -54,6 +63,7 @@ glabel func_802E742C /* 108D6C 802E74EC 46020082 */ mul.s $f2, $f0, $f2 /* 108D70 802E74F0 080B9D5C */ j .L802E7570 /* 108D74 802E74F4 00000000 */ nop +glabel L802E74F8_108D78 /* 108D78 802E74F8 C600000C */ lwc1 $f0, 0xc($s0) /* 108D7C 802E74FC 3C013F80 */ lui $at, 0x3f80 /* 108D80 802E7500 44811000 */ mtc1 $at, $f2 @@ -88,13 +98,14 @@ glabel func_802E742C .L802E7570: /* 108DF0 802E7570 C6000008 */ lwc1 $f0, 8($s0) /* 108DF4 802E7574 46020000 */ add.s $f0, $f0, $f2 -/* 108DF8 802E7578 080B9D6C */ j .L802E75B0 +/* 108DF8 802E7578 080B9D6C */ j L802E75B0_108E30 /* 108DFC 802E757C E6000008 */ swc1 $f0, 8($s0) +glabel L802E7580_108E00 /* 108E00 802E7580 92020006 */ lbu $v0, 6($s0) /* 108E04 802E7584 2442FFFF */ addiu $v0, $v0, -1 /* 108E08 802E7588 A2020006 */ sb $v0, 6($s0) /* 108E0C 802E758C 00021600 */ sll $v0, $v0, 0x18 -/* 108E10 802E7590 14400007 */ bnez $v0, .L802E75B0 +/* 108E10 802E7590 14400007 */ bnez $v0, L802E75B0_108E30 /* 108E14 802E7594 00000000 */ nop /* 108E18 802E7598 92020004 */ lbu $v0, 4($s0) /* 108E1C 802E759C 24420001 */ addiu $v0, $v0, 1 @@ -102,7 +113,7 @@ glabel func_802E742C /* 108E24 802E75A4 8C820000 */ lw $v0, ($a0) /* 108E28 802E75A8 34424000 */ ori $v0, $v0, 0x4000 /* 108E2C 802E75AC AC820000 */ sw $v0, ($a0) -.L802E75B0: +glabel L802E75B0_108E30 /* 108E30 802E75B0 8FBF0014 */ lw $ra, 0x14($sp) /* 108E34 802E75B4 8FB00010 */ lw $s0, 0x10($sp) /* 108E38 802E75B8 03E00008 */ jr $ra diff --git a/ver/us/asm/nonmatchings/code_1086a0_len_fc0/func_802E75E4.s b/ver/us/asm/nonmatchings/code_1086a0_len_fc0/func_802E75E4.s index a4b4cce7a9..4cd986f25c 100644 --- a/ver/us/asm/nonmatchings/code_1086a0_len_fc0/func_802E75E4.s +++ b/ver/us/asm/nonmatchings/code_1086a0_len_fc0/func_802E75E4.s @@ -1,6 +1,16 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches +.section .rodata + +glabel D_802EB320 +.double 0.7 + +glabel D_802EB328 +.double 0.4 + +.section .text + glabel func_802E75E4 /* 108E64 802E75E4 27BDFFA0 */ addiu $sp, $sp, -0x60 /* 108E68 802E75E8 AFB00028 */ sw $s0, 0x28($sp) diff --git a/ver/us/asm/nonmatchings/code_1086a0_len_fc0/func_802E7AE4.s b/ver/us/asm/nonmatchings/code_1086a0_len_fc0/func_802E7AE4.s index 92cd0e0cce..e431245e88 100644 --- a/ver/us/asm/nonmatchings/code_1086a0_len_fc0/func_802E7AE4.s +++ b/ver/us/asm/nonmatchings/code_1086a0_len_fc0/func_802E7AE4.s @@ -1,6 +1,13 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches +.section .rodata + +glabel jtbl_802EB330 +.word L802E7B2C_1093AC, L802E7B3C_1093BC, L802E7B50_1093D0, L802E7B64_1093E4, L802E7B74_1093F4, L802E7B7C_1093FC, 0, 0 + +.section .text + glabel func_802E7AE4 /* 109364 802E7AE4 27BDFFC8 */ addiu $sp, $sp, -0x38 /* 109368 802E7AE8 AFB1001C */ sw $s1, 0x1c($sp) @@ -15,31 +22,37 @@ glabel func_802E7AE4 /* 10938C 802E7B0C 2C620006 */ sltiu $v0, $v1, 6 /* 109390 802E7B10 1040001D */ beqz $v0, .L802E7B88 /* 109394 802E7B14 00031080 */ sll $v0, $v1, 2 -/* 109398 802E7B18 3C01802F */ lui $at, %hi(D_802EB330) +/* 109398 802E7B18 3C01802F */ lui $at, %hi(jtbl_802EB330) /* 10939C 802E7B1C 00220821 */ addu $at, $at, $v0 -/* 1093A0 802E7B20 8C22B330 */ lw $v0, %lo(D_802EB330)($at) +/* 1093A0 802E7B20 8C22B330 */ lw $v0, %lo(jtbl_802EB330)($at) /* 1093A4 802E7B24 00400008 */ jr $v0 /* 1093A8 802E7B28 00000000 */ nop +glabel L802E7B2C_1093AC /* 1093AC 802E7B2C 3C018011 */ lui $at, %hi(gPlayerData) /* 1093B0 802E7B30 A020F290 */ sb $zero, %lo(gPlayerData)($at) /* 1093B4 802E7B34 080B9EE2 */ j .L802E7B88 /* 1093B8 802E7B38 00000000 */ nop +glabel L802E7B3C_1093BC /* 1093BC 802E7B3C 24020001 */ addiu $v0, $zero, 1 /* 1093C0 802E7B40 3C018011 */ lui $at, %hi(gPlayerData) /* 1093C4 802E7B44 A022F290 */ sb $v0, %lo(gPlayerData)($at) /* 1093C8 802E7B48 080B9EE2 */ j .L802E7B88 /* 1093CC 802E7B4C 00000000 */ nop +glabel L802E7B50_1093D0 /* 1093D0 802E7B50 24020002 */ addiu $v0, $zero, 2 /* 1093D4 802E7B54 3C018011 */ lui $at, %hi(gPlayerData) /* 1093D8 802E7B58 A022F290 */ sb $v0, %lo(gPlayerData)($at) /* 1093DC 802E7B5C 080B9EE2 */ j .L802E7B88 /* 1093E0 802E7B60 00000000 */ nop +glabel L802E7B64_1093E4 /* 1093E4 802E7B64 3C018011 */ lui $at, %hi(gPlayerData+0x1) /* 1093E8 802E7B68 A020F291 */ sb $zero, %lo(gPlayerData+0x1)($at) /* 1093EC 802E7B6C 080B9EE2 */ j .L802E7B88 /* 1093F0 802E7B70 00000000 */ nop +glabel L802E7B74_1093F4 /* 1093F4 802E7B74 080B9EE0 */ j .L802E7B80 /* 1093F8 802E7B78 24020001 */ addiu $v0, $zero, 1 +glabel L802E7B7C_1093FC /* 1093FC 802E7B7C 24020002 */ addiu $v0, $zero, 2 .L802E7B80: /* 109400 802E7B80 3C018011 */ lui $at, %hi(gPlayerData+0x1) diff --git a/ver/us/asm/nonmatchings/code_109660_len_1270/func_802E7FA0.s b/ver/us/asm/nonmatchings/code_109660_len_1270/func_802E7FA0.s index b12be3b5ac..9122521ba7 100644 --- a/ver/us/asm/nonmatchings/code_109660_len_1270/func_802E7FA0.s +++ b/ver/us/asm/nonmatchings/code_109660_len_1270/func_802E7FA0.s @@ -1,6 +1,22 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches +.section .rodata + +glabel D_802EB350 +.double 0.4 + +glabel D_802EB358 +.double 1.6 + +glabel D_802EB360 +.double 0.8 + +glabel D_802EB368 +.double -10.2 + +.section .text + glabel func_802E7FA0 /* 109820 802E7FA0 27BDFF78 */ addiu $sp, $sp, -0x88 /* 109824 802E7FA4 F7B80068 */ sdc1 $f24, 0x68($sp) diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_8006F890.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_8006F890.s index 2cb20f73ee..ec2d697fc4 100644 --- a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_8006F890.s +++ b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_8006F890.s @@ -22,7 +22,7 @@ glabel func_8006F890 /* 4ACD4 8006F8D4 C7B00028 */ lwc1 $f16, 0x28($sp) /* 4ACD8 8006F8D8 8FBF002C */ lw $ra, 0x2c($sp) /* 4ACDC 8006F8DC 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4ACE0 8006F8E0 3C018008 */ lui $at, %hi(D_8007F210) -/* 4ACE4 8006F8E4 8C21F210 */ lw $at, %lo(D_8007F210)($at) +/* 4ACE0 8006F8E0 3C018008 */ lui $at, %hi(gEffectTable) +/* 4ACE4 8006F8E4 8C21F210 */ lw $at, %lo(gEffectTable)($at) /* 4ACE8 8006F8E8 00200008 */ jr $at /* 4ACEC 8006F8EC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_8006F8F0.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_8006F8F0.s index 3563897e10..61e98d810b 100644 --- a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_8006F8F0.s +++ b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_8006F8F0.s @@ -22,7 +22,7 @@ glabel func_8006F8F0 /* 4AD34 8006F934 C7B00028 */ lwc1 $f16, 0x28($sp) /* 4AD38 8006F938 8FBF002C */ lw $ra, 0x2c($sp) /* 4AD3C 8006F93C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4AD40 8006F940 3C018008 */ lui $at, %hi(D_8007F228) -/* 4AD44 8006F944 8C21F228 */ lw $at, %lo(D_8007F228)($at) +/* 4AD40 8006F940 3C018008 */ lui $at, %hi(gEffectTable+0x18) +/* 4AD44 8006F944 8C21F228 */ lw $at, %lo(gEffectTable+0x18)($at) /* 4AD48 8006F948 00200008 */ jr $at /* 4AD4C 8006F94C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_8006F950.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_8006F950.s index 5519a5dc56..21a80f45f6 100644 --- a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_8006F950.s +++ b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_8006F950.s @@ -22,7 +22,7 @@ glabel func_8006F950 /* 4AD94 8006F994 C7B00028 */ lwc1 $f16, 0x28($sp) /* 4AD98 8006F998 8FBF002C */ lw $ra, 0x2c($sp) /* 4AD9C 8006F99C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4ADA0 8006F9A0 3C018008 */ lui $at, %hi(D_8007F240) -/* 4ADA4 8006F9A4 8C21F240 */ lw $at, %lo(D_8007F240)($at) +/* 4ADA0 8006F9A0 3C018008 */ lui $at, %hi(gEffectTable+0x30) +/* 4ADA4 8006F9A4 8C21F240 */ lw $at, %lo(gEffectTable+0x30)($at) /* 4ADA8 8006F9A8 00200008 */ jr $at /* 4ADAC 8006F9AC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_8006F9B0.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_8006F9B0.s index b165ec1762..e2c6522896 100644 --- a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_8006F9B0.s +++ b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_8006F9B0.s @@ -22,7 +22,7 @@ glabel func_8006F9B0 /* 4ADF4 8006F9F4 C7B00028 */ lwc1 $f16, 0x28($sp) /* 4ADF8 8006F9F8 8FBF002C */ lw $ra, 0x2c($sp) /* 4ADFC 8006F9FC 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4AE00 8006FA00 3C018008 */ lui $at, %hi(D_8007F258) -/* 4AE04 8006FA04 8C21F258 */ lw $at, %lo(D_8007F258)($at) +/* 4AE00 8006FA00 3C018008 */ lui $at, %hi(gEffectTable+0x48) +/* 4AE04 8006FA04 8C21F258 */ lw $at, %lo(gEffectTable+0x48)($at) /* 4AE08 8006FA08 00200008 */ jr $at /* 4AE0C 8006FA0C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_8006FA10.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_8006FA10.s index fee7e34d60..444e3d752a 100644 --- a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_8006FA10.s +++ b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_8006FA10.s @@ -22,7 +22,7 @@ glabel func_8006FA10 /* 4AE54 8006FA54 C7B00028 */ lwc1 $f16, 0x28($sp) /* 4AE58 8006FA58 8FBF002C */ lw $ra, 0x2c($sp) /* 4AE5C 8006FA5C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4AE60 8006FA60 3C018008 */ lui $at, %hi(D_8007F270) -/* 4AE64 8006FA64 8C21F270 */ lw $at, %lo(D_8007F270)($at) +/* 4AE60 8006FA60 3C018008 */ lui $at, %hi(gEffectTable+0x60) +/* 4AE64 8006FA64 8C21F270 */ lw $at, %lo(gEffectTable+0x60)($at) /* 4AE68 8006FA68 00200008 */ jr $at /* 4AE6C 8006FA6C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_8006FA70.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_8006FA70.s index 5379ed5f2b..d06290d5fd 100644 --- a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_8006FA70.s +++ b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_8006FA70.s @@ -22,7 +22,7 @@ glabel func_8006FA70 /* 4AEB4 8006FAB4 C7B00028 */ lwc1 $f16, 0x28($sp) /* 4AEB8 8006FAB8 8FBF002C */ lw $ra, 0x2c($sp) /* 4AEBC 8006FABC 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4AEC0 8006FAC0 3C018008 */ lui $at, %hi(D_8007F288) -/* 4AEC4 8006FAC4 8C21F288 */ lw $at, %lo(D_8007F288)($at) +/* 4AEC0 8006FAC0 3C018008 */ lui $at, %hi(gEffectTable+0x78) +/* 4AEC4 8006FAC4 8C21F288 */ lw $at, %lo(gEffectTable+0x78)($at) /* 4AEC8 8006FAC8 00200008 */ jr $at /* 4AECC 8006FACC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_8006FB90.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_8006FB90.s index 0aea3ec69d..3c8b162ed1 100644 --- a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_8006FB90.s +++ b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_8006FB90.s @@ -22,7 +22,7 @@ glabel func_8006FB90 /* 4AFD4 8006FBD4 C7B00028 */ lwc1 $f16, 0x28($sp) /* 4AFD8 8006FBD8 8FBF002C */ lw $ra, 0x2c($sp) /* 4AFDC 8006FBDC 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4AFE0 8006FBE0 3C018008 */ lui $at, %hi(D_8007F2D0) -/* 4AFE4 8006FBE4 8C21F2D0 */ lw $at, %lo(D_8007F2D0)($at) +/* 4AFE0 8006FBE0 3C018008 */ lui $at, %hi(gEffectTable+0xC0) +/* 4AFE4 8006FBE4 8C21F2D0 */ lw $at, %lo(gEffectTable+0xC0)($at) /* 4AFE8 8006FBE8 00200008 */ jr $at /* 4AFEC 8006FBEC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_8006FBF0.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_8006FBF0.s index b84fde51c5..6ef13c42c4 100644 --- a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_8006FBF0.s +++ b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_8006FBF0.s @@ -22,7 +22,7 @@ glabel func_8006FBF0 /* 4B034 8006FC34 C7B00028 */ lwc1 $f16, 0x28($sp) /* 4B038 8006FC38 8FBF002C */ lw $ra, 0x2c($sp) /* 4B03C 8006FC3C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4B040 8006FC40 3C018008 */ lui $at, %hi(D_8007F2E8) -/* 4B044 8006FC44 8C21F2E8 */ lw $at, %lo(D_8007F2E8)($at) +/* 4B040 8006FC40 3C018008 */ lui $at, %hi(gEffectTable+0xD8) +/* 4B044 8006FC44 8C21F2E8 */ lw $at, %lo(gEffectTable+0xD8)($at) /* 4B048 8006FC48 00200008 */ jr $at /* 4B04C 8006FC4C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_8006FC50.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_8006FC50.s index afb0773c50..5ed5f7b5df 100644 --- a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_8006FC50.s +++ b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_8006FC50.s @@ -22,7 +22,7 @@ glabel func_8006FC50 /* 4B094 8006FC94 C7B00028 */ lwc1 $f16, 0x28($sp) /* 4B098 8006FC98 8FBF002C */ lw $ra, 0x2c($sp) /* 4B09C 8006FC9C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4B0A0 8006FCA0 3C018008 */ lui $at, %hi(D_8007F300) -/* 4B0A4 8006FCA4 8C21F300 */ lw $at, %lo(D_8007F300)($at) +/* 4B0A0 8006FCA0 3C018008 */ lui $at, %hi(gEffectTable+0xF0) +/* 4B0A4 8006FCA4 8C21F300 */ lw $at, %lo(gEffectTable+0xF0)($at) /* 4B0A8 8006FCA8 00200008 */ jr $at /* 4B0AC 8006FCAC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_8006FCB0.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_8006FCB0.s index 89d9a6f40d..6ff1e9cac8 100644 --- a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_8006FCB0.s +++ b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_8006FCB0.s @@ -22,7 +22,7 @@ glabel func_8006FCB0 /* 4B0F4 8006FCF4 C7B00028 */ lwc1 $f16, 0x28($sp) /* 4B0F8 8006FCF8 8FBF002C */ lw $ra, 0x2c($sp) /* 4B0FC 8006FCFC 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4B100 8006FD00 3C018008 */ lui $at, %hi(D_8007F318) -/* 4B104 8006FD04 8C21F318 */ lw $at, %lo(D_8007F318)($at) +/* 4B100 8006FD00 3C018008 */ lui $at, %hi(gEffectTable+0x108) +/* 4B104 8006FD04 8C21F318 */ lw $at, %lo(gEffectTable+0x108)($at) /* 4B108 8006FD08 00200008 */ jr $at /* 4B10C 8006FD0C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_8006FD10.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_8006FD10.s index 4f1f7ef188..f3ece70473 100644 --- a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_8006FD10.s +++ b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_8006FD10.s @@ -22,7 +22,7 @@ glabel func_8006FD10 /* 4B154 8006FD54 C7B00028 */ lwc1 $f16, 0x28($sp) /* 4B158 8006FD58 8FBF002C */ lw $ra, 0x2c($sp) /* 4B15C 8006FD5C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4B160 8006FD60 3C018008 */ lui $at, %hi(D_8007F330) -/* 4B164 8006FD64 8C21F330 */ lw $at, %lo(D_8007F330)($at) +/* 4B160 8006FD60 3C018008 */ lui $at, %hi(gEffectTable+0x120) +/* 4B164 8006FD64 8C21F330 */ lw $at, %lo(gEffectTable+0x120)($at) /* 4B168 8006FD68 00200008 */ jr $at /* 4B16C 8006FD6C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_8006FD70.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_8006FD70.s index ab602ea2a9..e919ba3a24 100644 --- a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_8006FD70.s +++ b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_8006FD70.s @@ -22,7 +22,7 @@ glabel func_8006FD70 /* 4B1B4 8006FDB4 C7B00028 */ lwc1 $f16, 0x28($sp) /* 4B1B8 8006FDB8 8FBF002C */ lw $ra, 0x2c($sp) /* 4B1BC 8006FDBC 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4B1C0 8006FDC0 3C018008 */ lui $at, %hi(D_8007F348) -/* 4B1C4 8006FDC4 8C21F348 */ lw $at, %lo(D_8007F348)($at) +/* 4B1C0 8006FDC0 3C018008 */ lui $at, %hi(gEffectTable+0x138) +/* 4B1C4 8006FDC4 8C21F348 */ lw $at, %lo(gEffectTable+0x138)($at) /* 4B1C8 8006FDC8 00200008 */ jr $at /* 4B1CC 8006FDCC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_8006FDD0.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_8006FDD0.s index aa5ad391c1..e7305071f1 100644 --- a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_8006FDD0.s +++ b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_8006FDD0.s @@ -22,7 +22,7 @@ glabel func_8006FDD0 /* 4B214 8006FE14 C7B00028 */ lwc1 $f16, 0x28($sp) /* 4B218 8006FE18 8FBF002C */ lw $ra, 0x2c($sp) /* 4B21C 8006FE1C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4B220 8006FE20 3C018008 */ lui $at, %hi(D_8007F360) -/* 4B224 8006FE24 8C21F360 */ lw $at, %lo(D_8007F360)($at) +/* 4B220 8006FE20 3C018008 */ lui $at, %hi(gEffectTable+0x150) +/* 4B224 8006FE24 8C21F360 */ lw $at, %lo(gEffectTable+0x150)($at) /* 4B228 8006FE28 00200008 */ jr $at /* 4B22C 8006FE2C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_8006FE30.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_8006FE30.s index db9fdf2b70..08b21acd74 100644 --- a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_8006FE30.s +++ b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_8006FE30.s @@ -22,7 +22,7 @@ glabel func_8006FE30 /* 4B274 8006FE74 C7B00028 */ lwc1 $f16, 0x28($sp) /* 4B278 8006FE78 8FBF002C */ lw $ra, 0x2c($sp) /* 4B27C 8006FE7C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4B280 8006FE80 3C018008 */ lui $at, %hi(D_8007F378) -/* 4B284 8006FE84 8C21F378 */ lw $at, %lo(D_8007F378)($at) +/* 4B280 8006FE80 3C018008 */ lui $at, %hi(gEffectTable+0x168) +/* 4B284 8006FE84 8C21F378 */ lw $at, %lo(gEffectTable+0x168)($at) /* 4B288 8006FE88 00200008 */ jr $at /* 4B28C 8006FE8C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_8006FEF0.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_8006FEF0.s index 8e594edb8e..ef19ace9ff 100644 --- a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_8006FEF0.s +++ b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_8006FEF0.s @@ -22,7 +22,7 @@ glabel func_8006FEF0 /* 4B334 8006FF34 C7B00028 */ lwc1 $f16, 0x28($sp) /* 4B338 8006FF38 8FBF002C */ lw $ra, 0x2c($sp) /* 4B33C 8006FF3C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4B340 8006FF40 3C018008 */ lui $at, %hi(D_8007F3A8) -/* 4B344 8006FF44 8C21F3A8 */ lw $at, %lo(D_8007F3A8)($at) +/* 4B340 8006FF40 3C018008 */ lui $at, %hi(gEffectTable+0x198) +/* 4B344 8006FF44 8C21F3A8 */ lw $at, %lo(gEffectTable+0x198)($at) /* 4B348 8006FF48 00200008 */ jr $at /* 4B34C 8006FF4C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_8006FF50.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_8006FF50.s index 51f52a0b8a..bcca67ebfe 100644 --- a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_8006FF50.s +++ b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_8006FF50.s @@ -22,7 +22,7 @@ glabel func_8006FF50 /* 4B394 8006FF94 C7B00028 */ lwc1 $f16, 0x28($sp) /* 4B398 8006FF98 8FBF002C */ lw $ra, 0x2c($sp) /* 4B39C 8006FF9C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4B3A0 8006FFA0 3C018008 */ lui $at, %hi(D_8007F3C0) -/* 4B3A4 8006FFA4 8C21F3C0 */ lw $at, %lo(D_8007F3C0)($at) +/* 4B3A0 8006FFA0 3C018008 */ lui $at, %hi(gEffectTable+0x1B0) +/* 4B3A4 8006FFA4 8C21F3C0 */ lw $at, %lo(gEffectTable+0x1B0)($at) /* 4B3A8 8006FFA8 00200008 */ jr $at /* 4B3AC 8006FFAC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_8006FFB0.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_8006FFB0.s index f83d6bcda1..a3994d0efb 100644 --- a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_8006FFB0.s +++ b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_8006FFB0.s @@ -22,7 +22,7 @@ glabel func_8006FFB0 /* 4B3F4 8006FFF4 C7B00028 */ lwc1 $f16, 0x28($sp) /* 4B3F8 8006FFF8 8FBF002C */ lw $ra, 0x2c($sp) /* 4B3FC 8006FFFC 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4B400 80070000 3C018008 */ lui $at, %hi(D_8007F3D8) -/* 4B404 80070004 8C21F3D8 */ lw $at, %lo(D_8007F3D8)($at) +/* 4B400 80070000 3C018008 */ lui $at, %hi(gEffectTable+0x1C8) +/* 4B404 80070004 8C21F3D8 */ lw $at, %lo(gEffectTable+0x1C8)($at) /* 4B408 80070008 00200008 */ jr $at /* 4B40C 8007000C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070010.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070010.s index 5c175f3f83..2fabd2e825 100644 --- a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070010.s +++ b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070010.s @@ -22,7 +22,7 @@ glabel func_80070010 /* 4B454 80070054 C7B00028 */ lwc1 $f16, 0x28($sp) /* 4B458 80070058 8FBF002C */ lw $ra, 0x2c($sp) /* 4B45C 8007005C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4B460 80070060 3C018008 */ lui $at, %hi(D_8007F3F0) -/* 4B464 80070064 8C21F3F0 */ lw $at, %lo(D_8007F3F0)($at) +/* 4B460 80070060 3C018008 */ lui $at, %hi(gEffectTable+0x1E0) +/* 4B464 80070064 8C21F3F0 */ lw $at, %lo(gEffectTable+0x1E0)($at) /* 4B468 80070068 00200008 */ jr $at /* 4B46C 8007006C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070070.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070070.s index 71c71e5cbf..01587ef178 100644 --- a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070070.s +++ b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070070.s @@ -22,7 +22,7 @@ glabel func_80070070 /* 4B4B4 800700B4 C7B00028 */ lwc1 $f16, 0x28($sp) /* 4B4B8 800700B8 8FBF002C */ lw $ra, 0x2c($sp) /* 4B4BC 800700BC 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4B4C0 800700C0 3C018008 */ lui $at, %hi(D_8007F408) -/* 4B4C4 800700C4 8C21F408 */ lw $at, %lo(D_8007F408)($at) +/* 4B4C0 800700C0 3C018008 */ lui $at, %hi(gEffectTable+0x1F8) +/* 4B4C4 800700C4 8C21F408 */ lw $at, %lo(gEffectTable+0x1F8)($at) /* 4B4C8 800700C8 00200008 */ jr $at /* 4B4CC 800700CC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800700D0.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800700D0.s index a010cb1670..3b1c80c69f 100644 --- a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800700D0.s +++ b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800700D0.s @@ -22,7 +22,7 @@ glabel func_800700D0 /* 4B514 80070114 C7B00028 */ lwc1 $f16, 0x28($sp) /* 4B518 80070118 8FBF002C */ lw $ra, 0x2c($sp) /* 4B51C 8007011C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4B520 80070120 3C018008 */ lui $at, %hi(D_8007F420) -/* 4B524 80070124 8C21F420 */ lw $at, %lo(D_8007F420)($at) +/* 4B520 80070120 3C018008 */ lui $at, %hi(gEffectTable+0x210) +/* 4B524 80070124 8C21F420 */ lw $at, %lo(gEffectTable+0x210)($at) /* 4B528 80070128 00200008 */ jr $at /* 4B52C 8007012C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070130.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070130.s index d5cb45a16d..391485ffa0 100644 --- a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070130.s +++ b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070130.s @@ -22,7 +22,7 @@ glabel func_80070130 /* 4B574 80070174 C7B00028 */ lwc1 $f16, 0x28($sp) /* 4B578 80070178 8FBF002C */ lw $ra, 0x2c($sp) /* 4B57C 8007017C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4B580 80070180 3C018008 */ lui $at, %hi(D_8007F438) -/* 4B584 80070184 8C21F438 */ lw $at, %lo(D_8007F438)($at) +/* 4B580 80070180 3C018008 */ lui $at, %hi(gEffectTable+0x228) +/* 4B584 80070184 8C21F438 */ lw $at, %lo(gEffectTable+0x228)($at) /* 4B588 80070188 00200008 */ jr $at /* 4B58C 8007018C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070190.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070190.s index 820e36128b..dbdf5fb30f 100644 --- a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070190.s +++ b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070190.s @@ -22,7 +22,7 @@ glabel func_80070190 /* 4B5D4 800701D4 C7B00028 */ lwc1 $f16, 0x28($sp) /* 4B5D8 800701D8 8FBF002C */ lw $ra, 0x2c($sp) /* 4B5DC 800701DC 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4B5E0 800701E0 3C018008 */ lui $at, %hi(D_8007F450) -/* 4B5E4 800701E4 8C21F450 */ lw $at, %lo(D_8007F450)($at) +/* 4B5E0 800701E0 3C018008 */ lui $at, %hi(gEffectTable+0x240) +/* 4B5E4 800701E4 8C21F450 */ lw $at, %lo(gEffectTable+0x240)($at) /* 4B5E8 800701E8 00200008 */ jr $at /* 4B5EC 800701EC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800701F0.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800701F0.s index a64408c665..a126242bc4 100644 --- a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800701F0.s +++ b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800701F0.s @@ -22,7 +22,7 @@ glabel func_800701F0 /* 4B634 80070234 C7B00028 */ lwc1 $f16, 0x28($sp) /* 4B638 80070238 8FBF002C */ lw $ra, 0x2c($sp) /* 4B63C 8007023C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4B640 80070240 3C018008 */ lui $at, %hi(D_8007F468) -/* 4B644 80070244 8C21F468 */ lw $at, %lo(D_8007F468)($at) +/* 4B640 80070240 3C018008 */ lui $at, %hi(gEffectTable+0x258) +/* 4B644 80070244 8C21F468 */ lw $at, %lo(gEffectTable+0x258)($at) /* 4B648 80070248 00200008 */ jr $at /* 4B64C 8007024C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070250.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070250.s index 1c0121c268..cdc0090aff 100644 --- a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070250.s +++ b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070250.s @@ -22,7 +22,7 @@ glabel func_80070250 /* 4B694 80070294 C7B00028 */ lwc1 $f16, 0x28($sp) /* 4B698 80070298 8FBF002C */ lw $ra, 0x2c($sp) /* 4B69C 8007029C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4B6A0 800702A0 3C018008 */ lui $at, %hi(D_8007F480) -/* 4B6A4 800702A4 8C21F480 */ lw $at, %lo(D_8007F480)($at) +/* 4B6A0 800702A0 3C018008 */ lui $at, %hi(gEffectTable+0x270) +/* 4B6A4 800702A4 8C21F480 */ lw $at, %lo(gEffectTable+0x270)($at) /* 4B6A8 800702A8 00200008 */ jr $at /* 4B6AC 800702AC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800702B0.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800702B0.s index f8cca97a60..6c4b242730 100644 --- a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800702B0.s +++ b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800702B0.s @@ -22,7 +22,7 @@ glabel func_800702B0 /* 4B6F4 800702F4 C7B00028 */ lwc1 $f16, 0x28($sp) /* 4B6F8 800702F8 8FBF002C */ lw $ra, 0x2c($sp) /* 4B6FC 800702FC 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4B700 80070300 3C018008 */ lui $at, %hi(D_8007F498) -/* 4B704 80070304 8C21F498 */ lw $at, %lo(D_8007F498)($at) +/* 4B700 80070300 3C018008 */ lui $at, %hi(gEffectTable+0x288) +/* 4B704 80070304 8C21F498 */ lw $at, %lo(gEffectTable+0x288)($at) /* 4B708 80070308 00200008 */ jr $at /* 4B70C 8007030C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070310.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070310.s index f4fd01c7a8..d2388a9443 100644 --- a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070310.s +++ b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070310.s @@ -22,7 +22,7 @@ glabel func_80070310 /* 4B754 80070354 C7B00028 */ lwc1 $f16, 0x28($sp) /* 4B758 80070358 8FBF002C */ lw $ra, 0x2c($sp) /* 4B75C 8007035C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4B760 80070360 3C018008 */ lui $at, %hi(D_8007F4B0) -/* 4B764 80070364 8C21F4B0 */ lw $at, %lo(D_8007F4B0)($at) +/* 4B760 80070360 3C018008 */ lui $at, %hi(gEffectTable+0x2A0) +/* 4B764 80070364 8C21F4B0 */ lw $at, %lo(gEffectTable+0x2A0)($at) /* 4B768 80070368 00200008 */ jr $at /* 4B76C 8007036C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070370.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070370.s index 170da30bbb..709162b43a 100644 --- a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070370.s +++ b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070370.s @@ -22,7 +22,7 @@ glabel func_80070370 /* 4B7B4 800703B4 C7B00028 */ lwc1 $f16, 0x28($sp) /* 4B7B8 800703B8 8FBF002C */ lw $ra, 0x2c($sp) /* 4B7BC 800703BC 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4B7C0 800703C0 3C018008 */ lui $at, %hi(D_8007F4C8) -/* 4B7C4 800703C4 8C21F4C8 */ lw $at, %lo(D_8007F4C8)($at) +/* 4B7C0 800703C0 3C018008 */ lui $at, %hi(gEffectTable+0x2B8) +/* 4B7C4 800703C4 8C21F4C8 */ lw $at, %lo(gEffectTable+0x2B8)($at) /* 4B7C8 800703C8 00200008 */ jr $at /* 4B7CC 800703CC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800703D0.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800703D0.s index 77984f0ade..80149a5983 100644 --- a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800703D0.s +++ b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800703D0.s @@ -22,7 +22,7 @@ glabel func_800703D0 /* 4B814 80070414 C7B00028 */ lwc1 $f16, 0x28($sp) /* 4B818 80070418 8FBF002C */ lw $ra, 0x2c($sp) /* 4B81C 8007041C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4B820 80070420 3C018008 */ lui $at, %hi(D_8007F4E0) -/* 4B824 80070424 8C21F4E0 */ lw $at, %lo(D_8007F4E0)($at) +/* 4B820 80070420 3C018008 */ lui $at, %hi(gEffectTable+0x2D0) +/* 4B824 80070424 8C21F4E0 */ lw $at, %lo(gEffectTable+0x2D0)($at) /* 4B828 80070428 00200008 */ jr $at /* 4B82C 8007042C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070430.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070430.s index 6c655270d3..4d02bdf196 100644 --- a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070430.s +++ b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070430.s @@ -22,7 +22,7 @@ glabel func_80070430 /* 4B874 80070474 C7B00028 */ lwc1 $f16, 0x28($sp) /* 4B878 80070478 8FBF002C */ lw $ra, 0x2c($sp) /* 4B87C 8007047C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4B880 80070480 3C018008 */ lui $at, %hi(D_8007F4F8) -/* 4B884 80070484 8C21F4F8 */ lw $at, %lo(D_8007F4F8)($at) +/* 4B880 80070480 3C018008 */ lui $at, %hi(gEffectTable+0x2E8) +/* 4B884 80070484 8C21F4F8 */ lw $at, %lo(gEffectTable+0x2E8)($at) /* 4B888 80070488 00200008 */ jr $at /* 4B88C 8007048C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070490.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070490.s index 80e95ba293..b16f1cd67e 100644 --- a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070490.s +++ b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070490.s @@ -22,7 +22,7 @@ glabel func_80070490 /* 4B8D4 800704D4 C7B00028 */ lwc1 $f16, 0x28($sp) /* 4B8D8 800704D8 8FBF002C */ lw $ra, 0x2c($sp) /* 4B8DC 800704DC 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4B8E0 800704E0 3C018008 */ lui $at, %hi(D_8007F510) -/* 4B8E4 800704E4 8C21F510 */ lw $at, %lo(D_8007F510)($at) +/* 4B8E0 800704E0 3C018008 */ lui $at, %hi(gEffectTable+0x300) +/* 4B8E4 800704E4 8C21F510 */ lw $at, %lo(gEffectTable+0x300)($at) /* 4B8E8 800704E8 00200008 */ jr $at /* 4B8EC 800704EC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800704F0.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800704F0.s index 121454b92e..58c69824de 100644 --- a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800704F0.s +++ b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800704F0.s @@ -22,7 +22,7 @@ glabel func_800704F0 /* 4B934 80070534 C7B00028 */ lwc1 $f16, 0x28($sp) /* 4B938 80070538 8FBF002C */ lw $ra, 0x2c($sp) /* 4B93C 8007053C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4B940 80070540 3C018008 */ lui $at, %hi(D_8007F528) -/* 4B944 80070544 8C21F528 */ lw $at, %lo(D_8007F528)($at) +/* 4B940 80070540 3C018008 */ lui $at, %hi(gEffectTable+0x318) +/* 4B944 80070544 8C21F528 */ lw $at, %lo(gEffectTable+0x318)($at) /* 4B948 80070548 00200008 */ jr $at /* 4B94C 8007054C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070550.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070550.s index 3acc7f3a01..4ff9da649b 100644 --- a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070550.s +++ b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070550.s @@ -22,7 +22,7 @@ glabel func_80070550 /* 4B994 80070594 C7B00028 */ lwc1 $f16, 0x28($sp) /* 4B998 80070598 8FBF002C */ lw $ra, 0x2c($sp) /* 4B99C 8007059C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4B9A0 800705A0 3C018008 */ lui $at, %hi(D_8007F540) -/* 4B9A4 800705A4 8C21F540 */ lw $at, %lo(D_8007F540)($at) +/* 4B9A0 800705A0 3C018008 */ lui $at, %hi(gEffectTable+0x330) +/* 4B9A4 800705A4 8C21F540 */ lw $at, %lo(gEffectTable+0x330)($at) /* 4B9A8 800705A8 00200008 */ jr $at /* 4B9AC 800705AC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800705B0.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800705B0.s index 89509aa5de..077169138a 100644 --- a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800705B0.s +++ b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800705B0.s @@ -22,7 +22,7 @@ glabel func_800705B0 /* 4B9F4 800705F4 C7B00028 */ lwc1 $f16, 0x28($sp) /* 4B9F8 800705F8 8FBF002C */ lw $ra, 0x2c($sp) /* 4B9FC 800705FC 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4BA00 80070600 3C018008 */ lui $at, %hi(D_8007F558) -/* 4BA04 80070604 8C21F558 */ lw $at, %lo(D_8007F558)($at) +/* 4BA00 80070600 3C018008 */ lui $at, %hi(gEffectTable+0x348) +/* 4BA04 80070604 8C21F558 */ lw $at, %lo(gEffectTable+0x348)($at) /* 4BA08 80070608 00200008 */ jr $at /* 4BA0C 8007060C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070610.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070610.s index a139fd7731..277a3ff908 100644 --- a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070610.s +++ b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070610.s @@ -22,7 +22,7 @@ glabel func_80070610 /* 4BA54 80070654 C7B00028 */ lwc1 $f16, 0x28($sp) /* 4BA58 80070658 8FBF002C */ lw $ra, 0x2c($sp) /* 4BA5C 8007065C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4BA60 80070660 3C018008 */ lui $at, %hi(D_8007F570) -/* 4BA64 80070664 8C21F570 */ lw $at, %lo(D_8007F570)($at) +/* 4BA60 80070660 3C018008 */ lui $at, %hi(gEffectTable+0x360) +/* 4BA64 80070664 8C21F570 */ lw $at, %lo(gEffectTable+0x360)($at) /* 4BA68 80070668 00200008 */ jr $at /* 4BA6C 8007066C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070670.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070670.s index 8ef2b4d60c..d930072123 100644 --- a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070670.s +++ b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070670.s @@ -22,7 +22,7 @@ glabel func_80070670 /* 4BAB4 800706B4 C7B00028 */ lwc1 $f16, 0x28($sp) /* 4BAB8 800706B8 8FBF002C */ lw $ra, 0x2c($sp) /* 4BABC 800706BC 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4BAC0 800706C0 3C018008 */ lui $at, %hi(D_8007F588) -/* 4BAC4 800706C4 8C21F588 */ lw $at, %lo(D_8007F588)($at) +/* 4BAC0 800706C0 3C018008 */ lui $at, %hi(gEffectTable+0x378) +/* 4BAC4 800706C4 8C21F588 */ lw $at, %lo(gEffectTable+0x378)($at) /* 4BAC8 800706C8 00200008 */ jr $at /* 4BACC 800706CC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800706D0.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800706D0.s index ab6518f52e..a61a5b4d4f 100644 --- a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800706D0.s +++ b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800706D0.s @@ -22,7 +22,7 @@ glabel func_800706D0 /* 4BB14 80070714 C7B00028 */ lwc1 $f16, 0x28($sp) /* 4BB18 80070718 8FBF002C */ lw $ra, 0x2c($sp) /* 4BB1C 8007071C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4BB20 80070720 3C018008 */ lui $at, %hi(D_8007F5A0) -/* 4BB24 80070724 8C21F5A0 */ lw $at, %lo(D_8007F5A0)($at) +/* 4BB20 80070720 3C018008 */ lui $at, %hi(gEffectTable+0x390) +/* 4BB24 80070724 8C21F5A0 */ lw $at, %lo(gEffectTable+0x390)($at) /* 4BB28 80070728 00200008 */ jr $at /* 4BB2C 8007072C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070730.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070730.s index 9ba24cb371..140b67e3c7 100644 --- a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070730.s +++ b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070730.s @@ -22,7 +22,7 @@ glabel func_80070730 /* 4BB74 80070774 C7B00028 */ lwc1 $f16, 0x28($sp) /* 4BB78 80070778 8FBF002C */ lw $ra, 0x2c($sp) /* 4BB7C 8007077C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4BB80 80070780 3C018008 */ lui $at, %hi(D_8007F5B8) -/* 4BB84 80070784 8C21F5B8 */ lw $at, %lo(D_8007F5B8)($at) +/* 4BB80 80070780 3C018008 */ lui $at, %hi(gEffectTable+0x3A8) +/* 4BB84 80070784 8C21F5B8 */ lw $at, %lo(gEffectTable+0x3A8)($at) /* 4BB88 80070788 00200008 */ jr $at /* 4BB8C 8007078C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070850.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070850.s index c46410a75a..9f93c1557c 100644 --- a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070850.s +++ b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070850.s @@ -22,7 +22,7 @@ glabel func_80070850 /* 4BC94 80070894 C7B00028 */ lwc1 $f16, 0x28($sp) /* 4BC98 80070898 8FBF002C */ lw $ra, 0x2c($sp) /* 4BC9C 8007089C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4BCA0 800708A0 3C018008 */ lui $at, %hi(D_8007F600) -/* 4BCA4 800708A4 8C21F600 */ lw $at, %lo(D_8007F600)($at) +/* 4BCA0 800708A0 3C018008 */ lui $at, %hi(gEffectTable+0x3F0) +/* 4BCA4 800708A4 8C21F600 */ lw $at, %lo(gEffectTable+0x3F0)($at) /* 4BCA8 800708A8 00200008 */ jr $at /* 4BCAC 800708AC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800708B0.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800708B0.s index b02fe5a9ad..6bda55877d 100644 --- a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800708B0.s +++ b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800708B0.s @@ -22,7 +22,7 @@ glabel func_800708B0 /* 4BCF4 800708F4 C7B00028 */ lwc1 $f16, 0x28($sp) /* 4BCF8 800708F8 8FBF002C */ lw $ra, 0x2c($sp) /* 4BCFC 800708FC 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4BD00 80070900 3C018008 */ lui $at, %hi(D_8007F618) -/* 4BD04 80070904 8C21F618 */ lw $at, %lo(D_8007F618)($at) +/* 4BD00 80070900 3C018008 */ lui $at, %hi(gEffectTable+0x408) +/* 4BD04 80070904 8C21F618 */ lw $at, %lo(gEffectTable+0x408)($at) /* 4BD08 80070908 00200008 */ jr $at /* 4BD0C 8007090C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070910.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070910.s index f9ff10f17f..da8c459f79 100644 --- a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070910.s +++ b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070910.s @@ -22,7 +22,7 @@ glabel func_80070910 /* 4BD54 80070954 C7B00028 */ lwc1 $f16, 0x28($sp) /* 4BD58 80070958 8FBF002C */ lw $ra, 0x2c($sp) /* 4BD5C 8007095C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4BD60 80070960 3C018008 */ lui $at, %hi(D_8007F630) -/* 4BD64 80070964 8C21F630 */ lw $at, %lo(D_8007F630)($at) +/* 4BD60 80070960 3C018008 */ lui $at, %hi(gEffectTable+0x420) +/* 4BD64 80070964 8C21F630 */ lw $at, %lo(gEffectTable+0x420)($at) /* 4BD68 80070968 00200008 */ jr $at /* 4BD6C 8007096C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070970.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070970.s index cfc8648280..d5680a80ed 100644 --- a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070970.s +++ b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070970.s @@ -22,7 +22,7 @@ glabel func_80070970 /* 4BDB4 800709B4 C7B00028 */ lwc1 $f16, 0x28($sp) /* 4BDB8 800709B8 8FBF002C */ lw $ra, 0x2c($sp) /* 4BDBC 800709BC 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4BDC0 800709C0 3C018008 */ lui $at, %hi(D_8007F648) -/* 4BDC4 800709C4 8C21F648 */ lw $at, %lo(D_8007F648)($at) +/* 4BDC0 800709C0 3C018008 */ lui $at, %hi(gEffectTable+0x438) +/* 4BDC4 800709C4 8C21F648 */ lw $at, %lo(gEffectTable+0x438)($at) /* 4BDC8 800709C8 00200008 */ jr $at /* 4BDCC 800709CC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800709D0.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800709D0.s index b59e6d07a6..3af12e0131 100644 --- a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800709D0.s +++ b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800709D0.s @@ -22,7 +22,7 @@ glabel func_800709D0 /* 4BE14 80070A14 C7B00028 */ lwc1 $f16, 0x28($sp) /* 4BE18 80070A18 8FBF002C */ lw $ra, 0x2c($sp) /* 4BE1C 80070A1C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4BE20 80070A20 3C018008 */ lui $at, %hi(D_8007F660) -/* 4BE24 80070A24 8C21F660 */ lw $at, %lo(D_8007F660)($at) +/* 4BE20 80070A20 3C018008 */ lui $at, %hi(gEffectTable+0x450) +/* 4BE24 80070A24 8C21F660 */ lw $at, %lo(gEffectTable+0x450)($at) /* 4BE28 80070A28 00200008 */ jr $at /* 4BE2C 80070A2C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070A30.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070A30.s index 4a07ee0a1b..4ac16e5d27 100644 --- a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070A30.s +++ b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070A30.s @@ -22,7 +22,7 @@ glabel func_80070A30 /* 4BE74 80070A74 C7B00028 */ lwc1 $f16, 0x28($sp) /* 4BE78 80070A78 8FBF002C */ lw $ra, 0x2c($sp) /* 4BE7C 80070A7C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4BE80 80070A80 3C018008 */ lui $at, %hi(D_8007F678) -/* 4BE84 80070A84 8C21F678 */ lw $at, %lo(D_8007F678)($at) +/* 4BE80 80070A80 3C018008 */ lui $at, %hi(gEffectTable+0x468) +/* 4BE84 80070A84 8C21F678 */ lw $at, %lo(gEffectTable+0x468)($at) /* 4BE88 80070A88 00200008 */ jr $at /* 4BE8C 80070A8C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070A90.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070A90.s index 12d1b4b73f..cac824b587 100644 --- a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070A90.s +++ b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070A90.s @@ -22,7 +22,7 @@ glabel func_80070A90 /* 4BED4 80070AD4 C7B00028 */ lwc1 $f16, 0x28($sp) /* 4BED8 80070AD8 8FBF002C */ lw $ra, 0x2c($sp) /* 4BEDC 80070ADC 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4BEE0 80070AE0 3C018008 */ lui $at, %hi(D_8007F690) -/* 4BEE4 80070AE4 8C21F690 */ lw $at, %lo(D_8007F690)($at) +/* 4BEE0 80070AE0 3C018008 */ lui $at, %hi(gEffectTable+0x480) +/* 4BEE4 80070AE4 8C21F690 */ lw $at, %lo(gEffectTable+0x480)($at) /* 4BEE8 80070AE8 00200008 */ jr $at /* 4BEEC 80070AEC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070AF0.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070AF0.s index 2dd974b29e..36e2b13b7f 100644 --- a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070AF0.s +++ b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070AF0.s @@ -22,7 +22,7 @@ glabel func_80070AF0 /* 4BF34 80070B34 C7B00028 */ lwc1 $f16, 0x28($sp) /* 4BF38 80070B38 8FBF002C */ lw $ra, 0x2c($sp) /* 4BF3C 80070B3C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4BF40 80070B40 3C018008 */ lui $at, %hi(D_8007F6A8) -/* 4BF44 80070B44 8C21F6A8 */ lw $at, %lo(D_8007F6A8)($at) +/* 4BF40 80070B40 3C018008 */ lui $at, %hi(gEffectTable+0x498) +/* 4BF44 80070B44 8C21F6A8 */ lw $at, %lo(gEffectTable+0x498)($at) /* 4BF48 80070B48 00200008 */ jr $at /* 4BF4C 80070B4C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070B50.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070B50.s index e200f6808f..e404fdcaff 100644 --- a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070B50.s +++ b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070B50.s @@ -22,7 +22,7 @@ glabel func_80070B50 /* 4BF94 80070B94 C7B00028 */ lwc1 $f16, 0x28($sp) /* 4BF98 80070B98 8FBF002C */ lw $ra, 0x2c($sp) /* 4BF9C 80070B9C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4BFA0 80070BA0 3C018008 */ lui $at, %hi(D_8007F6C0) -/* 4BFA4 80070BA4 8C21F6C0 */ lw $at, %lo(D_8007F6C0)($at) +/* 4BFA0 80070BA0 3C018008 */ lui $at, %hi(gEffectTable+0x4B0) +/* 4BFA4 80070BA4 8C21F6C0 */ lw $at, %lo(gEffectTable+0x4B0)($at) /* 4BFA8 80070BA8 00200008 */ jr $at /* 4BFAC 80070BAC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070BB0.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070BB0.s index fc2aaa8e93..3bbd4811ca 100644 --- a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070BB0.s +++ b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070BB0.s @@ -22,7 +22,7 @@ glabel func_80070BB0 /* 4BFF4 80070BF4 C7B00028 */ lwc1 $f16, 0x28($sp) /* 4BFF8 80070BF8 8FBF002C */ lw $ra, 0x2c($sp) /* 4BFFC 80070BFC 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4C000 80070C00 3C018008 */ lui $at, %hi(D_8007F6D8) -/* 4C004 80070C04 8C21F6D8 */ lw $at, %lo(D_8007F6D8)($at) +/* 4C000 80070C00 3C018008 */ lui $at, %hi(gEffectTable+0x4C8) +/* 4C004 80070C04 8C21F6D8 */ lw $at, %lo(gEffectTable+0x4C8)($at) /* 4C008 80070C08 00200008 */ jr $at /* 4C00C 80070C0C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070C10.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070C10.s index 7c525b0da7..c217a30dc3 100644 --- a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070C10.s +++ b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070C10.s @@ -22,7 +22,7 @@ glabel func_80070C10 /* 4C054 80070C54 C7B00028 */ lwc1 $f16, 0x28($sp) /* 4C058 80070C58 8FBF002C */ lw $ra, 0x2c($sp) /* 4C05C 80070C5C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4C060 80070C60 3C018008 */ lui $at, %hi(D_8007F6F0) -/* 4C064 80070C64 8C21F6F0 */ lw $at, %lo(D_8007F6F0)($at) +/* 4C060 80070C60 3C018008 */ lui $at, %hi(gEffectTable+0x4E0) +/* 4C064 80070C64 8C21F6F0 */ lw $at, %lo(gEffectTable+0x4E0)($at) /* 4C068 80070C68 00200008 */ jr $at /* 4C06C 80070C6C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070C70.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070C70.s index 30d8f56e69..e1b73b9593 100644 --- a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070C70.s +++ b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070C70.s @@ -22,7 +22,7 @@ glabel func_80070C70 /* 4C0B4 80070CB4 C7B00028 */ lwc1 $f16, 0x28($sp) /* 4C0B8 80070CB8 8FBF002C */ lw $ra, 0x2c($sp) /* 4C0BC 80070CBC 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4C0C0 80070CC0 3C018008 */ lui $at, %hi(D_8007F708) -/* 4C0C4 80070CC4 8C21F708 */ lw $at, %lo(D_8007F708)($at) +/* 4C0C0 80070CC0 3C018008 */ lui $at, %hi(gEffectTable+0x4F8) +/* 4C0C4 80070CC4 8C21F708 */ lw $at, %lo(gEffectTable+0x4F8)($at) /* 4C0C8 80070CC8 00200008 */ jr $at /* 4C0CC 80070CCC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070CD0.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070CD0.s index a6b29f6e5a..9278a6c4e4 100644 --- a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070CD0.s +++ b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070CD0.s @@ -22,7 +22,7 @@ glabel func_80070CD0 /* 4C114 80070D14 C7B00028 */ lwc1 $f16, 0x28($sp) /* 4C118 80070D18 8FBF002C */ lw $ra, 0x2c($sp) /* 4C11C 80070D1C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4C120 80070D20 3C018008 */ lui $at, %hi(D_8007F720) -/* 4C124 80070D24 8C21F720 */ lw $at, %lo(D_8007F720)($at) +/* 4C120 80070D20 3C018008 */ lui $at, %hi(gEffectTable+0x510) +/* 4C124 80070D24 8C21F720 */ lw $at, %lo(gEffectTable+0x510)($at) /* 4C128 80070D28 00200008 */ jr $at /* 4C12C 80070D2C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070D30.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070D30.s index f750e5540f..45028fa2ba 100644 --- a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070D30.s +++ b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070D30.s @@ -22,7 +22,7 @@ glabel func_80070D30 /* 4C174 80070D74 C7B00028 */ lwc1 $f16, 0x28($sp) /* 4C178 80070D78 8FBF002C */ lw $ra, 0x2c($sp) /* 4C17C 80070D7C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4C180 80070D80 3C018008 */ lui $at, %hi(D_8007F738) -/* 4C184 80070D84 8C21F738 */ lw $at, %lo(D_8007F738)($at) +/* 4C180 80070D80 3C018008 */ lui $at, %hi(gEffectTable+0x528) +/* 4C184 80070D84 8C21F738 */ lw $at, %lo(gEffectTable+0x528)($at) /* 4C188 80070D88 00200008 */ jr $at /* 4C18C 80070D8C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070D90.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070D90.s index edb0a232e6..6701c34571 100644 --- a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070D90.s +++ b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070D90.s @@ -22,7 +22,7 @@ glabel func_80070D90 /* 4C1D4 80070DD4 C7B00028 */ lwc1 $f16, 0x28($sp) /* 4C1D8 80070DD8 8FBF002C */ lw $ra, 0x2c($sp) /* 4C1DC 80070DDC 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4C1E0 80070DE0 3C018008 */ lui $at, %hi(D_8007F750) -/* 4C1E4 80070DE4 8C21F750 */ lw $at, %lo(D_8007F750)($at) +/* 4C1E0 80070DE0 3C018008 */ lui $at, %hi(gEffectTable+0x540) +/* 4C1E4 80070DE4 8C21F750 */ lw $at, %lo(gEffectTable+0x540)($at) /* 4C1E8 80070DE8 00200008 */ jr $at /* 4C1EC 80070DEC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070DF0.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070DF0.s index 8ff891d78f..c1768c4cbb 100644 --- a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070DF0.s +++ b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070DF0.s @@ -22,7 +22,7 @@ glabel func_80070DF0 /* 4C234 80070E34 C7B00028 */ lwc1 $f16, 0x28($sp) /* 4C238 80070E38 8FBF002C */ lw $ra, 0x2c($sp) /* 4C23C 80070E3C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4C240 80070E40 3C018008 */ lui $at, %hi(D_8007F768) -/* 4C244 80070E44 8C21F768 */ lw $at, %lo(D_8007F768)($at) +/* 4C240 80070E40 3C018008 */ lui $at, %hi(gEffectTable+0x558) +/* 4C244 80070E44 8C21F768 */ lw $at, %lo(gEffectTable+0x558)($at) /* 4C248 80070E48 00200008 */ jr $at /* 4C24C 80070E4C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070E50.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070E50.s index 37d9fcb9fe..c31aa83e99 100644 --- a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070E50.s +++ b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070E50.s @@ -22,7 +22,7 @@ glabel func_80070E50 /* 4C294 80070E94 C7B00028 */ lwc1 $f16, 0x28($sp) /* 4C298 80070E98 8FBF002C */ lw $ra, 0x2c($sp) /* 4C29C 80070E9C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4C2A0 80070EA0 3C018008 */ lui $at, %hi(D_8007F780) -/* 4C2A4 80070EA4 8C21F780 */ lw $at, %lo(D_8007F780)($at) +/* 4C2A0 80070EA0 3C018008 */ lui $at, %hi(gEffectTable+0x570) +/* 4C2A4 80070EA4 8C21F780 */ lw $at, %lo(gEffectTable+0x570)($at) /* 4C2A8 80070EA8 00200008 */ jr $at /* 4C2AC 80070EAC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070EB0.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070EB0.s index c5ad2b443b..3ca13168f7 100644 --- a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070EB0.s +++ b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070EB0.s @@ -22,7 +22,7 @@ glabel func_80070EB0 /* 4C2F4 80070EF4 C7B00028 */ lwc1 $f16, 0x28($sp) /* 4C2F8 80070EF8 8FBF002C */ lw $ra, 0x2c($sp) /* 4C2FC 80070EFC 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4C300 80070F00 3C018008 */ lui $at, %hi(D_8007F798) -/* 4C304 80070F04 8C21F798 */ lw $at, %lo(D_8007F798)($at) +/* 4C300 80070F00 3C018008 */ lui $at, %hi(gEffectTable+0x588) +/* 4C304 80070F04 8C21F798 */ lw $at, %lo(gEffectTable+0x588)($at) /* 4C308 80070F08 00200008 */ jr $at /* 4C30C 80070F0C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070F10.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070F10.s index a5bf818028..fec4ff3e0e 100644 --- a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070F10.s +++ b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070F10.s @@ -22,7 +22,7 @@ glabel func_80070F10 /* 4C354 80070F54 C7B00028 */ lwc1 $f16, 0x28($sp) /* 4C358 80070F58 8FBF002C */ lw $ra, 0x2c($sp) /* 4C35C 80070F5C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4C360 80070F60 3C018008 */ lui $at, %hi(D_8007F7B0) -/* 4C364 80070F64 8C21F7B0 */ lw $at, %lo(D_8007F7B0)($at) +/* 4C360 80070F60 3C018008 */ lui $at, %hi(gEffectTable+0x5A0) +/* 4C364 80070F64 8C21F7B0 */ lw $at, %lo(gEffectTable+0x5A0)($at) /* 4C368 80070F68 00200008 */ jr $at /* 4C36C 80070F6C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070F70.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070F70.s index 5d61fbae16..97016fc162 100644 --- a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070F70.s +++ b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070F70.s @@ -22,7 +22,7 @@ glabel func_80070F70 /* 4C3B4 80070FB4 C7B00028 */ lwc1 $f16, 0x28($sp) /* 4C3B8 80070FB8 8FBF002C */ lw $ra, 0x2c($sp) /* 4C3BC 80070FBC 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4C3C0 80070FC0 3C018008 */ lui $at, %hi(D_8007F7C8) -/* 4C3C4 80070FC4 8C21F7C8 */ lw $at, %lo(D_8007F7C8)($at) +/* 4C3C0 80070FC0 3C018008 */ lui $at, %hi(gEffectTable+0x5B8) +/* 4C3C4 80070FC4 8C21F7C8 */ lw $at, %lo(gEffectTable+0x5B8)($at) /* 4C3C8 80070FC8 00200008 */ jr $at /* 4C3CC 80070FCC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070FD0.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070FD0.s index 9ad42c48cf..4606e9ac0d 100644 --- a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070FD0.s +++ b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070FD0.s @@ -22,7 +22,7 @@ glabel func_80070FD0 /* 4C414 80071014 C7B00028 */ lwc1 $f16, 0x28($sp) /* 4C418 80071018 8FBF002C */ lw $ra, 0x2c($sp) /* 4C41C 8007101C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4C420 80071020 3C018008 */ lui $at, %hi(D_8007F7E0) -/* 4C424 80071024 8C21F7E0 */ lw $at, %lo(D_8007F7E0)($at) +/* 4C420 80071020 3C018008 */ lui $at, %hi(gEffectTable+0x5D0) +/* 4C424 80071024 8C21F7E0 */ lw $at, %lo(gEffectTable+0x5D0)($at) /* 4C428 80071028 00200008 */ jr $at /* 4C42C 8007102C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071030.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071030.s index dba0a787e4..b40225bd6d 100644 --- a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071030.s +++ b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071030.s @@ -22,7 +22,7 @@ glabel func_80071030 /* 4C474 80071074 C7B00028 */ lwc1 $f16, 0x28($sp) /* 4C478 80071078 8FBF002C */ lw $ra, 0x2c($sp) /* 4C47C 8007107C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4C480 80071080 3C018008 */ lui $at, %hi(D_8007F7F8) -/* 4C484 80071084 8C21F7F8 */ lw $at, %lo(D_8007F7F8)($at) +/* 4C480 80071080 3C018008 */ lui $at, %hi(gEffectTable+0x5E8) +/* 4C484 80071084 8C21F7F8 */ lw $at, %lo(gEffectTable+0x5E8)($at) /* 4C488 80071088 00200008 */ jr $at /* 4C48C 8007108C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071090.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071090.s index d07f7f178b..8e904f8391 100644 --- a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071090.s +++ b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071090.s @@ -22,7 +22,7 @@ glabel func_80071090 /* 4C4D4 800710D4 C7B00028 */ lwc1 $f16, 0x28($sp) /* 4C4D8 800710D8 8FBF002C */ lw $ra, 0x2c($sp) /* 4C4DC 800710DC 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4C4E0 800710E0 3C018008 */ lui $at, %hi(D_8007F810) -/* 4C4E4 800710E4 8C21F810 */ lw $at, %lo(D_8007F810)($at) +/* 4C4E0 800710E0 3C018008 */ lui $at, %hi(gEffectTable+0x600) +/* 4C4E4 800710E4 8C21F810 */ lw $at, %lo(gEffectTable+0x600)($at) /* 4C4E8 800710E8 00200008 */ jr $at /* 4C4EC 800710EC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800710F0.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800710F0.s index cda1e62149..323945d7e3 100644 --- a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800710F0.s +++ b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800710F0.s @@ -22,7 +22,7 @@ glabel func_800710F0 /* 4C534 80071134 C7B00028 */ lwc1 $f16, 0x28($sp) /* 4C538 80071138 8FBF002C */ lw $ra, 0x2c($sp) /* 4C53C 8007113C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4C540 80071140 3C018008 */ lui $at, %hi(D_8007F828) -/* 4C544 80071144 8C21F828 */ lw $at, %lo(D_8007F828)($at) +/* 4C540 80071140 3C018008 */ lui $at, %hi(gEffectTable+0x618) +/* 4C544 80071144 8C21F828 */ lw $at, %lo(gEffectTable+0x618)($at) /* 4C548 80071148 00200008 */ jr $at /* 4C54C 8007114C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071150.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071150.s index 5ac065703a..49e0af471f 100644 --- a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071150.s +++ b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071150.s @@ -22,7 +22,7 @@ glabel func_80071150 /* 4C594 80071194 C7B00028 */ lwc1 $f16, 0x28($sp) /* 4C598 80071198 8FBF002C */ lw $ra, 0x2c($sp) /* 4C59C 8007119C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4C5A0 800711A0 3C018008 */ lui $at, %hi(D_8007F840) -/* 4C5A4 800711A4 8C21F840 */ lw $at, %lo(D_8007F840)($at) +/* 4C5A0 800711A0 3C018008 */ lui $at, %hi(gEffectTable+0x630) +/* 4C5A4 800711A4 8C21F840 */ lw $at, %lo(gEffectTable+0x630)($at) /* 4C5A8 800711A8 00200008 */ jr $at /* 4C5AC 800711AC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800711B0.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800711B0.s index 2abc83d2e9..733d159f30 100644 --- a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800711B0.s +++ b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800711B0.s @@ -22,7 +22,7 @@ glabel func_800711B0 /* 4C5F4 800711F4 C7B00028 */ lwc1 $f16, 0x28($sp) /* 4C5F8 800711F8 8FBF002C */ lw $ra, 0x2c($sp) /* 4C5FC 800711FC 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4C600 80071200 3C018008 */ lui $at, %hi(D_8007F858) -/* 4C604 80071204 8C21F858 */ lw $at, %lo(D_8007F858)($at) +/* 4C600 80071200 3C018008 */ lui $at, %hi(gEffectTable+0x648) +/* 4C604 80071204 8C21F858 */ lw $at, %lo(gEffectTable+0x648)($at) /* 4C608 80071208 00200008 */ jr $at /* 4C60C 8007120C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071210.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071210.s index afed78bde2..d951673375 100644 --- a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071210.s +++ b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071210.s @@ -22,7 +22,7 @@ glabel func_80071210 /* 4C654 80071254 C7B00028 */ lwc1 $f16, 0x28($sp) /* 4C658 80071258 8FBF002C */ lw $ra, 0x2c($sp) /* 4C65C 8007125C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4C660 80071260 3C018008 */ lui $at, %hi(D_8007F870) -/* 4C664 80071264 8C21F870 */ lw $at, %lo(D_8007F870)($at) +/* 4C660 80071260 3C018008 */ lui $at, %hi(gEffectTable+0x660) +/* 4C664 80071264 8C21F870 */ lw $at, %lo(gEffectTable+0x660)($at) /* 4C668 80071268 00200008 */ jr $at /* 4C66C 8007126C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071270.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071270.s index 20201e7f8d..e4b1cba48b 100644 --- a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071270.s +++ b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071270.s @@ -22,7 +22,7 @@ glabel func_80071270 /* 4C6B4 800712B4 C7B00028 */ lwc1 $f16, 0x28($sp) /* 4C6B8 800712B8 8FBF002C */ lw $ra, 0x2c($sp) /* 4C6BC 800712BC 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4C6C0 800712C0 3C018008 */ lui $at, %hi(D_8007F888) -/* 4C6C4 800712C4 8C21F888 */ lw $at, %lo(D_8007F888)($at) +/* 4C6C0 800712C0 3C018008 */ lui $at, %hi(gEffectTable+0x678) +/* 4C6C4 800712C4 8C21F888 */ lw $at, %lo(gEffectTable+0x678)($at) /* 4C6C8 800712C8 00200008 */ jr $at /* 4C6CC 800712CC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800712D0.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800712D0.s index 4b2a74c444..f7bcd78a1d 100644 --- a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800712D0.s +++ b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800712D0.s @@ -22,7 +22,7 @@ glabel func_800712D0 /* 4C714 80071314 C7B00028 */ lwc1 $f16, 0x28($sp) /* 4C718 80071318 8FBF002C */ lw $ra, 0x2c($sp) /* 4C71C 8007131C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4C720 80071320 3C018008 */ lui $at, %hi(D_8007F8A0) -/* 4C724 80071324 8C21F8A0 */ lw $at, %lo(D_8007F8A0)($at) +/* 4C720 80071320 3C018008 */ lui $at, %hi(gEffectTable+0x690) +/* 4C724 80071324 8C21F8A0 */ lw $at, %lo(gEffectTable+0x690)($at) /* 4C728 80071328 00200008 */ jr $at /* 4C72C 8007132C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071330.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071330.s index 7baac64322..f8bff1d5da 100644 --- a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071330.s +++ b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071330.s @@ -22,7 +22,7 @@ glabel func_80071330 /* 4C774 80071374 C7B00028 */ lwc1 $f16, 0x28($sp) /* 4C778 80071378 8FBF002C */ lw $ra, 0x2c($sp) /* 4C77C 8007137C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4C780 80071380 3C018008 */ lui $at, %hi(D_8007F8B8) -/* 4C784 80071384 8C21F8B8 */ lw $at, %lo(D_8007F8B8)($at) +/* 4C780 80071380 3C018008 */ lui $at, %hi(gEffectTable+0x6A8) +/* 4C784 80071384 8C21F8B8 */ lw $at, %lo(gEffectTable+0x6A8)($at) /* 4C788 80071388 00200008 */ jr $at /* 4C78C 8007138C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071390.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071390.s index 0ef36a383e..a43853e680 100644 --- a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071390.s +++ b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071390.s @@ -22,7 +22,7 @@ glabel func_80071390 /* 4C7D4 800713D4 C7B00028 */ lwc1 $f16, 0x28($sp) /* 4C7D8 800713D8 8FBF002C */ lw $ra, 0x2c($sp) /* 4C7DC 800713DC 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4C7E0 800713E0 3C018008 */ lui $at, %hi(D_8007F8D0) -/* 4C7E4 800713E4 8C21F8D0 */ lw $at, %lo(D_8007F8D0)($at) +/* 4C7E0 800713E0 3C018008 */ lui $at, %hi(gEffectTable+0x6C0) +/* 4C7E4 800713E4 8C21F8D0 */ lw $at, %lo(gEffectTable+0x6C0)($at) /* 4C7E8 800713E8 00200008 */ jr $at /* 4C7EC 800713EC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800713F0.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800713F0.s index 008a7476b7..09984e1227 100644 --- a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800713F0.s +++ b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800713F0.s @@ -22,7 +22,7 @@ glabel func_800713F0 /* 4C834 80071434 C7B00028 */ lwc1 $f16, 0x28($sp) /* 4C838 80071438 8FBF002C */ lw $ra, 0x2c($sp) /* 4C83C 8007143C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4C840 80071440 3C018008 */ lui $at, %hi(D_8007F8E8) -/* 4C844 80071444 8C21F8E8 */ lw $at, %lo(D_8007F8E8)($at) +/* 4C840 80071440 3C018008 */ lui $at, %hi(gEffectTable+0x6D8) +/* 4C844 80071444 8C21F8E8 */ lw $at, %lo(gEffectTable+0x6D8)($at) /* 4C848 80071448 00200008 */ jr $at /* 4C84C 8007144C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071450.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071450.s index 0d46ebd3ef..1a7cc1a878 100644 --- a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071450.s +++ b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071450.s @@ -22,7 +22,7 @@ glabel func_80071450 /* 4C894 80071494 C7B00028 */ lwc1 $f16, 0x28($sp) /* 4C898 80071498 8FBF002C */ lw $ra, 0x2c($sp) /* 4C89C 8007149C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4C8A0 800714A0 3C018008 */ lui $at, %hi(D_8007F900) -/* 4C8A4 800714A4 8C21F900 */ lw $at, %lo(D_8007F900)($at) +/* 4C8A0 800714A0 3C018008 */ lui $at, %hi(gEffectTable+0x6F0) +/* 4C8A4 800714A4 8C21F900 */ lw $at, %lo(gEffectTable+0x6F0)($at) /* 4C8A8 800714A8 00200008 */ jr $at /* 4C8AC 800714AC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800714B0.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800714B0.s index e23474d181..2782e6a3d6 100644 --- a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800714B0.s +++ b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800714B0.s @@ -22,7 +22,7 @@ glabel func_800714B0 /* 4C8F4 800714F4 C7B00028 */ lwc1 $f16, 0x28($sp) /* 4C8F8 800714F8 8FBF002C */ lw $ra, 0x2c($sp) /* 4C8FC 800714FC 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4C900 80071500 3C018008 */ lui $at, %hi(D_8007F918) -/* 4C904 80071504 8C21F918 */ lw $at, %lo(D_8007F918)($at) +/* 4C900 80071500 3C018008 */ lui $at, %hi(gEffectTable+0x708) +/* 4C904 80071504 8C21F918 */ lw $at, %lo(gEffectTable+0x708)($at) /* 4C908 80071508 00200008 */ jr $at /* 4C90C 8007150C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071510.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071510.s index 29e053521b..171c8925dc 100644 --- a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071510.s +++ b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071510.s @@ -22,7 +22,7 @@ glabel func_80071510 /* 4C954 80071554 C7B00028 */ lwc1 $f16, 0x28($sp) /* 4C958 80071558 8FBF002C */ lw $ra, 0x2c($sp) /* 4C95C 8007155C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4C960 80071560 3C018008 */ lui $at, %hi(D_8007F930) -/* 4C964 80071564 8C21F930 */ lw $at, %lo(D_8007F930)($at) +/* 4C960 80071560 3C018008 */ lui $at, %hi(gEffectTable+0x720) +/* 4C964 80071564 8C21F930 */ lw $at, %lo(gEffectTable+0x720)($at) /* 4C968 80071568 00200008 */ jr $at /* 4C96C 8007156C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071570.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071570.s index ca8b7d103b..ecf794e0af 100644 --- a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071570.s +++ b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071570.s @@ -22,7 +22,7 @@ glabel func_80071570 /* 4C9B4 800715B4 C7B00028 */ lwc1 $f16, 0x28($sp) /* 4C9B8 800715B8 8FBF002C */ lw $ra, 0x2c($sp) /* 4C9BC 800715BC 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4C9C0 800715C0 3C018008 */ lui $at, %hi(D_8007F948) -/* 4C9C4 800715C4 8C21F948 */ lw $at, %lo(D_8007F948)($at) +/* 4C9C0 800715C0 3C018008 */ lui $at, %hi(gEffectTable+0x738) +/* 4C9C4 800715C4 8C21F948 */ lw $at, %lo(gEffectTable+0x738)($at) /* 4C9C8 800715C8 00200008 */ jr $at /* 4C9CC 800715CC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800715D0.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800715D0.s index 415a2a41b0..6213f9301d 100644 --- a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800715D0.s +++ b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800715D0.s @@ -22,7 +22,7 @@ glabel func_800715D0 /* 4CA14 80071614 C7B00028 */ lwc1 $f16, 0x28($sp) /* 4CA18 80071618 8FBF002C */ lw $ra, 0x2c($sp) /* 4CA1C 8007161C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4CA20 80071620 3C018008 */ lui $at, %hi(D_8007F960) -/* 4CA24 80071624 8C21F960 */ lw $at, %lo(D_8007F960)($at) +/* 4CA20 80071620 3C018008 */ lui $at, %hi(gEffectTable+0x750) +/* 4CA24 80071624 8C21F960 */ lw $at, %lo(gEffectTable+0x750)($at) /* 4CA28 80071628 00200008 */ jr $at /* 4CA2C 8007162C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071630.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071630.s index d3d325f982..5f1887604d 100644 --- a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071630.s +++ b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071630.s @@ -22,7 +22,7 @@ glabel func_80071630 /* 4CA74 80071674 C7B00028 */ lwc1 $f16, 0x28($sp) /* 4CA78 80071678 8FBF002C */ lw $ra, 0x2c($sp) /* 4CA7C 8007167C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4CA80 80071680 3C018008 */ lui $at, %hi(D_8007F978) -/* 4CA84 80071684 8C21F978 */ lw $at, %lo(D_8007F978)($at) +/* 4CA80 80071680 3C018008 */ lui $at, %hi(gEffectTable+0x768) +/* 4CA84 80071684 8C21F978 */ lw $at, %lo(gEffectTable+0x768)($at) /* 4CA88 80071688 00200008 */ jr $at /* 4CA8C 8007168C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071690.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071690.s index bb9d010abc..af09b1c2d8 100644 --- a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071690.s +++ b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071690.s @@ -22,7 +22,7 @@ glabel func_80071690 /* 4CAD4 800716D4 C7B00028 */ lwc1 $f16, 0x28($sp) /* 4CAD8 800716D8 8FBF002C */ lw $ra, 0x2c($sp) /* 4CADC 800716DC 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4CAE0 800716E0 3C018008 */ lui $at, %hi(D_8007F990) -/* 4CAE4 800716E4 8C21F990 */ lw $at, %lo(D_8007F990)($at) +/* 4CAE0 800716E0 3C018008 */ lui $at, %hi(gEffectTable+0x780) +/* 4CAE4 800716E4 8C21F990 */ lw $at, %lo(gEffectTable+0x780)($at) /* 4CAE8 800716E8 00200008 */ jr $at /* 4CAEC 800716EC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800716F0.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800716F0.s index c8660059bd..447757dbd2 100644 --- a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800716F0.s +++ b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800716F0.s @@ -22,7 +22,7 @@ glabel func_800716F0 /* 4CB34 80071734 C7B00028 */ lwc1 $f16, 0x28($sp) /* 4CB38 80071738 8FBF002C */ lw $ra, 0x2c($sp) /* 4CB3C 8007173C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4CB40 80071740 3C018008 */ lui $at, %hi(D_8007F9A8) -/* 4CB44 80071744 8C21F9A8 */ lw $at, %lo(D_8007F9A8)($at) +/* 4CB40 80071740 3C018008 */ lui $at, %hi(gEffectTable+0x798) +/* 4CB44 80071744 8C21F9A8 */ lw $at, %lo(gEffectTable+0x798)($at) /* 4CB48 80071748 00200008 */ jr $at /* 4CB4C 8007174C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071750.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071750.s index d0ea34f711..cc752e8d00 100644 --- a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071750.s +++ b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071750.s @@ -22,7 +22,7 @@ glabel func_80071750 /* 4CB94 80071794 C7B00028 */ lwc1 $f16, 0x28($sp) /* 4CB98 80071798 8FBF002C */ lw $ra, 0x2c($sp) /* 4CB9C 8007179C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4CBA0 800717A0 3C018008 */ lui $at, %hi(D_8007F9C0) -/* 4CBA4 800717A4 8C21F9C0 */ lw $at, %lo(D_8007F9C0)($at) +/* 4CBA0 800717A0 3C018008 */ lui $at, %hi(gEffectTable+0x7B0) +/* 4CBA4 800717A4 8C21F9C0 */ lw $at, %lo(gEffectTable+0x7B0)($at) /* 4CBA8 800717A8 00200008 */ jr $at /* 4CBAC 800717AC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800717B0.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800717B0.s index 0586bfb7fd..37dd8e0aae 100644 --- a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800717B0.s +++ b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800717B0.s @@ -22,7 +22,7 @@ glabel func_800717B0 /* 4CBF4 800717F4 C7B00028 */ lwc1 $f16, 0x28($sp) /* 4CBF8 800717F8 8FBF002C */ lw $ra, 0x2c($sp) /* 4CBFC 800717FC 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4CC00 80071800 3C018008 */ lui $at, %hi(D_8007F9D8) -/* 4CC04 80071804 8C21F9D8 */ lw $at, %lo(D_8007F9D8)($at) +/* 4CC00 80071800 3C018008 */ lui $at, %hi(gEffectTable+0x7C8) +/* 4CC04 80071804 8C21F9D8 */ lw $at, %lo(gEffectTable+0x7C8)($at) /* 4CC08 80071808 00200008 */ jr $at /* 4CC0C 8007180C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071810.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071810.s index 7fb785e5ea..ef5e6fb169 100644 --- a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071810.s +++ b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071810.s @@ -22,7 +22,7 @@ glabel func_80071810 /* 4CC54 80071854 C7B00028 */ lwc1 $f16, 0x28($sp) /* 4CC58 80071858 8FBF002C */ lw $ra, 0x2c($sp) /* 4CC5C 8007185C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4CC60 80071860 3C018008 */ lui $at, %hi(D_8007F9F0) -/* 4CC64 80071864 8C21F9F0 */ lw $at, %lo(D_8007F9F0)($at) +/* 4CC60 80071860 3C018008 */ lui $at, %hi(gEffectTable+0x7E0) +/* 4CC64 80071864 8C21F9F0 */ lw $at, %lo(gEffectTable+0x7E0)($at) /* 4CC68 80071868 00200008 */ jr $at /* 4CC6C 8007186C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071870.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071870.s index 68345df8b1..849476cbe2 100644 --- a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071870.s +++ b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071870.s @@ -22,7 +22,7 @@ glabel func_80071870 /* 4CCB4 800718B4 C7B00028 */ lwc1 $f16, 0x28($sp) /* 4CCB8 800718B8 8FBF002C */ lw $ra, 0x2c($sp) /* 4CCBC 800718BC 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4CCC0 800718C0 3C018008 */ lui $at, %hi(D_8007FA08) -/* 4CCC4 800718C4 8C21FA08 */ lw $at, %lo(D_8007FA08)($at) +/* 4CCC0 800718C0 3C018008 */ lui $at, %hi(gEffectTable+0x7F8) +/* 4CCC4 800718C4 8C21FA08 */ lw $at, %lo(gEffectTable+0x7F8)($at) /* 4CCC8 800718C8 00200008 */ jr $at /* 4CCCC 800718CC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800718D0.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800718D0.s index f42c06b76a..65d9f13792 100644 --- a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800718D0.s +++ b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800718D0.s @@ -22,7 +22,7 @@ glabel func_800718D0 /* 4CD14 80071914 C7B00028 */ lwc1 $f16, 0x28($sp) /* 4CD18 80071918 8FBF002C */ lw $ra, 0x2c($sp) /* 4CD1C 8007191C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4CD20 80071920 3C018008 */ lui $at, %hi(D_8007FA20) -/* 4CD24 80071924 8C21FA20 */ lw $at, %lo(D_8007FA20)($at) +/* 4CD20 80071920 3C018008 */ lui $at, %hi(gEffectTable+0x810) +/* 4CD24 80071924 8C21FA20 */ lw $at, %lo(gEffectTable+0x810)($at) /* 4CD28 80071928 00200008 */ jr $at /* 4CD2C 8007192C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071930.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071930.s index 56176a9925..e750b5e56d 100644 --- a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071930.s +++ b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071930.s @@ -22,7 +22,7 @@ glabel func_80071930 /* 4CD74 80071974 C7B00028 */ lwc1 $f16, 0x28($sp) /* 4CD78 80071978 8FBF002C */ lw $ra, 0x2c($sp) /* 4CD7C 8007197C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4CD80 80071980 3C018008 */ lui $at, %hi(D_8007FA38) -/* 4CD84 80071984 8C21FA38 */ lw $at, %lo(D_8007FA38)($at) +/* 4CD80 80071980 3C018008 */ lui $at, %hi(gEffectTable+0x828) +/* 4CD84 80071984 8C21FA38 */ lw $at, %lo(gEffectTable+0x828)($at) /* 4CD88 80071988 00200008 */ jr $at /* 4CD8C 8007198C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071990.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071990.s index f746bf6875..ca95e9959c 100644 --- a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071990.s +++ b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071990.s @@ -22,7 +22,7 @@ glabel func_80071990 /* 4CDD4 800719D4 C7B00028 */ lwc1 $f16, 0x28($sp) /* 4CDD8 800719D8 8FBF002C */ lw $ra, 0x2c($sp) /* 4CDDC 800719DC 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4CDE0 800719E0 3C018008 */ lui $at, %hi(D_8007FA50) -/* 4CDE4 800719E4 8C21FA50 */ lw $at, %lo(D_8007FA50)($at) +/* 4CDE0 800719E0 3C018008 */ lui $at, %hi(gEffectTable+0x840) +/* 4CDE4 800719E4 8C21FA50 */ lw $at, %lo(gEffectTable+0x840)($at) /* 4CDE8 800719E8 00200008 */ jr $at /* 4CDEC 800719EC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800719F0.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800719F0.s index 852f4db8d9..d8e05c4aa5 100644 --- a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800719F0.s +++ b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800719F0.s @@ -22,7 +22,7 @@ glabel func_800719F0 /* 4CE34 80071A34 C7B00028 */ lwc1 $f16, 0x28($sp) /* 4CE38 80071A38 8FBF002C */ lw $ra, 0x2c($sp) /* 4CE3C 80071A3C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4CE40 80071A40 3C018008 */ lui $at, %hi(D_8007FA68) -/* 4CE44 80071A44 8C21FA68 */ lw $at, %lo(D_8007FA68)($at) +/* 4CE40 80071A40 3C018008 */ lui $at, %hi(gEffectTable+0x858) +/* 4CE44 80071A44 8C21FA68 */ lw $at, %lo(gEffectTable+0x858)($at) /* 4CE48 80071A48 00200008 */ jr $at /* 4CE4C 80071A4C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071A50.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071A50.s index c3c3bbe7fb..19cca583f3 100644 --- a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071A50.s +++ b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071A50.s @@ -22,7 +22,7 @@ glabel func_80071A50 /* 4CE94 80071A94 C7B00028 */ lwc1 $f16, 0x28($sp) /* 4CE98 80071A98 8FBF002C */ lw $ra, 0x2c($sp) /* 4CE9C 80071A9C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4CEA0 80071AA0 3C018008 */ lui $at, %hi(D_8007FA80) -/* 4CEA4 80071AA4 8C21FA80 */ lw $at, %lo(D_8007FA80)($at) +/* 4CEA0 80071AA0 3C018008 */ lui $at, %hi(gEffectTable+0x870) +/* 4CEA4 80071AA4 8C21FA80 */ lw $at, %lo(gEffectTable+0x870)($at) /* 4CEA8 80071AA8 00200008 */ jr $at /* 4CEAC 80071AAC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071AB0.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071AB0.s index a8067ee615..4b91885230 100644 --- a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071AB0.s +++ b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071AB0.s @@ -22,7 +22,7 @@ glabel func_80071AB0 /* 4CEF4 80071AF4 C7B00028 */ lwc1 $f16, 0x28($sp) /* 4CEF8 80071AF8 8FBF002C */ lw $ra, 0x2c($sp) /* 4CEFC 80071AFC 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4CF00 80071B00 3C018008 */ lui $at, %hi(D_8007FA98) -/* 4CF04 80071B04 8C21FA98 */ lw $at, %lo(D_8007FA98)($at) +/* 4CF00 80071B00 3C018008 */ lui $at, %hi(gEffectTable+0x888) +/* 4CF04 80071B04 8C21FA98 */ lw $at, %lo(gEffectTable+0x888)($at) /* 4CF08 80071B08 00200008 */ jr $at /* 4CF0C 80071B0C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071B10.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071B10.s index 6e5edc26b1..3b86b73bfe 100644 --- a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071B10.s +++ b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071B10.s @@ -22,7 +22,7 @@ glabel func_80071B10 /* 4CF54 80071B54 C7B00028 */ lwc1 $f16, 0x28($sp) /* 4CF58 80071B58 8FBF002C */ lw $ra, 0x2c($sp) /* 4CF5C 80071B5C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4CF60 80071B60 3C018008 */ lui $at, %hi(D_8007FAB0) -/* 4CF64 80071B64 8C21FAB0 */ lw $at, %lo(D_8007FAB0)($at) +/* 4CF60 80071B60 3C018008 */ lui $at, %hi(gEffectTable+0x8A0) +/* 4CF64 80071B64 8C21FAB0 */ lw $at, %lo(gEffectTable+0x8A0)($at) /* 4CF68 80071B68 00200008 */ jr $at /* 4CF6C 80071B6C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071B70.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071B70.s index 0fc3ce121c..632f460c91 100644 --- a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071B70.s +++ b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071B70.s @@ -22,7 +22,7 @@ glabel func_80071B70 /* 4CFB4 80071BB4 C7B00028 */ lwc1 $f16, 0x28($sp) /* 4CFB8 80071BB8 8FBF002C */ lw $ra, 0x2c($sp) /* 4CFBC 80071BBC 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4CFC0 80071BC0 3C018008 */ lui $at, %hi(D_8007FAC8) -/* 4CFC4 80071BC4 8C21FAC8 */ lw $at, %lo(D_8007FAC8)($at) +/* 4CFC0 80071BC0 3C018008 */ lui $at, %hi(gEffectTable+0x8B8) +/* 4CFC4 80071BC4 8C21FAC8 */ lw $at, %lo(gEffectTable+0x8B8)($at) /* 4CFC8 80071BC8 00200008 */ jr $at /* 4CFCC 80071BCC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071BD0.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071BD0.s index 5af3bd24dd..cb37910ac2 100644 --- a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071BD0.s +++ b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071BD0.s @@ -22,7 +22,7 @@ glabel func_80071BD0 /* 4D014 80071C14 C7B00028 */ lwc1 $f16, 0x28($sp) /* 4D018 80071C18 8FBF002C */ lw $ra, 0x2c($sp) /* 4D01C 80071C1C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4D020 80071C20 3C018008 */ lui $at, %hi(D_8007FAE0) -/* 4D024 80071C24 8C21FAE0 */ lw $at, %lo(D_8007FAE0)($at) +/* 4D020 80071C20 3C018008 */ lui $at, %hi(gEffectTable+0x8D0) +/* 4D024 80071C24 8C21FAE0 */ lw $at, %lo(gEffectTable+0x8D0)($at) /* 4D028 80071C28 00200008 */ jr $at /* 4D02C 80071C2C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071C30.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071C30.s index fee8727a62..91bb180e8a 100644 --- a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071C30.s +++ b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071C30.s @@ -22,7 +22,7 @@ glabel func_80071C30 /* 4D074 80071C74 C7B00028 */ lwc1 $f16, 0x28($sp) /* 4D078 80071C78 8FBF002C */ lw $ra, 0x2c($sp) /* 4D07C 80071C7C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4D080 80071C80 3C018008 */ lui $at, %hi(D_8007FAF8) -/* 4D084 80071C84 8C21FAF8 */ lw $at, %lo(D_8007FAF8)($at) +/* 4D080 80071C80 3C018008 */ lui $at, %hi(gEffectTable+0x8E8) +/* 4D084 80071C84 8C21FAF8 */ lw $at, %lo(gEffectTable+0x8E8)($at) /* 4D088 80071C88 00200008 */ jr $at /* 4D08C 80071C8C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071C90.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071C90.s index caccdaa3de..97976d3e70 100644 --- a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071C90.s +++ b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071C90.s @@ -22,7 +22,7 @@ glabel func_80071C90 /* 4D0D4 80071CD4 C7B00028 */ lwc1 $f16, 0x28($sp) /* 4D0D8 80071CD8 8FBF002C */ lw $ra, 0x2c($sp) /* 4D0DC 80071CDC 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4D0E0 80071CE0 3C018008 */ lui $at, %hi(D_8007FB10) -/* 4D0E4 80071CE4 8C21FB10 */ lw $at, %lo(D_8007FB10)($at) +/* 4D0E0 80071CE0 3C018008 */ lui $at, %hi(gEffectTable+0x900) +/* 4D0E4 80071CE4 8C21FB10 */ lw $at, %lo(gEffectTable+0x900)($at) /* 4D0E8 80071CE8 00200008 */ jr $at /* 4D0EC 80071CEC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071CF0.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071CF0.s index db32dcb37d..f481303af2 100644 --- a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071CF0.s +++ b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071CF0.s @@ -22,7 +22,7 @@ glabel func_80071CF0 /* 4D134 80071D34 C7B00028 */ lwc1 $f16, 0x28($sp) /* 4D138 80071D38 8FBF002C */ lw $ra, 0x2c($sp) /* 4D13C 80071D3C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4D140 80071D40 3C018008 */ lui $at, %hi(D_8007FB28) -/* 4D144 80071D44 8C21FB28 */ lw $at, %lo(D_8007FB28)($at) +/* 4D140 80071D40 3C018008 */ lui $at, %hi(gEffectTable+0x918) +/* 4D144 80071D44 8C21FB28 */ lw $at, %lo(gEffectTable+0x918)($at) /* 4D148 80071D48 00200008 */ jr $at /* 4D14C 80071D4C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071D50.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071D50.s index eebee55806..b33a8d5477 100644 --- a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071D50.s +++ b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071D50.s @@ -22,7 +22,7 @@ glabel func_80071D50 /* 4D194 80071D94 C7B00028 */ lwc1 $f16, 0x28($sp) /* 4D198 80071D98 8FBF002C */ lw $ra, 0x2c($sp) /* 4D19C 80071D9C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4D1A0 80071DA0 3C018008 */ lui $at, %hi(D_8007FB40) -/* 4D1A4 80071DA4 8C21FB40 */ lw $at, %lo(D_8007FB40)($at) +/* 4D1A0 80071DA0 3C018008 */ lui $at, %hi(gEffectTable+0x930) +/* 4D1A4 80071DA4 8C21FB40 */ lw $at, %lo(gEffectTable+0x930)($at) /* 4D1A8 80071DA8 00200008 */ jr $at /* 4D1AC 80071DAC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071DB0.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071DB0.s index 601a33b844..8ad6fde457 100644 --- a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071DB0.s +++ b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071DB0.s @@ -22,7 +22,7 @@ glabel func_80071DB0 /* 4D1F4 80071DF4 C7B00028 */ lwc1 $f16, 0x28($sp) /* 4D1F8 80071DF8 8FBF002C */ lw $ra, 0x2c($sp) /* 4D1FC 80071DFC 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4D200 80071E00 3C018008 */ lui $at, %hi(D_8007FB58) -/* 4D204 80071E04 8C21FB58 */ lw $at, %lo(D_8007FB58)($at) +/* 4D200 80071E00 3C018008 */ lui $at, %hi(gEffectTable+0x948) +/* 4D204 80071E04 8C21FB58 */ lw $at, %lo(gEffectTable+0x948)($at) /* 4D208 80071E08 00200008 */ jr $at /* 4D20C 80071E0C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071E10.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071E10.s index 864543a1d9..9b41162d57 100644 --- a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071E10.s +++ b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071E10.s @@ -22,7 +22,7 @@ glabel func_80071E10 /* 4D254 80071E54 C7B00028 */ lwc1 $f16, 0x28($sp) /* 4D258 80071E58 8FBF002C */ lw $ra, 0x2c($sp) /* 4D25C 80071E5C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4D260 80071E60 3C018008 */ lui $at, %hi(D_8007FB70) -/* 4D264 80071E64 8C21FB70 */ lw $at, %lo(D_8007FB70)($at) +/* 4D260 80071E60 3C018008 */ lui $at, %hi(gEffectTable+0x960) +/* 4D264 80071E64 8C21FB70 */ lw $at, %lo(gEffectTable+0x960)($at) /* 4D268 80071E68 00200008 */ jr $at /* 4D26C 80071E6C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071E70.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071E70.s index 17e25a0f4c..b575163086 100644 --- a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071E70.s +++ b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071E70.s @@ -22,7 +22,7 @@ glabel func_80071E70 /* 4D2B4 80071EB4 C7B00028 */ lwc1 $f16, 0x28($sp) /* 4D2B8 80071EB8 8FBF002C */ lw $ra, 0x2c($sp) /* 4D2BC 80071EBC 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4D2C0 80071EC0 3C018008 */ lui $at, %hi(D_8007FB88) -/* 4D2C4 80071EC4 8C21FB88 */ lw $at, %lo(D_8007FB88)($at) +/* 4D2C0 80071EC0 3C018008 */ lui $at, %hi(gEffectTable+0x978) +/* 4D2C4 80071EC4 8C21FB88 */ lw $at, %lo(gEffectTable+0x978)($at) /* 4D2C8 80071EC8 00200008 */ jr $at /* 4D2CC 80071ECC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071ED0.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071ED0.s index 2bfca19015..06c9bbc460 100644 --- a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071ED0.s +++ b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071ED0.s @@ -22,7 +22,7 @@ glabel func_80071ED0 /* 4D314 80071F14 C7B00028 */ lwc1 $f16, 0x28($sp) /* 4D318 80071F18 8FBF002C */ lw $ra, 0x2c($sp) /* 4D31C 80071F1C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4D320 80071F20 3C018008 */ lui $at, %hi(D_8007FBA0) -/* 4D324 80071F24 8C21FBA0 */ lw $at, %lo(D_8007FBA0)($at) +/* 4D320 80071F20 3C018008 */ lui $at, %hi(gEffectTable+0x990) +/* 4D324 80071F24 8C21FBA0 */ lw $at, %lo(gEffectTable+0x990)($at) /* 4D328 80071F28 00200008 */ jr $at /* 4D32C 80071F2C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071F30.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071F30.s index d109f7abb8..7d29722ae2 100644 --- a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071F30.s +++ b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071F30.s @@ -22,7 +22,7 @@ glabel func_80071F30 /* 4D374 80071F74 C7B00028 */ lwc1 $f16, 0x28($sp) /* 4D378 80071F78 8FBF002C */ lw $ra, 0x2c($sp) /* 4D37C 80071F7C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4D380 80071F80 3C018008 */ lui $at, %hi(D_8007FBB8) -/* 4D384 80071F84 8C21FBB8 */ lw $at, %lo(D_8007FBB8)($at) +/* 4D380 80071F80 3C018008 */ lui $at, %hi(gEffectTable+0x9A8) +/* 4D384 80071F84 8C21FBB8 */ lw $at, %lo(gEffectTable+0x9A8)($at) /* 4D388 80071F88 00200008 */ jr $at /* 4D38C 80071F8C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071F90.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071F90.s index 272ed96078..780b775f2a 100644 --- a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071F90.s +++ b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071F90.s @@ -22,7 +22,7 @@ glabel func_80071F90 /* 4D3D4 80071FD4 C7B00028 */ lwc1 $f16, 0x28($sp) /* 4D3D8 80071FD8 8FBF002C */ lw $ra, 0x2c($sp) /* 4D3DC 80071FDC 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4D3E0 80071FE0 3C018008 */ lui $at, %hi(D_8007FBD0) -/* 4D3E4 80071FE4 8C21FBD0 */ lw $at, %lo(D_8007FBD0)($at) +/* 4D3E0 80071FE0 3C018008 */ lui $at, %hi(gEffectTable+0x9C0) +/* 4D3E4 80071FE4 8C21FBD0 */ lw $at, %lo(gEffectTable+0x9C0)($at) /* 4D3E8 80071FE8 00200008 */ jr $at /* 4D3EC 80071FEC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071FF0.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071FF0.s index 9d21b69877..6bee0f77a2 100644 --- a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071FF0.s +++ b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071FF0.s @@ -22,7 +22,7 @@ glabel func_80071FF0 /* 4D434 80072034 C7B00028 */ lwc1 $f16, 0x28($sp) /* 4D438 80072038 8FBF002C */ lw $ra, 0x2c($sp) /* 4D43C 8007203C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4D440 80072040 3C018008 */ lui $at, %hi(D_8007FBE8) -/* 4D444 80072044 8C21FBE8 */ lw $at, %lo(D_8007FBE8)($at) +/* 4D440 80072040 3C018008 */ lui $at, %hi(gEffectTable+0x9D8) +/* 4D444 80072044 8C21FBE8 */ lw $at, %lo(gEffectTable+0x9D8)($at) /* 4D448 80072048 00200008 */ jr $at /* 4D44C 8007204C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80072050.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80072050.s index c4f59d68c0..cf3146d071 100644 --- a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80072050.s +++ b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80072050.s @@ -22,7 +22,7 @@ glabel func_80072050 /* 4D494 80072094 C7B00028 */ lwc1 $f16, 0x28($sp) /* 4D498 80072098 8FBF002C */ lw $ra, 0x2c($sp) /* 4D49C 8007209C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4D4A0 800720A0 3C018008 */ lui $at, %hi(D_8007FC00) -/* 4D4A4 800720A4 8C21FC00 */ lw $at, %lo(D_8007FC00)($at) +/* 4D4A0 800720A0 3C018008 */ lui $at, %hi(gEffectTable+0x9F0) +/* 4D4A4 800720A4 8C21FC00 */ lw $at, %lo(gEffectTable+0x9F0)($at) /* 4D4A8 800720A8 00200008 */ jr $at /* 4D4AC 800720AC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800720B0.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800720B0.s index eacaabadf2..2b1f43ed8f 100644 --- a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800720B0.s +++ b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800720B0.s @@ -22,7 +22,7 @@ glabel func_800720B0 /* 4D4F4 800720F4 C7B00028 */ lwc1 $f16, 0x28($sp) /* 4D4F8 800720F8 8FBF002C */ lw $ra, 0x2c($sp) /* 4D4FC 800720FC 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4D500 80072100 3C018008 */ lui $at, %hi(D_8007FC18) -/* 4D504 80072104 8C21FC18 */ lw $at, %lo(D_8007FC18)($at) +/* 4D500 80072100 3C018008 */ lui $at, %hi(gEffectTable+0xA08) +/* 4D504 80072104 8C21FC18 */ lw $at, %lo(gEffectTable+0xA08)($at) /* 4D508 80072108 00200008 */ jr $at /* 4D50C 8007210C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80072110.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80072110.s index f4da5e0bb5..4890babb19 100644 --- a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80072110.s +++ b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80072110.s @@ -22,7 +22,7 @@ glabel func_80072110 /* 4D554 80072154 C7B00028 */ lwc1 $f16, 0x28($sp) /* 4D558 80072158 8FBF002C */ lw $ra, 0x2c($sp) /* 4D55C 8007215C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4D560 80072160 3C018008 */ lui $at, %hi(D_8007FC30) -/* 4D564 80072164 8C21FC30 */ lw $at, %lo(D_8007FC30)($at) +/* 4D560 80072160 3C018008 */ lui $at, %hi(gEffectTable+0xA20) +/* 4D564 80072164 8C21FC30 */ lw $at, %lo(gEffectTable+0xA20)($at) /* 4D568 80072168 00200008 */ jr $at /* 4D56C 8007216C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80072170.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80072170.s index 302de51e3b..23e92d326d 100644 --- a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80072170.s +++ b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80072170.s @@ -22,7 +22,7 @@ glabel func_80072170 /* 4D5B4 800721B4 C7B00028 */ lwc1 $f16, 0x28($sp) /* 4D5B8 800721B8 8FBF002C */ lw $ra, 0x2c($sp) /* 4D5BC 800721BC 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4D5C0 800721C0 3C018008 */ lui $at, %hi(D_8007FC48) -/* 4D5C4 800721C4 8C21FC48 */ lw $at, %lo(D_8007FC48)($at) +/* 4D5C0 800721C0 3C018008 */ lui $at, %hi(gEffectTable+0xA38) +/* 4D5C4 800721C4 8C21FC48 */ lw $at, %lo(gEffectTable+0xA38)($at) /* 4D5C8 800721C8 00200008 */ jr $at /* 4D5CC 800721CC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800721D0.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800721D0.s index 2bd9aa800c..ef2a42c7d4 100644 --- a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800721D0.s +++ b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800721D0.s @@ -22,7 +22,7 @@ glabel func_800721D0 /* 4D614 80072214 C7B00028 */ lwc1 $f16, 0x28($sp) /* 4D618 80072218 8FBF002C */ lw $ra, 0x2c($sp) /* 4D61C 8007221C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4D620 80072220 3C018008 */ lui $at, %hi(D_8007FC60) -/* 4D624 80072224 8C21FC60 */ lw $at, %lo(D_8007FC60)($at) +/* 4D620 80072220 3C018008 */ lui $at, %hi(gEffectTable+0xA50) +/* 4D624 80072224 8C21FC60 */ lw $at, %lo(gEffectTable+0xA50)($at) /* 4D628 80072228 00200008 */ jr $at /* 4D62C 8007222C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80072230.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80072230.s index 137f669069..3e25a8f927 100644 --- a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80072230.s +++ b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80072230.s @@ -22,7 +22,7 @@ glabel func_80072230 /* 4D674 80072274 C7B00028 */ lwc1 $f16, 0x28($sp) /* 4D678 80072278 8FBF002C */ lw $ra, 0x2c($sp) /* 4D67C 8007227C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4D680 80072280 3C018008 */ lui $at, %hi(D_8007FC78) -/* 4D684 80072284 8C21FC78 */ lw $at, %lo(D_8007FC78)($at) +/* 4D680 80072280 3C018008 */ lui $at, %hi(gEffectTable+0xA68) +/* 4D684 80072284 8C21FC78 */ lw $at, %lo(gEffectTable+0xA68)($at) /* 4D688 80072288 00200008 */ jr $at /* 4D68C 8007228C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80072290.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80072290.s index 081795997b..98edff34f0 100644 --- a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80072290.s +++ b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80072290.s @@ -22,7 +22,7 @@ glabel func_80072290 /* 4D6D4 800722D4 C7B00028 */ lwc1 $f16, 0x28($sp) /* 4D6D8 800722D8 8FBF002C */ lw $ra, 0x2c($sp) /* 4D6DC 800722DC 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4D6E0 800722E0 3C018008 */ lui $at, %hi(D_8007FC90) -/* 4D6E4 800722E4 8C21FC90 */ lw $at, %lo(D_8007FC90)($at) +/* 4D6E0 800722E0 3C018008 */ lui $at, %hi(gEffectTable+0xA80) +/* 4D6E4 800722E4 8C21FC90 */ lw $at, %lo(gEffectTable+0xA80)($at) /* 4D6E8 800722E8 00200008 */ jr $at /* 4D6EC 800722EC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800722F0.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800722F0.s index b490931339..81d8b5248f 100644 --- a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800722F0.s +++ b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800722F0.s @@ -22,7 +22,7 @@ glabel func_800722F0 /* 4D734 80072334 C7B00028 */ lwc1 $f16, 0x28($sp) /* 4D738 80072338 8FBF002C */ lw $ra, 0x2c($sp) /* 4D73C 8007233C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4D740 80072340 3C018008 */ lui $at, %hi(D_8007FCA8) -/* 4D744 80072344 8C21FCA8 */ lw $at, %lo(D_8007FCA8)($at) +/* 4D740 80072340 3C018008 */ lui $at, %hi(gEffectTable+0xA98) +/* 4D744 80072344 8C21FCA8 */ lw $at, %lo(gEffectTable+0xA98)($at) /* 4D748 80072348 00200008 */ jr $at /* 4D74C 8007234C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80072350.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80072350.s index 66e0f5d39b..71c1209b07 100644 --- a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80072350.s +++ b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80072350.s @@ -22,7 +22,7 @@ glabel func_80072350 /* 4D794 80072394 C7B00028 */ lwc1 $f16, 0x28($sp) /* 4D798 80072398 8FBF002C */ lw $ra, 0x2c($sp) /* 4D79C 8007239C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4D7A0 800723A0 3C018008 */ lui $at, %hi(D_8007FCC0) -/* 4D7A4 800723A4 8C21FCC0 */ lw $at, %lo(D_8007FCC0)($at) +/* 4D7A0 800723A0 3C018008 */ lui $at, %hi(gEffectTable+0xAB0) +/* 4D7A4 800723A4 8C21FCC0 */ lw $at, %lo(gEffectTable+0xAB0)($at) /* 4D7A8 800723A8 00200008 */ jr $at /* 4D7AC 800723AC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800723B0.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800723B0.s index 9a9a207481..74e31b79b6 100644 --- a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800723B0.s +++ b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800723B0.s @@ -22,7 +22,7 @@ glabel func_800723B0 /* 4D7F4 800723F4 C7B00028 */ lwc1 $f16, 0x28($sp) /* 4D7F8 800723F8 8FBF002C */ lw $ra, 0x2c($sp) /* 4D7FC 800723FC 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4D800 80072400 3C018008 */ lui $at, %hi(D_8007FCD8) -/* 4D804 80072404 8C21FCD8 */ lw $at, %lo(D_8007FCD8)($at) +/* 4D800 80072400 3C018008 */ lui $at, %hi(gEffectTable+0xAC8) +/* 4D804 80072404 8C21FCD8 */ lw $at, %lo(gEffectTable+0xAC8)($at) /* 4D808 80072408 00200008 */ jr $at /* 4D80C 8007240C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80072410.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80072410.s index 8e8c859a9b..e12ab242eb 100644 --- a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80072410.s +++ b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80072410.s @@ -22,7 +22,7 @@ glabel func_80072410 /* 4D854 80072454 C7B00028 */ lwc1 $f16, 0x28($sp) /* 4D858 80072458 8FBF002C */ lw $ra, 0x2c($sp) /* 4D85C 8007245C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4D860 80072460 3C018008 */ lui $at, %hi(D_8007FCF0) -/* 4D864 80072464 8C21FCF0 */ lw $at, %lo(D_8007FCF0)($at) +/* 4D860 80072460 3C018008 */ lui $at, %hi(gEffectTable+0xAE0) +/* 4D864 80072464 8C21FCF0 */ lw $at, %lo(gEffectTable+0xAE0)($at) /* 4D868 80072468 00200008 */ jr $at /* 4D86C 8007246C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80072470.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80072470.s index ff9d6aa56c..d5413568c7 100644 --- a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80072470.s +++ b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80072470.s @@ -22,7 +22,7 @@ glabel func_80072470 /* 4D8B4 800724B4 C7B00028 */ lwc1 $f16, 0x28($sp) /* 4D8B8 800724B8 8FBF002C */ lw $ra, 0x2c($sp) /* 4D8BC 800724BC 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4D8C0 800724C0 3C018008 */ lui $at, %hi(D_8007FD08) -/* 4D8C4 800724C4 8C21FD08 */ lw $at, %lo(D_8007FD08)($at) +/* 4D8C0 800724C0 3C018008 */ lui $at, %hi(gEffectTable+0xAF8) +/* 4D8C4 800724C4 8C21FD08 */ lw $at, %lo(gEffectTable+0xAF8)($at) /* 4D8C8 800724C8 00200008 */ jr $at /* 4D8CC 800724CC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800724D0.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800724D0.s index 99e0734960..4d339bbfbd 100644 --- a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800724D0.s +++ b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800724D0.s @@ -22,7 +22,7 @@ glabel func_800724D0 /* 4D914 80072514 C7B00028 */ lwc1 $f16, 0x28($sp) /* 4D918 80072518 8FBF002C */ lw $ra, 0x2c($sp) /* 4D91C 8007251C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4D920 80072520 3C018008 */ lui $at, %hi(D_8007FD20) -/* 4D924 80072524 8C21FD20 */ lw $at, %lo(D_8007FD20)($at) +/* 4D920 80072520 3C018008 */ lui $at, %hi(gEffectTable+0xB10) +/* 4D924 80072524 8C21FD20 */ lw $at, %lo(gEffectTable+0xB10)($at) /* 4D928 80072528 00200008 */ jr $at /* 4D92C 8007252C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80072530.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80072530.s index 78688e27eb..34ded8e761 100644 --- a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80072530.s +++ b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80072530.s @@ -22,7 +22,7 @@ glabel func_80072530 /* 4D974 80072574 C7B00028 */ lwc1 $f16, 0x28($sp) /* 4D978 80072578 8FBF002C */ lw $ra, 0x2c($sp) /* 4D97C 8007257C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4D980 80072580 3C018008 */ lui $at, %hi(D_8007FD38) -/* 4D984 80072584 8C21FD38 */ lw $at, %lo(D_8007FD38)($at) +/* 4D980 80072580 3C018008 */ lui $at, %hi(gEffectTable+0xB28) +/* 4D984 80072584 8C21FD38 */ lw $at, %lo(gEffectTable+0xB28)($at) /* 4D988 80072588 00200008 */ jr $at /* 4D98C 8007258C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80072590.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80072590.s index 7812b03f95..6cedc0a94e 100644 --- a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80072590.s +++ b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80072590.s @@ -22,7 +22,7 @@ glabel func_80072590 /* 4D9D4 800725D4 C7B00028 */ lwc1 $f16, 0x28($sp) /* 4D9D8 800725D8 8FBF002C */ lw $ra, 0x2c($sp) /* 4D9DC 800725DC 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4D9E0 800725E0 3C018008 */ lui $at, %hi(D_8007FD50) -/* 4D9E4 800725E4 8C21FD50 */ lw $at, %lo(D_8007FD50)($at) +/* 4D9E0 800725E0 3C018008 */ lui $at, %hi(gEffectTable+0xB40) +/* 4D9E4 800725E4 8C21FD50 */ lw $at, %lo(gEffectTable+0xB40)($at) /* 4D9E8 800725E8 00200008 */ jr $at /* 4D9EC 800725EC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800725F0.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800725F0.s index afdbb0060c..ce5ef28b2a 100644 --- a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800725F0.s +++ b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800725F0.s @@ -22,7 +22,7 @@ glabel func_800725F0 /* 4DA34 80072634 C7B00028 */ lwc1 $f16, 0x28($sp) /* 4DA38 80072638 8FBF002C */ lw $ra, 0x2c($sp) /* 4DA3C 8007263C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4DA40 80072640 3C018008 */ lui $at, %hi(D_8007FD68) -/* 4DA44 80072644 8C21FD68 */ lw $at, %lo(D_8007FD68)($at) +/* 4DA40 80072640 3C018008 */ lui $at, %hi(gEffectTable+0xB58) +/* 4DA44 80072644 8C21FD68 */ lw $at, %lo(gEffectTable+0xB58)($at) /* 4DA48 80072648 00200008 */ jr $at /* 4DA4C 8007264C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80072650.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80072650.s index f6c1f6d39d..4ab44ef9a7 100644 --- a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80072650.s +++ b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80072650.s @@ -22,7 +22,7 @@ glabel func_80072650 /* 4DA94 80072694 C7B00028 */ lwc1 $f16, 0x28($sp) /* 4DA98 80072698 8FBF002C */ lw $ra, 0x2c($sp) /* 4DA9C 8007269C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4DAA0 800726A0 3C018008 */ lui $at, %hi(D_8007FD80) -/* 4DAA4 800726A4 8C21FD80 */ lw $at, %lo(D_8007FD80)($at) +/* 4DAA0 800726A0 3C018008 */ lui $at, %hi(gEffectTable+0xB70) +/* 4DAA4 800726A4 8C21FD80 */ lw $at, %lo(gEffectTable+0xB70)($at) /* 4DAA8 800726A8 00200008 */ jr $at /* 4DAAC 800726AC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800726B0.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800726B0.s index c8c9fe1b7d..870389d692 100644 --- a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800726B0.s +++ b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800726B0.s @@ -22,7 +22,7 @@ glabel func_800726B0 /* 4DAF4 800726F4 C7B00028 */ lwc1 $f16, 0x28($sp) /* 4DAF8 800726F8 8FBF002C */ lw $ra, 0x2c($sp) /* 4DAFC 800726FC 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4DB00 80072700 3C018008 */ lui $at, %hi(D_8007FD98) -/* 4DB04 80072704 8C21FD98 */ lw $at, %lo(D_8007FD98)($at) +/* 4DB00 80072700 3C018008 */ lui $at, %hi(gEffectTable+0xB88) +/* 4DB04 80072704 8C21FD98 */ lw $at, %lo(gEffectTable+0xB88)($at) /* 4DB08 80072708 00200008 */ jr $at /* 4DB0C 8007270C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80072710.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80072710.s index 6d9eb5712c..0162ea699e 100644 --- a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80072710.s +++ b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80072710.s @@ -22,7 +22,7 @@ glabel func_80072710 /* 4DB54 80072754 C7B00028 */ lwc1 $f16, 0x28($sp) /* 4DB58 80072758 8FBF002C */ lw $ra, 0x2c($sp) /* 4DB5C 8007275C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4DB60 80072760 3C018008 */ lui $at, %hi(D_8007FDB0) -/* 4DB64 80072764 8C21FDB0 */ lw $at, %lo(D_8007FDB0)($at) +/* 4DB60 80072760 3C018008 */ lui $at, %hi(gEffectTable+0xBA0) +/* 4DB64 80072764 8C21FDB0 */ lw $at, %lo(gEffectTable+0xBA0)($at) /* 4DB68 80072768 00200008 */ jr $at /* 4DB6C 8007276C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80072770.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80072770.s index 8283628f19..c2d1a36129 100644 --- a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80072770.s +++ b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80072770.s @@ -22,7 +22,7 @@ glabel func_80072770 /* 4DBB4 800727B4 C7B00028 */ lwc1 $f16, 0x28($sp) /* 4DBB8 800727B8 8FBF002C */ lw $ra, 0x2c($sp) /* 4DBBC 800727BC 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4DBC0 800727C0 3C018008 */ lui $at, %hi(D_8007FDC8) -/* 4DBC4 800727C4 8C21FDC8 */ lw $at, %lo(D_8007FDC8)($at) +/* 4DBC0 800727C0 3C018008 */ lui $at, %hi(gEffectTable+0xBB8) +/* 4DBC4 800727C4 8C21FDC8 */ lw $at, %lo(gEffectTable+0xBB8)($at) /* 4DBC8 800727C8 00200008 */ jr $at /* 4DBCC 800727CC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800727D0.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800727D0.s index 55655c5619..4feef42699 100644 --- a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800727D0.s +++ b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800727D0.s @@ -22,7 +22,7 @@ glabel func_800727D0 /* 4DC14 80072814 C7B00028 */ lwc1 $f16, 0x28($sp) /* 4DC18 80072818 8FBF002C */ lw $ra, 0x2c($sp) /* 4DC1C 8007281C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4DC20 80072820 3C018008 */ lui $at, %hi(D_8007FDE0) -/* 4DC24 80072824 8C21FDE0 */ lw $at, %lo(D_8007FDE0)($at) +/* 4DC20 80072820 3C018008 */ lui $at, %hi(gEffectTable+0xBD0) +/* 4DC24 80072824 8C21FDE0 */ lw $at, %lo(gEffectTable+0xBD0)($at) /* 4DC28 80072828 00200008 */ jr $at /* 4DC2C 8007282C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80072830.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80072830.s index f3fc6299d3..763d744a45 100644 --- a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80072830.s +++ b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80072830.s @@ -22,7 +22,7 @@ glabel func_80072830 /* 4DC74 80072874 C7B00028 */ lwc1 $f16, 0x28($sp) /* 4DC78 80072878 8FBF002C */ lw $ra, 0x2c($sp) /* 4DC7C 8007287C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4DC80 80072880 3C018008 */ lui $at, %hi(D_8007FDF8) -/* 4DC84 80072884 8C21FDF8 */ lw $at, %lo(D_8007FDF8)($at) +/* 4DC80 80072880 3C018008 */ lui $at, %hi(gEffectTable+0xBE8) +/* 4DC84 80072884 8C21FDF8 */ lw $at, %lo(gEffectTable+0xBE8)($at) /* 4DC88 80072888 00200008 */ jr $at /* 4DC8C 8007288C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80072890.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80072890.s index 239ce60130..da976c4267 100644 --- a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80072890.s +++ b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80072890.s @@ -22,7 +22,7 @@ glabel func_80072890 /* 4DCD4 800728D4 C7B00028 */ lwc1 $f16, 0x28($sp) /* 4DCD8 800728D8 8FBF002C */ lw $ra, 0x2c($sp) /* 4DCDC 800728DC 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4DCE0 800728E0 3C018008 */ lui $at, %hi(D_8007FE10) -/* 4DCE4 800728E4 8C21FE10 */ lw $at, %lo(D_8007FE10)($at) +/* 4DCE0 800728E0 3C018008 */ lui $at, %hi(gEffectTable+0xC00) +/* 4DCE4 800728E4 8C21FE10 */ lw $at, %lo(gEffectTable+0xC00)($at) /* 4DCE8 800728E8 00200008 */ jr $at /* 4DCEC 800728EC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800728F0.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800728F0.s index faeddf5a95..0a042692fc 100644 --- a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800728F0.s +++ b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800728F0.s @@ -22,7 +22,7 @@ glabel func_800728F0 /* 4DD34 80072934 C7B00028 */ lwc1 $f16, 0x28($sp) /* 4DD38 80072938 8FBF002C */ lw $ra, 0x2c($sp) /* 4DD3C 8007293C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4DD40 80072940 3C018008 */ lui $at, %hi(D_8007FE28) -/* 4DD44 80072944 8C21FE28 */ lw $at, %lo(D_8007FE28)($at) +/* 4DD40 80072940 3C018008 */ lui $at, %hi(gEffectTable+0xC18) +/* 4DD44 80072944 8C21FE28 */ lw $at, %lo(gEffectTable+0xC18)($at) /* 4DD48 80072948 00200008 */ jr $at /* 4DD4C 8007294C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80072950.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80072950.s index fc5d91b57d..af1c869e8b 100644 --- a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80072950.s +++ b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80072950.s @@ -22,7 +22,7 @@ glabel func_80072950 /* 4DD94 80072994 C7B00028 */ lwc1 $f16, 0x28($sp) /* 4DD98 80072998 8FBF002C */ lw $ra, 0x2c($sp) /* 4DD9C 8007299C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4DDA0 800729A0 3C018008 */ lui $at, %hi(D_8007FE40) -/* 4DDA4 800729A4 8C21FE40 */ lw $at, %lo(D_8007FE40)($at) +/* 4DDA0 800729A0 3C018008 */ lui $at, %hi(gEffectTable+0xC30) +/* 4DDA4 800729A4 8C21FE40 */ lw $at, %lo(gEffectTable+0xC30)($at) /* 4DDA8 800729A8 00200008 */ jr $at /* 4DDAC 800729AC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800729B0.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800729B0.s index 07c917b545..6a9b963419 100644 --- a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800729B0.s +++ b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800729B0.s @@ -22,7 +22,7 @@ glabel func_800729B0 /* 4DDF4 800729F4 C7B00028 */ lwc1 $f16, 0x28($sp) /* 4DDF8 800729F8 8FBF002C */ lw $ra, 0x2c($sp) /* 4DDFC 800729FC 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4DE00 80072A00 3C018008 */ lui $at, %hi(D_8007FE58) -/* 4DE04 80072A04 8C21FE58 */ lw $at, %lo(D_8007FE58)($at) +/* 4DE00 80072A00 3C018008 */ lui $at, %hi(gEffectTable+0xC48) +/* 4DE04 80072A04 8C21FE58 */ lw $at, %lo(gEffectTable+0xC48)($at) /* 4DE08 80072A08 00200008 */ jr $at /* 4DE0C 80072A0C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80072A10.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80072A10.s index 737d510511..447018dbb9 100644 --- a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80072A10.s +++ b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80072A10.s @@ -22,7 +22,7 @@ glabel func_80072A10 /* 4DE54 80072A54 C7B00028 */ lwc1 $f16, 0x28($sp) /* 4DE58 80072A58 8FBF002C */ lw $ra, 0x2c($sp) /* 4DE5C 80072A5C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4DE60 80072A60 3C018008 */ lui $at, %hi(D_8007FE70) -/* 4DE64 80072A64 8C21FE70 */ lw $at, %lo(D_8007FE70)($at) +/* 4DE60 80072A60 3C018008 */ lui $at, %hi(gEffectTable+0xC60) +/* 4DE64 80072A64 8C21FE70 */ lw $at, %lo(gEffectTable+0xC60)($at) /* 4DE68 80072A68 00200008 */ jr $at /* 4DE6C 80072A6C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80072A70.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80072A70.s index 9485a5e457..63c6ef8bd6 100644 --- a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80072A70.s +++ b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80072A70.s @@ -22,7 +22,7 @@ glabel func_80072A70 /* 4DEB4 80072AB4 C7B00028 */ lwc1 $f16, 0x28($sp) /* 4DEB8 80072AB8 8FBF002C */ lw $ra, 0x2c($sp) /* 4DEBC 80072ABC 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4DEC0 80072AC0 3C018008 */ lui $at, %hi(D_8007FE88) -/* 4DEC4 80072AC4 8C21FE88 */ lw $at, %lo(D_8007FE88)($at) +/* 4DEC0 80072AC0 3C018008 */ lui $at, %hi(gEffectTable+0xC78) +/* 4DEC4 80072AC4 8C21FE88 */ lw $at, %lo(gEffectTable+0xC78)($at) /* 4DEC8 80072AC8 00200008 */ jr $at /* 4DECC 80072ACC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80072AD0.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80072AD0.s index dd7db08f1d..0542226335 100644 --- a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80072AD0.s +++ b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80072AD0.s @@ -22,7 +22,7 @@ glabel func_80072AD0 /* 4DF14 80072B14 C7B00028 */ lwc1 $f16, 0x28($sp) /* 4DF18 80072B18 8FBF002C */ lw $ra, 0x2c($sp) /* 4DF1C 80072B1C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4DF20 80072B20 3C018008 */ lui $at, %hi(D_8007FEA0) -/* 4DF24 80072B24 8C21FEA0 */ lw $at, %lo(D_8007FEA0)($at) +/* 4DF20 80072B20 3C018008 */ lui $at, %hi(gEffectTable+0xC90) +/* 4DF24 80072B24 8C21FEA0 */ lw $at, %lo(gEffectTable+0xC90)($at) /* 4DF28 80072B28 00200008 */ jr $at /* 4DF2C 80072B2C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/fx_emote.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/fx_emote.s index 96fe15c4e3..29cd5debbe 100644 --- a/ver/us/asm/nonmatchings/code_4ac90_len_3910/fx_emote.s +++ b/ver/us/asm/nonmatchings/code_4ac90_len_3910/fx_emote.s @@ -22,7 +22,7 @@ glabel fx_emote /* 4B2D4 8006FED4 C7B00028 */ lwc1 $f16, 0x28($sp) /* 4B2D8 8006FED8 8FBF002C */ lw $ra, 0x2c($sp) /* 4B2DC 8006FEDC 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4B2E0 8006FEE0 3C018008 */ lui $at, %hi(D_8007F390) -/* 4B2E4 8006FEE4 8C21F390 */ lw $at, %lo(D_8007F390)($at) +/* 4B2E0 8006FEE0 3C018008 */ lui $at, %hi(gEffectTable+0x180) +/* 4B2E4 8006FEE4 8C21F390 */ lw $at, %lo(gEffectTable+0x180)($at) /* 4B2E8 8006FEE8 00200008 */ jr $at /* 4B2EC 8006FEEC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/fx_sleep_bubble.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/fx_sleep_bubble.s index ee137db291..289ced9351 100644 --- a/ver/us/asm/nonmatchings/code_4ac90_len_3910/fx_sleep_bubble.s +++ b/ver/us/asm/nonmatchings/code_4ac90_len_3910/fx_sleep_bubble.s @@ -22,7 +22,7 @@ glabel fx_sleep_bubble /* 4BC34 80070834 C7B00028 */ lwc1 $f16, 0x28($sp) /* 4BC38 80070838 8FBF002C */ lw $ra, 0x2c($sp) /* 4BC3C 8007083C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4BC40 80070840 3C018008 */ lui $at, %hi(D_8007F5E8) -/* 4BC44 80070844 8C21F5E8 */ lw $at, %lo(D_8007F5E8)($at) +/* 4BC40 80070840 3C018008 */ lui $at, %hi(gEffectTable+0x3D8) +/* 4BC44 80070844 8C21F5E8 */ lw $at, %lo(gEffectTable+0x3D8)($at) /* 4BC48 80070848 00200008 */ jr $at /* 4BC4C 8007084C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/fx_sweat.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/fx_sweat.s index 0682717a76..fca9b925b2 100644 --- a/ver/us/asm/nonmatchings/code_4ac90_len_3910/fx_sweat.s +++ b/ver/us/asm/nonmatchings/code_4ac90_len_3910/fx_sweat.s @@ -22,7 +22,7 @@ glabel fx_sweat /* 4BBD4 800707D4 C7B00028 */ lwc1 $f16, 0x28($sp) /* 4BBD8 800707D8 8FBF002C */ lw $ra, 0x2c($sp) /* 4BBDC 800707DC 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4BBE0 800707E0 3C018008 */ lui $at, %hi(D_8007F5D0) -/* 4BBE4 800707E4 8C21F5D0 */ lw $at, %lo(D_8007F5D0)($at) +/* 4BBE0 800707E0 3C018008 */ lui $at, %hi(gEffectTable+0x3C0) +/* 4BBE4 800707E4 8C21F5D0 */ lw $at, %lo(gEffectTable+0x3C0)($at) /* 4BBE8 800707E8 00200008 */ jr $at /* 4BBEC 800707EC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/fx_walk_large.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/fx_walk_large.s index 5964806aaa..fe505ce5b3 100644 --- a/ver/us/asm/nonmatchings/code_4ac90_len_3910/fx_walk_large.s +++ b/ver/us/asm/nonmatchings/code_4ac90_len_3910/fx_walk_large.s @@ -22,7 +22,7 @@ glabel fx_walk_large /* 4AF14 8006FB14 C7B00028 */ lwc1 $f16, 0x28($sp) /* 4AF18 8006FB18 8FBF002C */ lw $ra, 0x2c($sp) /* 4AF1C 8006FB1C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4AF20 8006FB20 3C018008 */ lui $at, %hi(D_8007F2A0) -/* 4AF24 8006FB24 8C21F2A0 */ lw $at, %lo(D_8007F2A0)($at) +/* 4AF20 8006FB20 3C018008 */ lui $at, %hi(gEffectTable+0x90) +/* 4AF24 8006FB24 8C21F2A0 */ lw $at, %lo(gEffectTable+0x90)($at) /* 4AF28 8006FB28 00200008 */ jr $at /* 4AF2C 8006FB2C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/fx_walk_normal.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/fx_walk_normal.s index 0f59ce1b2b..03a6d18acf 100644 --- a/ver/us/asm/nonmatchings/code_4ac90_len_3910/fx_walk_normal.s +++ b/ver/us/asm/nonmatchings/code_4ac90_len_3910/fx_walk_normal.s @@ -22,7 +22,7 @@ glabel fx_walk_normal /* 4AF74 8006FB74 C7B00028 */ lwc1 $f16, 0x28($sp) /* 4AF78 8006FB78 8FBF002C */ lw $ra, 0x2c($sp) /* 4AF7C 8006FB7C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4AF80 8006FB80 3C018008 */ lui $at, %hi(D_8007F2B8) -/* 4AF84 8006FB84 8C21F2B8 */ lw $at, %lo(D_8007F2B8)($at) +/* 4AF80 8006FB80 3C018008 */ lui $at, %hi(gEffectTable+0xA8) +/* 4AF84 8006FB84 8C21F2B8 */ lw $at, %lo(gEffectTable+0xA8)($at) /* 4AF88 8006FB88 00200008 */ jr $at /* 4AF8C 8006FB8C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/code_715850/func_802A1000_715850.s b/ver/us/asm/nonmatchings/code_715850/func_802A1000_715850.s deleted file mode 100644 index bec9e437c9..0000000000 --- a/ver/us/asm/nonmatchings/code_715850/func_802A1000_715850.s +++ /dev/null @@ -1,125 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1000_715850 -/* 715850 802A1000 27BDFF98 */ addiu $sp, $sp, -0x68 -/* 715854 802A1004 AFB50044 */ sw $s5, 0x44($sp) -/* 715858 802A1008 0080A82D */ daddu $s5, $a0, $zero -/* 71585C 802A100C AFB10034 */ sw $s1, 0x34($sp) -/* 715860 802A1010 0000882D */ daddu $s1, $zero, $zero -/* 715864 802A1014 2405001D */ addiu $a1, $zero, 0x1d -/* 715868 802A1018 F7B40050 */ sdc1 $f20, 0x50($sp) -/* 71586C 802A101C 4480A000 */ mtc1 $zero, $f20 -/* 715870 802A1020 3C02800E */ lui $v0, %hi(gBattleStatus) -/* 715874 802A1024 2442C070 */ addiu $v0, $v0, %lo(gBattleStatus) -/* 715878 802A1028 AFBF0048 */ sw $ra, 0x48($sp) -/* 71587C 802A102C AFB40040 */ sw $s4, 0x40($sp) -/* 715880 802A1030 AFB3003C */ sw $s3, 0x3c($sp) -/* 715884 802A1034 AFB20038 */ sw $s2, 0x38($sp) -/* 715888 802A1038 AFB00030 */ sw $s0, 0x30($sp) -/* 71588C 802A103C F7B80060 */ sdc1 $f24, 0x60($sp) -/* 715890 802A1040 F7B60058 */ sdc1 $f22, 0x58($sp) -/* 715894 802A1044 8C5300D8 */ lw $s3, 0xd8($v0) -/* 715898 802A1048 8442017A */ lh $v0, 0x17a($v0) -/* 71589C 802A104C 0260202D */ daddu $a0, $s3, $zero -/* 7158A0 802A1050 00021140 */ sll $v0, $v0, 5 -/* 7158A4 802A1054 3C128008 */ lui $s2, %hi(gItemTable+0xC) -/* 7158A8 802A1058 02429021 */ addu $s2, $s2, $v0 -/* 7158AC 802A105C 865278EC */ lh $s2, %lo(gItemTable+0xC)($s2) -/* 7158B0 802A1060 92620191 */ lbu $v0, 0x191($s3) -/* 7158B4 802A1064 C6620148 */ lwc1 $f2, 0x148($s3) -/* 7158B8 802A1068 44820000 */ mtc1 $v0, $f0 -/* 7158BC 802A106C 00000000 */ nop -/* 7158C0 802A1070 46800020 */ cvt.s.w $f0, $f0 -/* 7158C4 802A1074 0C099CAB */ jal heroes_is_ability_active -/* 7158C8 802A1078 46001580 */ add.s $f22, $f2, $f0 -/* 7158CC 802A107C 50400048 */ beql $v0, $zero, .L802A11A0 -/* 7158D0 802A1080 AEB10084 */ sw $s1, 0x84($s5) -/* 7158D4 802A1084 1A400045 */ blez $s2, .L802A119C -/* 7158D8 802A1088 3C0451EB */ lui $a0, 0x51eb -/* 7158DC 802A108C 3484851F */ ori $a0, $a0, 0x851f -/* 7158E0 802A1090 00121880 */ sll $v1, $s2, 2 -/* 7158E4 802A1094 00721821 */ addu $v1, $v1, $s2 -/* 7158E8 802A1098 00031100 */ sll $v0, $v1, 4 -/* 7158EC 802A109C 00431023 */ subu $v0, $v0, $v1 -/* 7158F0 802A10A0 24420063 */ addiu $v0, $v0, 0x63 -/* 7158F4 802A10A4 00440018 */ mult $v0, $a0 -/* 7158F8 802A10A8 000217C3 */ sra $v0, $v0, 0x1f -/* 7158FC 802A10AC 00004010 */ mfhi $t0 -/* 715900 802A10B0 00081943 */ sra $v1, $t0, 5 -/* 715904 802A10B4 00629023 */ subu $s2, $v1, $v0 -/* 715908 802A10B8 0232102A */ slt $v0, $s1, $s2 -/* 71590C 802A10BC 10400019 */ beqz $v0, .L802A1124 -/* 715910 802A10C0 0220802D */ daddu $s0, $s1, $zero -/* 715914 802A10C4 24140017 */ addiu $s4, $zero, 0x17 -/* 715918 802A10C8 3C0141F0 */ lui $at, 0x41f0 -/* 71591C 802A10CC 4481C000 */ mtc1 $at, $f24 -/* 715920 802A10D0 24110001 */ addiu $s1, $zero, 1 -.L802A10D4: -/* 715924 802A10D4 C6600144 */ lwc1 $f0, 0x144($s3) -/* 715928 802A10D8 C662014C */ lwc1 $f2, 0x14c($s3) -/* 71592C 802A10DC 4600A10D */ trunc.w.s $f4, $f20 -/* 715930 802A10E0 E7A40018 */ swc1 $f4, 0x18($sp) -/* 715934 802A10E4 24040157 */ addiu $a0, $zero, 0x157 -/* 715938 802A10E8 AFB10014 */ sw $s1, 0x14($sp) -/* 71593C 802A10EC 26310003 */ addiu $s1, $s1, 3 -/* 715940 802A10F0 26100001 */ addiu $s0, $s0, 1 -/* 715944 802A10F4 4406B000 */ mfc1 $a2, $f22 -/* 715948 802A10F8 44050000 */ mfc1 $a1, $f0 -/* 71594C 802A10FC 44071000 */ mfc1 $a3, $f2 -/* 715950 802A1100 4618A500 */ add.s $f20, $f20, $f24 -/* 715954 802A1104 AFB40010 */ sw $s4, 0x10($sp) -/* 715958 802A1108 0C04C4FD */ jal make_item_entity -/* 71595C 802A110C AFA0001C */ sw $zero, 0x1c($sp) -/* 715960 802A1110 0C03A830 */ jal add_coins -/* 715964 802A1114 24040001 */ addiu $a0, $zero, 1 -/* 715968 802A1118 0212102A */ slt $v0, $s0, $s2 -/* 71596C 802A111C 1440FFED */ bnez $v0, .L802A10D4 -/* 715970 802A1120 00000000 */ nop -.L802A1124: -/* 715974 802A1124 00101040 */ sll $v0, $s0, 1 -/* 715978 802A1128 00501021 */ addu $v0, $v0, $s0 -/* 71597C 802A112C 2451001E */ addiu $s1, $v0, 0x1e -/* 715980 802A1130 C6600144 */ lwc1 $f0, 0x144($s3) -/* 715984 802A1134 C6760148 */ lwc1 $f22, 0x148($s3) -/* 715988 802A1138 C662014C */ lwc1 $f2, 0x14c($s3) -/* 71598C 802A113C 3C048007 */ lui $a0, %hi(gCurrentCameraID) -/* 715990 802A1140 8C847410 */ lw $a0, %lo(gCurrentCameraID)($a0) -/* 715994 802A1144 27A20020 */ addiu $v0, $sp, 0x20 -/* 715998 802A1148 AFA20010 */ sw $v0, 0x10($sp) -/* 71599C 802A114C 27A20024 */ addiu $v0, $sp, 0x24 -/* 7159A0 802A1150 AFA20014 */ sw $v0, 0x14($sp) -/* 7159A4 802A1154 44050000 */ mfc1 $a1, $f0 -/* 7159A8 802A1158 4406B000 */ mfc1 $a2, $f22 -/* 7159AC 802A115C 44071000 */ mfc1 $a3, $f2 -/* 7159B0 802A1160 27A20028 */ addiu $v0, $sp, 0x28 -/* 7159B4 802A1164 0C00B94E */ jal get_screen_coords -/* 7159B8 802A1168 AFA20018 */ sw $v0, 0x18($sp) -/* 7159BC 802A116C 3C048011 */ lui $a0, %hi(D_80108A64) -/* 7159C0 802A1170 24848A64 */ addiu $a0, $a0, %lo(D_80108A64) -/* 7159C4 802A1174 0C050529 */ jal create_icon -/* 7159C8 802A1178 00000000 */ nop -/* 7159CC 802A117C 8FA50020 */ lw $a1, 0x20($sp) -/* 7159D0 802A1180 8FA60024 */ lw $a2, 0x24($sp) -/* 7159D4 802A1184 0040202D */ daddu $a0, $v0, $zero -/* 7159D8 802A1188 3C01802A */ lui $at, %hi(D_802A2410) -/* 7159DC 802A118C AC242410 */ sw $a0, %lo(D_802A2410)($at) -/* 7159E0 802A1190 24A50024 */ addiu $a1, $a1, 0x24 -/* 7159E4 802A1194 0C051261 */ jal set_icon_render_pos -/* 7159E8 802A1198 24C6FFC1 */ addiu $a2, $a2, -0x3f -.L802A119C: -/* 7159EC 802A119C AEB10084 */ sw $s1, 0x84($s5) -.L802A11A0: -/* 7159F0 802A11A0 8FBF0048 */ lw $ra, 0x48($sp) -/* 7159F4 802A11A4 8FB50044 */ lw $s5, 0x44($sp) -/* 7159F8 802A11A8 8FB40040 */ lw $s4, 0x40($sp) -/* 7159FC 802A11AC 8FB3003C */ lw $s3, 0x3c($sp) -/* 715A00 802A11B0 8FB20038 */ lw $s2, 0x38($sp) -/* 715A04 802A11B4 8FB10034 */ lw $s1, 0x34($sp) -/* 715A08 802A11B8 8FB00030 */ lw $s0, 0x30($sp) -/* 715A0C 802A11BC D7B80060 */ ldc1 $f24, 0x60($sp) -/* 715A10 802A11C0 D7B60058 */ ldc1 $f22, 0x58($sp) -/* 715A14 802A11C4 D7B40050 */ ldc1 $f20, 0x50($sp) -/* 715A18 802A11C8 24020002 */ addiu $v0, $zero, 2 -/* 715A1C 802A11CC 03E00008 */ jr $ra -/* 715A20 802A11D0 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/ver/us/asm/nonmatchings/code_715850/func_802A11D4_715A24.s b/ver/us/asm/nonmatchings/code_715850/func_802A11D4_715A24.s deleted file mode 100644 index 6620a2255e..0000000000 --- a/ver/us/asm/nonmatchings/code_715850/func_802A11D4_715A24.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A11D4_715A24 -/* 715A24 802A11D4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 715A28 802A11D8 3C03800E */ lui $v1, %hi(gBattleStatus) -/* 715A2C 802A11DC 2463C070 */ addiu $v1, $v1, %lo(gBattleStatus) -/* 715A30 802A11E0 AFBF0014 */ sw $ra, 0x14($sp) -/* 715A34 802A11E4 AFB00010 */ sw $s0, 0x10($sp) -/* 715A38 802A11E8 8462017A */ lh $v0, 0x17a($v1) -/* 715A3C 802A11EC 8C6400D8 */ lw $a0, 0xd8($v1) -/* 715A40 802A11F0 00021140 */ sll $v0, $v0, 5 -/* 715A44 802A11F4 3C108008 */ lui $s0, %hi(gItemTable+0xC) -/* 715A48 802A11F8 02028021 */ addu $s0, $s0, $v0 -/* 715A4C 802A11FC 861078EC */ lh $s0, %lo(gItemTable+0xC)($s0) -/* 715A50 802A1200 0C099CAB */ jal heroes_is_ability_active -/* 715A54 802A1204 2405001D */ addiu $a1, $zero, 0x1d -/* 715A58 802A1208 10400007 */ beqz $v0, .L802A1228 -/* 715A5C 802A120C 00000000 */ nop -/* 715A60 802A1210 1A000005 */ blez $s0, .L802A1228 -/* 715A64 802A1214 00000000 */ nop -/* 715A68 802A1218 3C04802A */ lui $a0, %hi(D_802A2410) -/* 715A6C 802A121C 8C842410 */ lw $a0, %lo(D_802A2410)($a0) -/* 715A70 802A1220 0C05123D */ jal free_icon -/* 715A74 802A1224 00000000 */ nop -.L802A1228: -/* 715A78 802A1228 8FBF0014 */ lw $ra, 0x14($sp) -/* 715A7C 802A122C 8FB00010 */ lw $s0, 0x10($sp) -/* 715A80 802A1230 24020002 */ addiu $v0, $zero, 2 -/* 715A84 802A1234 03E00008 */ jr $ra -/* 715A88 802A1238 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/code_715850/func_802A123C_715A8C.s b/ver/us/asm/nonmatchings/code_715850/func_802A123C_715A8C.s deleted file mode 100644 index d33f15408e..0000000000 --- a/ver/us/asm/nonmatchings/code_715850/func_802A123C_715A8C.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A123C_715A8C -/* 715A8C 802A123C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 715A90 802A1240 AFB10014 */ sw $s1, 0x14($sp) -/* 715A94 802A1244 0080882D */ daddu $s1, $a0, $zero -/* 715A98 802A1248 AFBF0020 */ sw $ra, 0x20($sp) -/* 715A9C 802A124C AFB3001C */ sw $s3, 0x1c($sp) -/* 715AA0 802A1250 AFB20018 */ sw $s2, 0x18($sp) -/* 715AA4 802A1254 AFB00010 */ sw $s0, 0x10($sp) -/* 715AA8 802A1258 8E30000C */ lw $s0, 0xc($s1) -/* 715AAC 802A125C 8E050000 */ lw $a1, ($s0) -/* 715AB0 802A1260 0C0B1EAF */ jal get_variable -/* 715AB4 802A1264 26100004 */ addiu $s0, $s0, 4 -/* 715AB8 802A1268 8E050000 */ lw $a1, ($s0) -/* 715ABC 802A126C 26100004 */ addiu $s0, $s0, 4 -/* 715AC0 802A1270 0220202D */ daddu $a0, $s1, $zero -/* 715AC4 802A1274 0C0B1EAF */ jal get_variable -/* 715AC8 802A1278 0040982D */ daddu $s3, $v0, $zero -/* 715ACC 802A127C 0220202D */ daddu $a0, $s1, $zero -/* 715AD0 802A1280 8E050000 */ lw $a1, ($s0) -/* 715AD4 802A1284 0C0B1EAF */ jal get_variable -/* 715AD8 802A1288 0040902D */ daddu $s2, $v0, $zero -/* 715ADC 802A128C 8E2400BC */ lw $a0, 0xbc($s1) -/* 715AE0 802A1290 0C04C3D6 */ jal get_item_entity -/* 715AE4 802A1294 0040802D */ daddu $s0, $v0, $zero -/* 715AE8 802A1298 0040182D */ daddu $v1, $v0, $zero -/* 715AEC 802A129C 44930000 */ mtc1 $s3, $f0 -/* 715AF0 802A12A0 00000000 */ nop -/* 715AF4 802A12A4 46800020 */ cvt.s.w $f0, $f0 -/* 715AF8 802A12A8 E4600008 */ swc1 $f0, 8($v1) -/* 715AFC 802A12AC 44920000 */ mtc1 $s2, $f0 -/* 715B00 802A12B0 00000000 */ nop -/* 715B04 802A12B4 46800020 */ cvt.s.w $f0, $f0 -/* 715B08 802A12B8 E460000C */ swc1 $f0, 0xc($v1) -/* 715B0C 802A12BC 44900000 */ mtc1 $s0, $f0 -/* 715B10 802A12C0 00000000 */ nop -/* 715B14 802A12C4 46800020 */ cvt.s.w $f0, $f0 -/* 715B18 802A12C8 E4600010 */ swc1 $f0, 0x10($v1) -/* 715B1C 802A12CC 8FBF0020 */ lw $ra, 0x20($sp) -/* 715B20 802A12D0 8FB3001C */ lw $s3, 0x1c($sp) -/* 715B24 802A12D4 8FB20018 */ lw $s2, 0x18($sp) -/* 715B28 802A12D8 8FB10014 */ lw $s1, 0x14($sp) -/* 715B2C 802A12DC 8FB00010 */ lw $s0, 0x10($sp) -/* 715B30 802A12E0 24020002 */ addiu $v0, $zero, 2 -/* 715B34 802A12E4 03E00008 */ jr $ra -/* 715B38 802A12E8 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/code_715850/func_802A12EC_715B3C.s b/ver/us/asm/nonmatchings/code_715850/func_802A12EC_715B3C.s deleted file mode 100644 index 5bfee63806..0000000000 --- a/ver/us/asm/nonmatchings/code_715850/func_802A12EC_715B3C.s +++ /dev/null @@ -1,43 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A12EC_715B3C -/* 715B3C 802A12EC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 715B40 802A12F0 AFB00010 */ sw $s0, 0x10($sp) -/* 715B44 802A12F4 3C10800E */ lui $s0, %hi(gBattleStatus+0xDC) -/* 715B48 802A12F8 8E10C14C */ lw $s0, %lo(gBattleStatus+0xDC)($s0) -/* 715B4C 802A12FC AFBF0014 */ sw $ra, 0x14($sp) -/* 715B50 802A1300 82020217 */ lb $v0, 0x217($s0) -/* 715B54 802A1304 8C85000C */ lw $a1, 0xc($a0) -/* 715B58 802A1308 10400017 */ beqz $v0, .L802A1368 -/* 715B5C 802A130C 24020002 */ addiu $v0, $zero, 2 -/* 715B60 802A1310 8CA50000 */ lw $a1, ($a1) -/* 715B64 802A1314 0C0B1EAF */ jal get_variable -/* 715B68 802A1318 00000000 */ nop -/* 715B6C 802A131C 92030217 */ lbu $v1, 0x217($s0) -/* 715B70 802A1320 00621823 */ subu $v1, $v1, $v0 -/* 715B74 802A1324 A2030217 */ sb $v1, 0x217($s0) -/* 715B78 802A1328 00031E00 */ sll $v1, $v1, 0x18 -/* 715B7C 802A132C 04620001 */ bltzl $v1, .L802A1334 -/* 715B80 802A1330 A2000217 */ sb $zero, 0x217($s0) -.L802A1334: -/* 715B84 802A1334 82030217 */ lb $v1, 0x217($s0) -/* 715B88 802A1338 18600005 */ blez $v1, .L802A1350 -/* 715B8C 802A133C 24040034 */ addiu $a0, $zero, 0x34 -/* 715B90 802A1340 8E020440 */ lw $v0, 0x440($s0) -/* 715B94 802A1344 8C42000C */ lw $v0, 0xc($v0) -/* 715B98 802A1348 080A84D9 */ j .L802A1364 -/* 715B9C 802A134C AC43003C */ sw $v1, 0x3c($v0) -.L802A1350: -/* 715BA0 802A1350 0C09F7A0 */ jal dispatch_event_partner -/* 715BA4 802A1354 A2000216 */ sb $zero, 0x216($s0) -/* 715BA8 802A1358 8E020440 */ lw $v0, 0x440($s0) -/* 715BAC 802A135C 8C42000C */ lw $v0, 0xc($v0) -/* 715BB0 802A1360 AC40003C */ sw $zero, 0x3c($v0) -.L802A1364: -/* 715BB4 802A1364 24020002 */ addiu $v0, $zero, 2 -.L802A1368: -/* 715BB8 802A1368 8FBF0014 */ lw $ra, 0x14($sp) -/* 715BBC 802A136C 8FB00010 */ lw $s0, 0x10($sp) -/* 715BC0 802A1370 03E00008 */ jr $ra -/* 715BC4 802A1374 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/code_715850/func_802A1378_715BC8.s b/ver/us/asm/nonmatchings/code_715850/func_802A1378_715BC8.s deleted file mode 100644 index 5a7bbcbb61..0000000000 --- a/ver/us/asm/nonmatchings/code_715850/func_802A1378_715BC8.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1378_715BC8 -/* 715BC8 802A1378 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 715BCC 802A137C AFB1001C */ sw $s1, 0x1c($sp) -/* 715BD0 802A1380 0080882D */ daddu $s1, $a0, $zero -/* 715BD4 802A1384 AFBF0028 */ sw $ra, 0x28($sp) -/* 715BD8 802A1388 AFB30024 */ sw $s3, 0x24($sp) -/* 715BDC 802A138C AFB20020 */ sw $s2, 0x20($sp) -/* 715BE0 802A1390 AFB00018 */ sw $s0, 0x18($sp) -/* 715BE4 802A1394 8E30000C */ lw $s0, 0xc($s1) -/* 715BE8 802A1398 8E050000 */ lw $a1, ($s0) -/* 715BEC 802A139C 0C0B1EAF */ jal get_variable -/* 715BF0 802A13A0 26100004 */ addiu $s0, $s0, 4 -/* 715BF4 802A13A4 8E050000 */ lw $a1, ($s0) -/* 715BF8 802A13A8 26100004 */ addiu $s0, $s0, 4 -/* 715BFC 802A13AC 0220202D */ daddu $a0, $s1, $zero -/* 715C00 802A13B0 0C0B1EAF */ jal get_variable -/* 715C04 802A13B4 0040982D */ daddu $s3, $v0, $zero -/* 715C08 802A13B8 8E050000 */ lw $a1, ($s0) -/* 715C0C 802A13BC 26100004 */ addiu $s0, $s0, 4 -/* 715C10 802A13C0 0220202D */ daddu $a0, $s1, $zero -/* 715C14 802A13C4 0C0B1EAF */ jal get_variable -/* 715C18 802A13C8 0040902D */ daddu $s2, $v0, $zero -/* 715C1C 802A13CC 0220202D */ daddu $a0, $s1, $zero -/* 715C20 802A13D0 8E050000 */ lw $a1, ($s0) -/* 715C24 802A13D4 0C0B1EAF */ jal get_variable -/* 715C28 802A13D8 0040802D */ daddu $s0, $v0, $zero -/* 715C2C 802A13DC 44930000 */ mtc1 $s3, $f0 -/* 715C30 802A13E0 00000000 */ nop -/* 715C34 802A13E4 46800020 */ cvt.s.w $f0, $f0 -/* 715C38 802A13E8 44050000 */ mfc1 $a1, $f0 -/* 715C3C 802A13EC 44920000 */ mtc1 $s2, $f0 -/* 715C40 802A13F0 00000000 */ nop -/* 715C44 802A13F4 46800020 */ cvt.s.w $f0, $f0 -/* 715C48 802A13F8 44060000 */ mfc1 $a2, $f0 -/* 715C4C 802A13FC 44900000 */ mtc1 $s0, $f0 -/* 715C50 802A1400 00000000 */ nop -/* 715C54 802A1404 46800020 */ cvt.s.w $f0, $f0 -/* 715C58 802A1408 44070000 */ mfc1 $a3, $f0 -/* 715C5C 802A140C 0000202D */ daddu $a0, $zero, $zero -/* 715C60 802A1410 0C01C424 */ jal func_80071090 -/* 715C64 802A1414 AFA20010 */ sw $v0, 0x10($sp) -/* 715C68 802A1418 8FBF0028 */ lw $ra, 0x28($sp) -/* 715C6C 802A141C 8FB30024 */ lw $s3, 0x24($sp) -/* 715C70 802A1420 8FB20020 */ lw $s2, 0x20($sp) -/* 715C74 802A1424 8FB1001C */ lw $s1, 0x1c($sp) -/* 715C78 802A1428 8FB00018 */ lw $s0, 0x18($sp) -/* 715C7C 802A142C 24020002 */ addiu $v0, $zero, 2 -/* 715C80 802A1430 03E00008 */ jr $ra -/* 715C84 802A1434 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/code_715850/func_802A1438_715C88.s b/ver/us/asm/nonmatchings/code_715850/func_802A1438_715C88.s deleted file mode 100644 index 4e7982ce37..0000000000 --- a/ver/us/asm/nonmatchings/code_715850/func_802A1438_715C88.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1438_715C88 -/* 715C88 802A1438 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 715C8C 802A143C AFB1001C */ sw $s1, 0x1c($sp) -/* 715C90 802A1440 0080882D */ daddu $s1, $a0, $zero -/* 715C94 802A1444 AFBF0028 */ sw $ra, 0x28($sp) -/* 715C98 802A1448 AFB30024 */ sw $s3, 0x24($sp) -/* 715C9C 802A144C AFB20020 */ sw $s2, 0x20($sp) -/* 715CA0 802A1450 AFB00018 */ sw $s0, 0x18($sp) -/* 715CA4 802A1454 8E30000C */ lw $s0, 0xc($s1) -/* 715CA8 802A1458 8E050000 */ lw $a1, ($s0) -/* 715CAC 802A145C 0C0B1EAF */ jal get_variable -/* 715CB0 802A1460 26100004 */ addiu $s0, $s0, 4 -/* 715CB4 802A1464 8E050000 */ lw $a1, ($s0) -/* 715CB8 802A1468 26100004 */ addiu $s0, $s0, 4 -/* 715CBC 802A146C 0220202D */ daddu $a0, $s1, $zero -/* 715CC0 802A1470 0C0B1EAF */ jal get_variable -/* 715CC4 802A1474 0040982D */ daddu $s3, $v0, $zero -/* 715CC8 802A1478 8E050000 */ lw $a1, ($s0) -/* 715CCC 802A147C 26100004 */ addiu $s0, $s0, 4 -/* 715CD0 802A1480 0220202D */ daddu $a0, $s1, $zero -/* 715CD4 802A1484 0C0B1EAF */ jal get_variable -/* 715CD8 802A1488 0040902D */ daddu $s2, $v0, $zero -/* 715CDC 802A148C 0220202D */ daddu $a0, $s1, $zero -/* 715CE0 802A1490 8E050000 */ lw $a1, ($s0) -/* 715CE4 802A1494 0C0B1EAF */ jal get_variable -/* 715CE8 802A1498 0040802D */ daddu $s0, $v0, $zero -/* 715CEC 802A149C 44930000 */ mtc1 $s3, $f0 -/* 715CF0 802A14A0 00000000 */ nop -/* 715CF4 802A14A4 46800020 */ cvt.s.w $f0, $f0 -/* 715CF8 802A14A8 44050000 */ mfc1 $a1, $f0 -/* 715CFC 802A14AC 44920000 */ mtc1 $s2, $f0 -/* 715D00 802A14B0 00000000 */ nop -/* 715D04 802A14B4 46800020 */ cvt.s.w $f0, $f0 -/* 715D08 802A14B8 44060000 */ mfc1 $a2, $f0 -/* 715D0C 802A14BC 44900000 */ mtc1 $s0, $f0 -/* 715D10 802A14C0 00000000 */ nop -/* 715D14 802A14C4 46800020 */ cvt.s.w $f0, $f0 -/* 715D18 802A14C8 44070000 */ mfc1 $a3, $f0 -/* 715D1C 802A14CC 24040001 */ addiu $a0, $zero, 1 -/* 715D20 802A14D0 0C01C424 */ jal func_80071090 -/* 715D24 802A14D4 AFA20010 */ sw $v0, 0x10($sp) -/* 715D28 802A14D8 8FBF0028 */ lw $ra, 0x28($sp) -/* 715D2C 802A14DC 8FB30024 */ lw $s3, 0x24($sp) -/* 715D30 802A14E0 8FB20020 */ lw $s2, 0x20($sp) -/* 715D34 802A14E4 8FB1001C */ lw $s1, 0x1c($sp) -/* 715D38 802A14E8 8FB00018 */ lw $s0, 0x18($sp) -/* 715D3C 802A14EC 24020002 */ addiu $v0, $zero, 2 -/* 715D40 802A14F0 03E00008 */ jr $ra -/* 715D44 802A14F4 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/code_715850/func_802A14F8_715D48.s b/ver/us/asm/nonmatchings/code_715850/func_802A14F8_715D48.s deleted file mode 100644 index 9cec9fefa0..0000000000 --- a/ver/us/asm/nonmatchings/code_715850/func_802A14F8_715D48.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A14F8_715D48 -/* 715D48 802A14F8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 715D4C 802A14FC AFBF0014 */ sw $ra, 0x14($sp) -/* 715D50 802A1500 AFB00010 */ sw $s0, 0x10($sp) -/* 715D54 802A1504 8C82000C */ lw $v0, 0xc($a0) -/* 715D58 802A1508 0C0B1EAF */ jal get_variable -/* 715D5C 802A150C 8C450000 */ lw $a1, ($v0) -/* 715D60 802A1510 3C038011 */ lui $v1, %hi(gPlayerData) -/* 715D64 802A1514 2463F290 */ addiu $v1, $v1, %lo(gPlayerData) -/* 715D68 802A1518 80640002 */ lb $a0, 2($v1) -/* 715D6C 802A151C 80650003 */ lb $a1, 3($v1) -/* 715D70 802A1520 00822021 */ addu $a0, $a0, $v0 -/* 715D74 802A1524 00A4102A */ slt $v0, $a1, $a0 -/* 715D78 802A1528 10400002 */ beqz $v0, .L802A1534 -/* 715D7C 802A152C 0060802D */ daddu $s0, $v1, $zero -/* 715D80 802A1530 00A0202D */ daddu $a0, $a1, $zero -.L802A1534: -/* 715D84 802A1534 A2040002 */ sb $a0, 2($s0) -/* 715D88 802A1538 8FBF0014 */ lw $ra, 0x14($sp) -/* 715D8C 802A153C 8FB00010 */ lw $s0, 0x10($sp) -/* 715D90 802A1540 24020002 */ addiu $v0, $zero, 2 -/* 715D94 802A1544 03E00008 */ jr $ra -/* 715D98 802A1548 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/code_715850/func_802A154C_715D9C.s b/ver/us/asm/nonmatchings/code_715850/func_802A154C_715D9C.s deleted file mode 100644 index 002221325b..0000000000 --- a/ver/us/asm/nonmatchings/code_715850/func_802A154C_715D9C.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A154C_715D9C -/* 715D9C 802A154C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 715DA0 802A1550 AFBF0014 */ sw $ra, 0x14($sp) -/* 715DA4 802A1554 AFB00010 */ sw $s0, 0x10($sp) -/* 715DA8 802A1558 8C82000C */ lw $v0, 0xc($a0) -/* 715DAC 802A155C 0C0B1EAF */ jal get_variable -/* 715DB0 802A1560 8C450000 */ lw $a1, ($v0) -/* 715DB4 802A1564 3C038011 */ lui $v1, %hi(gPlayerData) -/* 715DB8 802A1568 2463F290 */ addiu $v1, $v1, %lo(gPlayerData) -/* 715DBC 802A156C 80640005 */ lb $a0, 5($v1) -/* 715DC0 802A1570 80650006 */ lb $a1, 6($v1) -/* 715DC4 802A1574 00822021 */ addu $a0, $a0, $v0 -/* 715DC8 802A1578 00A4102A */ slt $v0, $a1, $a0 -/* 715DCC 802A157C 10400002 */ beqz $v0, .L802A1588 -/* 715DD0 802A1580 0060802D */ daddu $s0, $v1, $zero -/* 715DD4 802A1584 00A0202D */ daddu $a0, $a1, $zero -.L802A1588: -/* 715DD8 802A1588 A2040005 */ sb $a0, 5($s0) -/* 715DDC 802A158C 8FBF0014 */ lw $ra, 0x14($sp) -/* 715DE0 802A1590 8FB00010 */ lw $s0, 0x10($sp) -/* 715DE4 802A1594 24020002 */ addiu $v0, $zero, 2 -/* 715DE8 802A1598 03E00008 */ jr $ra -/* 715DEC 802A159C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/code_715850/func_802A15A0_715DF0.s b/ver/us/asm/nonmatchings/code_715850/func_802A15A0_715DF0.s deleted file mode 100644 index 53bf24e282..0000000000 --- a/ver/us/asm/nonmatchings/code_715850/func_802A15A0_715DF0.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A15A0_715DF0 -/* 715DF0 802A15A0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 715DF4 802A15A4 AFB00010 */ sw $s0, 0x10($sp) -/* 715DF8 802A15A8 0080802D */ daddu $s0, $a0, $zero -/* 715DFC 802A15AC AFBF0014 */ sw $ra, 0x14($sp) -/* 715E00 802A15B0 8E02000C */ lw $v0, 0xc($s0) -/* 715E04 802A15B4 0C0B1EAF */ jal get_variable -/* 715E08 802A15B8 8C450000 */ lw $a1, ($v0) -/* 715E0C 802A15BC 3C038008 */ lui $v1, %hi(gItemTable) -/* 715E10 802A15C0 246378E0 */ addiu $v1, $v1, %lo(gItemTable) -/* 715E14 802A15C4 00021140 */ sll $v0, $v0, 5 -/* 715E18 802A15C8 00431021 */ addu $v0, $v0, $v1 -/* 715E1C 802A15CC 8043001B */ lb $v1, 0x1b($v0) -/* 715E20 802A15D0 AE0300B0 */ sw $v1, 0xb0($s0) -/* 715E24 802A15D4 8043001C */ lb $v1, 0x1c($v0) -/* 715E28 802A15D8 AE0300B4 */ sw $v1, 0xb4($s0) -/* 715E2C 802A15DC 8043001B */ lb $v1, 0x1b($v0) -/* 715E30 802A15E0 38630001 */ xori $v1, $v1, 1 -/* 715E34 802A15E4 2C630001 */ sltiu $v1, $v1, 1 -/* 715E38 802A15E8 AE0300C0 */ sw $v1, 0xc0($s0) -/* 715E3C 802A15EC 8FBF0014 */ lw $ra, 0x14($sp) -/* 715E40 802A15F0 8FB00010 */ lw $s0, 0x10($sp) -/* 715E44 802A15F4 24020002 */ addiu $v0, $zero, 2 -/* 715E48 802A15F8 03E00008 */ jr $ra -/* 715E4C 802A15FC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/code_719970/func_802A1000_719970.s b/ver/us/asm/nonmatchings/code_719970/func_802A1000_719970.s deleted file mode 100644 index c2c343f02b..0000000000 --- a/ver/us/asm/nonmatchings/code_719970/func_802A1000_719970.s +++ /dev/null @@ -1,125 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1000_719970 -/* 719970 802A1000 27BDFF98 */ addiu $sp, $sp, -0x68 -/* 719974 802A1004 AFB50044 */ sw $s5, 0x44($sp) -/* 719978 802A1008 0080A82D */ daddu $s5, $a0, $zero -/* 71997C 802A100C AFB10034 */ sw $s1, 0x34($sp) -/* 719980 802A1010 0000882D */ daddu $s1, $zero, $zero -/* 719984 802A1014 2405001D */ addiu $a1, $zero, 0x1d -/* 719988 802A1018 F7B40050 */ sdc1 $f20, 0x50($sp) -/* 71998C 802A101C 4480A000 */ mtc1 $zero, $f20 -/* 719990 802A1020 3C02800E */ lui $v0, %hi(gBattleStatus) -/* 719994 802A1024 2442C070 */ addiu $v0, $v0, %lo(gBattleStatus) -/* 719998 802A1028 AFBF0048 */ sw $ra, 0x48($sp) -/* 71999C 802A102C AFB40040 */ sw $s4, 0x40($sp) -/* 7199A0 802A1030 AFB3003C */ sw $s3, 0x3c($sp) -/* 7199A4 802A1034 AFB20038 */ sw $s2, 0x38($sp) -/* 7199A8 802A1038 AFB00030 */ sw $s0, 0x30($sp) -/* 7199AC 802A103C F7B80060 */ sdc1 $f24, 0x60($sp) -/* 7199B0 802A1040 F7B60058 */ sdc1 $f22, 0x58($sp) -/* 7199B4 802A1044 8C5300D8 */ lw $s3, 0xd8($v0) -/* 7199B8 802A1048 8442017A */ lh $v0, 0x17a($v0) -/* 7199BC 802A104C 0260202D */ daddu $a0, $s3, $zero -/* 7199C0 802A1050 00021140 */ sll $v0, $v0, 5 -/* 7199C4 802A1054 3C128008 */ lui $s2, %hi(gItemTable+0xC) -/* 7199C8 802A1058 02429021 */ addu $s2, $s2, $v0 -/* 7199CC 802A105C 865278EC */ lh $s2, %lo(gItemTable+0xC)($s2) -/* 7199D0 802A1060 92620191 */ lbu $v0, 0x191($s3) -/* 7199D4 802A1064 C6620148 */ lwc1 $f2, 0x148($s3) -/* 7199D8 802A1068 44820000 */ mtc1 $v0, $f0 -/* 7199DC 802A106C 00000000 */ nop -/* 7199E0 802A1070 46800020 */ cvt.s.w $f0, $f0 -/* 7199E4 802A1074 0C099CAB */ jal heroes_is_ability_active -/* 7199E8 802A1078 46001580 */ add.s $f22, $f2, $f0 -/* 7199EC 802A107C 50400048 */ beql $v0, $zero, .L802A11A0 -/* 7199F0 802A1080 AEB10084 */ sw $s1, 0x84($s5) -/* 7199F4 802A1084 1A400045 */ blez $s2, .L802A119C -/* 7199F8 802A1088 3C0451EB */ lui $a0, 0x51eb -/* 7199FC 802A108C 3484851F */ ori $a0, $a0, 0x851f -/* 719A00 802A1090 00121880 */ sll $v1, $s2, 2 -/* 719A04 802A1094 00721821 */ addu $v1, $v1, $s2 -/* 719A08 802A1098 00031100 */ sll $v0, $v1, 4 -/* 719A0C 802A109C 00431023 */ subu $v0, $v0, $v1 -/* 719A10 802A10A0 24420063 */ addiu $v0, $v0, 0x63 -/* 719A14 802A10A4 00440018 */ mult $v0, $a0 -/* 719A18 802A10A8 000217C3 */ sra $v0, $v0, 0x1f -/* 719A1C 802A10AC 00004010 */ mfhi $t0 -/* 719A20 802A10B0 00081943 */ sra $v1, $t0, 5 -/* 719A24 802A10B4 00629023 */ subu $s2, $v1, $v0 -/* 719A28 802A10B8 0232102A */ slt $v0, $s1, $s2 -/* 719A2C 802A10BC 10400019 */ beqz $v0, .L802A1124 -/* 719A30 802A10C0 0220802D */ daddu $s0, $s1, $zero -/* 719A34 802A10C4 24140017 */ addiu $s4, $zero, 0x17 -/* 719A38 802A10C8 3C0141F0 */ lui $at, 0x41f0 -/* 719A3C 802A10CC 4481C000 */ mtc1 $at, $f24 -/* 719A40 802A10D0 24110001 */ addiu $s1, $zero, 1 -.L802A10D4: -/* 719A44 802A10D4 C6600144 */ lwc1 $f0, 0x144($s3) -/* 719A48 802A10D8 C662014C */ lwc1 $f2, 0x14c($s3) -/* 719A4C 802A10DC 4600A10D */ trunc.w.s $f4, $f20 -/* 719A50 802A10E0 E7A40018 */ swc1 $f4, 0x18($sp) -/* 719A54 802A10E4 24040157 */ addiu $a0, $zero, 0x157 -/* 719A58 802A10E8 AFB10014 */ sw $s1, 0x14($sp) -/* 719A5C 802A10EC 26310003 */ addiu $s1, $s1, 3 -/* 719A60 802A10F0 26100001 */ addiu $s0, $s0, 1 -/* 719A64 802A10F4 4406B000 */ mfc1 $a2, $f22 -/* 719A68 802A10F8 44050000 */ mfc1 $a1, $f0 -/* 719A6C 802A10FC 44071000 */ mfc1 $a3, $f2 -/* 719A70 802A1100 4618A500 */ add.s $f20, $f20, $f24 -/* 719A74 802A1104 AFB40010 */ sw $s4, 0x10($sp) -/* 719A78 802A1108 0C04C4FD */ jal make_item_entity -/* 719A7C 802A110C AFA0001C */ sw $zero, 0x1c($sp) -/* 719A80 802A1110 0C03A830 */ jal add_coins -/* 719A84 802A1114 24040001 */ addiu $a0, $zero, 1 -/* 719A88 802A1118 0212102A */ slt $v0, $s0, $s2 -/* 719A8C 802A111C 1440FFED */ bnez $v0, .L802A10D4 -/* 719A90 802A1120 00000000 */ nop -.L802A1124: -/* 719A94 802A1124 00101040 */ sll $v0, $s0, 1 -/* 719A98 802A1128 00501021 */ addu $v0, $v0, $s0 -/* 719A9C 802A112C 2451001E */ addiu $s1, $v0, 0x1e -/* 719AA0 802A1130 C6600144 */ lwc1 $f0, 0x144($s3) -/* 719AA4 802A1134 C6760148 */ lwc1 $f22, 0x148($s3) -/* 719AA8 802A1138 C662014C */ lwc1 $f2, 0x14c($s3) -/* 719AAC 802A113C 3C048007 */ lui $a0, %hi(gCurrentCameraID) -/* 719AB0 802A1140 8C847410 */ lw $a0, %lo(gCurrentCameraID)($a0) -/* 719AB4 802A1144 27A20020 */ addiu $v0, $sp, 0x20 -/* 719AB8 802A1148 AFA20010 */ sw $v0, 0x10($sp) -/* 719ABC 802A114C 27A20024 */ addiu $v0, $sp, 0x24 -/* 719AC0 802A1150 AFA20014 */ sw $v0, 0x14($sp) -/* 719AC4 802A1154 44050000 */ mfc1 $a1, $f0 -/* 719AC8 802A1158 4406B000 */ mfc1 $a2, $f22 -/* 719ACC 802A115C 44071000 */ mfc1 $a3, $f2 -/* 719AD0 802A1160 27A20028 */ addiu $v0, $sp, 0x28 -/* 719AD4 802A1164 0C00B94E */ jal get_screen_coords -/* 719AD8 802A1168 AFA20018 */ sw $v0, 0x18($sp) -/* 719ADC 802A116C 3C048011 */ lui $a0, %hi(D_80108A64) -/* 719AE0 802A1170 24848A64 */ addiu $a0, $a0, %lo(D_80108A64) -/* 719AE4 802A1174 0C050529 */ jal create_icon -/* 719AE8 802A1178 00000000 */ nop -/* 719AEC 802A117C 8FA50020 */ lw $a1, 0x20($sp) -/* 719AF0 802A1180 8FA60024 */ lw $a2, 0x24($sp) -/* 719AF4 802A1184 0040202D */ daddu $a0, $v0, $zero -/* 719AF8 802A1188 3C01802A */ lui $at, %hi(D_802A1E80) -/* 719AFC 802A118C AC241E80 */ sw $a0, %lo(D_802A1E80)($at) -/* 719B00 802A1190 24A50024 */ addiu $a1, $a1, 0x24 -/* 719B04 802A1194 0C051261 */ jal set_icon_render_pos -/* 719B08 802A1198 24C6FFC1 */ addiu $a2, $a2, -0x3f -.L802A119C: -/* 719B0C 802A119C AEB10084 */ sw $s1, 0x84($s5) -.L802A11A0: -/* 719B10 802A11A0 8FBF0048 */ lw $ra, 0x48($sp) -/* 719B14 802A11A4 8FB50044 */ lw $s5, 0x44($sp) -/* 719B18 802A11A8 8FB40040 */ lw $s4, 0x40($sp) -/* 719B1C 802A11AC 8FB3003C */ lw $s3, 0x3c($sp) -/* 719B20 802A11B0 8FB20038 */ lw $s2, 0x38($sp) -/* 719B24 802A11B4 8FB10034 */ lw $s1, 0x34($sp) -/* 719B28 802A11B8 8FB00030 */ lw $s0, 0x30($sp) -/* 719B2C 802A11BC D7B80060 */ ldc1 $f24, 0x60($sp) -/* 719B30 802A11C0 D7B60058 */ ldc1 $f22, 0x58($sp) -/* 719B34 802A11C4 D7B40050 */ ldc1 $f20, 0x50($sp) -/* 719B38 802A11C8 24020002 */ addiu $v0, $zero, 2 -/* 719B3C 802A11CC 03E00008 */ jr $ra -/* 719B40 802A11D0 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/ver/us/asm/nonmatchings/code_719970/func_802A11D4_719B44.s b/ver/us/asm/nonmatchings/code_719970/func_802A11D4_719B44.s deleted file mode 100644 index f13f9c6409..0000000000 --- a/ver/us/asm/nonmatchings/code_719970/func_802A11D4_719B44.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A11D4_719B44 -/* 719B44 802A11D4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 719B48 802A11D8 3C03800E */ lui $v1, %hi(gBattleStatus) -/* 719B4C 802A11DC 2463C070 */ addiu $v1, $v1, %lo(gBattleStatus) -/* 719B50 802A11E0 AFBF0014 */ sw $ra, 0x14($sp) -/* 719B54 802A11E4 AFB00010 */ sw $s0, 0x10($sp) -/* 719B58 802A11E8 8462017A */ lh $v0, 0x17a($v1) -/* 719B5C 802A11EC 8C6400D8 */ lw $a0, 0xd8($v1) -/* 719B60 802A11F0 00021140 */ sll $v0, $v0, 5 -/* 719B64 802A11F4 3C108008 */ lui $s0, %hi(gItemTable+0xC) -/* 719B68 802A11F8 02028021 */ addu $s0, $s0, $v0 -/* 719B6C 802A11FC 861078EC */ lh $s0, %lo(gItemTable+0xC)($s0) -/* 719B70 802A1200 0C099CAB */ jal heroes_is_ability_active -/* 719B74 802A1204 2405001D */ addiu $a1, $zero, 0x1d -/* 719B78 802A1208 10400007 */ beqz $v0, .L802A1228 -/* 719B7C 802A120C 00000000 */ nop -/* 719B80 802A1210 1A000005 */ blez $s0, .L802A1228 -/* 719B84 802A1214 00000000 */ nop -/* 719B88 802A1218 3C04802A */ lui $a0, %hi(D_802A1E80) -/* 719B8C 802A121C 8C841E80 */ lw $a0, %lo(D_802A1E80)($a0) -/* 719B90 802A1220 0C05123D */ jal free_icon -/* 719B94 802A1224 00000000 */ nop -.L802A1228: -/* 719B98 802A1228 8FBF0014 */ lw $ra, 0x14($sp) -/* 719B9C 802A122C 8FB00010 */ lw $s0, 0x10($sp) -/* 719BA0 802A1230 24020002 */ addiu $v0, $zero, 2 -/* 719BA4 802A1234 03E00008 */ jr $ra -/* 719BA8 802A1238 27BD0018 */ addiu $sp, $sp, 0x18 -/* 719BAC 802A123C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/code_724CE0/func_802A1000_724CE0.s b/ver/us/asm/nonmatchings/code_724CE0/func_802A1000_724CE0.s deleted file mode 100644 index 28aa9603c2..0000000000 --- a/ver/us/asm/nonmatchings/code_724CE0/func_802A1000_724CE0.s +++ /dev/null @@ -1,125 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1000_724CE0 -/* 724CE0 802A1000 27BDFF98 */ addiu $sp, $sp, -0x68 -/* 724CE4 802A1004 AFB50044 */ sw $s5, 0x44($sp) -/* 724CE8 802A1008 0080A82D */ daddu $s5, $a0, $zero -/* 724CEC 802A100C AFB10034 */ sw $s1, 0x34($sp) -/* 724CF0 802A1010 0000882D */ daddu $s1, $zero, $zero -/* 724CF4 802A1014 2405001D */ addiu $a1, $zero, 0x1d -/* 724CF8 802A1018 F7B40050 */ sdc1 $f20, 0x50($sp) -/* 724CFC 802A101C 4480A000 */ mtc1 $zero, $f20 -/* 724D00 802A1020 3C02800E */ lui $v0, %hi(gBattleStatus) -/* 724D04 802A1024 2442C070 */ addiu $v0, $v0, %lo(gBattleStatus) -/* 724D08 802A1028 AFBF0048 */ sw $ra, 0x48($sp) -/* 724D0C 802A102C AFB40040 */ sw $s4, 0x40($sp) -/* 724D10 802A1030 AFB3003C */ sw $s3, 0x3c($sp) -/* 724D14 802A1034 AFB20038 */ sw $s2, 0x38($sp) -/* 724D18 802A1038 AFB00030 */ sw $s0, 0x30($sp) -/* 724D1C 802A103C F7B80060 */ sdc1 $f24, 0x60($sp) -/* 724D20 802A1040 F7B60058 */ sdc1 $f22, 0x58($sp) -/* 724D24 802A1044 8C5300D8 */ lw $s3, 0xd8($v0) -/* 724D28 802A1048 8442017A */ lh $v0, 0x17a($v0) -/* 724D2C 802A104C 0260202D */ daddu $a0, $s3, $zero -/* 724D30 802A1050 00021140 */ sll $v0, $v0, 5 -/* 724D34 802A1054 3C128008 */ lui $s2, %hi(gItemTable+0xC) -/* 724D38 802A1058 02429021 */ addu $s2, $s2, $v0 -/* 724D3C 802A105C 865278EC */ lh $s2, %lo(gItemTable+0xC)($s2) -/* 724D40 802A1060 92620191 */ lbu $v0, 0x191($s3) -/* 724D44 802A1064 C6620148 */ lwc1 $f2, 0x148($s3) -/* 724D48 802A1068 44820000 */ mtc1 $v0, $f0 -/* 724D4C 802A106C 00000000 */ nop -/* 724D50 802A1070 46800020 */ cvt.s.w $f0, $f0 -/* 724D54 802A1074 0C099CAB */ jal heroes_is_ability_active -/* 724D58 802A1078 46001580 */ add.s $f22, $f2, $f0 -/* 724D5C 802A107C 50400048 */ beql $v0, $zero, .L802A11A0 -/* 724D60 802A1080 AEB10084 */ sw $s1, 0x84($s5) -/* 724D64 802A1084 1A400045 */ blez $s2, .L802A119C -/* 724D68 802A1088 3C0451EB */ lui $a0, 0x51eb -/* 724D6C 802A108C 3484851F */ ori $a0, $a0, 0x851f -/* 724D70 802A1090 00121880 */ sll $v1, $s2, 2 -/* 724D74 802A1094 00721821 */ addu $v1, $v1, $s2 -/* 724D78 802A1098 00031100 */ sll $v0, $v1, 4 -/* 724D7C 802A109C 00431023 */ subu $v0, $v0, $v1 -/* 724D80 802A10A0 24420063 */ addiu $v0, $v0, 0x63 -/* 724D84 802A10A4 00440018 */ mult $v0, $a0 -/* 724D88 802A10A8 000217C3 */ sra $v0, $v0, 0x1f -/* 724D8C 802A10AC 00004010 */ mfhi $t0 -/* 724D90 802A10B0 00081943 */ sra $v1, $t0, 5 -/* 724D94 802A10B4 00629023 */ subu $s2, $v1, $v0 -/* 724D98 802A10B8 0232102A */ slt $v0, $s1, $s2 -/* 724D9C 802A10BC 10400019 */ beqz $v0, .L802A1124 -/* 724DA0 802A10C0 0220802D */ daddu $s0, $s1, $zero -/* 724DA4 802A10C4 24140017 */ addiu $s4, $zero, 0x17 -/* 724DA8 802A10C8 3C0141F0 */ lui $at, 0x41f0 -/* 724DAC 802A10CC 4481C000 */ mtc1 $at, $f24 -/* 724DB0 802A10D0 24110001 */ addiu $s1, $zero, 1 -.L802A10D4: -/* 724DB4 802A10D4 C6600144 */ lwc1 $f0, 0x144($s3) -/* 724DB8 802A10D8 C662014C */ lwc1 $f2, 0x14c($s3) -/* 724DBC 802A10DC 4600A10D */ trunc.w.s $f4, $f20 -/* 724DC0 802A10E0 E7A40018 */ swc1 $f4, 0x18($sp) -/* 724DC4 802A10E4 24040157 */ addiu $a0, $zero, 0x157 -/* 724DC8 802A10E8 AFB10014 */ sw $s1, 0x14($sp) -/* 724DCC 802A10EC 26310003 */ addiu $s1, $s1, 3 -/* 724DD0 802A10F0 26100001 */ addiu $s0, $s0, 1 -/* 724DD4 802A10F4 4406B000 */ mfc1 $a2, $f22 -/* 724DD8 802A10F8 44050000 */ mfc1 $a1, $f0 -/* 724DDC 802A10FC 44071000 */ mfc1 $a3, $f2 -/* 724DE0 802A1100 4618A500 */ add.s $f20, $f20, $f24 -/* 724DE4 802A1104 AFB40010 */ sw $s4, 0x10($sp) -/* 724DE8 802A1108 0C04C4FD */ jal make_item_entity -/* 724DEC 802A110C AFA0001C */ sw $zero, 0x1c($sp) -/* 724DF0 802A1110 0C03A830 */ jal add_coins -/* 724DF4 802A1114 24040001 */ addiu $a0, $zero, 1 -/* 724DF8 802A1118 0212102A */ slt $v0, $s0, $s2 -/* 724DFC 802A111C 1440FFED */ bnez $v0, .L802A10D4 -/* 724E00 802A1120 00000000 */ nop -.L802A1124: -/* 724E04 802A1124 00101040 */ sll $v0, $s0, 1 -/* 724E08 802A1128 00501021 */ addu $v0, $v0, $s0 -/* 724E0C 802A112C 2451001E */ addiu $s1, $v0, 0x1e -/* 724E10 802A1130 C6600144 */ lwc1 $f0, 0x144($s3) -/* 724E14 802A1134 C6760148 */ lwc1 $f22, 0x148($s3) -/* 724E18 802A1138 C662014C */ lwc1 $f2, 0x14c($s3) -/* 724E1C 802A113C 3C048007 */ lui $a0, %hi(gCurrentCameraID) -/* 724E20 802A1140 8C847410 */ lw $a0, %lo(gCurrentCameraID)($a0) -/* 724E24 802A1144 27A20020 */ addiu $v0, $sp, 0x20 -/* 724E28 802A1148 AFA20010 */ sw $v0, 0x10($sp) -/* 724E2C 802A114C 27A20024 */ addiu $v0, $sp, 0x24 -/* 724E30 802A1150 AFA20014 */ sw $v0, 0x14($sp) -/* 724E34 802A1154 44050000 */ mfc1 $a1, $f0 -/* 724E38 802A1158 4406B000 */ mfc1 $a2, $f22 -/* 724E3C 802A115C 44071000 */ mfc1 $a3, $f2 -/* 724E40 802A1160 27A20028 */ addiu $v0, $sp, 0x28 -/* 724E44 802A1164 0C00B94E */ jal get_screen_coords -/* 724E48 802A1168 AFA20018 */ sw $v0, 0x18($sp) -/* 724E4C 802A116C 3C048011 */ lui $a0, %hi(D_80108A64) -/* 724E50 802A1170 24848A64 */ addiu $a0, $a0, %lo(D_80108A64) -/* 724E54 802A1174 0C050529 */ jal create_icon -/* 724E58 802A1178 00000000 */ nop -/* 724E5C 802A117C 8FA50020 */ lw $a1, 0x20($sp) -/* 724E60 802A1180 8FA60024 */ lw $a2, 0x24($sp) -/* 724E64 802A1184 0040202D */ daddu $a0, $v0, $zero -/* 724E68 802A1188 3C01802A */ lui $at, %hi(D_802A2280) -/* 724E6C 802A118C AC242280 */ sw $a0, %lo(D_802A2280)($at) -/* 724E70 802A1190 24A50024 */ addiu $a1, $a1, 0x24 -/* 724E74 802A1194 0C051261 */ jal set_icon_render_pos -/* 724E78 802A1198 24C6FFC1 */ addiu $a2, $a2, -0x3f -.L802A119C: -/* 724E7C 802A119C AEB10084 */ sw $s1, 0x84($s5) -.L802A11A0: -/* 724E80 802A11A0 8FBF0048 */ lw $ra, 0x48($sp) -/* 724E84 802A11A4 8FB50044 */ lw $s5, 0x44($sp) -/* 724E88 802A11A8 8FB40040 */ lw $s4, 0x40($sp) -/* 724E8C 802A11AC 8FB3003C */ lw $s3, 0x3c($sp) -/* 724E90 802A11B0 8FB20038 */ lw $s2, 0x38($sp) -/* 724E94 802A11B4 8FB10034 */ lw $s1, 0x34($sp) -/* 724E98 802A11B8 8FB00030 */ lw $s0, 0x30($sp) -/* 724E9C 802A11BC D7B80060 */ ldc1 $f24, 0x60($sp) -/* 724EA0 802A11C0 D7B60058 */ ldc1 $f22, 0x58($sp) -/* 724EA4 802A11C4 D7B40050 */ ldc1 $f20, 0x50($sp) -/* 724EA8 802A11C8 24020002 */ addiu $v0, $zero, 2 -/* 724EAC 802A11CC 03E00008 */ jr $ra -/* 724EB0 802A11D0 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/ver/us/asm/nonmatchings/code_724CE0/func_802A11D4_724EB4.s b/ver/us/asm/nonmatchings/code_724CE0/func_802A11D4_724EB4.s deleted file mode 100644 index 81033fdbd5..0000000000 --- a/ver/us/asm/nonmatchings/code_724CE0/func_802A11D4_724EB4.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A11D4_724EB4 -/* 724EB4 802A11D4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 724EB8 802A11D8 3C03800E */ lui $v1, %hi(gBattleStatus) -/* 724EBC 802A11DC 2463C070 */ addiu $v1, $v1, %lo(gBattleStatus) -/* 724EC0 802A11E0 AFBF0014 */ sw $ra, 0x14($sp) -/* 724EC4 802A11E4 AFB00010 */ sw $s0, 0x10($sp) -/* 724EC8 802A11E8 8462017A */ lh $v0, 0x17a($v1) -/* 724ECC 802A11EC 8C6400D8 */ lw $a0, 0xd8($v1) -/* 724ED0 802A11F0 00021140 */ sll $v0, $v0, 5 -/* 724ED4 802A11F4 3C108008 */ lui $s0, %hi(gItemTable+0xC) -/* 724ED8 802A11F8 02028021 */ addu $s0, $s0, $v0 -/* 724EDC 802A11FC 861078EC */ lh $s0, %lo(gItemTable+0xC)($s0) -/* 724EE0 802A1200 0C099CAB */ jal heroes_is_ability_active -/* 724EE4 802A1204 2405001D */ addiu $a1, $zero, 0x1d -/* 724EE8 802A1208 10400007 */ beqz $v0, .L802A1228 -/* 724EEC 802A120C 00000000 */ nop -/* 724EF0 802A1210 1A000005 */ blez $s0, .L802A1228 -/* 724EF4 802A1214 00000000 */ nop -/* 724EF8 802A1218 3C04802A */ lui $a0, %hi(D_802A2280) -/* 724EFC 802A121C 8C842280 */ lw $a0, %lo(D_802A2280)($a0) -/* 724F00 802A1220 0C05123D */ jal free_icon -/* 724F04 802A1224 00000000 */ nop -.L802A1228: -/* 724F08 802A1228 8FBF0014 */ lw $ra, 0x14($sp) -/* 724F0C 802A122C 8FB00010 */ lw $s0, 0x10($sp) -/* 724F10 802A1230 24020002 */ addiu $v0, $zero, 2 -/* 724F14 802A1234 03E00008 */ jr $ra -/* 724F18 802A1238 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/code_724CE0/func_802A123C_724F1C.s b/ver/us/asm/nonmatchings/code_724CE0/func_802A123C_724F1C.s deleted file mode 100644 index bc9b427a74..0000000000 --- a/ver/us/asm/nonmatchings/code_724CE0/func_802A123C_724F1C.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A123C_724F1C -/* 724F1C 802A123C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 724F20 802A1240 AFB10014 */ sw $s1, 0x14($sp) -/* 724F24 802A1244 0080882D */ daddu $s1, $a0, $zero -/* 724F28 802A1248 AFBF0020 */ sw $ra, 0x20($sp) -/* 724F2C 802A124C AFB3001C */ sw $s3, 0x1c($sp) -/* 724F30 802A1250 AFB20018 */ sw $s2, 0x18($sp) -/* 724F34 802A1254 AFB00010 */ sw $s0, 0x10($sp) -/* 724F38 802A1258 8E30000C */ lw $s0, 0xc($s1) -/* 724F3C 802A125C 8E050000 */ lw $a1, ($s0) -/* 724F40 802A1260 0C0B1EAF */ jal get_variable -/* 724F44 802A1264 26100004 */ addiu $s0, $s0, 4 -/* 724F48 802A1268 8E050000 */ lw $a1, ($s0) -/* 724F4C 802A126C 26100004 */ addiu $s0, $s0, 4 -/* 724F50 802A1270 0220202D */ daddu $a0, $s1, $zero -/* 724F54 802A1274 0C0B1EAF */ jal get_variable -/* 724F58 802A1278 0040982D */ daddu $s3, $v0, $zero -/* 724F5C 802A127C 0220202D */ daddu $a0, $s1, $zero -/* 724F60 802A1280 8E050000 */ lw $a1, ($s0) -/* 724F64 802A1284 0C0B1EAF */ jal get_variable -/* 724F68 802A1288 0040902D */ daddu $s2, $v0, $zero -/* 724F6C 802A128C 8E2400BC */ lw $a0, 0xbc($s1) -/* 724F70 802A1290 0C04C3D6 */ jal get_item_entity -/* 724F74 802A1294 0040802D */ daddu $s0, $v0, $zero -/* 724F78 802A1298 0040182D */ daddu $v1, $v0, $zero -/* 724F7C 802A129C 44930000 */ mtc1 $s3, $f0 -/* 724F80 802A12A0 00000000 */ nop -/* 724F84 802A12A4 46800020 */ cvt.s.w $f0, $f0 -/* 724F88 802A12A8 E4600008 */ swc1 $f0, 8($v1) -/* 724F8C 802A12AC 44920000 */ mtc1 $s2, $f0 -/* 724F90 802A12B0 00000000 */ nop -/* 724F94 802A12B4 46800020 */ cvt.s.w $f0, $f0 -/* 724F98 802A12B8 E460000C */ swc1 $f0, 0xc($v1) -/* 724F9C 802A12BC 44900000 */ mtc1 $s0, $f0 -/* 724FA0 802A12C0 00000000 */ nop -/* 724FA4 802A12C4 46800020 */ cvt.s.w $f0, $f0 -/* 724FA8 802A12C8 E4600010 */ swc1 $f0, 0x10($v1) -/* 724FAC 802A12CC 8FBF0020 */ lw $ra, 0x20($sp) -/* 724FB0 802A12D0 8FB3001C */ lw $s3, 0x1c($sp) -/* 724FB4 802A12D4 8FB20018 */ lw $s2, 0x18($sp) -/* 724FB8 802A12D8 8FB10014 */ lw $s1, 0x14($sp) -/* 724FBC 802A12DC 8FB00010 */ lw $s0, 0x10($sp) -/* 724FC0 802A12E0 24020002 */ addiu $v0, $zero, 2 -/* 724FC4 802A12E4 03E00008 */ jr $ra -/* 724FC8 802A12E8 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/code_724CE0/func_802A12EC_724FCC.s b/ver/us/asm/nonmatchings/code_724CE0/func_802A12EC_724FCC.s deleted file mode 100644 index 63bbdbcd4d..0000000000 --- a/ver/us/asm/nonmatchings/code_724CE0/func_802A12EC_724FCC.s +++ /dev/null @@ -1,43 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A12EC_724FCC -/* 724FCC 802A12EC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 724FD0 802A12F0 AFB00010 */ sw $s0, 0x10($sp) -/* 724FD4 802A12F4 3C10800E */ lui $s0, %hi(gBattleStatus+0xDC) -/* 724FD8 802A12F8 8E10C14C */ lw $s0, %lo(gBattleStatus+0xDC)($s0) -/* 724FDC 802A12FC AFBF0014 */ sw $ra, 0x14($sp) -/* 724FE0 802A1300 82020217 */ lb $v0, 0x217($s0) -/* 724FE4 802A1304 8C85000C */ lw $a1, 0xc($a0) -/* 724FE8 802A1308 10400017 */ beqz $v0, .L802A1368 -/* 724FEC 802A130C 24020002 */ addiu $v0, $zero, 2 -/* 724FF0 802A1310 8CA50000 */ lw $a1, ($a1) -/* 724FF4 802A1314 0C0B1EAF */ jal get_variable -/* 724FF8 802A1318 00000000 */ nop -/* 724FFC 802A131C 92030217 */ lbu $v1, 0x217($s0) -/* 725000 802A1320 00621823 */ subu $v1, $v1, $v0 -/* 725004 802A1324 A2030217 */ sb $v1, 0x217($s0) -/* 725008 802A1328 00031E00 */ sll $v1, $v1, 0x18 -/* 72500C 802A132C 04620001 */ bltzl $v1, .L802A1334 -/* 725010 802A1330 A2000217 */ sb $zero, 0x217($s0) -.L802A1334: -/* 725014 802A1334 82030217 */ lb $v1, 0x217($s0) -/* 725018 802A1338 18600005 */ blez $v1, .L802A1350 -/* 72501C 802A133C 24040034 */ addiu $a0, $zero, 0x34 -/* 725020 802A1340 8E020440 */ lw $v0, 0x440($s0) -/* 725024 802A1344 8C42000C */ lw $v0, 0xc($v0) -/* 725028 802A1348 080A84D9 */ j .L802A1364 -/* 72502C 802A134C AC43003C */ sw $v1, 0x3c($v0) -.L802A1350: -/* 725030 802A1350 0C09F7A0 */ jal dispatch_event_partner -/* 725034 802A1354 A2000216 */ sb $zero, 0x216($s0) -/* 725038 802A1358 8E020440 */ lw $v0, 0x440($s0) -/* 72503C 802A135C 8C42000C */ lw $v0, 0xc($v0) -/* 725040 802A1360 AC40003C */ sw $zero, 0x3c($v0) -.L802A1364: -/* 725044 802A1364 24020002 */ addiu $v0, $zero, 2 -.L802A1368: -/* 725048 802A1368 8FBF0014 */ lw $ra, 0x14($sp) -/* 72504C 802A136C 8FB00010 */ lw $s0, 0x10($sp) -/* 725050 802A1370 03E00008 */ jr $ra -/* 725054 802A1374 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/code_724CE0/func_802A1378_725058.s b/ver/us/asm/nonmatchings/code_724CE0/func_802A1378_725058.s deleted file mode 100644 index 511e8ebccd..0000000000 --- a/ver/us/asm/nonmatchings/code_724CE0/func_802A1378_725058.s +++ /dev/null @@ -1,47 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1378_725058 -/* 725058 802A1378 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 72505C 802A137C AFBF0018 */ sw $ra, 0x18($sp) -/* 725060 802A1380 AFB10014 */ sw $s1, 0x14($sp) -/* 725064 802A1384 AFB00010 */ sw $s0, 0x10($sp) -/* 725068 802A1388 8C82000C */ lw $v0, 0xc($a0) -/* 72506C 802A138C 0C0B1EAF */ jal get_variable -/* 725070 802A1390 8C450000 */ lw $a1, ($v0) -/* 725074 802A1394 0C09A75B */ jal get_actor -/* 725078 802A1398 0040202D */ daddu $a0, $v0, $zero -/* 72507C 802A139C 0040802D */ daddu $s0, $v0, $zero -/* 725080 802A13A0 96020192 */ lhu $v0, 0x192($s0) -/* 725084 802A13A4 82030210 */ lb $v1, 0x210($s0) -/* 725088 802A13A8 10600005 */ beqz $v1, .L802A13C0 -/* 72508C 802A13AC 30510700 */ andi $s1, $v0, 0x700 -/* 725090 802A13B0 86040436 */ lh $a0, 0x436($s0) -/* 725094 802A13B4 A2000211 */ sb $zero, 0x211($s0) -/* 725098 802A13B8 0C011E26 */ jal func_80047898 -/* 72509C 802A13BC A2000210 */ sb $zero, 0x210($s0) -.L802A13C0: -/* 7250A0 802A13C0 82020216 */ lb $v0, 0x216($s0) -/* 7250A4 802A13C4 1040000C */ beqz $v0, .L802A13F8 -/* 7250A8 802A13C8 00000000 */ nop -/* 7250AC 802A13CC A2000217 */ sb $zero, 0x217($s0) -/* 7250B0 802A13D0 12200006 */ beqz $s1, .L802A13EC -/* 7250B4 802A13D4 A2000216 */ sb $zero, 0x216($s0) -/* 7250B8 802A13D8 24020100 */ addiu $v0, $zero, 0x100 -/* 7250BC 802A13DC 16220003 */ bne $s1, $v0, .L802A13EC -/* 7250C0 802A13E0 00000000 */ nop -/* 7250C4 802A13E4 0C09F7A0 */ jal dispatch_event_partner -/* 7250C8 802A13E8 24040031 */ addiu $a0, $zero, 0x31 -.L802A13EC: -/* 7250CC 802A13EC 8E020440 */ lw $v0, 0x440($s0) -/* 7250D0 802A13F0 8C42000C */ lw $v0, 0xc($v0) -/* 7250D4 802A13F4 AC40003C */ sw $zero, 0x3c($v0) -.L802A13F8: -/* 7250D8 802A13F8 0C099DDF */ jal func_8026777C -/* 7250DC 802A13FC 00000000 */ nop -/* 7250E0 802A1400 8FBF0018 */ lw $ra, 0x18($sp) -/* 7250E4 802A1404 8FB10014 */ lw $s1, 0x14($sp) -/* 7250E8 802A1408 8FB00010 */ lw $s0, 0x10($sp) -/* 7250EC 802A140C 24020002 */ addiu $v0, $zero, 2 -/* 7250F0 802A1410 03E00008 */ jr $ra -/* 7250F4 802A1414 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/code_724CE0/func_802A1418_7250F8.s b/ver/us/asm/nonmatchings/code_724CE0/func_802A1418_7250F8.s deleted file mode 100644 index a2011bd42b..0000000000 --- a/ver/us/asm/nonmatchings/code_724CE0/func_802A1418_7250F8.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1418_7250F8 -/* 7250F8 802A1418 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 7250FC 802A141C AFB1001C */ sw $s1, 0x1c($sp) -/* 725100 802A1420 0080882D */ daddu $s1, $a0, $zero -/* 725104 802A1424 AFBF0028 */ sw $ra, 0x28($sp) -/* 725108 802A1428 AFB30024 */ sw $s3, 0x24($sp) -/* 72510C 802A142C AFB20020 */ sw $s2, 0x20($sp) -/* 725110 802A1430 AFB00018 */ sw $s0, 0x18($sp) -/* 725114 802A1434 8E30000C */ lw $s0, 0xc($s1) -/* 725118 802A1438 8E050000 */ lw $a1, ($s0) -/* 72511C 802A143C 0C0B1EAF */ jal get_variable -/* 725120 802A1440 26100004 */ addiu $s0, $s0, 4 -/* 725124 802A1444 8E050000 */ lw $a1, ($s0) -/* 725128 802A1448 26100004 */ addiu $s0, $s0, 4 -/* 72512C 802A144C 0220202D */ daddu $a0, $s1, $zero -/* 725130 802A1450 0C0B1EAF */ jal get_variable -/* 725134 802A1454 0040982D */ daddu $s3, $v0, $zero -/* 725138 802A1458 8E050000 */ lw $a1, ($s0) -/* 72513C 802A145C 26100004 */ addiu $s0, $s0, 4 -/* 725140 802A1460 0220202D */ daddu $a0, $s1, $zero -/* 725144 802A1464 0C0B1EAF */ jal get_variable -/* 725148 802A1468 0040902D */ daddu $s2, $v0, $zero -/* 72514C 802A146C 0220202D */ daddu $a0, $s1, $zero -/* 725150 802A1470 8E050000 */ lw $a1, ($s0) -/* 725154 802A1474 0C0B1EAF */ jal get_variable -/* 725158 802A1478 0040802D */ daddu $s0, $v0, $zero -/* 72515C 802A147C 44930000 */ mtc1 $s3, $f0 -/* 725160 802A1480 00000000 */ nop -/* 725164 802A1484 46800020 */ cvt.s.w $f0, $f0 -/* 725168 802A1488 44050000 */ mfc1 $a1, $f0 -/* 72516C 802A148C 44920000 */ mtc1 $s2, $f0 -/* 725170 802A1490 00000000 */ nop -/* 725174 802A1494 46800020 */ cvt.s.w $f0, $f0 -/* 725178 802A1498 44060000 */ mfc1 $a2, $f0 -/* 72517C 802A149C 44900000 */ mtc1 $s0, $f0 -/* 725180 802A14A0 00000000 */ nop -/* 725184 802A14A4 46800020 */ cvt.s.w $f0, $f0 -/* 725188 802A14A8 44070000 */ mfc1 $a3, $f0 -/* 72518C 802A14AC 24040001 */ addiu $a0, $zero, 1 -/* 725190 802A14B0 0C01C424 */ jal func_80071090 -/* 725194 802A14B4 AFA20010 */ sw $v0, 0x10($sp) -/* 725198 802A14B8 8FBF0028 */ lw $ra, 0x28($sp) -/* 72519C 802A14BC 8FB30024 */ lw $s3, 0x24($sp) -/* 7251A0 802A14C0 8FB20020 */ lw $s2, 0x20($sp) -/* 7251A4 802A14C4 8FB1001C */ lw $s1, 0x1c($sp) -/* 7251A8 802A14C8 8FB00018 */ lw $s0, 0x18($sp) -/* 7251AC 802A14CC 24020002 */ addiu $v0, $zero, 2 -/* 7251B0 802A14D0 03E00008 */ jr $ra -/* 7251B4 802A14D4 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/code_724CE0/func_802A14D8_7251B8.s b/ver/us/asm/nonmatchings/code_724CE0/func_802A14D8_7251B8.s deleted file mode 100644 index d61b02c6c3..0000000000 --- a/ver/us/asm/nonmatchings/code_724CE0/func_802A14D8_7251B8.s +++ /dev/null @@ -1,27 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A14D8_7251B8 -/* 7251B8 802A14D8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 7251BC 802A14DC AFBF0014 */ sw $ra, 0x14($sp) -/* 7251C0 802A14E0 AFB00010 */ sw $s0, 0x10($sp) -/* 7251C4 802A14E4 8C82000C */ lw $v0, 0xc($a0) -/* 7251C8 802A14E8 0C0B1EAF */ jal get_variable -/* 7251CC 802A14EC 8C450000 */ lw $a1, ($v0) -/* 7251D0 802A14F0 3C038011 */ lui $v1, %hi(gPlayerData) -/* 7251D4 802A14F4 2463F290 */ addiu $v1, $v1, %lo(gPlayerData) -/* 7251D8 802A14F8 80640005 */ lb $a0, 5($v1) -/* 7251DC 802A14FC 80650006 */ lb $a1, 6($v1) -/* 7251E0 802A1500 00822021 */ addu $a0, $a0, $v0 -/* 7251E4 802A1504 00A4102A */ slt $v0, $a1, $a0 -/* 7251E8 802A1508 10400002 */ beqz $v0, .L802A1514 -/* 7251EC 802A150C 0060802D */ daddu $s0, $v1, $zero -/* 7251F0 802A1510 00A0202D */ daddu $a0, $a1, $zero -.L802A1514: -/* 7251F4 802A1514 A2040005 */ sb $a0, 5($s0) -/* 7251F8 802A1518 8FBF0014 */ lw $ra, 0x14($sp) -/* 7251FC 802A151C 8FB00010 */ lw $s0, 0x10($sp) -/* 725200 802A1520 24020002 */ addiu $v0, $zero, 2 -/* 725204 802A1524 03E00008 */ jr $ra -/* 725208 802A1528 27BD0018 */ addiu $sp, $sp, 0x18 -/* 72520C 802A152C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/code_7305A0/func_802A1000_7305A0.s b/ver/us/asm/nonmatchings/code_7305A0/func_802A1000_7305A0.s deleted file mode 100644 index 8fdea879b4..0000000000 --- a/ver/us/asm/nonmatchings/code_7305A0/func_802A1000_7305A0.s +++ /dev/null @@ -1,125 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1000_7305A0 -/* 7305A0 802A1000 27BDFF98 */ addiu $sp, $sp, -0x68 -/* 7305A4 802A1004 AFB50044 */ sw $s5, 0x44($sp) -/* 7305A8 802A1008 0080A82D */ daddu $s5, $a0, $zero -/* 7305AC 802A100C AFB10034 */ sw $s1, 0x34($sp) -/* 7305B0 802A1010 0000882D */ daddu $s1, $zero, $zero -/* 7305B4 802A1014 2405001D */ addiu $a1, $zero, 0x1d -/* 7305B8 802A1018 F7B40050 */ sdc1 $f20, 0x50($sp) -/* 7305BC 802A101C 4480A000 */ mtc1 $zero, $f20 -/* 7305C0 802A1020 3C02800E */ lui $v0, %hi(gBattleStatus) -/* 7305C4 802A1024 2442C070 */ addiu $v0, $v0, %lo(gBattleStatus) -/* 7305C8 802A1028 AFBF0048 */ sw $ra, 0x48($sp) -/* 7305CC 802A102C AFB40040 */ sw $s4, 0x40($sp) -/* 7305D0 802A1030 AFB3003C */ sw $s3, 0x3c($sp) -/* 7305D4 802A1034 AFB20038 */ sw $s2, 0x38($sp) -/* 7305D8 802A1038 AFB00030 */ sw $s0, 0x30($sp) -/* 7305DC 802A103C F7B80060 */ sdc1 $f24, 0x60($sp) -/* 7305E0 802A1040 F7B60058 */ sdc1 $f22, 0x58($sp) -/* 7305E4 802A1044 8C5300D8 */ lw $s3, 0xd8($v0) -/* 7305E8 802A1048 8442017A */ lh $v0, 0x17a($v0) -/* 7305EC 802A104C 0260202D */ daddu $a0, $s3, $zero -/* 7305F0 802A1050 00021140 */ sll $v0, $v0, 5 -/* 7305F4 802A1054 3C128008 */ lui $s2, %hi(gItemTable+0xC) -/* 7305F8 802A1058 02429021 */ addu $s2, $s2, $v0 -/* 7305FC 802A105C 865278EC */ lh $s2, %lo(gItemTable+0xC)($s2) -/* 730600 802A1060 92620191 */ lbu $v0, 0x191($s3) -/* 730604 802A1064 C6620148 */ lwc1 $f2, 0x148($s3) -/* 730608 802A1068 44820000 */ mtc1 $v0, $f0 -/* 73060C 802A106C 00000000 */ nop -/* 730610 802A1070 46800020 */ cvt.s.w $f0, $f0 -/* 730614 802A1074 0C099CAB */ jal heroes_is_ability_active -/* 730618 802A1078 46001580 */ add.s $f22, $f2, $f0 -/* 73061C 802A107C 50400048 */ beql $v0, $zero, .L802A11A0 -/* 730620 802A1080 AEB10084 */ sw $s1, 0x84($s5) -/* 730624 802A1084 1A400045 */ blez $s2, .L802A119C -/* 730628 802A1088 3C0451EB */ lui $a0, 0x51eb -/* 73062C 802A108C 3484851F */ ori $a0, $a0, 0x851f -/* 730630 802A1090 00121880 */ sll $v1, $s2, 2 -/* 730634 802A1094 00721821 */ addu $v1, $v1, $s2 -/* 730638 802A1098 00031100 */ sll $v0, $v1, 4 -/* 73063C 802A109C 00431023 */ subu $v0, $v0, $v1 -/* 730640 802A10A0 24420063 */ addiu $v0, $v0, 0x63 -/* 730644 802A10A4 00440018 */ mult $v0, $a0 -/* 730648 802A10A8 000217C3 */ sra $v0, $v0, 0x1f -/* 73064C 802A10AC 00004010 */ mfhi $t0 -/* 730650 802A10B0 00081943 */ sra $v1, $t0, 5 -/* 730654 802A10B4 00629023 */ subu $s2, $v1, $v0 -/* 730658 802A10B8 0232102A */ slt $v0, $s1, $s2 -/* 73065C 802A10BC 10400019 */ beqz $v0, .L802A1124 -/* 730660 802A10C0 0220802D */ daddu $s0, $s1, $zero -/* 730664 802A10C4 24140017 */ addiu $s4, $zero, 0x17 -/* 730668 802A10C8 3C0141F0 */ lui $at, 0x41f0 -/* 73066C 802A10CC 4481C000 */ mtc1 $at, $f24 -/* 730670 802A10D0 24110001 */ addiu $s1, $zero, 1 -.L802A10D4: -/* 730674 802A10D4 C6600144 */ lwc1 $f0, 0x144($s3) -/* 730678 802A10D8 C662014C */ lwc1 $f2, 0x14c($s3) -/* 73067C 802A10DC 4600A10D */ trunc.w.s $f4, $f20 -/* 730680 802A10E0 E7A40018 */ swc1 $f4, 0x18($sp) -/* 730684 802A10E4 24040157 */ addiu $a0, $zero, 0x157 -/* 730688 802A10E8 AFB10014 */ sw $s1, 0x14($sp) -/* 73068C 802A10EC 26310003 */ addiu $s1, $s1, 3 -/* 730690 802A10F0 26100001 */ addiu $s0, $s0, 1 -/* 730694 802A10F4 4406B000 */ mfc1 $a2, $f22 -/* 730698 802A10F8 44050000 */ mfc1 $a1, $f0 -/* 73069C 802A10FC 44071000 */ mfc1 $a3, $f2 -/* 7306A0 802A1100 4618A500 */ add.s $f20, $f20, $f24 -/* 7306A4 802A1104 AFB40010 */ sw $s4, 0x10($sp) -/* 7306A8 802A1108 0C04C4FD */ jal make_item_entity -/* 7306AC 802A110C AFA0001C */ sw $zero, 0x1c($sp) -/* 7306B0 802A1110 0C03A830 */ jal add_coins -/* 7306B4 802A1114 24040001 */ addiu $a0, $zero, 1 -/* 7306B8 802A1118 0212102A */ slt $v0, $s0, $s2 -/* 7306BC 802A111C 1440FFED */ bnez $v0, .L802A10D4 -/* 7306C0 802A1120 00000000 */ nop -.L802A1124: -/* 7306C4 802A1124 00101040 */ sll $v0, $s0, 1 -/* 7306C8 802A1128 00501021 */ addu $v0, $v0, $s0 -/* 7306CC 802A112C 2451001E */ addiu $s1, $v0, 0x1e -/* 7306D0 802A1130 C6600144 */ lwc1 $f0, 0x144($s3) -/* 7306D4 802A1134 C6760148 */ lwc1 $f22, 0x148($s3) -/* 7306D8 802A1138 C662014C */ lwc1 $f2, 0x14c($s3) -/* 7306DC 802A113C 3C048007 */ lui $a0, %hi(gCurrentCameraID) -/* 7306E0 802A1140 8C847410 */ lw $a0, %lo(gCurrentCameraID)($a0) -/* 7306E4 802A1144 27A20020 */ addiu $v0, $sp, 0x20 -/* 7306E8 802A1148 AFA20010 */ sw $v0, 0x10($sp) -/* 7306EC 802A114C 27A20024 */ addiu $v0, $sp, 0x24 -/* 7306F0 802A1150 AFA20014 */ sw $v0, 0x14($sp) -/* 7306F4 802A1154 44050000 */ mfc1 $a1, $f0 -/* 7306F8 802A1158 4406B000 */ mfc1 $a2, $f22 -/* 7306FC 802A115C 44071000 */ mfc1 $a3, $f2 -/* 730700 802A1160 27A20028 */ addiu $v0, $sp, 0x28 -/* 730704 802A1164 0C00B94E */ jal get_screen_coords -/* 730708 802A1168 AFA20018 */ sw $v0, 0x18($sp) -/* 73070C 802A116C 3C048011 */ lui $a0, %hi(D_80108A64) -/* 730710 802A1170 24848A64 */ addiu $a0, $a0, %lo(D_80108A64) -/* 730714 802A1174 0C050529 */ jal create_icon -/* 730718 802A1178 00000000 */ nop -/* 73071C 802A117C 8FA50020 */ lw $a1, 0x20($sp) -/* 730720 802A1180 8FA60024 */ lw $a2, 0x24($sp) -/* 730724 802A1184 0040202D */ daddu $a0, $v0, $zero -/* 730728 802A1188 3C01802A */ lui $at, %hi(D_802A1D60) -/* 73072C 802A118C AC241D60 */ sw $a0, %lo(D_802A1D60)($at) -/* 730730 802A1190 24A50024 */ addiu $a1, $a1, 0x24 -/* 730734 802A1194 0C051261 */ jal set_icon_render_pos -/* 730738 802A1198 24C6FFC1 */ addiu $a2, $a2, -0x3f -.L802A119C: -/* 73073C 802A119C AEB10084 */ sw $s1, 0x84($s5) -.L802A11A0: -/* 730740 802A11A0 8FBF0048 */ lw $ra, 0x48($sp) -/* 730744 802A11A4 8FB50044 */ lw $s5, 0x44($sp) -/* 730748 802A11A8 8FB40040 */ lw $s4, 0x40($sp) -/* 73074C 802A11AC 8FB3003C */ lw $s3, 0x3c($sp) -/* 730750 802A11B0 8FB20038 */ lw $s2, 0x38($sp) -/* 730754 802A11B4 8FB10034 */ lw $s1, 0x34($sp) -/* 730758 802A11B8 8FB00030 */ lw $s0, 0x30($sp) -/* 73075C 802A11BC D7B80060 */ ldc1 $f24, 0x60($sp) -/* 730760 802A11C0 D7B60058 */ ldc1 $f22, 0x58($sp) -/* 730764 802A11C4 D7B40050 */ ldc1 $f20, 0x50($sp) -/* 730768 802A11C8 24020002 */ addiu $v0, $zero, 2 -/* 73076C 802A11CC 03E00008 */ jr $ra -/* 730770 802A11D0 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/ver/us/asm/nonmatchings/code_7305A0/func_802A11D4_730774.s b/ver/us/asm/nonmatchings/code_7305A0/func_802A11D4_730774.s deleted file mode 100644 index 627054344c..0000000000 --- a/ver/us/asm/nonmatchings/code_7305A0/func_802A11D4_730774.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A11D4_730774 -/* 730774 802A11D4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 730778 802A11D8 3C03800E */ lui $v1, %hi(gBattleStatus) -/* 73077C 802A11DC 2463C070 */ addiu $v1, $v1, %lo(gBattleStatus) -/* 730780 802A11E0 AFBF0014 */ sw $ra, 0x14($sp) -/* 730784 802A11E4 AFB00010 */ sw $s0, 0x10($sp) -/* 730788 802A11E8 8462017A */ lh $v0, 0x17a($v1) -/* 73078C 802A11EC 8C6400D8 */ lw $a0, 0xd8($v1) -/* 730790 802A11F0 00021140 */ sll $v0, $v0, 5 -/* 730794 802A11F4 3C108008 */ lui $s0, %hi(gItemTable+0xC) -/* 730798 802A11F8 02028021 */ addu $s0, $s0, $v0 -/* 73079C 802A11FC 861078EC */ lh $s0, %lo(gItemTable+0xC)($s0) -/* 7307A0 802A1200 0C099CAB */ jal heroes_is_ability_active -/* 7307A4 802A1204 2405001D */ addiu $a1, $zero, 0x1d -/* 7307A8 802A1208 10400007 */ beqz $v0, .L802A1228 -/* 7307AC 802A120C 00000000 */ nop -/* 7307B0 802A1210 1A000005 */ blez $s0, .L802A1228 -/* 7307B4 802A1214 00000000 */ nop -/* 7307B8 802A1218 3C04802A */ lui $a0, %hi(D_802A1D60) -/* 7307BC 802A121C 8C841D60 */ lw $a0, %lo(D_802A1D60)($a0) -/* 7307C0 802A1220 0C05123D */ jal free_icon -/* 7307C4 802A1224 00000000 */ nop -.L802A1228: -/* 7307C8 802A1228 8FBF0014 */ lw $ra, 0x14($sp) -/* 7307CC 802A122C 8FB00010 */ lw $s0, 0x10($sp) -/* 7307D0 802A1230 24020002 */ addiu $v0, $zero, 2 -/* 7307D4 802A1234 03E00008 */ jr $ra -/* 7307D8 802A1238 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/code_7305A0/func_802A123C_7307DC.s b/ver/us/asm/nonmatchings/code_7305A0/func_802A123C_7307DC.s deleted file mode 100644 index 713d3321cf..0000000000 --- a/ver/us/asm/nonmatchings/code_7305A0/func_802A123C_7307DC.s +++ /dev/null @@ -1,20 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A123C_7307DC -/* 7307DC 802A123C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 7307E0 802A1240 0080102D */ daddu $v0, $a0, $zero -/* 7307E4 802A1244 AFB00010 */ sw $s0, 0x10($sp) -/* 7307E8 802A1248 3C10800E */ lui $s0, %hi(gBattleStatus+0xD8) -/* 7307EC 802A124C 8E10C148 */ lw $s0, %lo(gBattleStatus+0xD8)($s0) -/* 7307F0 802A1250 2405000B */ addiu $a1, $zero, 0xb -/* 7307F4 802A1254 AFBF0014 */ sw $ra, 0x14($sp) -/* 7307F8 802A1258 8C460084 */ lw $a2, 0x84($v0) -/* 7307FC 802A125C 0C0997D0 */ jal inflict_status -/* 730800 802A1260 0200202D */ daddu $a0, $s0, $zero -/* 730804 802A1264 A200021C */ sb $zero, 0x21c($s0) -/* 730808 802A1268 8FBF0014 */ lw $ra, 0x14($sp) -/* 73080C 802A126C 8FB00010 */ lw $s0, 0x10($sp) -/* 730810 802A1270 24020002 */ addiu $v0, $zero, 2 -/* 730814 802A1274 03E00008 */ jr $ra -/* 730818 802A1278 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/code_7305A0/func_802A127C_73081C.s b/ver/us/asm/nonmatchings/code_7305A0/func_802A127C_73081C.s deleted file mode 100644 index 6f0fc5a802..0000000000 --- a/ver/us/asm/nonmatchings/code_7305A0/func_802A127C_73081C.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A127C_73081C -/* 73081C 802A127C 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 730820 802A1280 AFB1001C */ sw $s1, 0x1c($sp) -/* 730824 802A1284 0080882D */ daddu $s1, $a0, $zero -/* 730828 802A1288 AFBF0028 */ sw $ra, 0x28($sp) -/* 73082C 802A128C AFB30024 */ sw $s3, 0x24($sp) -/* 730830 802A1290 AFB20020 */ sw $s2, 0x20($sp) -/* 730834 802A1294 AFB00018 */ sw $s0, 0x18($sp) -/* 730838 802A1298 8E30000C */ lw $s0, 0xc($s1) -/* 73083C 802A129C 8E050000 */ lw $a1, ($s0) -/* 730840 802A12A0 0C0B1EAF */ jal get_variable -/* 730844 802A12A4 26100004 */ addiu $s0, $s0, 4 -/* 730848 802A12A8 8E050000 */ lw $a1, ($s0) -/* 73084C 802A12AC 26100004 */ addiu $s0, $s0, 4 -/* 730850 802A12B0 0220202D */ daddu $a0, $s1, $zero -/* 730854 802A12B4 0C0B1EAF */ jal get_variable -/* 730858 802A12B8 0040982D */ daddu $s3, $v0, $zero -/* 73085C 802A12BC 8E050000 */ lw $a1, ($s0) -/* 730860 802A12C0 26100004 */ addiu $s0, $s0, 4 -/* 730864 802A12C4 0220202D */ daddu $a0, $s1, $zero -/* 730868 802A12C8 0C0B1EAF */ jal get_variable -/* 73086C 802A12CC 0040902D */ daddu $s2, $v0, $zero -/* 730870 802A12D0 0220202D */ daddu $a0, $s1, $zero -/* 730874 802A12D4 8E050000 */ lw $a1, ($s0) -/* 730878 802A12D8 0C0B1EAF */ jal get_variable -/* 73087C 802A12DC 0040802D */ daddu $s0, $v0, $zero -/* 730880 802A12E0 44930000 */ mtc1 $s3, $f0 -/* 730884 802A12E4 00000000 */ nop -/* 730888 802A12E8 46800020 */ cvt.s.w $f0, $f0 -/* 73088C 802A12EC 44050000 */ mfc1 $a1, $f0 -/* 730890 802A12F0 44920000 */ mtc1 $s2, $f0 -/* 730894 802A12F4 00000000 */ nop -/* 730898 802A12F8 46800020 */ cvt.s.w $f0, $f0 -/* 73089C 802A12FC 44060000 */ mfc1 $a2, $f0 -/* 7308A0 802A1300 44900000 */ mtc1 $s0, $f0 -/* 7308A4 802A1304 00000000 */ nop -/* 7308A8 802A1308 46800020 */ cvt.s.w $f0, $f0 -/* 7308AC 802A130C 44070000 */ mfc1 $a3, $f0 -/* 7308B0 802A1310 0000202D */ daddu $a0, $zero, $zero -/* 7308B4 802A1314 0C01C424 */ jal func_80071090 -/* 7308B8 802A1318 AFA20010 */ sw $v0, 0x10($sp) -/* 7308BC 802A131C 8FBF0028 */ lw $ra, 0x28($sp) -/* 7308C0 802A1320 8FB30024 */ lw $s3, 0x24($sp) -/* 7308C4 802A1324 8FB20020 */ lw $s2, 0x20($sp) -/* 7308C8 802A1328 8FB1001C */ lw $s1, 0x1c($sp) -/* 7308CC 802A132C 8FB00018 */ lw $s0, 0x18($sp) -/* 7308D0 802A1330 24020002 */ addiu $v0, $zero, 2 -/* 7308D4 802A1334 03E00008 */ jr $ra -/* 7308D8 802A1338 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/code_7305A0/func_802A133C_7308DC.s b/ver/us/asm/nonmatchings/code_7305A0/func_802A133C_7308DC.s deleted file mode 100644 index 522d37e91d..0000000000 --- a/ver/us/asm/nonmatchings/code_7305A0/func_802A133C_7308DC.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A133C_7308DC -/* 7308DC 802A133C 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 7308E0 802A1340 AFB1001C */ sw $s1, 0x1c($sp) -/* 7308E4 802A1344 0080882D */ daddu $s1, $a0, $zero -/* 7308E8 802A1348 AFBF0028 */ sw $ra, 0x28($sp) -/* 7308EC 802A134C AFB30024 */ sw $s3, 0x24($sp) -/* 7308F0 802A1350 AFB20020 */ sw $s2, 0x20($sp) -/* 7308F4 802A1354 AFB00018 */ sw $s0, 0x18($sp) -/* 7308F8 802A1358 8E30000C */ lw $s0, 0xc($s1) -/* 7308FC 802A135C 8E050000 */ lw $a1, ($s0) -/* 730900 802A1360 0C0B1EAF */ jal get_variable -/* 730904 802A1364 26100004 */ addiu $s0, $s0, 4 -/* 730908 802A1368 8E050000 */ lw $a1, ($s0) -/* 73090C 802A136C 26100004 */ addiu $s0, $s0, 4 -/* 730910 802A1370 0220202D */ daddu $a0, $s1, $zero -/* 730914 802A1374 0C0B1EAF */ jal get_variable -/* 730918 802A1378 0040982D */ daddu $s3, $v0, $zero -/* 73091C 802A137C 8E050000 */ lw $a1, ($s0) -/* 730920 802A1380 26100004 */ addiu $s0, $s0, 4 -/* 730924 802A1384 0220202D */ daddu $a0, $s1, $zero -/* 730928 802A1388 0C0B1EAF */ jal get_variable -/* 73092C 802A138C 0040902D */ daddu $s2, $v0, $zero -/* 730930 802A1390 0220202D */ daddu $a0, $s1, $zero -/* 730934 802A1394 8E050000 */ lw $a1, ($s0) -/* 730938 802A1398 0C0B1EAF */ jal get_variable -/* 73093C 802A139C 0040802D */ daddu $s0, $v0, $zero -/* 730940 802A13A0 44930000 */ mtc1 $s3, $f0 -/* 730944 802A13A4 00000000 */ nop -/* 730948 802A13A8 46800020 */ cvt.s.w $f0, $f0 -/* 73094C 802A13AC 44050000 */ mfc1 $a1, $f0 -/* 730950 802A13B0 44920000 */ mtc1 $s2, $f0 -/* 730954 802A13B4 00000000 */ nop -/* 730958 802A13B8 46800020 */ cvt.s.w $f0, $f0 -/* 73095C 802A13BC 44060000 */ mfc1 $a2, $f0 -/* 730960 802A13C0 44900000 */ mtc1 $s0, $f0 -/* 730964 802A13C4 00000000 */ nop -/* 730968 802A13C8 46800020 */ cvt.s.w $f0, $f0 -/* 73096C 802A13CC 44070000 */ mfc1 $a3, $f0 -/* 730970 802A13D0 24040001 */ addiu $a0, $zero, 1 -/* 730974 802A13D4 0C01C424 */ jal func_80071090 -/* 730978 802A13D8 AFA20010 */ sw $v0, 0x10($sp) -/* 73097C 802A13DC 8FBF0028 */ lw $ra, 0x28($sp) -/* 730980 802A13E0 8FB30024 */ lw $s3, 0x24($sp) -/* 730984 802A13E4 8FB20020 */ lw $s2, 0x20($sp) -/* 730988 802A13E8 8FB1001C */ lw $s1, 0x1c($sp) -/* 73098C 802A13EC 8FB00018 */ lw $s0, 0x18($sp) -/* 730990 802A13F0 24020002 */ addiu $v0, $zero, 2 -/* 730994 802A13F4 03E00008 */ jr $ra -/* 730998 802A13F8 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/code_7305A0/func_802A13FC_73099C.s b/ver/us/asm/nonmatchings/code_7305A0/func_802A13FC_73099C.s deleted file mode 100644 index fa3ad0eec3..0000000000 --- a/ver/us/asm/nonmatchings/code_7305A0/func_802A13FC_73099C.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A13FC_73099C -/* 73099C 802A13FC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 7309A0 802A1400 AFBF0014 */ sw $ra, 0x14($sp) -/* 7309A4 802A1404 AFB00010 */ sw $s0, 0x10($sp) -/* 7309A8 802A1408 8C82000C */ lw $v0, 0xc($a0) -/* 7309AC 802A140C 0C0B1EAF */ jal get_variable -/* 7309B0 802A1410 8C450000 */ lw $a1, ($v0) -/* 7309B4 802A1414 3C038011 */ lui $v1, %hi(gPlayerData) -/* 7309B8 802A1418 2463F290 */ addiu $v1, $v1, %lo(gPlayerData) -/* 7309BC 802A141C 80640002 */ lb $a0, 2($v1) -/* 7309C0 802A1420 80650003 */ lb $a1, 3($v1) -/* 7309C4 802A1424 00822021 */ addu $a0, $a0, $v0 -/* 7309C8 802A1428 00A4102A */ slt $v0, $a1, $a0 -/* 7309CC 802A142C 10400002 */ beqz $v0, .L802A1438 -/* 7309D0 802A1430 0060802D */ daddu $s0, $v1, $zero -/* 7309D4 802A1434 00A0202D */ daddu $a0, $a1, $zero -.L802A1438: -/* 7309D8 802A1438 A2040002 */ sb $a0, 2($s0) -/* 7309DC 802A143C 8FBF0014 */ lw $ra, 0x14($sp) -/* 7309E0 802A1440 8FB00010 */ lw $s0, 0x10($sp) -/* 7309E4 802A1444 24020002 */ addiu $v0, $zero, 2 -/* 7309E8 802A1448 03E00008 */ jr $ra -/* 7309EC 802A144C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/code_7305A0/func_802A1450_7309F0.s b/ver/us/asm/nonmatchings/code_7305A0/func_802A1450_7309F0.s deleted file mode 100644 index 452e0da1ca..0000000000 --- a/ver/us/asm/nonmatchings/code_7305A0/func_802A1450_7309F0.s +++ /dev/null @@ -1,24 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1450_7309F0 -/* 7309F0 802A1450 3C058011 */ lui $a1, %hi(gPlayerData) -/* 7309F4 802A1454 24A5F290 */ addiu $a1, $a1, %lo(gPlayerData) -/* 7309F8 802A1458 90A20002 */ lbu $v0, 2($a1) -/* 7309FC 802A145C 3C068009 */ lui $a2, %hi(gItemTable+0x199B) -/* 730A00 802A1460 90C6927B */ lbu $a2, %lo(gItemTable+0x199B)($a2) -/* 730A04 802A1464 80A30003 */ lb $v1, 3($a1) -/* 730A08 802A1468 00461021 */ addu $v0, $v0, $a2 -/* 730A0C 802A146C A0A20002 */ sb $v0, 2($a1) -/* 730A10 802A1470 00021600 */ sll $v0, $v0, 0x18 -/* 730A14 802A1474 00021603 */ sra $v0, $v0, 0x18 -/* 730A18 802A1478 0062182A */ slt $v1, $v1, $v0 -/* 730A1C 802A147C 90A20003 */ lbu $v0, 3($a1) -/* 730A20 802A1480 54600001 */ bnel $v1, $zero, .L802A1488 -/* 730A24 802A1484 A0A20002 */ sb $v0, 2($a1) -.L802A1488: -/* 730A28 802A1488 00061600 */ sll $v0, $a2, 0x18 -/* 730A2C 802A148C 00021603 */ sra $v0, $v0, 0x18 -/* 730A30 802A1490 AC820090 */ sw $v0, 0x90($a0) -/* 730A34 802A1494 03E00008 */ jr $ra -/* 730A38 802A1498 24020002 */ addiu $v0, $zero, 2 diff --git a/ver/us/asm/nonmatchings/code_7305A0/func_802A149C_730A3C.s b/ver/us/asm/nonmatchings/code_7305A0/func_802A149C_730A3C.s deleted file mode 100644 index d4a92147f9..0000000000 --- a/ver/us/asm/nonmatchings/code_7305A0/func_802A149C_730A3C.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A149C_730A3C -/* 730A3C 802A149C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 730A40 802A14A0 AFBF0014 */ sw $ra, 0x14($sp) -/* 730A44 802A14A4 AFB00010 */ sw $s0, 0x10($sp) -/* 730A48 802A14A8 8C82000C */ lw $v0, 0xc($a0) -/* 730A4C 802A14AC 0C0B1EAF */ jal get_variable -/* 730A50 802A14B0 8C450000 */ lw $a1, ($v0) -/* 730A54 802A14B4 3C038011 */ lui $v1, %hi(gPlayerData) -/* 730A58 802A14B8 2463F290 */ addiu $v1, $v1, %lo(gPlayerData) -/* 730A5C 802A14BC 80640002 */ lb $a0, 2($v1) -/* 730A60 802A14C0 80650006 */ lb $a1, 6($v1) -/* 730A64 802A14C4 00822021 */ addu $a0, $a0, $v0 -/* 730A68 802A14C8 00A4102A */ slt $v0, $a1, $a0 -/* 730A6C 802A14CC 10400002 */ beqz $v0, .L802A14D8 -/* 730A70 802A14D0 0060802D */ daddu $s0, $v1, $zero -/* 730A74 802A14D4 00A0202D */ daddu $a0, $a1, $zero -.L802A14D8: -/* 730A78 802A14D8 A2040005 */ sb $a0, 5($s0) -/* 730A7C 802A14DC 8FBF0014 */ lw $ra, 0x14($sp) -/* 730A80 802A14E0 8FB00010 */ lw $s0, 0x10($sp) -/* 730A84 802A14E4 24020002 */ addiu $v0, $zero, 2 -/* 730A88 802A14E8 03E00008 */ jr $ra -/* 730A8C 802A14EC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/code_7305A0/func_802A14F0_730A90.s b/ver/us/asm/nonmatchings/code_7305A0/func_802A14F0_730A90.s deleted file mode 100644 index 419dd443a4..0000000000 --- a/ver/us/asm/nonmatchings/code_7305A0/func_802A14F0_730A90.s +++ /dev/null @@ -1,25 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A14F0_730A90 -/* 730A90 802A14F0 3C068009 */ lui $a2, %hi(gItemTable+0x1980) -/* 730A94 802A14F4 24C69260 */ addiu $a2, $a2, %lo(gItemTable+0x1980) -/* 730A98 802A14F8 3C058011 */ lui $a1, %hi(gPlayerData) -/* 730A9C 802A14FC 24A5F290 */ addiu $a1, $a1, %lo(gPlayerData) -/* 730AA0 802A1500 90A20005 */ lbu $v0, 5($a1) -/* 730AA4 802A1504 90C3001B */ lbu $v1, 0x1b($a2) -/* 730AA8 802A1508 00431021 */ addu $v0, $v0, $v1 -/* 730AAC 802A150C A0A20005 */ sb $v0, 5($a1) -/* 730AB0 802A1510 00021600 */ sll $v0, $v0, 0x18 -/* 730AB4 802A1514 80A30006 */ lb $v1, 6($a1) -/* 730AB8 802A1518 00021603 */ sra $v0, $v0, 0x18 -/* 730ABC 802A151C 0062182A */ slt $v1, $v1, $v0 -/* 730AC0 802A1520 90A20006 */ lbu $v0, 6($a1) -/* 730AC4 802A1524 54600001 */ bnel $v1, $zero, .L802A152C -/* 730AC8 802A1528 A0A20005 */ sb $v0, 5($a1) -.L802A152C: -/* 730ACC 802A152C 80C2001C */ lb $v0, 0x1c($a2) -/* 730AD0 802A1530 AC820090 */ sw $v0, 0x90($a0) -/* 730AD4 802A1534 03E00008 */ jr $ra -/* 730AD8 802A1538 24020002 */ addiu $v0, $zero, 2 -/* 730ADC 802A153C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/code_7330D0/func_802A1000_7330D0.s b/ver/us/asm/nonmatchings/code_7330D0/func_802A1000_7330D0.s deleted file mode 100644 index f1233496bc..0000000000 --- a/ver/us/asm/nonmatchings/code_7330D0/func_802A1000_7330D0.s +++ /dev/null @@ -1,125 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1000_7330D0 -/* 7330D0 802A1000 27BDFF98 */ addiu $sp, $sp, -0x68 -/* 7330D4 802A1004 AFB50044 */ sw $s5, 0x44($sp) -/* 7330D8 802A1008 0080A82D */ daddu $s5, $a0, $zero -/* 7330DC 802A100C AFB10034 */ sw $s1, 0x34($sp) -/* 7330E0 802A1010 0000882D */ daddu $s1, $zero, $zero -/* 7330E4 802A1014 2405001D */ addiu $a1, $zero, 0x1d -/* 7330E8 802A1018 F7B40050 */ sdc1 $f20, 0x50($sp) -/* 7330EC 802A101C 4480A000 */ mtc1 $zero, $f20 -/* 7330F0 802A1020 3C02800E */ lui $v0, %hi(gBattleStatus) -/* 7330F4 802A1024 2442C070 */ addiu $v0, $v0, %lo(gBattleStatus) -/* 7330F8 802A1028 AFBF0048 */ sw $ra, 0x48($sp) -/* 7330FC 802A102C AFB40040 */ sw $s4, 0x40($sp) -/* 733100 802A1030 AFB3003C */ sw $s3, 0x3c($sp) -/* 733104 802A1034 AFB20038 */ sw $s2, 0x38($sp) -/* 733108 802A1038 AFB00030 */ sw $s0, 0x30($sp) -/* 73310C 802A103C F7B80060 */ sdc1 $f24, 0x60($sp) -/* 733110 802A1040 F7B60058 */ sdc1 $f22, 0x58($sp) -/* 733114 802A1044 8C5300D8 */ lw $s3, 0xd8($v0) -/* 733118 802A1048 8442017A */ lh $v0, 0x17a($v0) -/* 73311C 802A104C 0260202D */ daddu $a0, $s3, $zero -/* 733120 802A1050 00021140 */ sll $v0, $v0, 5 -/* 733124 802A1054 3C128008 */ lui $s2, %hi(gItemTable+0xC) -/* 733128 802A1058 02429021 */ addu $s2, $s2, $v0 -/* 73312C 802A105C 865278EC */ lh $s2, %lo(gItemTable+0xC)($s2) -/* 733130 802A1060 92620191 */ lbu $v0, 0x191($s3) -/* 733134 802A1064 C6620148 */ lwc1 $f2, 0x148($s3) -/* 733138 802A1068 44820000 */ mtc1 $v0, $f0 -/* 73313C 802A106C 00000000 */ nop -/* 733140 802A1070 46800020 */ cvt.s.w $f0, $f0 -/* 733144 802A1074 0C099CAB */ jal heroes_is_ability_active -/* 733148 802A1078 46001580 */ add.s $f22, $f2, $f0 -/* 73314C 802A107C 50400048 */ beql $v0, $zero, .L802A11A0 -/* 733150 802A1080 AEB10084 */ sw $s1, 0x84($s5) -/* 733154 802A1084 1A400045 */ blez $s2, .L802A119C -/* 733158 802A1088 3C0451EB */ lui $a0, 0x51eb -/* 73315C 802A108C 3484851F */ ori $a0, $a0, 0x851f -/* 733160 802A1090 00121880 */ sll $v1, $s2, 2 -/* 733164 802A1094 00721821 */ addu $v1, $v1, $s2 -/* 733168 802A1098 00031100 */ sll $v0, $v1, 4 -/* 73316C 802A109C 00431023 */ subu $v0, $v0, $v1 -/* 733170 802A10A0 24420063 */ addiu $v0, $v0, 0x63 -/* 733174 802A10A4 00440018 */ mult $v0, $a0 -/* 733178 802A10A8 000217C3 */ sra $v0, $v0, 0x1f -/* 73317C 802A10AC 00004010 */ mfhi $t0 -/* 733180 802A10B0 00081943 */ sra $v1, $t0, 5 -/* 733184 802A10B4 00629023 */ subu $s2, $v1, $v0 -/* 733188 802A10B8 0232102A */ slt $v0, $s1, $s2 -/* 73318C 802A10BC 10400019 */ beqz $v0, .L802A1124 -/* 733190 802A10C0 0220802D */ daddu $s0, $s1, $zero -/* 733194 802A10C4 24140017 */ addiu $s4, $zero, 0x17 -/* 733198 802A10C8 3C0141F0 */ lui $at, 0x41f0 -/* 73319C 802A10CC 4481C000 */ mtc1 $at, $f24 -/* 7331A0 802A10D0 24110001 */ addiu $s1, $zero, 1 -.L802A10D4: -/* 7331A4 802A10D4 C6600144 */ lwc1 $f0, 0x144($s3) -/* 7331A8 802A10D8 C662014C */ lwc1 $f2, 0x14c($s3) -/* 7331AC 802A10DC 4600A10D */ trunc.w.s $f4, $f20 -/* 7331B0 802A10E0 E7A40018 */ swc1 $f4, 0x18($sp) -/* 7331B4 802A10E4 24040157 */ addiu $a0, $zero, 0x157 -/* 7331B8 802A10E8 AFB10014 */ sw $s1, 0x14($sp) -/* 7331BC 802A10EC 26310003 */ addiu $s1, $s1, 3 -/* 7331C0 802A10F0 26100001 */ addiu $s0, $s0, 1 -/* 7331C4 802A10F4 4406B000 */ mfc1 $a2, $f22 -/* 7331C8 802A10F8 44050000 */ mfc1 $a1, $f0 -/* 7331CC 802A10FC 44071000 */ mfc1 $a3, $f2 -/* 7331D0 802A1100 4618A500 */ add.s $f20, $f20, $f24 -/* 7331D4 802A1104 AFB40010 */ sw $s4, 0x10($sp) -/* 7331D8 802A1108 0C04C4FD */ jal make_item_entity -/* 7331DC 802A110C AFA0001C */ sw $zero, 0x1c($sp) -/* 7331E0 802A1110 0C03A830 */ jal add_coins -/* 7331E4 802A1114 24040001 */ addiu $a0, $zero, 1 -/* 7331E8 802A1118 0212102A */ slt $v0, $s0, $s2 -/* 7331EC 802A111C 1440FFED */ bnez $v0, .L802A10D4 -/* 7331F0 802A1120 00000000 */ nop -.L802A1124: -/* 7331F4 802A1124 00101040 */ sll $v0, $s0, 1 -/* 7331F8 802A1128 00501021 */ addu $v0, $v0, $s0 -/* 7331FC 802A112C 2451001E */ addiu $s1, $v0, 0x1e -/* 733200 802A1130 C6600144 */ lwc1 $f0, 0x144($s3) -/* 733204 802A1134 C6760148 */ lwc1 $f22, 0x148($s3) -/* 733208 802A1138 C662014C */ lwc1 $f2, 0x14c($s3) -/* 73320C 802A113C 3C048007 */ lui $a0, %hi(gCurrentCameraID) -/* 733210 802A1140 8C847410 */ lw $a0, %lo(gCurrentCameraID)($a0) -/* 733214 802A1144 27A20020 */ addiu $v0, $sp, 0x20 -/* 733218 802A1148 AFA20010 */ sw $v0, 0x10($sp) -/* 73321C 802A114C 27A20024 */ addiu $v0, $sp, 0x24 -/* 733220 802A1150 AFA20014 */ sw $v0, 0x14($sp) -/* 733224 802A1154 44050000 */ mfc1 $a1, $f0 -/* 733228 802A1158 4406B000 */ mfc1 $a2, $f22 -/* 73322C 802A115C 44071000 */ mfc1 $a3, $f2 -/* 733230 802A1160 27A20028 */ addiu $v0, $sp, 0x28 -/* 733234 802A1164 0C00B94E */ jal get_screen_coords -/* 733238 802A1168 AFA20018 */ sw $v0, 0x18($sp) -/* 73323C 802A116C 3C048011 */ lui $a0, %hi(D_80108A64) -/* 733240 802A1170 24848A64 */ addiu $a0, $a0, %lo(D_80108A64) -/* 733244 802A1174 0C050529 */ jal create_icon -/* 733248 802A1178 00000000 */ nop -/* 73324C 802A117C 8FA50020 */ lw $a1, 0x20($sp) -/* 733250 802A1180 8FA60024 */ lw $a2, 0x24($sp) -/* 733254 802A1184 0040202D */ daddu $a0, $v0, $zero -/* 733258 802A1188 3C01802A */ lui $at, %hi(D_802A24D0) -/* 73325C 802A118C AC2424D0 */ sw $a0, %lo(D_802A24D0)($at) -/* 733260 802A1190 24A50024 */ addiu $a1, $a1, 0x24 -/* 733264 802A1194 0C051261 */ jal set_icon_render_pos -/* 733268 802A1198 24C6FFC1 */ addiu $a2, $a2, -0x3f -.L802A119C: -/* 73326C 802A119C AEB10084 */ sw $s1, 0x84($s5) -.L802A11A0: -/* 733270 802A11A0 8FBF0048 */ lw $ra, 0x48($sp) -/* 733274 802A11A4 8FB50044 */ lw $s5, 0x44($sp) -/* 733278 802A11A8 8FB40040 */ lw $s4, 0x40($sp) -/* 73327C 802A11AC 8FB3003C */ lw $s3, 0x3c($sp) -/* 733280 802A11B0 8FB20038 */ lw $s2, 0x38($sp) -/* 733284 802A11B4 8FB10034 */ lw $s1, 0x34($sp) -/* 733288 802A11B8 8FB00030 */ lw $s0, 0x30($sp) -/* 73328C 802A11BC D7B80060 */ ldc1 $f24, 0x60($sp) -/* 733290 802A11C0 D7B60058 */ ldc1 $f22, 0x58($sp) -/* 733294 802A11C4 D7B40050 */ ldc1 $f20, 0x50($sp) -/* 733298 802A11C8 24020002 */ addiu $v0, $zero, 2 -/* 73329C 802A11CC 03E00008 */ jr $ra -/* 7332A0 802A11D0 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/ver/us/asm/nonmatchings/code_7330D0/func_802A11D4_7332A4.s b/ver/us/asm/nonmatchings/code_7330D0/func_802A11D4_7332A4.s deleted file mode 100644 index a970c4c79b..0000000000 --- a/ver/us/asm/nonmatchings/code_7330D0/func_802A11D4_7332A4.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A11D4_7332A4 -/* 7332A4 802A11D4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 7332A8 802A11D8 3C03800E */ lui $v1, %hi(gBattleStatus) -/* 7332AC 802A11DC 2463C070 */ addiu $v1, $v1, %lo(gBattleStatus) -/* 7332B0 802A11E0 AFBF0014 */ sw $ra, 0x14($sp) -/* 7332B4 802A11E4 AFB00010 */ sw $s0, 0x10($sp) -/* 7332B8 802A11E8 8462017A */ lh $v0, 0x17a($v1) -/* 7332BC 802A11EC 8C6400D8 */ lw $a0, 0xd8($v1) -/* 7332C0 802A11F0 00021140 */ sll $v0, $v0, 5 -/* 7332C4 802A11F4 3C108008 */ lui $s0, %hi(gItemTable+0xC) -/* 7332C8 802A11F8 02028021 */ addu $s0, $s0, $v0 -/* 7332CC 802A11FC 861078EC */ lh $s0, %lo(gItemTable+0xC)($s0) -/* 7332D0 802A1200 0C099CAB */ jal heroes_is_ability_active -/* 7332D4 802A1204 2405001D */ addiu $a1, $zero, 0x1d -/* 7332D8 802A1208 10400007 */ beqz $v0, .L802A1228 -/* 7332DC 802A120C 00000000 */ nop -/* 7332E0 802A1210 1A000005 */ blez $s0, .L802A1228 -/* 7332E4 802A1214 00000000 */ nop -/* 7332E8 802A1218 3C04802A */ lui $a0, %hi(D_802A24D0) -/* 7332EC 802A121C 8C8424D0 */ lw $a0, %lo(D_802A24D0)($a0) -/* 7332F0 802A1220 0C05123D */ jal free_icon -/* 7332F4 802A1224 00000000 */ nop -.L802A1228: -/* 7332F8 802A1228 8FBF0014 */ lw $ra, 0x14($sp) -/* 7332FC 802A122C 8FB00010 */ lw $s0, 0x10($sp) -/* 733300 802A1230 24020002 */ addiu $v0, $zero, 2 -/* 733304 802A1234 03E00008 */ jr $ra -/* 733308 802A1238 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/code_7330D0/func_802A123C_73330C.s b/ver/us/asm/nonmatchings/code_7330D0/func_802A123C_73330C.s deleted file mode 100644 index b578de0aa6..0000000000 --- a/ver/us/asm/nonmatchings/code_7330D0/func_802A123C_73330C.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A123C_73330C -/* 73330C 802A123C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 733310 802A1240 AFB10014 */ sw $s1, 0x14($sp) -/* 733314 802A1244 0080882D */ daddu $s1, $a0, $zero -/* 733318 802A1248 AFBF0020 */ sw $ra, 0x20($sp) -/* 73331C 802A124C AFB3001C */ sw $s3, 0x1c($sp) -/* 733320 802A1250 AFB20018 */ sw $s2, 0x18($sp) -/* 733324 802A1254 AFB00010 */ sw $s0, 0x10($sp) -/* 733328 802A1258 8E30000C */ lw $s0, 0xc($s1) -/* 73332C 802A125C 8E050000 */ lw $a1, ($s0) -/* 733330 802A1260 0C0B1EAF */ jal get_variable -/* 733334 802A1264 26100004 */ addiu $s0, $s0, 4 -/* 733338 802A1268 8E050000 */ lw $a1, ($s0) -/* 73333C 802A126C 26100004 */ addiu $s0, $s0, 4 -/* 733340 802A1270 0220202D */ daddu $a0, $s1, $zero -/* 733344 802A1274 0C0B1EAF */ jal get_variable -/* 733348 802A1278 0040982D */ daddu $s3, $v0, $zero -/* 73334C 802A127C 0220202D */ daddu $a0, $s1, $zero -/* 733350 802A1280 8E050000 */ lw $a1, ($s0) -/* 733354 802A1284 0C0B1EAF */ jal get_variable -/* 733358 802A1288 0040902D */ daddu $s2, $v0, $zero -/* 73335C 802A128C 8E2400BC */ lw $a0, 0xbc($s1) -/* 733360 802A1290 0C04C3D6 */ jal get_item_entity -/* 733364 802A1294 0040802D */ daddu $s0, $v0, $zero -/* 733368 802A1298 0040182D */ daddu $v1, $v0, $zero -/* 73336C 802A129C 44930000 */ mtc1 $s3, $f0 -/* 733370 802A12A0 00000000 */ nop -/* 733374 802A12A4 46800020 */ cvt.s.w $f0, $f0 -/* 733378 802A12A8 E4600008 */ swc1 $f0, 8($v1) -/* 73337C 802A12AC 44920000 */ mtc1 $s2, $f0 -/* 733380 802A12B0 00000000 */ nop -/* 733384 802A12B4 46800020 */ cvt.s.w $f0, $f0 -/* 733388 802A12B8 E460000C */ swc1 $f0, 0xc($v1) -/* 73338C 802A12BC 44900000 */ mtc1 $s0, $f0 -/* 733390 802A12C0 00000000 */ nop -/* 733394 802A12C4 46800020 */ cvt.s.w $f0, $f0 -/* 733398 802A12C8 E4600010 */ swc1 $f0, 0x10($v1) -/* 73339C 802A12CC 8FBF0020 */ lw $ra, 0x20($sp) -/* 7333A0 802A12D0 8FB3001C */ lw $s3, 0x1c($sp) -/* 7333A4 802A12D4 8FB20018 */ lw $s2, 0x18($sp) -/* 7333A8 802A12D8 8FB10014 */ lw $s1, 0x14($sp) -/* 7333AC 802A12DC 8FB00010 */ lw $s0, 0x10($sp) -/* 7333B0 802A12E0 24020002 */ addiu $v0, $zero, 2 -/* 7333B4 802A12E4 03E00008 */ jr $ra -/* 7333B8 802A12E8 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/code_7330D0/func_802A12EC_7333BC.s b/ver/us/asm/nonmatchings/code_7330D0/func_802A12EC_7333BC.s deleted file mode 100644 index b4a118fe89..0000000000 --- a/ver/us/asm/nonmatchings/code_7330D0/func_802A12EC_7333BC.s +++ /dev/null @@ -1,43 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A12EC_7333BC -/* 7333BC 802A12EC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 7333C0 802A12F0 AFB00010 */ sw $s0, 0x10($sp) -/* 7333C4 802A12F4 3C10800E */ lui $s0, %hi(gBattleStatus+0xDC) -/* 7333C8 802A12F8 8E10C14C */ lw $s0, %lo(gBattleStatus+0xDC)($s0) -/* 7333CC 802A12FC AFBF0014 */ sw $ra, 0x14($sp) -/* 7333D0 802A1300 82020217 */ lb $v0, 0x217($s0) -/* 7333D4 802A1304 8C85000C */ lw $a1, 0xc($a0) -/* 7333D8 802A1308 10400017 */ beqz $v0, .L802A1368 -/* 7333DC 802A130C 24020002 */ addiu $v0, $zero, 2 -/* 7333E0 802A1310 8CA50000 */ lw $a1, ($a1) -/* 7333E4 802A1314 0C0B1EAF */ jal get_variable -/* 7333E8 802A1318 00000000 */ nop -/* 7333EC 802A131C 92030217 */ lbu $v1, 0x217($s0) -/* 7333F0 802A1320 00621823 */ subu $v1, $v1, $v0 -/* 7333F4 802A1324 A2030217 */ sb $v1, 0x217($s0) -/* 7333F8 802A1328 00031E00 */ sll $v1, $v1, 0x18 -/* 7333FC 802A132C 04620001 */ bltzl $v1, .L802A1334 -/* 733400 802A1330 A2000217 */ sb $zero, 0x217($s0) -.L802A1334: -/* 733404 802A1334 82030217 */ lb $v1, 0x217($s0) -/* 733408 802A1338 18600005 */ blez $v1, .L802A1350 -/* 73340C 802A133C 24040034 */ addiu $a0, $zero, 0x34 -/* 733410 802A1340 8E020440 */ lw $v0, 0x440($s0) -/* 733414 802A1344 8C42000C */ lw $v0, 0xc($v0) -/* 733418 802A1348 080A84D9 */ j .L802A1364 -/* 73341C 802A134C AC43003C */ sw $v1, 0x3c($v0) -.L802A1350: -/* 733420 802A1350 0C09F7A0 */ jal dispatch_event_partner -/* 733424 802A1354 A2000216 */ sb $zero, 0x216($s0) -/* 733428 802A1358 8E020440 */ lw $v0, 0x440($s0) -/* 73342C 802A135C 8C42000C */ lw $v0, 0xc($v0) -/* 733430 802A1360 AC40003C */ sw $zero, 0x3c($v0) -.L802A1364: -/* 733434 802A1364 24020002 */ addiu $v0, $zero, 2 -.L802A1368: -/* 733438 802A1368 8FBF0014 */ lw $ra, 0x14($sp) -/* 73343C 802A136C 8FB00010 */ lw $s0, 0x10($sp) -/* 733440 802A1370 03E00008 */ jr $ra -/* 733444 802A1374 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/code_7330D0/func_802A1378_733448.s b/ver/us/asm/nonmatchings/code_7330D0/func_802A1378_733448.s deleted file mode 100644 index f1543bbd69..0000000000 --- a/ver/us/asm/nonmatchings/code_7330D0/func_802A1378_733448.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1378_733448 -/* 733448 802A1378 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 73344C 802A137C AFB1001C */ sw $s1, 0x1c($sp) -/* 733450 802A1380 0080882D */ daddu $s1, $a0, $zero -/* 733454 802A1384 AFBF0028 */ sw $ra, 0x28($sp) -/* 733458 802A1388 AFB30024 */ sw $s3, 0x24($sp) -/* 73345C 802A138C AFB20020 */ sw $s2, 0x20($sp) -/* 733460 802A1390 AFB00018 */ sw $s0, 0x18($sp) -/* 733464 802A1394 8E30000C */ lw $s0, 0xc($s1) -/* 733468 802A1398 8E050000 */ lw $a1, ($s0) -/* 73346C 802A139C 0C0B1EAF */ jal get_variable -/* 733470 802A13A0 26100004 */ addiu $s0, $s0, 4 -/* 733474 802A13A4 8E050000 */ lw $a1, ($s0) -/* 733478 802A13A8 26100004 */ addiu $s0, $s0, 4 -/* 73347C 802A13AC 0220202D */ daddu $a0, $s1, $zero -/* 733480 802A13B0 0C0B1EAF */ jal get_variable -/* 733484 802A13B4 0040982D */ daddu $s3, $v0, $zero -/* 733488 802A13B8 8E050000 */ lw $a1, ($s0) -/* 73348C 802A13BC 26100004 */ addiu $s0, $s0, 4 -/* 733490 802A13C0 0220202D */ daddu $a0, $s1, $zero -/* 733494 802A13C4 0C0B1EAF */ jal get_variable -/* 733498 802A13C8 0040902D */ daddu $s2, $v0, $zero -/* 73349C 802A13CC 0220202D */ daddu $a0, $s1, $zero -/* 7334A0 802A13D0 8E050000 */ lw $a1, ($s0) -/* 7334A4 802A13D4 0C0B1EAF */ jal get_variable -/* 7334A8 802A13D8 0040802D */ daddu $s0, $v0, $zero -/* 7334AC 802A13DC 44930000 */ mtc1 $s3, $f0 -/* 7334B0 802A13E0 00000000 */ nop -/* 7334B4 802A13E4 46800020 */ cvt.s.w $f0, $f0 -/* 7334B8 802A13E8 44050000 */ mfc1 $a1, $f0 -/* 7334BC 802A13EC 44920000 */ mtc1 $s2, $f0 -/* 7334C0 802A13F0 00000000 */ nop -/* 7334C4 802A13F4 46800020 */ cvt.s.w $f0, $f0 -/* 7334C8 802A13F8 44060000 */ mfc1 $a2, $f0 -/* 7334CC 802A13FC 44900000 */ mtc1 $s0, $f0 -/* 7334D0 802A1400 00000000 */ nop -/* 7334D4 802A1404 46800020 */ cvt.s.w $f0, $f0 -/* 7334D8 802A1408 44070000 */ mfc1 $a3, $f0 -/* 7334DC 802A140C 0000202D */ daddu $a0, $zero, $zero -/* 7334E0 802A1410 0C01C424 */ jal func_80071090 -/* 7334E4 802A1414 AFA20010 */ sw $v0, 0x10($sp) -/* 7334E8 802A1418 8FBF0028 */ lw $ra, 0x28($sp) -/* 7334EC 802A141C 8FB30024 */ lw $s3, 0x24($sp) -/* 7334F0 802A1420 8FB20020 */ lw $s2, 0x20($sp) -/* 7334F4 802A1424 8FB1001C */ lw $s1, 0x1c($sp) -/* 7334F8 802A1428 8FB00018 */ lw $s0, 0x18($sp) -/* 7334FC 802A142C 24020002 */ addiu $v0, $zero, 2 -/* 733500 802A1430 03E00008 */ jr $ra -/* 733504 802A1434 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/code_7330D0/func_802A1438_733508.s b/ver/us/asm/nonmatchings/code_7330D0/func_802A1438_733508.s deleted file mode 100644 index b8cb06859b..0000000000 --- a/ver/us/asm/nonmatchings/code_7330D0/func_802A1438_733508.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1438_733508 -/* 733508 802A1438 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 73350C 802A143C AFB1001C */ sw $s1, 0x1c($sp) -/* 733510 802A1440 0080882D */ daddu $s1, $a0, $zero -/* 733514 802A1444 AFBF0028 */ sw $ra, 0x28($sp) -/* 733518 802A1448 AFB30024 */ sw $s3, 0x24($sp) -/* 73351C 802A144C AFB20020 */ sw $s2, 0x20($sp) -/* 733520 802A1450 AFB00018 */ sw $s0, 0x18($sp) -/* 733524 802A1454 8E30000C */ lw $s0, 0xc($s1) -/* 733528 802A1458 8E050000 */ lw $a1, ($s0) -/* 73352C 802A145C 0C0B1EAF */ jal get_variable -/* 733530 802A1460 26100004 */ addiu $s0, $s0, 4 -/* 733534 802A1464 8E050000 */ lw $a1, ($s0) -/* 733538 802A1468 26100004 */ addiu $s0, $s0, 4 -/* 73353C 802A146C 0220202D */ daddu $a0, $s1, $zero -/* 733540 802A1470 0C0B1EAF */ jal get_variable -/* 733544 802A1474 0040982D */ daddu $s3, $v0, $zero -/* 733548 802A1478 8E050000 */ lw $a1, ($s0) -/* 73354C 802A147C 26100004 */ addiu $s0, $s0, 4 -/* 733550 802A1480 0220202D */ daddu $a0, $s1, $zero -/* 733554 802A1484 0C0B1EAF */ jal get_variable -/* 733558 802A1488 0040902D */ daddu $s2, $v0, $zero -/* 73355C 802A148C 0220202D */ daddu $a0, $s1, $zero -/* 733560 802A1490 8E050000 */ lw $a1, ($s0) -/* 733564 802A1494 0C0B1EAF */ jal get_variable -/* 733568 802A1498 0040802D */ daddu $s0, $v0, $zero -/* 73356C 802A149C 44930000 */ mtc1 $s3, $f0 -/* 733570 802A14A0 00000000 */ nop -/* 733574 802A14A4 46800020 */ cvt.s.w $f0, $f0 -/* 733578 802A14A8 44050000 */ mfc1 $a1, $f0 -/* 73357C 802A14AC 44920000 */ mtc1 $s2, $f0 -/* 733580 802A14B0 00000000 */ nop -/* 733584 802A14B4 46800020 */ cvt.s.w $f0, $f0 -/* 733588 802A14B8 44060000 */ mfc1 $a2, $f0 -/* 73358C 802A14BC 44900000 */ mtc1 $s0, $f0 -/* 733590 802A14C0 00000000 */ nop -/* 733594 802A14C4 46800020 */ cvt.s.w $f0, $f0 -/* 733598 802A14C8 44070000 */ mfc1 $a3, $f0 -/* 73359C 802A14CC 24040001 */ addiu $a0, $zero, 1 -/* 7335A0 802A14D0 0C01C424 */ jal func_80071090 -/* 7335A4 802A14D4 AFA20010 */ sw $v0, 0x10($sp) -/* 7335A8 802A14D8 8FBF0028 */ lw $ra, 0x28($sp) -/* 7335AC 802A14DC 8FB30024 */ lw $s3, 0x24($sp) -/* 7335B0 802A14E0 8FB20020 */ lw $s2, 0x20($sp) -/* 7335B4 802A14E4 8FB1001C */ lw $s1, 0x1c($sp) -/* 7335B8 802A14E8 8FB00018 */ lw $s0, 0x18($sp) -/* 7335BC 802A14EC 24020002 */ addiu $v0, $zero, 2 -/* 7335C0 802A14F0 03E00008 */ jr $ra -/* 7335C4 802A14F4 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/code_7330D0/func_802A14F8_7335C8.s b/ver/us/asm/nonmatchings/code_7330D0/func_802A14F8_7335C8.s deleted file mode 100644 index 31e0868b4e..0000000000 --- a/ver/us/asm/nonmatchings/code_7330D0/func_802A14F8_7335C8.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A14F8_7335C8 -/* 7335C8 802A14F8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 7335CC 802A14FC AFBF0014 */ sw $ra, 0x14($sp) -/* 7335D0 802A1500 AFB00010 */ sw $s0, 0x10($sp) -/* 7335D4 802A1504 8C82000C */ lw $v0, 0xc($a0) -/* 7335D8 802A1508 0C0B1EAF */ jal get_variable -/* 7335DC 802A150C 8C450000 */ lw $a1, ($v0) -/* 7335E0 802A1510 3C038011 */ lui $v1, %hi(gPlayerData) -/* 7335E4 802A1514 2463F290 */ addiu $v1, $v1, %lo(gPlayerData) -/* 7335E8 802A1518 80640002 */ lb $a0, 2($v1) -/* 7335EC 802A151C 80650003 */ lb $a1, 3($v1) -/* 7335F0 802A1520 00822021 */ addu $a0, $a0, $v0 -/* 7335F4 802A1524 00A4102A */ slt $v0, $a1, $a0 -/* 7335F8 802A1528 10400002 */ beqz $v0, .L802A1534 -/* 7335FC 802A152C 0060802D */ daddu $s0, $v1, $zero -/* 733600 802A1530 00A0202D */ daddu $a0, $a1, $zero -.L802A1534: -/* 733604 802A1534 A2040002 */ sb $a0, 2($s0) -/* 733608 802A1538 8FBF0014 */ lw $ra, 0x14($sp) -/* 73360C 802A153C 8FB00010 */ lw $s0, 0x10($sp) -/* 733610 802A1540 24020002 */ addiu $v0, $zero, 2 -/* 733614 802A1544 03E00008 */ jr $ra -/* 733618 802A1548 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/code_7330D0/func_802A154C_73361C.s b/ver/us/asm/nonmatchings/code_7330D0/func_802A154C_73361C.s deleted file mode 100644 index 667743b803..0000000000 --- a/ver/us/asm/nonmatchings/code_7330D0/func_802A154C_73361C.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A154C_73361C -/* 73361C 802A154C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 733620 802A1550 AFBF0014 */ sw $ra, 0x14($sp) -/* 733624 802A1554 AFB00010 */ sw $s0, 0x10($sp) -/* 733628 802A1558 8C82000C */ lw $v0, 0xc($a0) -/* 73362C 802A155C 0C0B1EAF */ jal get_variable -/* 733630 802A1560 8C450000 */ lw $a1, ($v0) -/* 733634 802A1564 3C038011 */ lui $v1, %hi(gPlayerData) -/* 733638 802A1568 2463F290 */ addiu $v1, $v1, %lo(gPlayerData) -/* 73363C 802A156C 80640005 */ lb $a0, 5($v1) -/* 733640 802A1570 80650006 */ lb $a1, 6($v1) -/* 733644 802A1574 00822021 */ addu $a0, $a0, $v0 -/* 733648 802A1578 00A4102A */ slt $v0, $a1, $a0 -/* 73364C 802A157C 10400002 */ beqz $v0, .L802A1588 -/* 733650 802A1580 0060802D */ daddu $s0, $v1, $zero -/* 733654 802A1584 00A0202D */ daddu $a0, $a1, $zero -.L802A1588: -/* 733658 802A1588 A2040005 */ sb $a0, 5($s0) -/* 73365C 802A158C 8FBF0014 */ lw $ra, 0x14($sp) -/* 733660 802A1590 8FB00010 */ lw $s0, 0x10($sp) -/* 733664 802A1594 24020002 */ addiu $v0, $zero, 2 -/* 733668 802A1598 03E00008 */ jr $ra -/* 73366C 802A159C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/code_7330D0/func_802A15A0_733670.s b/ver/us/asm/nonmatchings/code_7330D0/func_802A15A0_733670.s deleted file mode 100644 index fe95652080..0000000000 --- a/ver/us/asm/nonmatchings/code_7330D0/func_802A15A0_733670.s +++ /dev/null @@ -1,43 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A15A0_733670 -/* 733670 802A15A0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 733674 802A15A4 AFB00010 */ sw $s0, 0x10($sp) -/* 733678 802A15A8 0080802D */ daddu $s0, $a0, $zero -/* 73367C 802A15AC AFBF0014 */ sw $ra, 0x14($sp) -/* 733680 802A15B0 8E02000C */ lw $v0, 0xc($s0) -/* 733684 802A15B4 0C0B1EAF */ jal get_variable -/* 733688 802A15B8 8C450000 */ lw $a1, ($v0) -/* 73368C 802A15BC 3C038008 */ lui $v1, %hi(gItemTable) -/* 733690 802A15C0 246378E0 */ addiu $v1, $v1, %lo(gItemTable) -/* 733694 802A15C4 00021140 */ sll $v0, $v0, 5 -/* 733698 802A15C8 00431021 */ addu $v0, $v0, $v1 -/* 73369C 802A15CC 8043001B */ lb $v1, 0x1b($v0) -/* 7336A0 802A15D0 AE0300B0 */ sw $v1, 0xb0($s0) -/* 7336A4 802A15D4 8043001C */ lb $v1, 0x1c($v0) -/* 7336A8 802A15D8 AE0000B8 */ sw $zero, 0xb8($s0) -/* 7336AC 802A15DC AE0300B4 */ sw $v1, 0xb4($s0) -/* 7336B0 802A15E0 94420018 */ lhu $v0, 0x18($v0) -/* 7336B4 802A15E4 30420100 */ andi $v0, $v0, 0x100 -/* 7336B8 802A15E8 10400002 */ beqz $v0, .L802A15F4 -/* 7336BC 802A15EC 24020001 */ addiu $v0, $zero, 1 -/* 7336C0 802A15F0 AE0200B8 */ sw $v0, 0xb8($s0) -.L802A15F4: -/* 7336C4 802A15F4 8E0200B0 */ lw $v0, 0xb0($s0) -/* 7336C8 802A15F8 04400006 */ bltz $v0, .L802A1614 -/* 7336CC 802A15FC 0000182D */ daddu $v1, $zero, $zero -/* 7336D0 802A1600 5C400006 */ bgtzl $v0, .L802A161C -/* 7336D4 802A1604 AE0300C0 */ sw $v1, 0xc0($s0) -/* 7336D8 802A1608 8E0200B4 */ lw $v0, 0xb4($s0) -/* 7336DC 802A160C 04430003 */ bgezl $v0, .L802A161C -/* 7336E0 802A1610 AE0300C0 */ sw $v1, 0xc0($s0) -.L802A1614: -/* 7336E4 802A1614 24030001 */ addiu $v1, $zero, 1 -/* 7336E8 802A1618 AE0300C0 */ sw $v1, 0xc0($s0) -.L802A161C: -/* 7336EC 802A161C 8FBF0014 */ lw $ra, 0x14($sp) -/* 7336F0 802A1620 8FB00010 */ lw $s0, 0x10($sp) -/* 7336F4 802A1624 24020002 */ addiu $v0, $zero, 2 -/* 7336F8 802A1628 03E00008 */ jr $ra -/* 7336FC 802A162C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/code_77480/check_for_interactables.s b/ver/us/asm/nonmatchings/code_77480/check_for_interactables.s index 17129d9502..34074024c7 100644 --- a/ver/us/asm/nonmatchings/code_77480/check_for_interactables.s +++ b/ver/us/asm/nonmatchings/code_77480/check_for_interactables.s @@ -1,6 +1,13 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches +.section .rodata + +glabel jtbl_8010BC60 +.word L800E08F8_79DA8, L800E08F8_79DA8, L800E08F8_79DA8, L800E08F8_79DA8, L800E09C0_79E70, L800E09C0_79E70, L800E09C0_79E70, L800E09C0_79E70, L800E09C0_79E70, L800E08F8_79DA8, L800E09C0_79E70, L800E09C0_79E70, L800E09C0_79E70, L800E09C0_79E70, L800E09C0_79E70, L800E09C0_79E70, L800E09C0_79E70, L800E09C0_79E70, L800E09C0_79E70, L800E09C0_79E70, L800E09C0_79E70, L800E09C0_79E70, L800E09C0_79E70, L800E09C0_79E70, L800E09C0_79E70, L800E09C0_79E70, L800E09C0_79E70, L800E09C0_79E70, L800E09C0_79E70, L800E09C0_79E70, L800E09C0_79E70, L800E09C0_79E70, L800E09C0_79E70, L800E09C0_79E70, L800E09C0_79E70, L800E09C0_79E70, L800E09C0_79E70, L800E09C0_79E70, L800E09C0_79E70, L800E09C0_79E70, L800E09C0_79E70, L800E09C0_79E70, L800E09C0_79E70, L800E09C0_79E70, L800E09C0_79E70, L800E09C0_79E70, L800E09C0_79E70, L800E08F8_79DA8, L800E08F8_79DA8, 0, 0, 0 + +.section .text + glabel check_for_interactables /* 79CC8 800E0818 27BDFFD8 */ addiu $sp, $sp, -0x28 /* 79CCC 800E081C AFB10014 */ sw $s1, 0x14($sp) diff --git a/ver/us/asm/nonmatchings/code_77480/func_800DF15C.s b/ver/us/asm/nonmatchings/code_77480/func_800DF15C.s index c00c7a129e..67e90072b7 100644 --- a/ver/us/asm/nonmatchings/code_77480/func_800DF15C.s +++ b/ver/us/asm/nonmatchings/code_77480/func_800DF15C.s @@ -1,6 +1,13 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches +.section .rodata + +glabel D_8010BC50 +.double 0.1, 0.0 + +.section .text + glabel func_800DF15C /* 7860C 800DF15C 27BDFF60 */ addiu $sp, $sp, -0xa0 /* 78610 800DF160 AFB1006C */ sw $s1, 0x6c($sp) diff --git a/ver/us/asm/nonmatchings/code_789E60/func_802A1000_789E60.s b/ver/us/asm/nonmatchings/code_789E60/func_802A1000_789E60.s deleted file mode 100644 index b5215ed984..0000000000 --- a/ver/us/asm/nonmatchings/code_789E60/func_802A1000_789E60.s +++ /dev/null @@ -1,47 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1000_789E60 -/* 789E60 802A1000 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 789E64 802A1004 AFB1001C */ sw $s1, 0x1c($sp) -/* 789E68 802A1008 0080882D */ daddu $s1, $a0, $zero -/* 789E6C 802A100C AFBF0024 */ sw $ra, 0x24($sp) -/* 789E70 802A1010 AFB20020 */ sw $s2, 0x20($sp) -/* 789E74 802A1014 AFB00018 */ sw $s0, 0x18($sp) -/* 789E78 802A1018 8E30000C */ lw $s0, 0xc($s1) -/* 789E7C 802A101C 8E050000 */ lw $a1, ($s0) -/* 789E80 802A1020 0C0B1EAF */ jal get_variable -/* 789E84 802A1024 26100004 */ addiu $s0, $s0, 4 -/* 789E88 802A1028 8E050000 */ lw $a1, ($s0) -/* 789E8C 802A102C 26100004 */ addiu $s0, $s0, 4 -/* 789E90 802A1030 0220202D */ daddu $a0, $s1, $zero -/* 789E94 802A1034 0C0B1EAF */ jal get_variable -/* 789E98 802A1038 0040902D */ daddu $s2, $v0, $zero -/* 789E9C 802A103C 0220202D */ daddu $a0, $s1, $zero -/* 789EA0 802A1040 8E050000 */ lw $a1, ($s0) -/* 789EA4 802A1044 0C0B1EAF */ jal get_variable -/* 789EA8 802A1048 0040802D */ daddu $s0, $v0, $zero -/* 789EAC 802A104C 44921000 */ mtc1 $s2, $f2 -/* 789EB0 802A1050 00000000 */ nop -/* 789EB4 802A1054 468010A0 */ cvt.s.w $f2, $f2 -/* 789EB8 802A1058 44051000 */ mfc1 $a1, $f2 -/* 789EBC 802A105C 44901000 */ mtc1 $s0, $f2 -/* 789EC0 802A1060 00000000 */ nop -/* 789EC4 802A1064 468010A0 */ cvt.s.w $f2, $f2 -/* 789EC8 802A1068 44061000 */ mfc1 $a2, $f2 -/* 789ECC 802A106C 44821000 */ mtc1 $v0, $f2 -/* 789ED0 802A1070 00000000 */ nop -/* 789ED4 802A1074 468010A0 */ cvt.s.w $f2, $f2 -/* 789ED8 802A1078 3C014220 */ lui $at, 0x4220 -/* 789EDC 802A107C 44810000 */ mtc1 $at, $f0 -/* 789EE0 802A1080 44071000 */ mfc1 $a3, $f2 -/* 789EE4 802A1084 0000202D */ daddu $a0, $zero, $zero -/* 789EE8 802A1088 0C01BFBC */ jal func_8006FEF0 -/* 789EEC 802A108C E7A00010 */ swc1 $f0, 0x10($sp) -/* 789EF0 802A1090 8FBF0024 */ lw $ra, 0x24($sp) -/* 789EF4 802A1094 8FB20020 */ lw $s2, 0x20($sp) -/* 789EF8 802A1098 8FB1001C */ lw $s1, 0x1c($sp) -/* 789EFC 802A109C 8FB00018 */ lw $s0, 0x18($sp) -/* 789F00 802A10A0 24020002 */ addiu $v0, $zero, 2 -/* 789F04 802A10A4 03E00008 */ jr $ra -/* 789F08 802A10A8 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/code_789E60/func_802A10AC_789F0C.s b/ver/us/asm/nonmatchings/code_789E60/func_802A10AC_789F0C.s deleted file mode 100644 index 4d952c1357..0000000000 --- a/ver/us/asm/nonmatchings/code_789E60/func_802A10AC_789F0C.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A10AC_789F0C -/* 789F0C 802A10AC 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 789F10 802A10B0 AFB10024 */ sw $s1, 0x24($sp) -/* 789F14 802A10B4 0080882D */ daddu $s1, $a0, $zero -/* 789F18 802A10B8 AFBF002C */ sw $ra, 0x2c($sp) -/* 789F1C 802A10BC AFB20028 */ sw $s2, 0x28($sp) -/* 789F20 802A10C0 AFB00020 */ sw $s0, 0x20($sp) -/* 789F24 802A10C4 8E30000C */ lw $s0, 0xc($s1) -/* 789F28 802A10C8 8E050000 */ lw $a1, ($s0) -/* 789F2C 802A10CC 0C0B1EAF */ jal get_variable -/* 789F30 802A10D0 26100004 */ addiu $s0, $s0, 4 -/* 789F34 802A10D4 8E050000 */ lw $a1, ($s0) -/* 789F38 802A10D8 26100004 */ addiu $s0, $s0, 4 -/* 789F3C 802A10DC 0220202D */ daddu $a0, $s1, $zero -/* 789F40 802A10E0 0C0B1EAF */ jal get_variable -/* 789F44 802A10E4 0040902D */ daddu $s2, $v0, $zero -/* 789F48 802A10E8 0220202D */ daddu $a0, $s1, $zero -/* 789F4C 802A10EC 8E050000 */ lw $a1, ($s0) -/* 789F50 802A10F0 0C0B1EAF */ jal get_variable -/* 789F54 802A10F4 0040802D */ daddu $s0, $v0, $zero -/* 789F58 802A10F8 24040005 */ addiu $a0, $zero, 5 -/* 789F5C 802A10FC 44921000 */ mtc1 $s2, $f2 -/* 789F60 802A1100 00000000 */ nop -/* 789F64 802A1104 468010A0 */ cvt.s.w $f2, $f2 -/* 789F68 802A1108 44051000 */ mfc1 $a1, $f2 -/* 789F6C 802A110C 44901000 */ mtc1 $s0, $f2 -/* 789F70 802A1110 00000000 */ nop -/* 789F74 802A1114 468010A0 */ cvt.s.w $f2, $f2 -/* 789F78 802A1118 44061000 */ mfc1 $a2, $f2 -/* 789F7C 802A111C 44821000 */ mtc1 $v0, $f2 -/* 789F80 802A1120 00000000 */ nop -/* 789F84 802A1124 468010A0 */ cvt.s.w $f2, $f2 -/* 789F88 802A1128 3C014248 */ lui $at, 0x4248 -/* 789F8C 802A112C 44810000 */ mtc1 $at, $f0 -/* 789F90 802A1130 44071000 */ mfc1 $a3, $f2 -/* 789F94 802A1134 24030028 */ addiu $v1, $zero, 0x28 -/* 789F98 802A1138 AFA30018 */ sw $v1, 0x18($sp) -/* 789F9C 802A113C 2403001E */ addiu $v1, $zero, 0x1e -/* 789FA0 802A1140 AFA3001C */ sw $v1, 0x1c($sp) -/* 789FA4 802A1144 E7A00010 */ swc1 $f0, 0x10($sp) -/* 789FA8 802A1148 0C01C154 */ jal func_80070550 -/* 789FAC 802A114C E7A00014 */ swc1 $f0, 0x14($sp) -/* 789FB0 802A1150 8FBF002C */ lw $ra, 0x2c($sp) -/* 789FB4 802A1154 8FB20028 */ lw $s2, 0x28($sp) -/* 789FB8 802A1158 8FB10024 */ lw $s1, 0x24($sp) -/* 789FBC 802A115C 8FB00020 */ lw $s0, 0x20($sp) -/* 789FC0 802A1160 24020002 */ addiu $v0, $zero, 2 -/* 789FC4 802A1164 03E00008 */ jr $ra -/* 789FC8 802A1168 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/code_789E60/func_802A116C_789FCC.s b/ver/us/asm/nonmatchings/code_789E60/func_802A116C_789FCC.s deleted file mode 100644 index 434c11a7ca..0000000000 --- a/ver/us/asm/nonmatchings/code_789E60/func_802A116C_789FCC.s +++ /dev/null @@ -1,47 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A116C_789FCC -/* 789FCC 802A116C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 789FD0 802A1170 AFB1001C */ sw $s1, 0x1c($sp) -/* 789FD4 802A1174 0080882D */ daddu $s1, $a0, $zero -/* 789FD8 802A1178 AFBF0024 */ sw $ra, 0x24($sp) -/* 789FDC 802A117C AFB20020 */ sw $s2, 0x20($sp) -/* 789FE0 802A1180 AFB00018 */ sw $s0, 0x18($sp) -/* 789FE4 802A1184 8E30000C */ lw $s0, 0xc($s1) -/* 789FE8 802A1188 8E050000 */ lw $a1, ($s0) -/* 789FEC 802A118C 0C0B1EAF */ jal get_variable -/* 789FF0 802A1190 26100004 */ addiu $s0, $s0, 4 -/* 789FF4 802A1194 8E050000 */ lw $a1, ($s0) -/* 789FF8 802A1198 26100004 */ addiu $s0, $s0, 4 -/* 789FFC 802A119C 0220202D */ daddu $a0, $s1, $zero -/* 78A000 802A11A0 0C0B1EAF */ jal get_variable -/* 78A004 802A11A4 0040902D */ daddu $s2, $v0, $zero -/* 78A008 802A11A8 0220202D */ daddu $a0, $s1, $zero -/* 78A00C 802A11AC 8E050000 */ lw $a1, ($s0) -/* 78A010 802A11B0 0C0B1EAF */ jal get_variable -/* 78A014 802A11B4 0040802D */ daddu $s0, $v0, $zero -/* 78A018 802A11B8 44921000 */ mtc1 $s2, $f2 -/* 78A01C 802A11BC 00000000 */ nop -/* 78A020 802A11C0 468010A0 */ cvt.s.w $f2, $f2 -/* 78A024 802A11C4 44051000 */ mfc1 $a1, $f2 -/* 78A028 802A11C8 44901000 */ mtc1 $s0, $f2 -/* 78A02C 802A11CC 00000000 */ nop -/* 78A030 802A11D0 468010A0 */ cvt.s.w $f2, $f2 -/* 78A034 802A11D4 44061000 */ mfc1 $a2, $f2 -/* 78A038 802A11D8 44821000 */ mtc1 $v0, $f2 -/* 78A03C 802A11DC 00000000 */ nop -/* 78A040 802A11E0 468010A0 */ cvt.s.w $f2, $f2 -/* 78A044 802A11E4 3C0141F0 */ lui $at, 0x41f0 -/* 78A048 802A11E8 44810000 */ mtc1 $at, $f0 -/* 78A04C 802A11EC 44071000 */ mfc1 $a3, $f2 -/* 78A050 802A11F0 0000202D */ daddu $a0, $zero, $zero -/* 78A054 802A11F4 0C01BFBC */ jal func_8006FEF0 -/* 78A058 802A11F8 E7A00010 */ swc1 $f0, 0x10($sp) -/* 78A05C 802A11FC 8FBF0024 */ lw $ra, 0x24($sp) -/* 78A060 802A1200 8FB20020 */ lw $s2, 0x20($sp) -/* 78A064 802A1204 8FB1001C */ lw $s1, 0x1c($sp) -/* 78A068 802A1208 8FB00018 */ lw $s0, 0x18($sp) -/* 78A06C 802A120C 24020002 */ addiu $v0, $zero, 2 -/* 78A070 802A1210 03E00008 */ jr $ra -/* 78A074 802A1214 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/code_789E60/func_802A1218_78A078.s b/ver/us/asm/nonmatchings/code_789E60/func_802A1218_78A078.s deleted file mode 100644 index 4e7814cc54..0000000000 --- a/ver/us/asm/nonmatchings/code_789E60/func_802A1218_78A078.s +++ /dev/null @@ -1,55 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1218_78A078 -/* 78A078 802A1218 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* 78A07C 802A121C AFB1002C */ sw $s1, 0x2c($sp) -/* 78A080 802A1220 0080882D */ daddu $s1, $a0, $zero -/* 78A084 802A1224 AFBF0034 */ sw $ra, 0x34($sp) -/* 78A088 802A1228 AFB20030 */ sw $s2, 0x30($sp) -/* 78A08C 802A122C AFB00028 */ sw $s0, 0x28($sp) -/* 78A090 802A1230 8E30000C */ lw $s0, 0xc($s1) -/* 78A094 802A1234 8E050000 */ lw $a1, ($s0) -/* 78A098 802A1238 0C0B1EAF */ jal get_variable -/* 78A09C 802A123C 26100004 */ addiu $s0, $s0, 4 -/* 78A0A0 802A1240 8E050000 */ lw $a1, ($s0) -/* 78A0A4 802A1244 26100004 */ addiu $s0, $s0, 4 -/* 78A0A8 802A1248 0220202D */ daddu $a0, $s1, $zero -/* 78A0AC 802A124C 0C0B1EAF */ jal get_variable -/* 78A0B0 802A1250 0040902D */ daddu $s2, $v0, $zero -/* 78A0B4 802A1254 0220202D */ daddu $a0, $s1, $zero -/* 78A0B8 802A1258 8E050000 */ lw $a1, ($s0) -/* 78A0BC 802A125C 0C0B1EAF */ jal get_variable -/* 78A0C0 802A1260 0040802D */ daddu $s0, $v0, $zero -/* 78A0C4 802A1264 24040004 */ addiu $a0, $zero, 4 -/* 78A0C8 802A1268 44922000 */ mtc1 $s2, $f4 -/* 78A0CC 802A126C 00000000 */ nop -/* 78A0D0 802A1270 46802120 */ cvt.s.w $f4, $f4 -/* 78A0D4 802A1274 44052000 */ mfc1 $a1, $f4 -/* 78A0D8 802A1278 44902000 */ mtc1 $s0, $f4 -/* 78A0DC 802A127C 00000000 */ nop -/* 78A0E0 802A1280 46802120 */ cvt.s.w $f4, $f4 -/* 78A0E4 802A1284 44062000 */ mfc1 $a2, $f4 -/* 78A0E8 802A1288 44822000 */ mtc1 $v0, $f4 -/* 78A0EC 802A128C 00000000 */ nop -/* 78A0F0 802A1290 46802120 */ cvt.s.w $f4, $f4 -/* 78A0F4 802A1294 3C0141A0 */ lui $at, 0x41a0 -/* 78A0F8 802A1298 44810000 */ mtc1 $at, $f0 -/* 78A0FC 802A129C 3C013F80 */ lui $at, 0x3f80 -/* 78A100 802A12A0 44811000 */ mtc1 $at, $f2 -/* 78A104 802A12A4 44072000 */ mfc1 $a3, $f4 -/* 78A108 802A12A8 2403000A */ addiu $v1, $zero, 0xa -/* 78A10C 802A12AC AFA3001C */ sw $v1, 0x1c($sp) -/* 78A110 802A12B0 2403000F */ addiu $v1, $zero, 0xf -/* 78A114 802A12B4 AFA30020 */ sw $v1, 0x20($sp) -/* 78A118 802A12B8 E7A00010 */ swc1 $f0, 0x10($sp) -/* 78A11C 802A12BC E7A00014 */ swc1 $f0, 0x14($sp) -/* 78A120 802A12C0 0C01C8D4 */ jal func_80072350 -/* 78A124 802A12C4 E7A20018 */ swc1 $f2, 0x18($sp) -/* 78A128 802A12C8 8FBF0034 */ lw $ra, 0x34($sp) -/* 78A12C 802A12CC 8FB20030 */ lw $s2, 0x30($sp) -/* 78A130 802A12D0 8FB1002C */ lw $s1, 0x2c($sp) -/* 78A134 802A12D4 8FB00028 */ lw $s0, 0x28($sp) -/* 78A138 802A12D8 24020002 */ addiu $v0, $zero, 2 -/* 78A13C 802A12DC 03E00008 */ jr $ra -/* 78A140 802A12E0 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/ver/us/asm/nonmatchings/code_789E60/func_802A137C_78A1DC.s b/ver/us/asm/nonmatchings/code_789E60/func_802A137C_78A1DC.s deleted file mode 100644 index 31766cb159..0000000000 --- a/ver/us/asm/nonmatchings/code_789E60/func_802A137C_78A1DC.s +++ /dev/null @@ -1,44 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A137C_78A1DC -/* 78A1DC 802A137C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 78A1E0 802A1380 AFB00010 */ sw $s0, 0x10($sp) -/* 78A1E4 802A1384 0080802D */ daddu $s0, $a0, $zero -/* 78A1E8 802A1388 10A0000D */ beqz $a1, .L802A13C0 -/* 78A1EC 802A138C AFBF0014 */ sw $ra, 0x14($sp) -/* 78A1F0 802A1390 0C04760B */ jal func_8011D82C -/* 78A1F4 802A1394 24040001 */ addiu $a0, $zero, 1 -/* 78A1F8 802A1398 0000202D */ daddu $a0, $zero, $zero -/* 78A1FC 802A139C 0080282D */ daddu $a1, $a0, $zero -/* 78A200 802A13A0 0080302D */ daddu $a2, $a0, $zero -/* 78A204 802A13A4 0080382D */ daddu $a3, $a0, $zero -/* 78A208 802A13A8 3C038015 */ lui $v1, %hi(D_801512F0) -/* 78A20C 802A13AC 8C6312F0 */ lw $v1, %lo(D_801512F0)($v1) -/* 78A210 802A13B0 24020001 */ addiu $v0, $zero, 1 -/* 78A214 802A13B4 0C046F97 */ jal set_background_color_blend -/* 78A218 802A13B8 A0620000 */ sb $v0, ($v1) -/* 78A21C 802A13BC AE000070 */ sw $zero, 0x70($s0) -.L802A13C0: -/* 78A220 802A13C0 0000202D */ daddu $a0, $zero, $zero -/* 78A224 802A13C4 0080282D */ daddu $a1, $a0, $zero -/* 78A228 802A13C8 92070073 */ lbu $a3, 0x73($s0) -/* 78A22C 802A13CC 0C046F97 */ jal set_background_color_blend -/* 78A230 802A13D0 0080302D */ daddu $a2, $a0, $zero -/* 78A234 802A13D4 8E020070 */ lw $v0, 0x70($s0) -/* 78A238 802A13D8 2442000A */ addiu $v0, $v0, 0xa -/* 78A23C 802A13DC AE020070 */ sw $v0, 0x70($s0) -/* 78A240 802A13E0 284200E6 */ slti $v0, $v0, 0xe6 -/* 78A244 802A13E4 14400007 */ bnez $v0, .L802A1404 -/* 78A248 802A13E8 0000102D */ daddu $v0, $zero, $zero -/* 78A24C 802A13EC 0000202D */ daddu $a0, $zero, $zero -/* 78A250 802A13F0 0080282D */ daddu $a1, $a0, $zero -/* 78A254 802A13F4 0080302D */ daddu $a2, $a0, $zero -/* 78A258 802A13F8 0C046F97 */ jal set_background_color_blend -/* 78A25C 802A13FC 240700E6 */ addiu $a3, $zero, 0xe6 -/* 78A260 802A1400 24020002 */ addiu $v0, $zero, 2 -.L802A1404: -/* 78A264 802A1404 8FBF0014 */ lw $ra, 0x14($sp) -/* 78A268 802A1408 8FB00010 */ lw $s0, 0x10($sp) -/* 78A26C 802A140C 03E00008 */ jr $ra -/* 78A270 802A1410 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/code_789E60/func_802A1414_78A274.s b/ver/us/asm/nonmatchings/code_789E60/func_802A1414_78A274.s deleted file mode 100644 index 61f3effe1f..0000000000 --- a/ver/us/asm/nonmatchings/code_789E60/func_802A1414_78A274.s +++ /dev/null @@ -1,39 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1414_78A274 -/* 78A274 802A1414 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 78A278 802A1418 AFB00010 */ sw $s0, 0x10($sp) -/* 78A27C 802A141C 0080802D */ daddu $s0, $a0, $zero -/* 78A280 802A1420 10A00003 */ beqz $a1, .L802A1430 -/* 78A284 802A1424 AFBF0014 */ sw $ra, 0x14($sp) -/* 78A288 802A1428 24020014 */ addiu $v0, $zero, 0x14 -/* 78A28C 802A142C AE020070 */ sw $v0, 0x70($s0) -.L802A1430: -/* 78A290 802A1430 0000202D */ daddu $a0, $zero, $zero -/* 78A294 802A1434 0080282D */ daddu $a1, $a0, $zero -/* 78A298 802A1438 8E020070 */ lw $v0, 0x70($s0) -/* 78A29C 802A143C 0080302D */ daddu $a2, $a0, $zero -/* 78A2A0 802A1440 00023880 */ sll $a3, $v0, 2 -/* 78A2A4 802A1444 00E23821 */ addu $a3, $a3, $v0 -/* 78A2A8 802A1448 00073840 */ sll $a3, $a3, 1 -/* 78A2AC 802A144C 0C046F97 */ jal set_background_color_blend -/* 78A2B0 802A1450 30E700FE */ andi $a3, $a3, 0xfe -/* 78A2B4 802A1454 8E020070 */ lw $v0, 0x70($s0) -/* 78A2B8 802A1458 2442FFFF */ addiu $v0, $v0, -1 -/* 78A2BC 802A145C 10400003 */ beqz $v0, .L802A146C -/* 78A2C0 802A1460 AE020070 */ sw $v0, 0x70($s0) -/* 78A2C4 802A1464 080A8521 */ j .L802A1484 -/* 78A2C8 802A1468 0000102D */ daddu $v0, $zero, $zero -.L802A146C: -/* 78A2CC 802A146C 0000202D */ daddu $a0, $zero, $zero -/* 78A2D0 802A1470 0080282D */ daddu $a1, $a0, $zero -/* 78A2D4 802A1474 0080302D */ daddu $a2, $a0, $zero -/* 78A2D8 802A1478 0C046F97 */ jal set_background_color_blend -/* 78A2DC 802A147C 0080382D */ daddu $a3, $a0, $zero -/* 78A2E0 802A1480 24020002 */ addiu $v0, $zero, 2 -.L802A1484: -/* 78A2E4 802A1484 8FBF0014 */ lw $ra, 0x14($sp) -/* 78A2E8 802A1488 8FB00010 */ lw $s0, 0x10($sp) -/* 78A2EC 802A148C 03E00008 */ jr $ra -/* 78A2F0 802A1490 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/code_789E60/func_802A1494_78A2F4.s b/ver/us/asm/nonmatchings/code_789E60/func_802A1494_78A2F4.s deleted file mode 100644 index 5166f610b5..0000000000 --- a/ver/us/asm/nonmatchings/code_789E60/func_802A1494_78A2F4.s +++ /dev/null @@ -1,25 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1494_78A2F4 -/* 78A2F4 802A1494 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 78A2F8 802A1498 AFBF0010 */ sw $ra, 0x10($sp) -/* 78A2FC 802A149C 8C82000C */ lw $v0, 0xc($a0) -/* 78A300 802A14A0 0C0B1EAF */ jal get_variable -/* 78A304 802A14A4 8C450000 */ lw $a1, ($v0) -/* 78A308 802A14A8 3C058011 */ lui $a1, %hi(gPlayerData+0x12) -/* 78A30C 802A14AC 80A5F2A2 */ lb $a1, %lo(gPlayerData+0x12)($a1) -/* 78A310 802A14B0 24040100 */ addiu $a0, $zero, 0x100 -/* 78A314 802A14B4 00051880 */ sll $v1, $a1, 2 -/* 78A318 802A14B8 00651821 */ addu $v1, $v1, $a1 -/* 78A31C 802A14BC 00621821 */ addu $v1, $v1, $v0 -/* 78A320 802A14C0 00031880 */ sll $v1, $v1, 2 -/* 78A324 802A14C4 3C06802A */ lui $a2, %hi(D_8029C890) -/* 78A328 802A14C8 00C33021 */ addu $a2, $a2, $v1 -/* 78A32C 802A14CC 8CC6C890 */ lw $a2, %lo(D_8029C890)($a2) -/* 78A330 802A14D0 0C098F3F */ jal set_animation -/* 78A334 802A14D4 0000282D */ daddu $a1, $zero, $zero -/* 78A338 802A14D8 8FBF0010 */ lw $ra, 0x10($sp) -/* 78A33C 802A14DC 24020002 */ addiu $v0, $zero, 2 -/* 78A340 802A14E0 03E00008 */ jr $ra -/* 78A344 802A14E4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/code_789E60/func_802A14E8_78A348.s b/ver/us/asm/nonmatchings/code_789E60/func_802A14E8_78A348.s deleted file mode 100644 index 58c5192cbf..0000000000 --- a/ver/us/asm/nonmatchings/code_789E60/func_802A14E8_78A348.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A14E8_78A348 -/* 78A348 802A14E8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 78A34C 802A14EC AFBF0010 */ sw $ra, 0x10($sp) -/* 78A350 802A14F0 0C00EABB */ jal get_npc_unsafe -/* 78A354 802A14F4 24040064 */ addiu $a0, $zero, 0x64 -/* 78A358 802A14F8 0040202D */ daddu $a0, $v0, $zero -/* 78A35C 802A14FC 24030020 */ addiu $v1, $zero, 0x20 -/* 78A360 802A1500 A48300A8 */ sh $v1, 0xa8($a0) -/* 78A364 802A1504 A48300A6 */ sh $v1, 0xa6($a0) -/* 78A368 802A1508 8FBF0010 */ lw $ra, 0x10($sp) -/* 78A36C 802A150C 24020002 */ addiu $v0, $zero, 2 -/* 78A370 802A1510 03E00008 */ jr $ra -/* 78A374 802A1514 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/code_789E60/func_802A1518_78A378.s b/ver/us/asm/nonmatchings/code_789E60/func_802A1518_78A378.s deleted file mode 100644 index 8f5b8bbe5d..0000000000 --- a/ver/us/asm/nonmatchings/code_789E60/func_802A1518_78A378.s +++ /dev/null @@ -1,44 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1518_78A378 -/* 78A378 802A1518 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 78A37C 802A151C AFB20018 */ sw $s2, 0x18($sp) -/* 78A380 802A1520 0080902D */ daddu $s2, $a0, $zero -/* 78A384 802A1524 3C028011 */ lui $v0, %hi(gPlayerData) -/* 78A388 802A1528 2442F290 */ addiu $v0, $v0, %lo(gPlayerData) -/* 78A38C 802A152C AFB10014 */ sw $s1, 0x14($sp) -/* 78A390 802A1530 0040882D */ daddu $s1, $v0, $zero -/* 78A394 802A1534 AFBF001C */ sw $ra, 0x1c($sp) -/* 78A398 802A1538 AFB00010 */ sw $s0, 0x10($sp) -/* 78A39C 802A153C AE400084 */ sw $zero, 0x84($s2) -/* 78A3A0 802A1540 8222028E */ lb $v0, 0x28e($s1) -/* 78A3A4 802A1544 86230290 */ lh $v1, 0x290($s1) -/* 78A3A8 802A1548 00021200 */ sll $v0, $v0, 8 -/* 78A3AC 802A154C 0062182A */ slt $v1, $v1, $v0 -/* 78A3B0 802A1550 1060000F */ beqz $v1, .L802A1590 -/* 78A3B4 802A1554 24020001 */ addiu $v0, $zero, 1 -/* 78A3B8 802A1558 0C03A752 */ jal is_ability_active -/* 78A3BC 802A155C 24040030 */ addiu $a0, $zero, 0x30 -/* 78A3C0 802A1560 24040031 */ addiu $a0, $zero, 0x31 -/* 78A3C4 802A1564 0C03A752 */ jal is_ability_active -/* 78A3C8 802A1568 00028180 */ sll $s0, $v0, 6 -/* 78A3CC 802A156C 000211C0 */ sll $v0, $v0, 7 -/* 78A3D0 802A1570 02028021 */ addu $s0, $s0, $v0 -/* 78A3D4 802A1574 0C03A87D */ jal add_SP -/* 78A3D8 802A1578 26040080 */ addiu $a0, $s0, 0x80 -/* 78A3DC 802A157C 8222028E */ lb $v0, 0x28e($s1) -/* 78A3E0 802A1580 86230290 */ lh $v1, 0x290($s1) -/* 78A3E4 802A1584 00021200 */ sll $v0, $v0, 8 -/* 78A3E8 802A1588 14620003 */ bne $v1, $v0, .L802A1598 -/* 78A3EC 802A158C 24020002 */ addiu $v0, $zero, 2 -.L802A1590: -/* 78A3F0 802A1590 AE420084 */ sw $v0, 0x84($s2) -/* 78A3F4 802A1594 24020002 */ addiu $v0, $zero, 2 -.L802A1598: -/* 78A3F8 802A1598 8FBF001C */ lw $ra, 0x1c($sp) -/* 78A3FC 802A159C 8FB20018 */ lw $s2, 0x18($sp) -/* 78A400 802A15A0 8FB10014 */ lw $s1, 0x14($sp) -/* 78A404 802A15A4 8FB00010 */ lw $s0, 0x10($sp) -/* 78A408 802A15A8 03E00008 */ jr $ra -/* 78A40C 802A15AC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/code_789E60/func_802A15B0_78A410.s b/ver/us/asm/nonmatchings/code_789E60/func_802A15B0_78A410.s deleted file mode 100644 index bcb92a2bd9..0000000000 --- a/ver/us/asm/nonmatchings/code_789E60/func_802A15B0_78A410.s +++ /dev/null @@ -1,34 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A15B0_78A410 -/* 78A410 802A15B0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 78A414 802A15B4 AFB10014 */ sw $s1, 0x14($sp) -/* 78A418 802A15B8 0080882D */ daddu $s1, $a0, $zero -/* 78A41C 802A15BC 3C028011 */ lui $v0, %hi(gPlayerData) -/* 78A420 802A15C0 2442F290 */ addiu $v0, $v0, %lo(gPlayerData) -/* 78A424 802A15C4 AFB00010 */ sw $s0, 0x10($sp) -/* 78A428 802A15C8 0040802D */ daddu $s0, $v0, $zero -/* 78A42C 802A15CC AFBF0018 */ sw $ra, 0x18($sp) -/* 78A430 802A15D0 AE200084 */ sw $zero, 0x84($s1) -/* 78A434 802A15D4 8202028E */ lb $v0, 0x28e($s0) -/* 78A438 802A15D8 86030290 */ lh $v1, 0x290($s0) -/* 78A43C 802A15DC 00021200 */ sll $v0, $v0, 8 -/* 78A440 802A15E0 0062182A */ slt $v1, $v1, $v0 -/* 78A444 802A15E4 10600008 */ beqz $v1, .L802A1608 -/* 78A448 802A15E8 24020001 */ addiu $v0, $zero, 1 -/* 78A44C 802A15EC 0C03A87D */ jal add_SP -/* 78A450 802A15F0 24040080 */ addiu $a0, $zero, 0x80 -/* 78A454 802A15F4 8202028E */ lb $v0, 0x28e($s0) -/* 78A458 802A15F8 86030290 */ lh $v1, 0x290($s0) -/* 78A45C 802A15FC 00021200 */ sll $v0, $v0, 8 -/* 78A460 802A1600 14620003 */ bne $v1, $v0, .L802A1610 -/* 78A464 802A1604 24020002 */ addiu $v0, $zero, 2 -.L802A1608: -/* 78A468 802A1608 AE220084 */ sw $v0, 0x84($s1) -/* 78A46C 802A160C 24020002 */ addiu $v0, $zero, 2 -.L802A1610: -/* 78A470 802A1610 8FBF0018 */ lw $ra, 0x18($sp) -/* 78A474 802A1614 8FB10014 */ lw $s1, 0x14($sp) -/* 78A478 802A1618 8FB00010 */ lw $s0, 0x10($sp) -/* 78A47C 802A161C 03E00008 */ jr $ra diff --git a/ver/us/asm/nonmatchings/code_7900D0/func_802A1218_7902E8.s b/ver/us/asm/nonmatchings/code_7900D0/func_802A1218_7902E8.s deleted file mode 100644 index ef617e8282..0000000000 --- a/ver/us/asm/nonmatchings/code_7900D0/func_802A1218_7902E8.s +++ /dev/null @@ -1,55 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1218_7902E8 -/* 7902E8 802A1218 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* 7902EC 802A121C AFB1002C */ sw $s1, 0x2c($sp) -/* 7902F0 802A1220 0080882D */ daddu $s1, $a0, $zero -/* 7902F4 802A1224 AFBF0034 */ sw $ra, 0x34($sp) -/* 7902F8 802A1228 AFB20030 */ sw $s2, 0x30($sp) -/* 7902FC 802A122C AFB00028 */ sw $s0, 0x28($sp) -/* 790300 802A1230 8E30000C */ lw $s0, 0xc($s1) -/* 790304 802A1234 8E050000 */ lw $a1, ($s0) -/* 790308 802A1238 0C0B1EAF */ jal get_variable -/* 79030C 802A123C 26100004 */ addiu $s0, $s0, 4 -/* 790310 802A1240 8E050000 */ lw $a1, ($s0) -/* 790314 802A1244 26100004 */ addiu $s0, $s0, 4 -/* 790318 802A1248 0220202D */ daddu $a0, $s1, $zero -/* 79031C 802A124C 0C0B1EAF */ jal get_variable -/* 790320 802A1250 0040902D */ daddu $s2, $v0, $zero -/* 790324 802A1254 0220202D */ daddu $a0, $s1, $zero -/* 790328 802A1258 8E050000 */ lw $a1, ($s0) -/* 79032C 802A125C 0C0B1EAF */ jal get_variable -/* 790330 802A1260 0040802D */ daddu $s0, $v0, $zero -/* 790334 802A1264 24040004 */ addiu $a0, $zero, 4 -/* 790338 802A1268 44922000 */ mtc1 $s2, $f4 -/* 79033C 802A126C 00000000 */ nop -/* 790340 802A1270 46802120 */ cvt.s.w $f4, $f4 -/* 790344 802A1274 44052000 */ mfc1 $a1, $f4 -/* 790348 802A1278 44902000 */ mtc1 $s0, $f4 -/* 79034C 802A127C 00000000 */ nop -/* 790350 802A1280 46802120 */ cvt.s.w $f4, $f4 -/* 790354 802A1284 44062000 */ mfc1 $a2, $f4 -/* 790358 802A1288 44822000 */ mtc1 $v0, $f4 -/* 79035C 802A128C 00000000 */ nop -/* 790360 802A1290 46802120 */ cvt.s.w $f4, $f4 -/* 790364 802A1294 3C0141A0 */ lui $at, 0x41a0 -/* 790368 802A1298 44810000 */ mtc1 $at, $f0 -/* 79036C 802A129C 3C013F80 */ lui $at, 0x3f80 -/* 790370 802A12A0 44811000 */ mtc1 $at, $f2 -/* 790374 802A12A4 44072000 */ mfc1 $a3, $f4 -/* 790378 802A12A8 2403000A */ addiu $v1, $zero, 0xa -/* 79037C 802A12AC AFA3001C */ sw $v1, 0x1c($sp) -/* 790380 802A12B0 2403000F */ addiu $v1, $zero, 0xf -/* 790384 802A12B4 AFA30020 */ sw $v1, 0x20($sp) -/* 790388 802A12B8 E7A00010 */ swc1 $f0, 0x10($sp) -/* 79038C 802A12BC E7A00014 */ swc1 $f0, 0x14($sp) -/* 790390 802A12C0 0C01C8D4 */ jal func_80072350 -/* 790394 802A12C4 E7A20018 */ swc1 $f2, 0x18($sp) -/* 790398 802A12C8 8FBF0034 */ lw $ra, 0x34($sp) -/* 79039C 802A12CC 8FB20030 */ lw $s2, 0x30($sp) -/* 7903A0 802A12D0 8FB1002C */ lw $s1, 0x2c($sp) -/* 7903A4 802A12D4 8FB00028 */ lw $s0, 0x28($sp) -/* 7903A8 802A12D8 24020002 */ addiu $v0, $zero, 2 -/* 7903AC 802A12DC 03E00008 */ jr $ra -/* 7903B0 802A12E0 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/ver/us/asm/nonmatchings/code_7900D0/func_802A1494_790564.s b/ver/us/asm/nonmatchings/code_7900D0/func_802A1494_790564.s deleted file mode 100644 index 59691f522f..0000000000 --- a/ver/us/asm/nonmatchings/code_7900D0/func_802A1494_790564.s +++ /dev/null @@ -1,25 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1494_790564 -/* 790564 802A1494 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 790568 802A1498 AFBF0010 */ sw $ra, 0x10($sp) -/* 79056C 802A149C 8C82000C */ lw $v0, 0xc($a0) -/* 790570 802A14A0 0C0B1EAF */ jal get_variable -/* 790574 802A14A4 8C450000 */ lw $a1, ($v0) -/* 790578 802A14A8 3C058011 */ lui $a1, %hi(gPlayerData+0x12) -/* 79057C 802A14AC 80A5F2A2 */ lb $a1, %lo(gPlayerData+0x12)($a1) -/* 790580 802A14B0 24040100 */ addiu $a0, $zero, 0x100 -/* 790584 802A14B4 00051880 */ sll $v1, $a1, 2 -/* 790588 802A14B8 00651821 */ addu $v1, $v1, $a1 -/* 79058C 802A14BC 00621821 */ addu $v1, $v1, $v0 -/* 790590 802A14C0 00031880 */ sll $v1, $v1, 2 -/* 790594 802A14C4 3C06802A */ lui $a2, %hi(D_8029C890) -/* 790598 802A14C8 00C33021 */ addu $a2, $a2, $v1 -/* 79059C 802A14CC 8CC6C890 */ lw $a2, %lo(D_8029C890)($a2) -/* 7905A0 802A14D0 0C098F3F */ jal set_animation -/* 7905A4 802A14D4 0000282D */ daddu $a1, $zero, $zero -/* 7905A8 802A14D8 8FBF0010 */ lw $ra, 0x10($sp) -/* 7905AC 802A14DC 24020002 */ addiu $v0, $zero, 2 -/* 7905B0 802A14E0 03E00008 */ jr $ra -/* 7905B4 802A14E4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/code_7900D0/func_802A163C_79070C.s b/ver/us/asm/nonmatchings/code_7900D0/func_802A163C_79070C.s deleted file mode 100644 index 005fbce5bd..0000000000 --- a/ver/us/asm/nonmatchings/code_7900D0/func_802A163C_79070C.s +++ /dev/null @@ -1,51 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A163C_79070C -/* 79070C 802A163C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 790710 802A1640 AFB20018 */ sw $s2, 0x18($sp) -/* 790714 802A1644 0080902D */ daddu $s2, $a0, $zero -/* 790718 802A1648 AFBF001C */ sw $ra, 0x1c($sp) -/* 79071C 802A164C AFB10014 */ sw $s1, 0x14($sp) -/* 790720 802A1650 AFB00010 */ sw $s0, 0x10($sp) -/* 790724 802A1654 0C09A75B */ jal get_actor -/* 790728 802A1658 8E440148 */ lw $a0, 0x148($s2) -/* 79072C 802A165C 0040802D */ daddu $s0, $v0, $zero -/* 790730 802A1660 0C09A75B */ jal get_actor -/* 790734 802A1664 86040428 */ lh $a0, 0x428($s0) -/* 790738 802A1668 0040882D */ daddu $s1, $v0, $zero -/* 79073C 802A166C 82050426 */ lb $a1, 0x426($s0) -/* 790740 802A1670 0C099117 */ jal get_actor_part -/* 790744 802A1674 0220202D */ daddu $a0, $s1, $zero -/* 790748 802A1678 AE400084 */ sw $zero, 0x84($s2) -/* 79074C 802A167C 8E310000 */ lw $s1, ($s1) -/* 790750 802A1680 0040182D */ daddu $v1, $v0, $zero -/* 790754 802A1684 32224000 */ andi $v0, $s1, 0x4000 -/* 790758 802A1688 14400014 */ bnez $v0, .L802A16DC -/* 79075C 802A168C 24020002 */ addiu $v0, $zero, 2 -/* 790760 802A1690 3C020040 */ lui $v0, 0x40 -/* 790764 802A1694 02221024 */ and $v0, $s1, $v0 -/* 790768 802A1698 14400010 */ bnez $v0, .L802A16DC -/* 79076C 802A169C 24020002 */ addiu $v0, $zero, 2 -/* 790770 802A16A0 32222000 */ andi $v0, $s1, 0x2000 -/* 790774 802A16A4 1440000D */ bnez $v0, .L802A16DC -/* 790778 802A16A8 24020002 */ addiu $v0, $zero, 2 -/* 79077C 802A16AC 8C63007C */ lw $v1, 0x7c($v1) -/* 790780 802A16B0 3C020004 */ lui $v0, 4 -/* 790784 802A16B4 00621024 */ and $v0, $v1, $v0 -/* 790788 802A16B8 14400008 */ bnez $v0, .L802A16DC -/* 79078C 802A16BC 24020002 */ addiu $v0, $zero, 2 -/* 790790 802A16C0 3C020008 */ lui $v0, 8 -/* 790794 802A16C4 00621024 */ and $v0, $v1, $v0 -/* 790798 802A16C8 14400004 */ bnez $v0, .L802A16DC -/* 79079C 802A16CC 24020002 */ addiu $v0, $zero, 2 -/* 7907A0 802A16D0 24020001 */ addiu $v0, $zero, 1 -/* 7907A4 802A16D4 AE420084 */ sw $v0, 0x84($s2) -/* 7907A8 802A16D8 24020002 */ addiu $v0, $zero, 2 -.L802A16DC: -/* 7907AC 802A16DC 8FBF001C */ lw $ra, 0x1c($sp) -/* 7907B0 802A16E0 8FB20018 */ lw $s2, 0x18($sp) -/* 7907B4 802A16E4 8FB10014 */ lw $s1, 0x14($sp) -/* 7907B8 802A16E8 8FB00010 */ lw $s0, 0x10($sp) -/* 7907BC 802A16EC 03E00008 */ jr $ra -/* 7907C0 802A16F0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/code_7900D0/func_802A16F4_7907C4.s b/ver/us/asm/nonmatchings/code_7900D0/func_802A16F4_7907C4.s deleted file mode 100644 index eef24f0e29..0000000000 --- a/ver/us/asm/nonmatchings/code_7900D0/func_802A16F4_7907C4.s +++ /dev/null @@ -1,136 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A16F4_7907C4 -/* 7907C4 802A16F4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 7907C8 802A16F8 AFBF001C */ sw $ra, 0x1c($sp) -/* 7907CC 802A16FC AFB00018 */ sw $s0, 0x18($sp) -/* 7907D0 802A1700 0C09A75B */ jal get_actor -/* 7907D4 802A1704 8C840148 */ lw $a0, 0x148($a0) -/* 7907D8 802A1708 0040802D */ daddu $s0, $v0, $zero -/* 7907DC 802A170C 0C09A75B */ jal get_actor -/* 7907E0 802A1710 86040428 */ lh $a0, 0x428($s0) -/* 7907E4 802A1714 82050426 */ lb $a1, 0x426($s0) -/* 7907E8 802A1718 0040802D */ daddu $s0, $v0, $zero -/* 7907EC 802A171C 0C099117 */ jal get_actor_part -/* 7907F0 802A1720 0200202D */ daddu $a0, $s0, $zero -/* 7907F4 802A1724 8E030000 */ lw $v1, ($s0) -/* 7907F8 802A1728 0040202D */ daddu $a0, $v0, $zero -/* 7907FC 802A172C 30624000 */ andi $v0, $v1, 0x4000 -/* 790800 802A1730 14400069 */ bnez $v0, .L802A18D8 -/* 790804 802A1734 24020002 */ addiu $v0, $zero, 2 -/* 790808 802A1738 3C020040 */ lui $v0, 0x40 -/* 79080C 802A173C 00621024 */ and $v0, $v1, $v0 -/* 790810 802A1740 10400003 */ beqz $v0, .L802A1750 -/* 790814 802A1744 30622000 */ andi $v0, $v1, 0x2000 -/* 790818 802A1748 080A8636 */ j .L802A18D8 -/* 79081C 802A174C 24020002 */ addiu $v0, $zero, 2 -.L802A1750: -/* 790820 802A1750 14400061 */ bnez $v0, .L802A18D8 -/* 790824 802A1754 24020002 */ addiu $v0, $zero, 2 -/* 790828 802A1758 8C83007C */ lw $v1, 0x7c($a0) -/* 79082C 802A175C 3C020004 */ lui $v0, 4 -/* 790830 802A1760 00621024 */ and $v0, $v1, $v0 -/* 790834 802A1764 1440005C */ bnez $v0, .L802A18D8 -/* 790838 802A1768 24020002 */ addiu $v0, $zero, 2 -/* 79083C 802A176C 3C020008 */ lui $v0, 8 -/* 790840 802A1770 00621024 */ and $v0, $v1, $v0 -/* 790844 802A1774 14400058 */ bnez $v0, .L802A18D8 -/* 790848 802A1778 24020002 */ addiu $v0, $zero, 2 -/* 79084C 802A177C 0200202D */ daddu $a0, $s0, $zero -/* 790850 802A1780 0000282D */ daddu $a1, $zero, $zero -/* 790854 802A1784 2406000A */ addiu $a2, $zero, 0xa -/* 790858 802A1788 24020004 */ addiu $v0, $zero, 4 -/* 79085C 802A178C A2020224 */ sb $v0, 0x224($s0) -/* 790860 802A1790 24020003 */ addiu $v0, $zero, 3 -/* 790864 802A1794 0C09E23E */ jal dispatch_damage_event_actor_0 -/* 790868 802A1798 A2020223 */ sb $v0, 0x223($s0) -/* 79086C 802A179C 86020150 */ lh $v0, 0x150($s0) -/* 790870 802A17A0 C6000144 */ lwc1 $f0, 0x144($s0) -/* 790874 802A17A4 8E030000 */ lw $v1, ($s0) -/* 790878 802A17A8 44821000 */ mtc1 $v0, $f2 -/* 79087C 802A17AC 00000000 */ nop -/* 790880 802A17B0 468010A0 */ cvt.s.w $f2, $f2 -/* 790884 802A17B4 92020190 */ lbu $v0, 0x190($s0) -/* 790888 802A17B8 46020000 */ add.s $f0, $f0, $f2 -/* 79088C 802A17BC 00021042 */ srl $v0, $v0, 1 -/* 790890 802A17C0 44821000 */ mtc1 $v0, $f2 -/* 790894 802A17C4 00000000 */ nop -/* 790898 802A17C8 468010A0 */ cvt.s.w $f2, $f2 -/* 79089C 802A17CC 30620800 */ andi $v0, $v1, 0x800 -/* 7908A0 802A17D0 1040000D */ beqz $v0, .L802A1808 -/* 7908A4 802A17D4 46020100 */ add.s $f4, $f0, $f2 -/* 7908A8 802A17D8 86020152 */ lh $v0, 0x152($s0) -/* 7908AC 802A17DC C6000148 */ lwc1 $f0, 0x148($s0) -/* 7908B0 802A17E0 44821000 */ mtc1 $v0, $f2 -/* 7908B4 802A17E4 00000000 */ nop -/* 7908B8 802A17E8 468010A0 */ cvt.s.w $f2, $f2 -/* 7908BC 802A17EC 92020191 */ lbu $v0, 0x191($s0) -/* 7908C0 802A17F0 46020000 */ add.s $f0, $f0, $f2 -/* 7908C4 802A17F4 44821000 */ mtc1 $v0, $f2 -/* 7908C8 802A17F8 00000000 */ nop -/* 7908CC 802A17FC 468010A0 */ cvt.s.w $f2, $f2 -/* 7908D0 802A1800 080A861D */ j .L802A1874 -/* 7908D4 802A1804 46020001 */ sub.s $f0, $f0, $f2 -.L802A1808: -/* 7908D8 802A1808 30628000 */ andi $v0, $v1, 0x8000 -/* 7908DC 802A180C 1440000D */ bnez $v0, .L802A1844 -/* 7908E0 802A1810 00000000 */ nop -/* 7908E4 802A1814 86020152 */ lh $v0, 0x152($s0) -/* 7908E8 802A1818 C6000148 */ lwc1 $f0, 0x148($s0) -/* 7908EC 802A181C 44821000 */ mtc1 $v0, $f2 -/* 7908F0 802A1820 00000000 */ nop -/* 7908F4 802A1824 468010A0 */ cvt.s.w $f2, $f2 -/* 7908F8 802A1828 92020191 */ lbu $v0, 0x191($s0) -/* 7908FC 802A182C 46020000 */ add.s $f0, $f0, $f2 -/* 790900 802A1830 44821000 */ mtc1 $v0, $f2 -/* 790904 802A1834 00000000 */ nop -/* 790908 802A1838 468010A0 */ cvt.s.w $f2, $f2 -/* 79090C 802A183C 080A861D */ j .L802A1874 -/* 790910 802A1840 46001000 */ add.s $f0, $f2, $f0 -.L802A1844: -/* 790914 802A1844 86020152 */ lh $v0, 0x152($s0) -/* 790918 802A1848 C6020148 */ lwc1 $f2, 0x148($s0) -/* 79091C 802A184C 44820000 */ mtc1 $v0, $f0 -/* 790920 802A1850 00000000 */ nop -/* 790924 802A1854 46800020 */ cvt.s.w $f0, $f0 -/* 790928 802A1858 92020191 */ lbu $v0, 0x191($s0) -/* 79092C 802A185C 46001080 */ add.s $f2, $f2, $f0 -/* 790930 802A1860 00021040 */ sll $v0, $v0, 1 -/* 790934 802A1864 44820000 */ mtc1 $v0, $f0 -/* 790938 802A1868 00000000 */ nop -/* 79093C 802A186C 46800020 */ cvt.s.w $f0, $f0 -/* 790940 802A1870 46001000 */ add.s $f0, $f2, $f0 -.L802A1874: -/* 790944 802A1874 86020154 */ lh $v0, 0x154($s0) -/* 790948 802A1878 44060000 */ mfc1 $a2, $f0 -/* 79094C 802A187C C600014C */ lwc1 $f0, 0x14c($s0) -/* 790950 802A1880 44821000 */ mtc1 $v0, $f2 -/* 790954 802A1884 00000000 */ nop -/* 790958 802A1888 468010A0 */ cvt.s.w $f2, $f2 -/* 79095C 802A188C 46020000 */ add.s $f0, $f0, $f2 -/* 790960 802A1890 3C0140A0 */ lui $at, 0x40a0 -/* 790964 802A1894 44811000 */ mtc1 $at, $f2 -/* 790968 802A1898 24040005 */ addiu $a0, $zero, 5 -/* 79096C 802A189C 46020000 */ add.s $f0, $f0, $f2 -/* 790970 802A18A0 44052000 */ mfc1 $a1, $f4 -/* 790974 802A18A4 3C013F80 */ lui $at, 0x3f80 -/* 790978 802A18A8 44812000 */ mtc1 $at, $f4 -/* 79097C 802A18AC 44070000 */ mfc1 $a3, $f0 -/* 790980 802A18B0 2402003C */ addiu $v0, $zero, 0x3c -/* 790984 802A18B4 AFA20014 */ sw $v0, 0x14($sp) -/* 790988 802A18B8 0C01C634 */ jal func_800718D0 -/* 79098C 802A18BC E7A40010 */ swc1 $f4, 0x10($sp) -/* 790990 802A18C0 0C05272D */ jal play_sound -/* 790994 802A18C4 24042106 */ addiu $a0, $zero, 0x2106 -/* 790998 802A18C8 24020002 */ addiu $v0, $zero, 2 -/* 79099C 802A18CC 24030001 */ addiu $v1, $zero, 1 -/* 7909A0 802A18D0 3C01802A */ lui $at, %hi(D_802A2CC0) -/* 7909A4 802A18D4 AC232CC0 */ sw $v1, %lo(D_802A2CC0)($at) -.L802A18D8: -/* 7909A8 802A18D8 8FBF001C */ lw $ra, 0x1c($sp) -/* 7909AC 802A18DC 8FB00018 */ lw $s0, 0x18($sp) -/* 7909B0 802A18E0 03E00008 */ jr $ra -/* 7909B4 802A18E4 27BD0020 */ addiu $sp, $sp, 0x20 -/* 7909B8 802A18E8 00000000 */ nop -/* 7909BC 802A18EC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/code_793D20/func_802A1000_793D20.s b/ver/us/asm/nonmatchings/code_793D20/func_802A1000_793D20.s deleted file mode 100644 index 61121132dd..0000000000 --- a/ver/us/asm/nonmatchings/code_793D20/func_802A1000_793D20.s +++ /dev/null @@ -1,47 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1000_793D20 -/* 793D20 802A1000 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 793D24 802A1004 AFB1001C */ sw $s1, 0x1c($sp) -/* 793D28 802A1008 0080882D */ daddu $s1, $a0, $zero -/* 793D2C 802A100C AFBF0024 */ sw $ra, 0x24($sp) -/* 793D30 802A1010 AFB20020 */ sw $s2, 0x20($sp) -/* 793D34 802A1014 AFB00018 */ sw $s0, 0x18($sp) -/* 793D38 802A1018 8E30000C */ lw $s0, 0xc($s1) -/* 793D3C 802A101C 8E050000 */ lw $a1, ($s0) -/* 793D40 802A1020 0C0B1EAF */ jal get_variable -/* 793D44 802A1024 26100004 */ addiu $s0, $s0, 4 -/* 793D48 802A1028 8E050000 */ lw $a1, ($s0) -/* 793D4C 802A102C 26100004 */ addiu $s0, $s0, 4 -/* 793D50 802A1030 0220202D */ daddu $a0, $s1, $zero -/* 793D54 802A1034 0C0B1EAF */ jal get_variable -/* 793D58 802A1038 0040902D */ daddu $s2, $v0, $zero -/* 793D5C 802A103C 0220202D */ daddu $a0, $s1, $zero -/* 793D60 802A1040 8E050000 */ lw $a1, ($s0) -/* 793D64 802A1044 0C0B1EAF */ jal get_variable -/* 793D68 802A1048 0040802D */ daddu $s0, $v0, $zero -/* 793D6C 802A104C 44921000 */ mtc1 $s2, $f2 -/* 793D70 802A1050 00000000 */ nop -/* 793D74 802A1054 468010A0 */ cvt.s.w $f2, $f2 -/* 793D78 802A1058 44051000 */ mfc1 $a1, $f2 -/* 793D7C 802A105C 44901000 */ mtc1 $s0, $f2 -/* 793D80 802A1060 00000000 */ nop -/* 793D84 802A1064 468010A0 */ cvt.s.w $f2, $f2 -/* 793D88 802A1068 44061000 */ mfc1 $a2, $f2 -/* 793D8C 802A106C 44821000 */ mtc1 $v0, $f2 -/* 793D90 802A1070 00000000 */ nop -/* 793D94 802A1074 468010A0 */ cvt.s.w $f2, $f2 -/* 793D98 802A1078 3C014220 */ lui $at, 0x4220 -/* 793D9C 802A107C 44810000 */ mtc1 $at, $f0 -/* 793DA0 802A1080 44071000 */ mfc1 $a3, $f2 -/* 793DA4 802A1084 0000202D */ daddu $a0, $zero, $zero -/* 793DA8 802A1088 0C01BFBC */ jal func_8006FEF0 -/* 793DAC 802A108C E7A00010 */ swc1 $f0, 0x10($sp) -/* 793DB0 802A1090 8FBF0024 */ lw $ra, 0x24($sp) -/* 793DB4 802A1094 8FB20020 */ lw $s2, 0x20($sp) -/* 793DB8 802A1098 8FB1001C */ lw $s1, 0x1c($sp) -/* 793DBC 802A109C 8FB00018 */ lw $s0, 0x18($sp) -/* 793DC0 802A10A0 24020002 */ addiu $v0, $zero, 2 -/* 793DC4 802A10A4 03E00008 */ jr $ra -/* 793DC8 802A10A8 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/code_793D20/func_802A116C_793E8C.s b/ver/us/asm/nonmatchings/code_793D20/func_802A116C_793E8C.s deleted file mode 100644 index 14b0235976..0000000000 --- a/ver/us/asm/nonmatchings/code_793D20/func_802A116C_793E8C.s +++ /dev/null @@ -1,47 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A116C_793E8C -/* 793E8C 802A116C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 793E90 802A1170 AFB1001C */ sw $s1, 0x1c($sp) -/* 793E94 802A1174 0080882D */ daddu $s1, $a0, $zero -/* 793E98 802A1178 AFBF0024 */ sw $ra, 0x24($sp) -/* 793E9C 802A117C AFB20020 */ sw $s2, 0x20($sp) -/* 793EA0 802A1180 AFB00018 */ sw $s0, 0x18($sp) -/* 793EA4 802A1184 8E30000C */ lw $s0, 0xc($s1) -/* 793EA8 802A1188 8E050000 */ lw $a1, ($s0) -/* 793EAC 802A118C 0C0B1EAF */ jal get_variable -/* 793EB0 802A1190 26100004 */ addiu $s0, $s0, 4 -/* 793EB4 802A1194 8E050000 */ lw $a1, ($s0) -/* 793EB8 802A1198 26100004 */ addiu $s0, $s0, 4 -/* 793EBC 802A119C 0220202D */ daddu $a0, $s1, $zero -/* 793EC0 802A11A0 0C0B1EAF */ jal get_variable -/* 793EC4 802A11A4 0040902D */ daddu $s2, $v0, $zero -/* 793EC8 802A11A8 0220202D */ daddu $a0, $s1, $zero -/* 793ECC 802A11AC 8E050000 */ lw $a1, ($s0) -/* 793ED0 802A11B0 0C0B1EAF */ jal get_variable -/* 793ED4 802A11B4 0040802D */ daddu $s0, $v0, $zero -/* 793ED8 802A11B8 44921000 */ mtc1 $s2, $f2 -/* 793EDC 802A11BC 00000000 */ nop -/* 793EE0 802A11C0 468010A0 */ cvt.s.w $f2, $f2 -/* 793EE4 802A11C4 44051000 */ mfc1 $a1, $f2 -/* 793EE8 802A11C8 44901000 */ mtc1 $s0, $f2 -/* 793EEC 802A11CC 00000000 */ nop -/* 793EF0 802A11D0 468010A0 */ cvt.s.w $f2, $f2 -/* 793EF4 802A11D4 44061000 */ mfc1 $a2, $f2 -/* 793EF8 802A11D8 44821000 */ mtc1 $v0, $f2 -/* 793EFC 802A11DC 00000000 */ nop -/* 793F00 802A11E0 468010A0 */ cvt.s.w $f2, $f2 -/* 793F04 802A11E4 3C0141F0 */ lui $at, 0x41f0 -/* 793F08 802A11E8 44810000 */ mtc1 $at, $f0 -/* 793F0C 802A11EC 44071000 */ mfc1 $a3, $f2 -/* 793F10 802A11F0 0000202D */ daddu $a0, $zero, $zero -/* 793F14 802A11F4 0C01BFBC */ jal func_8006FEF0 -/* 793F18 802A11F8 E7A00010 */ swc1 $f0, 0x10($sp) -/* 793F1C 802A11FC 8FBF0024 */ lw $ra, 0x24($sp) -/* 793F20 802A1200 8FB20020 */ lw $s2, 0x20($sp) -/* 793F24 802A1204 8FB1001C */ lw $s1, 0x1c($sp) -/* 793F28 802A1208 8FB00018 */ lw $s0, 0x18($sp) -/* 793F2C 802A120C 24020002 */ addiu $v0, $zero, 2 -/* 793F30 802A1210 03E00008 */ jr $ra -/* 793F34 802A1214 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/code_793D20/func_802A1218_793F38.s b/ver/us/asm/nonmatchings/code_793D20/func_802A1218_793F38.s deleted file mode 100644 index bcbdb703d7..0000000000 --- a/ver/us/asm/nonmatchings/code_793D20/func_802A1218_793F38.s +++ /dev/null @@ -1,55 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1218_793F38 -/* 793F38 802A1218 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* 793F3C 802A121C AFB1002C */ sw $s1, 0x2c($sp) -/* 793F40 802A1220 0080882D */ daddu $s1, $a0, $zero -/* 793F44 802A1224 AFBF0034 */ sw $ra, 0x34($sp) -/* 793F48 802A1228 AFB20030 */ sw $s2, 0x30($sp) -/* 793F4C 802A122C AFB00028 */ sw $s0, 0x28($sp) -/* 793F50 802A1230 8E30000C */ lw $s0, 0xc($s1) -/* 793F54 802A1234 8E050000 */ lw $a1, ($s0) -/* 793F58 802A1238 0C0B1EAF */ jal get_variable -/* 793F5C 802A123C 26100004 */ addiu $s0, $s0, 4 -/* 793F60 802A1240 8E050000 */ lw $a1, ($s0) -/* 793F64 802A1244 26100004 */ addiu $s0, $s0, 4 -/* 793F68 802A1248 0220202D */ daddu $a0, $s1, $zero -/* 793F6C 802A124C 0C0B1EAF */ jal get_variable -/* 793F70 802A1250 0040902D */ daddu $s2, $v0, $zero -/* 793F74 802A1254 0220202D */ daddu $a0, $s1, $zero -/* 793F78 802A1258 8E050000 */ lw $a1, ($s0) -/* 793F7C 802A125C 0C0B1EAF */ jal get_variable -/* 793F80 802A1260 0040802D */ daddu $s0, $v0, $zero -/* 793F84 802A1264 24040004 */ addiu $a0, $zero, 4 -/* 793F88 802A1268 44922000 */ mtc1 $s2, $f4 -/* 793F8C 802A126C 00000000 */ nop -/* 793F90 802A1270 46802120 */ cvt.s.w $f4, $f4 -/* 793F94 802A1274 44052000 */ mfc1 $a1, $f4 -/* 793F98 802A1278 44902000 */ mtc1 $s0, $f4 -/* 793F9C 802A127C 00000000 */ nop -/* 793FA0 802A1280 46802120 */ cvt.s.w $f4, $f4 -/* 793FA4 802A1284 44062000 */ mfc1 $a2, $f4 -/* 793FA8 802A1288 44822000 */ mtc1 $v0, $f4 -/* 793FAC 802A128C 00000000 */ nop -/* 793FB0 802A1290 46802120 */ cvt.s.w $f4, $f4 -/* 793FB4 802A1294 3C0141A0 */ lui $at, 0x41a0 -/* 793FB8 802A1298 44810000 */ mtc1 $at, $f0 -/* 793FBC 802A129C 3C013F80 */ lui $at, 0x3f80 -/* 793FC0 802A12A0 44811000 */ mtc1 $at, $f2 -/* 793FC4 802A12A4 44072000 */ mfc1 $a3, $f4 -/* 793FC8 802A12A8 2403000A */ addiu $v1, $zero, 0xa -/* 793FCC 802A12AC AFA3001C */ sw $v1, 0x1c($sp) -/* 793FD0 802A12B0 2403000F */ addiu $v1, $zero, 0xf -/* 793FD4 802A12B4 AFA30020 */ sw $v1, 0x20($sp) -/* 793FD8 802A12B8 E7A00010 */ swc1 $f0, 0x10($sp) -/* 793FDC 802A12BC E7A00014 */ swc1 $f0, 0x14($sp) -/* 793FE0 802A12C0 0C01C8D4 */ jal func_80072350 -/* 793FE4 802A12C4 E7A20018 */ swc1 $f2, 0x18($sp) -/* 793FE8 802A12C8 8FBF0034 */ lw $ra, 0x34($sp) -/* 793FEC 802A12CC 8FB20030 */ lw $s2, 0x30($sp) -/* 793FF0 802A12D0 8FB1002C */ lw $s1, 0x2c($sp) -/* 793FF4 802A12D4 8FB00028 */ lw $s0, 0x28($sp) -/* 793FF8 802A12D8 24020002 */ addiu $v0, $zero, 2 -/* 793FFC 802A12DC 03E00008 */ jr $ra -/* 794000 802A12E0 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/ver/us/asm/nonmatchings/code_793D20/func_802A1414_794134.s b/ver/us/asm/nonmatchings/code_793D20/func_802A1414_794134.s deleted file mode 100644 index 99f6d0af4c..0000000000 --- a/ver/us/asm/nonmatchings/code_793D20/func_802A1414_794134.s +++ /dev/null @@ -1,39 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1414_794134 -/* 794134 802A1414 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 794138 802A1418 AFB00010 */ sw $s0, 0x10($sp) -/* 79413C 802A141C 0080802D */ daddu $s0, $a0, $zero -/* 794140 802A1420 10A00003 */ beqz $a1, .L802A1430 -/* 794144 802A1424 AFBF0014 */ sw $ra, 0x14($sp) -/* 794148 802A1428 24020014 */ addiu $v0, $zero, 0x14 -/* 79414C 802A142C AE020070 */ sw $v0, 0x70($s0) -.L802A1430: -/* 794150 802A1430 0000202D */ daddu $a0, $zero, $zero -/* 794154 802A1434 0080282D */ daddu $a1, $a0, $zero -/* 794158 802A1438 8E020070 */ lw $v0, 0x70($s0) -/* 79415C 802A143C 0080302D */ daddu $a2, $a0, $zero -/* 794160 802A1440 00023880 */ sll $a3, $v0, 2 -/* 794164 802A1444 00E23821 */ addu $a3, $a3, $v0 -/* 794168 802A1448 00073840 */ sll $a3, $a3, 1 -/* 79416C 802A144C 0C046F97 */ jal set_background_color_blend -/* 794170 802A1450 30E700FE */ andi $a3, $a3, 0xfe -/* 794174 802A1454 8E020070 */ lw $v0, 0x70($s0) -/* 794178 802A1458 2442FFFF */ addiu $v0, $v0, -1 -/* 79417C 802A145C 10400003 */ beqz $v0, .L802A146C -/* 794180 802A1460 AE020070 */ sw $v0, 0x70($s0) -/* 794184 802A1464 080A8521 */ j .L802A1484 -/* 794188 802A1468 0000102D */ daddu $v0, $zero, $zero -.L802A146C: -/* 79418C 802A146C 0000202D */ daddu $a0, $zero, $zero -/* 794190 802A1470 0080282D */ daddu $a1, $a0, $zero -/* 794194 802A1474 0080302D */ daddu $a2, $a0, $zero -/* 794198 802A1478 0C046F97 */ jal set_background_color_blend -/* 79419C 802A147C 0080382D */ daddu $a3, $a0, $zero -/* 7941A0 802A1480 24020002 */ addiu $v0, $zero, 2 -.L802A1484: -/* 7941A4 802A1484 8FBF0014 */ lw $ra, 0x14($sp) -/* 7941A8 802A1488 8FB00010 */ lw $s0, 0x10($sp) -/* 7941AC 802A148C 03E00008 */ jr $ra -/* 7941B0 802A1490 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/code_793D20/func_802A1494_7941B4.s b/ver/us/asm/nonmatchings/code_793D20/func_802A1494_7941B4.s deleted file mode 100644 index 07e8c5edf8..0000000000 --- a/ver/us/asm/nonmatchings/code_793D20/func_802A1494_7941B4.s +++ /dev/null @@ -1,25 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1494_7941B4 -/* 7941B4 802A1494 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 7941B8 802A1498 AFBF0010 */ sw $ra, 0x10($sp) -/* 7941BC 802A149C 8C82000C */ lw $v0, 0xc($a0) -/* 7941C0 802A14A0 0C0B1EAF */ jal get_variable -/* 7941C4 802A14A4 8C450000 */ lw $a1, ($v0) -/* 7941C8 802A14A8 3C058011 */ lui $a1, %hi(gPlayerData+0x12) -/* 7941CC 802A14AC 80A5F2A2 */ lb $a1, %lo(gPlayerData+0x12)($a1) -/* 7941D0 802A14B0 24040100 */ addiu $a0, $zero, 0x100 -/* 7941D4 802A14B4 00051880 */ sll $v1, $a1, 2 -/* 7941D8 802A14B8 00651821 */ addu $v1, $v1, $a1 -/* 7941DC 802A14BC 00621821 */ addu $v1, $v1, $v0 -/* 7941E0 802A14C0 00031880 */ sll $v1, $v1, 2 -/* 7941E4 802A14C4 3C06802A */ lui $a2, %hi(D_8029C890) -/* 7941E8 802A14C8 00C33021 */ addu $a2, $a2, $v1 -/* 7941EC 802A14CC 8CC6C890 */ lw $a2, %lo(D_8029C890)($a2) -/* 7941F0 802A14D0 0C098F3F */ jal set_animation -/* 7941F4 802A14D4 0000282D */ daddu $a1, $zero, $zero -/* 7941F8 802A14D8 8FBF0010 */ lw $ra, 0x10($sp) -/* 7941FC 802A14DC 24020002 */ addiu $v0, $zero, 2 -/* 794200 802A14E0 03E00008 */ jr $ra -/* 794204 802A14E4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/code_793D20/func_802A14E8_794208.s b/ver/us/asm/nonmatchings/code_793D20/func_802A14E8_794208.s deleted file mode 100644 index 2c849f636f..0000000000 --- a/ver/us/asm/nonmatchings/code_793D20/func_802A14E8_794208.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A14E8_794208 -/* 794208 802A14E8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 79420C 802A14EC AFBF0010 */ sw $ra, 0x10($sp) -/* 794210 802A14F0 0C00EABB */ jal get_npc_unsafe -/* 794214 802A14F4 24040064 */ addiu $a0, $zero, 0x64 -/* 794218 802A14F8 0040202D */ daddu $a0, $v0, $zero -/* 79421C 802A14FC 24030020 */ addiu $v1, $zero, 0x20 -/* 794220 802A1500 A48300A8 */ sh $v1, 0xa8($a0) -/* 794224 802A1504 A48300A6 */ sh $v1, 0xa6($a0) -/* 794228 802A1508 8FBF0010 */ lw $ra, 0x10($sp) -/* 79422C 802A150C 24020002 */ addiu $v0, $zero, 2 -/* 794230 802A1510 03E00008 */ jr $ra -/* 794234 802A1514 27BD0018 */ addiu $sp, $sp, 0x18 -/* 794238 802A1518 00000000 */ nop -/* 79423C 802A151C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/code_7952E0/func_802A1000_7952E0.s b/ver/us/asm/nonmatchings/code_7952E0/func_802A1000_7952E0.s deleted file mode 100644 index ced1df2af0..0000000000 --- a/ver/us/asm/nonmatchings/code_7952E0/func_802A1000_7952E0.s +++ /dev/null @@ -1,47 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1000_7952E0 -/* 7952E0 802A1000 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 7952E4 802A1004 AFB1001C */ sw $s1, 0x1c($sp) -/* 7952E8 802A1008 0080882D */ daddu $s1, $a0, $zero -/* 7952EC 802A100C AFBF0024 */ sw $ra, 0x24($sp) -/* 7952F0 802A1010 AFB20020 */ sw $s2, 0x20($sp) -/* 7952F4 802A1014 AFB00018 */ sw $s0, 0x18($sp) -/* 7952F8 802A1018 8E30000C */ lw $s0, 0xc($s1) -/* 7952FC 802A101C 8E050000 */ lw $a1, ($s0) -/* 795300 802A1020 0C0B1EAF */ jal get_variable -/* 795304 802A1024 26100004 */ addiu $s0, $s0, 4 -/* 795308 802A1028 8E050000 */ lw $a1, ($s0) -/* 79530C 802A102C 26100004 */ addiu $s0, $s0, 4 -/* 795310 802A1030 0220202D */ daddu $a0, $s1, $zero -/* 795314 802A1034 0C0B1EAF */ jal get_variable -/* 795318 802A1038 0040902D */ daddu $s2, $v0, $zero -/* 79531C 802A103C 0220202D */ daddu $a0, $s1, $zero -/* 795320 802A1040 8E050000 */ lw $a1, ($s0) -/* 795324 802A1044 0C0B1EAF */ jal get_variable -/* 795328 802A1048 0040802D */ daddu $s0, $v0, $zero -/* 79532C 802A104C 44921000 */ mtc1 $s2, $f2 -/* 795330 802A1050 00000000 */ nop -/* 795334 802A1054 468010A0 */ cvt.s.w $f2, $f2 -/* 795338 802A1058 44051000 */ mfc1 $a1, $f2 -/* 79533C 802A105C 44901000 */ mtc1 $s0, $f2 -/* 795340 802A1060 00000000 */ nop -/* 795344 802A1064 468010A0 */ cvt.s.w $f2, $f2 -/* 795348 802A1068 44061000 */ mfc1 $a2, $f2 -/* 79534C 802A106C 44821000 */ mtc1 $v0, $f2 -/* 795350 802A1070 00000000 */ nop -/* 795354 802A1074 468010A0 */ cvt.s.w $f2, $f2 -/* 795358 802A1078 3C014220 */ lui $at, 0x4220 -/* 79535C 802A107C 44810000 */ mtc1 $at, $f0 -/* 795360 802A1080 44071000 */ mfc1 $a3, $f2 -/* 795364 802A1084 0000202D */ daddu $a0, $zero, $zero -/* 795368 802A1088 0C01BFBC */ jal func_8006FEF0 -/* 79536C 802A108C E7A00010 */ swc1 $f0, 0x10($sp) -/* 795370 802A1090 8FBF0024 */ lw $ra, 0x24($sp) -/* 795374 802A1094 8FB20020 */ lw $s2, 0x20($sp) -/* 795378 802A1098 8FB1001C */ lw $s1, 0x1c($sp) -/* 79537C 802A109C 8FB00018 */ lw $s0, 0x18($sp) -/* 795380 802A10A0 24020002 */ addiu $v0, $zero, 2 -/* 795384 802A10A4 03E00008 */ jr $ra -/* 795388 802A10A8 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/code_7952E0/func_802A10AC_79538C.s b/ver/us/asm/nonmatchings/code_7952E0/func_802A10AC_79538C.s deleted file mode 100644 index 51abb48ccc..0000000000 --- a/ver/us/asm/nonmatchings/code_7952E0/func_802A10AC_79538C.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A10AC_79538C -/* 79538C 802A10AC 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 795390 802A10B0 AFB10024 */ sw $s1, 0x24($sp) -/* 795394 802A10B4 0080882D */ daddu $s1, $a0, $zero -/* 795398 802A10B8 AFBF002C */ sw $ra, 0x2c($sp) -/* 79539C 802A10BC AFB20028 */ sw $s2, 0x28($sp) -/* 7953A0 802A10C0 AFB00020 */ sw $s0, 0x20($sp) -/* 7953A4 802A10C4 8E30000C */ lw $s0, 0xc($s1) -/* 7953A8 802A10C8 8E050000 */ lw $a1, ($s0) -/* 7953AC 802A10CC 0C0B1EAF */ jal get_variable -/* 7953B0 802A10D0 26100004 */ addiu $s0, $s0, 4 -/* 7953B4 802A10D4 8E050000 */ lw $a1, ($s0) -/* 7953B8 802A10D8 26100004 */ addiu $s0, $s0, 4 -/* 7953BC 802A10DC 0220202D */ daddu $a0, $s1, $zero -/* 7953C0 802A10E0 0C0B1EAF */ jal get_variable -/* 7953C4 802A10E4 0040902D */ daddu $s2, $v0, $zero -/* 7953C8 802A10E8 0220202D */ daddu $a0, $s1, $zero -/* 7953CC 802A10EC 8E050000 */ lw $a1, ($s0) -/* 7953D0 802A10F0 0C0B1EAF */ jal get_variable -/* 7953D4 802A10F4 0040802D */ daddu $s0, $v0, $zero -/* 7953D8 802A10F8 24040005 */ addiu $a0, $zero, 5 -/* 7953DC 802A10FC 44921000 */ mtc1 $s2, $f2 -/* 7953E0 802A1100 00000000 */ nop -/* 7953E4 802A1104 468010A0 */ cvt.s.w $f2, $f2 -/* 7953E8 802A1108 44051000 */ mfc1 $a1, $f2 -/* 7953EC 802A110C 44901000 */ mtc1 $s0, $f2 -/* 7953F0 802A1110 00000000 */ nop -/* 7953F4 802A1114 468010A0 */ cvt.s.w $f2, $f2 -/* 7953F8 802A1118 44061000 */ mfc1 $a2, $f2 -/* 7953FC 802A111C 44821000 */ mtc1 $v0, $f2 -/* 795400 802A1120 00000000 */ nop -/* 795404 802A1124 468010A0 */ cvt.s.w $f2, $f2 -/* 795408 802A1128 3C014248 */ lui $at, 0x4248 -/* 79540C 802A112C 44810000 */ mtc1 $at, $f0 -/* 795410 802A1130 44071000 */ mfc1 $a3, $f2 -/* 795414 802A1134 24030028 */ addiu $v1, $zero, 0x28 -/* 795418 802A1138 AFA30018 */ sw $v1, 0x18($sp) -/* 79541C 802A113C 2403001E */ addiu $v1, $zero, 0x1e -/* 795420 802A1140 AFA3001C */ sw $v1, 0x1c($sp) -/* 795424 802A1144 E7A00010 */ swc1 $f0, 0x10($sp) -/* 795428 802A1148 0C01C154 */ jal func_80070550 -/* 79542C 802A114C E7A00014 */ swc1 $f0, 0x14($sp) -/* 795430 802A1150 8FBF002C */ lw $ra, 0x2c($sp) -/* 795434 802A1154 8FB20028 */ lw $s2, 0x28($sp) -/* 795438 802A1158 8FB10024 */ lw $s1, 0x24($sp) -/* 79543C 802A115C 8FB00020 */ lw $s0, 0x20($sp) -/* 795440 802A1160 24020002 */ addiu $v0, $zero, 2 -/* 795444 802A1164 03E00008 */ jr $ra -/* 795448 802A1168 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/code_7952E0/func_802A116C_79544C.s b/ver/us/asm/nonmatchings/code_7952E0/func_802A116C_79544C.s deleted file mode 100644 index 185081c341..0000000000 --- a/ver/us/asm/nonmatchings/code_7952E0/func_802A116C_79544C.s +++ /dev/null @@ -1,47 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A116C_79544C -/* 79544C 802A116C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 795450 802A1170 AFB1001C */ sw $s1, 0x1c($sp) -/* 795454 802A1174 0080882D */ daddu $s1, $a0, $zero -/* 795458 802A1178 AFBF0024 */ sw $ra, 0x24($sp) -/* 79545C 802A117C AFB20020 */ sw $s2, 0x20($sp) -/* 795460 802A1180 AFB00018 */ sw $s0, 0x18($sp) -/* 795464 802A1184 8E30000C */ lw $s0, 0xc($s1) -/* 795468 802A1188 8E050000 */ lw $a1, ($s0) -/* 79546C 802A118C 0C0B1EAF */ jal get_variable -/* 795470 802A1190 26100004 */ addiu $s0, $s0, 4 -/* 795474 802A1194 8E050000 */ lw $a1, ($s0) -/* 795478 802A1198 26100004 */ addiu $s0, $s0, 4 -/* 79547C 802A119C 0220202D */ daddu $a0, $s1, $zero -/* 795480 802A11A0 0C0B1EAF */ jal get_variable -/* 795484 802A11A4 0040902D */ daddu $s2, $v0, $zero -/* 795488 802A11A8 0220202D */ daddu $a0, $s1, $zero -/* 79548C 802A11AC 8E050000 */ lw $a1, ($s0) -/* 795490 802A11B0 0C0B1EAF */ jal get_variable -/* 795494 802A11B4 0040802D */ daddu $s0, $v0, $zero -/* 795498 802A11B8 44921000 */ mtc1 $s2, $f2 -/* 79549C 802A11BC 00000000 */ nop -/* 7954A0 802A11C0 468010A0 */ cvt.s.w $f2, $f2 -/* 7954A4 802A11C4 44051000 */ mfc1 $a1, $f2 -/* 7954A8 802A11C8 44901000 */ mtc1 $s0, $f2 -/* 7954AC 802A11CC 00000000 */ nop -/* 7954B0 802A11D0 468010A0 */ cvt.s.w $f2, $f2 -/* 7954B4 802A11D4 44061000 */ mfc1 $a2, $f2 -/* 7954B8 802A11D8 44821000 */ mtc1 $v0, $f2 -/* 7954BC 802A11DC 00000000 */ nop -/* 7954C0 802A11E0 468010A0 */ cvt.s.w $f2, $f2 -/* 7954C4 802A11E4 3C0141F0 */ lui $at, 0x41f0 -/* 7954C8 802A11E8 44810000 */ mtc1 $at, $f0 -/* 7954CC 802A11EC 44071000 */ mfc1 $a3, $f2 -/* 7954D0 802A11F0 0000202D */ daddu $a0, $zero, $zero -/* 7954D4 802A11F4 0C01BFBC */ jal func_8006FEF0 -/* 7954D8 802A11F8 E7A00010 */ swc1 $f0, 0x10($sp) -/* 7954DC 802A11FC 8FBF0024 */ lw $ra, 0x24($sp) -/* 7954E0 802A1200 8FB20020 */ lw $s2, 0x20($sp) -/* 7954E4 802A1204 8FB1001C */ lw $s1, 0x1c($sp) -/* 7954E8 802A1208 8FB00018 */ lw $s0, 0x18($sp) -/* 7954EC 802A120C 24020002 */ addiu $v0, $zero, 2 -/* 7954F0 802A1210 03E00008 */ jr $ra -/* 7954F4 802A1214 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/code_7952E0/func_802A1218_7954F8.s b/ver/us/asm/nonmatchings/code_7952E0/func_802A1218_7954F8.s deleted file mode 100644 index 88ea7f98b4..0000000000 --- a/ver/us/asm/nonmatchings/code_7952E0/func_802A1218_7954F8.s +++ /dev/null @@ -1,55 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1218_7954F8 -/* 7954F8 802A1218 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* 7954FC 802A121C AFB1002C */ sw $s1, 0x2c($sp) -/* 795500 802A1220 0080882D */ daddu $s1, $a0, $zero -/* 795504 802A1224 AFBF0034 */ sw $ra, 0x34($sp) -/* 795508 802A1228 AFB20030 */ sw $s2, 0x30($sp) -/* 79550C 802A122C AFB00028 */ sw $s0, 0x28($sp) -/* 795510 802A1230 8E30000C */ lw $s0, 0xc($s1) -/* 795514 802A1234 8E050000 */ lw $a1, ($s0) -/* 795518 802A1238 0C0B1EAF */ jal get_variable -/* 79551C 802A123C 26100004 */ addiu $s0, $s0, 4 -/* 795520 802A1240 8E050000 */ lw $a1, ($s0) -/* 795524 802A1244 26100004 */ addiu $s0, $s0, 4 -/* 795528 802A1248 0220202D */ daddu $a0, $s1, $zero -/* 79552C 802A124C 0C0B1EAF */ jal get_variable -/* 795530 802A1250 0040902D */ daddu $s2, $v0, $zero -/* 795534 802A1254 0220202D */ daddu $a0, $s1, $zero -/* 795538 802A1258 8E050000 */ lw $a1, ($s0) -/* 79553C 802A125C 0C0B1EAF */ jal get_variable -/* 795540 802A1260 0040802D */ daddu $s0, $v0, $zero -/* 795544 802A1264 24040004 */ addiu $a0, $zero, 4 -/* 795548 802A1268 44922000 */ mtc1 $s2, $f4 -/* 79554C 802A126C 00000000 */ nop -/* 795550 802A1270 46802120 */ cvt.s.w $f4, $f4 -/* 795554 802A1274 44052000 */ mfc1 $a1, $f4 -/* 795558 802A1278 44902000 */ mtc1 $s0, $f4 -/* 79555C 802A127C 00000000 */ nop -/* 795560 802A1280 46802120 */ cvt.s.w $f4, $f4 -/* 795564 802A1284 44062000 */ mfc1 $a2, $f4 -/* 795568 802A1288 44822000 */ mtc1 $v0, $f4 -/* 79556C 802A128C 00000000 */ nop -/* 795570 802A1290 46802120 */ cvt.s.w $f4, $f4 -/* 795574 802A1294 3C0141A0 */ lui $at, 0x41a0 -/* 795578 802A1298 44810000 */ mtc1 $at, $f0 -/* 79557C 802A129C 3C013F80 */ lui $at, 0x3f80 -/* 795580 802A12A0 44811000 */ mtc1 $at, $f2 -/* 795584 802A12A4 44072000 */ mfc1 $a3, $f4 -/* 795588 802A12A8 2403000A */ addiu $v1, $zero, 0xa -/* 79558C 802A12AC AFA3001C */ sw $v1, 0x1c($sp) -/* 795590 802A12B0 2403000F */ addiu $v1, $zero, 0xf -/* 795594 802A12B4 AFA30020 */ sw $v1, 0x20($sp) -/* 795598 802A12B8 E7A00010 */ swc1 $f0, 0x10($sp) -/* 79559C 802A12BC E7A00014 */ swc1 $f0, 0x14($sp) -/* 7955A0 802A12C0 0C01C8D4 */ jal func_80072350 -/* 7955A4 802A12C4 E7A20018 */ swc1 $f2, 0x18($sp) -/* 7955A8 802A12C8 8FBF0034 */ lw $ra, 0x34($sp) -/* 7955AC 802A12CC 8FB20030 */ lw $s2, 0x30($sp) -/* 7955B0 802A12D0 8FB1002C */ lw $s1, 0x2c($sp) -/* 7955B4 802A12D4 8FB00028 */ lw $s0, 0x28($sp) -/* 7955B8 802A12D8 24020002 */ addiu $v0, $zero, 2 -/* 7955BC 802A12DC 03E00008 */ jr $ra -/* 7955C0 802A12E0 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/ver/us/asm/nonmatchings/code_7952E0/func_802A137C_79565C.s b/ver/us/asm/nonmatchings/code_7952E0/func_802A137C_79565C.s deleted file mode 100644 index 5e638105eb..0000000000 --- a/ver/us/asm/nonmatchings/code_7952E0/func_802A137C_79565C.s +++ /dev/null @@ -1,44 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A137C_79565C -/* 79565C 802A137C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 795660 802A1380 AFB00010 */ sw $s0, 0x10($sp) -/* 795664 802A1384 0080802D */ daddu $s0, $a0, $zero -/* 795668 802A1388 10A0000D */ beqz $a1, .L802A13C0 -/* 79566C 802A138C AFBF0014 */ sw $ra, 0x14($sp) -/* 795670 802A1390 0C04760B */ jal func_8011D82C -/* 795674 802A1394 24040001 */ addiu $a0, $zero, 1 -/* 795678 802A1398 0000202D */ daddu $a0, $zero, $zero -/* 79567C 802A139C 0080282D */ daddu $a1, $a0, $zero -/* 795680 802A13A0 0080302D */ daddu $a2, $a0, $zero -/* 795684 802A13A4 0080382D */ daddu $a3, $a0, $zero -/* 795688 802A13A8 3C038015 */ lui $v1, %hi(D_801512F0) -/* 79568C 802A13AC 8C6312F0 */ lw $v1, %lo(D_801512F0)($v1) -/* 795690 802A13B0 24020001 */ addiu $v0, $zero, 1 -/* 795694 802A13B4 0C046F97 */ jal set_background_color_blend -/* 795698 802A13B8 A0620000 */ sb $v0, ($v1) -/* 79569C 802A13BC AE000070 */ sw $zero, 0x70($s0) -.L802A13C0: -/* 7956A0 802A13C0 0000202D */ daddu $a0, $zero, $zero -/* 7956A4 802A13C4 0080282D */ daddu $a1, $a0, $zero -/* 7956A8 802A13C8 92070073 */ lbu $a3, 0x73($s0) -/* 7956AC 802A13CC 0C046F97 */ jal set_background_color_blend -/* 7956B0 802A13D0 0080302D */ daddu $a2, $a0, $zero -/* 7956B4 802A13D4 8E020070 */ lw $v0, 0x70($s0) -/* 7956B8 802A13D8 2442000A */ addiu $v0, $v0, 0xa -/* 7956BC 802A13DC AE020070 */ sw $v0, 0x70($s0) -/* 7956C0 802A13E0 284200E6 */ slti $v0, $v0, 0xe6 -/* 7956C4 802A13E4 14400007 */ bnez $v0, .L802A1404 -/* 7956C8 802A13E8 0000102D */ daddu $v0, $zero, $zero -/* 7956CC 802A13EC 0000202D */ daddu $a0, $zero, $zero -/* 7956D0 802A13F0 0080282D */ daddu $a1, $a0, $zero -/* 7956D4 802A13F4 0080302D */ daddu $a2, $a0, $zero -/* 7956D8 802A13F8 0C046F97 */ jal set_background_color_blend -/* 7956DC 802A13FC 240700E6 */ addiu $a3, $zero, 0xe6 -/* 7956E0 802A1400 24020002 */ addiu $v0, $zero, 2 -.L802A1404: -/* 7956E4 802A1404 8FBF0014 */ lw $ra, 0x14($sp) -/* 7956E8 802A1408 8FB00010 */ lw $s0, 0x10($sp) -/* 7956EC 802A140C 03E00008 */ jr $ra -/* 7956F0 802A1410 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/code_7952E0/func_802A1414_7956F4.s b/ver/us/asm/nonmatchings/code_7952E0/func_802A1414_7956F4.s deleted file mode 100644 index b99b0e3b20..0000000000 --- a/ver/us/asm/nonmatchings/code_7952E0/func_802A1414_7956F4.s +++ /dev/null @@ -1,39 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1414_7956F4 -/* 7956F4 802A1414 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 7956F8 802A1418 AFB00010 */ sw $s0, 0x10($sp) -/* 7956FC 802A141C 0080802D */ daddu $s0, $a0, $zero -/* 795700 802A1420 10A00003 */ beqz $a1, .L802A1430 -/* 795704 802A1424 AFBF0014 */ sw $ra, 0x14($sp) -/* 795708 802A1428 24020014 */ addiu $v0, $zero, 0x14 -/* 79570C 802A142C AE020070 */ sw $v0, 0x70($s0) -.L802A1430: -/* 795710 802A1430 0000202D */ daddu $a0, $zero, $zero -/* 795714 802A1434 0080282D */ daddu $a1, $a0, $zero -/* 795718 802A1438 8E020070 */ lw $v0, 0x70($s0) -/* 79571C 802A143C 0080302D */ daddu $a2, $a0, $zero -/* 795720 802A1440 00023880 */ sll $a3, $v0, 2 -/* 795724 802A1444 00E23821 */ addu $a3, $a3, $v0 -/* 795728 802A1448 00073840 */ sll $a3, $a3, 1 -/* 79572C 802A144C 0C046F97 */ jal set_background_color_blend -/* 795730 802A1450 30E700FE */ andi $a3, $a3, 0xfe -/* 795734 802A1454 8E020070 */ lw $v0, 0x70($s0) -/* 795738 802A1458 2442FFFF */ addiu $v0, $v0, -1 -/* 79573C 802A145C 10400003 */ beqz $v0, .L802A146C -/* 795740 802A1460 AE020070 */ sw $v0, 0x70($s0) -/* 795744 802A1464 080A8521 */ j .L802A1484 -/* 795748 802A1468 0000102D */ daddu $v0, $zero, $zero -.L802A146C: -/* 79574C 802A146C 0000202D */ daddu $a0, $zero, $zero -/* 795750 802A1470 0080282D */ daddu $a1, $a0, $zero -/* 795754 802A1474 0080302D */ daddu $a2, $a0, $zero -/* 795758 802A1478 0C046F97 */ jal set_background_color_blend -/* 79575C 802A147C 0080382D */ daddu $a3, $a0, $zero -/* 795760 802A1480 24020002 */ addiu $v0, $zero, 2 -.L802A1484: -/* 795764 802A1484 8FBF0014 */ lw $ra, 0x14($sp) -/* 795768 802A1488 8FB00010 */ lw $s0, 0x10($sp) -/* 79576C 802A148C 03E00008 */ jr $ra -/* 795770 802A1490 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/code_7952E0/func_802A1494_795774.s b/ver/us/asm/nonmatchings/code_7952E0/func_802A1494_795774.s deleted file mode 100644 index 49bb8d02fa..0000000000 --- a/ver/us/asm/nonmatchings/code_7952E0/func_802A1494_795774.s +++ /dev/null @@ -1,25 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1494_795774 -/* 795774 802A1494 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 795778 802A1498 AFBF0010 */ sw $ra, 0x10($sp) -/* 79577C 802A149C 8C82000C */ lw $v0, 0xc($a0) -/* 795780 802A14A0 0C0B1EAF */ jal get_variable -/* 795784 802A14A4 8C450000 */ lw $a1, ($v0) -/* 795788 802A14A8 3C058011 */ lui $a1, %hi(gPlayerData+0x12) -/* 79578C 802A14AC 80A5F2A2 */ lb $a1, %lo(gPlayerData+0x12)($a1) -/* 795790 802A14B0 24040100 */ addiu $a0, $zero, 0x100 -/* 795794 802A14B4 00051880 */ sll $v1, $a1, 2 -/* 795798 802A14B8 00651821 */ addu $v1, $v1, $a1 -/* 79579C 802A14BC 00621821 */ addu $v1, $v1, $v0 -/* 7957A0 802A14C0 00031880 */ sll $v1, $v1, 2 -/* 7957A4 802A14C4 3C06802A */ lui $a2, %hi(D_8029C890) -/* 7957A8 802A14C8 00C33021 */ addu $a2, $a2, $v1 -/* 7957AC 802A14CC 8CC6C890 */ lw $a2, %lo(D_8029C890)($a2) -/* 7957B0 802A14D0 0C098F3F */ jal set_animation -/* 7957B4 802A14D4 0000282D */ daddu $a1, $zero, $zero -/* 7957B8 802A14D8 8FBF0010 */ lw $ra, 0x10($sp) -/* 7957BC 802A14DC 24020002 */ addiu $v0, $zero, 2 -/* 7957C0 802A14E0 03E00008 */ jr $ra -/* 7957C4 802A14E4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/code_7952E0/func_802A14E8_7957C8.s b/ver/us/asm/nonmatchings/code_7952E0/func_802A14E8_7957C8.s deleted file mode 100644 index 2f8b8040f4..0000000000 --- a/ver/us/asm/nonmatchings/code_7952E0/func_802A14E8_7957C8.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A14E8_7957C8 -/* 7957C8 802A14E8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 7957CC 802A14EC AFBF0010 */ sw $ra, 0x10($sp) -/* 7957D0 802A14F0 0C00EABB */ jal get_npc_unsafe -/* 7957D4 802A14F4 24040064 */ addiu $a0, $zero, 0x64 -/* 7957D8 802A14F8 0040202D */ daddu $a0, $v0, $zero -/* 7957DC 802A14FC 24030020 */ addiu $v1, $zero, 0x20 -/* 7957E0 802A1500 A48300A8 */ sh $v1, 0xa8($a0) -/* 7957E4 802A1504 A48300A6 */ sh $v1, 0xa6($a0) -/* 7957E8 802A1508 8FBF0010 */ lw $ra, 0x10($sp) -/* 7957EC 802A150C 24020002 */ addiu $v0, $zero, 2 -/* 7957F0 802A1510 03E00008 */ jr $ra -/* 7957F4 802A1514 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/code_7952E0/func_802A1518_7957F8.s b/ver/us/asm/nonmatchings/code_7952E0/func_802A1518_7957F8.s deleted file mode 100644 index 42100ad484..0000000000 --- a/ver/us/asm/nonmatchings/code_7952E0/func_802A1518_7957F8.s +++ /dev/null @@ -1,45 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1518_7957F8 -/* 7957F8 802A1518 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 7957FC 802A151C AFB00010 */ sw $s0, 0x10($sp) -/* 795800 802A1520 0080802D */ daddu $s0, $a0, $zero -/* 795804 802A1524 10A0000E */ beqz $a1, .L802A1560 -/* 795808 802A1528 AFBF0014 */ sw $ra, 0x14($sp) -/* 79580C 802A152C 0C04760B */ jal func_8011D82C -/* 795810 802A1530 24040001 */ addiu $a0, $zero, 1 -/* 795814 802A1534 0000202D */ daddu $a0, $zero, $zero -/* 795818 802A1538 0080282D */ daddu $a1, $a0, $zero -/* 79581C 802A153C 0080302D */ daddu $a2, $a0, $zero -/* 795820 802A1540 0080382D */ daddu $a3, $a0, $zero -/* 795824 802A1544 3C028015 */ lui $v0, %hi(D_801512F0) -/* 795828 802A1548 8C4212F0 */ lw $v0, %lo(D_801512F0)($v0) -/* 79582C 802A154C 24030001 */ addiu $v1, $zero, 1 -/* 795830 802A1550 0C046F97 */ jal set_background_color_blend -/* 795834 802A1554 A0430000 */ sb $v1, ($v0) -/* 795838 802A1558 240200C8 */ addiu $v0, $zero, 0xc8 -/* 79583C 802A155C AE020070 */ sw $v0, 0x70($s0) -.L802A1560: -/* 795840 802A1560 0000202D */ daddu $a0, $zero, $zero -/* 795844 802A1564 0080282D */ daddu $a1, $a0, $zero -/* 795848 802A1568 92070073 */ lbu $a3, 0x73($s0) -/* 79584C 802A156C 0C046F97 */ jal set_background_color_blend -/* 795850 802A1570 0080302D */ daddu $a2, $a0, $zero -/* 795854 802A1574 8E020070 */ lw $v0, 0x70($s0) -/* 795858 802A1578 24420002 */ addiu $v0, $v0, 2 -/* 79585C 802A157C AE020070 */ sw $v0, 0x70($s0) -/* 795860 802A1580 284200FE */ slti $v0, $v0, 0xfe -/* 795864 802A1584 14400007 */ bnez $v0, .L802A15A4 -/* 795868 802A1588 0000102D */ daddu $v0, $zero, $zero -/* 79586C 802A158C 0000202D */ daddu $a0, $zero, $zero -/* 795870 802A1590 0080282D */ daddu $a1, $a0, $zero -/* 795874 802A1594 0080302D */ daddu $a2, $a0, $zero -/* 795878 802A1598 0C046F97 */ jal set_background_color_blend -/* 79587C 802A159C 240700FE */ addiu $a3, $zero, 0xfe -/* 795880 802A15A0 24020002 */ addiu $v0, $zero, 2 -.L802A15A4: -/* 795884 802A15A4 8FBF0014 */ lw $ra, 0x14($sp) -/* 795888 802A15A8 8FB00010 */ lw $s0, 0x10($sp) -/* 79588C 802A15AC 03E00008 */ jr $ra -/* 795890 802A15B0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/code_7952E0/func_802A15B4_795894.s b/ver/us/asm/nonmatchings/code_7952E0/func_802A15B4_795894.s deleted file mode 100644 index 705dfd68e8..0000000000 --- a/ver/us/asm/nonmatchings/code_7952E0/func_802A15B4_795894.s +++ /dev/null @@ -1,36 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A15B4_795894 -/* 795894 802A15B4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 795898 802A15B8 AFB00010 */ sw $s0, 0x10($sp) -/* 79589C 802A15BC 0080802D */ daddu $s0, $a0, $zero -/* 7958A0 802A15C0 10A00003 */ beqz $a1, .L802A15D0 -/* 7958A4 802A15C4 AFBF0014 */ sw $ra, 0x14($sp) -/* 7958A8 802A15C8 240200FE */ addiu $v0, $zero, 0xfe -/* 7958AC 802A15CC AE020070 */ sw $v0, 0x70($s0) -.L802A15D0: -/* 7958B0 802A15D0 0000202D */ daddu $a0, $zero, $zero -/* 7958B4 802A15D4 0080282D */ daddu $a1, $a0, $zero -/* 7958B8 802A15D8 92070073 */ lbu $a3, 0x73($s0) -/* 7958BC 802A15DC 0C046F97 */ jal set_background_color_blend -/* 7958C0 802A15E0 0080302D */ daddu $a2, $a0, $zero -/* 7958C4 802A15E4 8E020070 */ lw $v0, 0x70($s0) -/* 7958C8 802A15E8 2442FFFB */ addiu $v0, $v0, -5 -/* 7958CC 802A15EC AE020070 */ sw $v0, 0x70($s0) -/* 7958D0 802A15F0 284200C9 */ slti $v0, $v0, 0xc9 -/* 7958D4 802A15F4 14400003 */ bnez $v0, .L802A1604 -/* 7958D8 802A15F8 0000202D */ daddu $a0, $zero, $zero -/* 7958DC 802A15FC 080A8586 */ j .L802A1618 -/* 7958E0 802A1600 0000102D */ daddu $v0, $zero, $zero -.L802A1604: -/* 7958E4 802A1604 0080282D */ daddu $a1, $a0, $zero -/* 7958E8 802A1608 0080302D */ daddu $a2, $a0, $zero -/* 7958EC 802A160C 0C046F97 */ jal set_background_color_blend -/* 7958F0 802A1610 240700C8 */ addiu $a3, $zero, 0xc8 -/* 7958F4 802A1614 24020002 */ addiu $v0, $zero, 2 -.L802A1618: -/* 7958F8 802A1618 8FBF0014 */ lw $ra, 0x14($sp) -/* 7958FC 802A161C 8FB00010 */ lw $s0, 0x10($sp) -/* 795900 802A1620 03E00008 */ jr $ra -/* 795904 802A1624 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/code_7952E0/func_802A1628_795908.s b/ver/us/asm/nonmatchings/code_7952E0/func_802A1628_795908.s deleted file mode 100644 index 529f658a80..0000000000 --- a/ver/us/asm/nonmatchings/code_7952E0/func_802A1628_795908.s +++ /dev/null @@ -1,47 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1628_795908 -/* 795908 802A1628 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 79590C 802A162C AFB10014 */ sw $s1, 0x14($sp) -/* 795910 802A1630 0080882D */ daddu $s1, $a0, $zero -/* 795914 802A1634 AFBF0018 */ sw $ra, 0x18($sp) -/* 795918 802A1638 AFB00010 */ sw $s0, 0x10($sp) -/* 79591C 802A163C 0C09A75B */ jal get_actor -/* 795920 802A1640 8E240148 */ lw $a0, 0x148($s1) -/* 795924 802A1644 0C09A75B */ jal get_actor -/* 795928 802A1648 84440428 */ lh $a0, 0x428($v0) -/* 79592C 802A164C 0040802D */ daddu $s0, $v0, $zero -/* 795930 802A1650 AE200084 */ sw $zero, 0x84($s1) -/* 795934 802A1654 8E030000 */ lw $v1, ($s0) -/* 795938 802A1658 30624000 */ andi $v0, $v1, 0x4000 -/* 79593C 802A165C 14400016 */ bnez $v0, .L802A16B8 -/* 795940 802A1660 24020002 */ addiu $v0, $zero, 2 -/* 795944 802A1664 3C020040 */ lui $v0, 0x40 -/* 795948 802A1668 00621024 */ and $v0, $v1, $v0 -/* 79594C 802A166C 14400012 */ bnez $v0, .L802A16B8 -/* 795950 802A1670 24020002 */ addiu $v0, $zero, 2 -/* 795954 802A1674 30622000 */ andi $v0, $v1, 0x2000 -/* 795958 802A1678 1440000F */ bnez $v0, .L802A16B8 -/* 79595C 802A167C 24020002 */ addiu $v0, $zero, 2 -/* 795960 802A1680 8E020008 */ lw $v0, 8($s0) -/* 795964 802A1684 9042001C */ lbu $v0, 0x1c($v0) -/* 795968 802A1688 1040000B */ beqz $v0, .L802A16B8 -/* 79596C 802A168C 24020002 */ addiu $v0, $zero, 2 -/* 795970 802A1690 0C00A67F */ jal rand_int -/* 795974 802A1694 24040064 */ addiu $a0, $zero, 0x64 -/* 795978 802A1698 8E030008 */ lw $v1, 8($s0) -/* 79597C 802A169C 9063001C */ lbu $v1, 0x1c($v1) -/* 795980 802A16A0 0062182A */ slt $v1, $v1, $v0 -/* 795984 802A16A4 14600004 */ bnez $v1, .L802A16B8 -/* 795988 802A16A8 24020002 */ addiu $v0, $zero, 2 -/* 79598C 802A16AC 24020001 */ addiu $v0, $zero, 1 -/* 795990 802A16B0 AE220084 */ sw $v0, 0x84($s1) -/* 795994 802A16B4 24020002 */ addiu $v0, $zero, 2 -.L802A16B8: -/* 795998 802A16B8 8FBF0018 */ lw $ra, 0x18($sp) -/* 79599C 802A16BC 8FB10014 */ lw $s1, 0x14($sp) -/* 7959A0 802A16C0 8FB00010 */ lw $s0, 0x10($sp) -/* 7959A4 802A16C4 03E00008 */ jr $ra -/* 7959A8 802A16C8 27BD0020 */ addiu $sp, $sp, 0x20 -/* 7959AC 802A16CC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/code_796FC0/func_802A1000_796FC0.s b/ver/us/asm/nonmatchings/code_796FC0/func_802A1000_796FC0.s deleted file mode 100644 index b2bb6aafb4..0000000000 --- a/ver/us/asm/nonmatchings/code_796FC0/func_802A1000_796FC0.s +++ /dev/null @@ -1,47 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1000_796FC0 -/* 796FC0 802A1000 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 796FC4 802A1004 AFB1001C */ sw $s1, 0x1c($sp) -/* 796FC8 802A1008 0080882D */ daddu $s1, $a0, $zero -/* 796FCC 802A100C AFBF0024 */ sw $ra, 0x24($sp) -/* 796FD0 802A1010 AFB20020 */ sw $s2, 0x20($sp) -/* 796FD4 802A1014 AFB00018 */ sw $s0, 0x18($sp) -/* 796FD8 802A1018 8E30000C */ lw $s0, 0xc($s1) -/* 796FDC 802A101C 8E050000 */ lw $a1, ($s0) -/* 796FE0 802A1020 0C0B1EAF */ jal get_variable -/* 796FE4 802A1024 26100004 */ addiu $s0, $s0, 4 -/* 796FE8 802A1028 8E050000 */ lw $a1, ($s0) -/* 796FEC 802A102C 26100004 */ addiu $s0, $s0, 4 -/* 796FF0 802A1030 0220202D */ daddu $a0, $s1, $zero -/* 796FF4 802A1034 0C0B1EAF */ jal get_variable -/* 796FF8 802A1038 0040902D */ daddu $s2, $v0, $zero -/* 796FFC 802A103C 0220202D */ daddu $a0, $s1, $zero -/* 797000 802A1040 8E050000 */ lw $a1, ($s0) -/* 797004 802A1044 0C0B1EAF */ jal get_variable -/* 797008 802A1048 0040802D */ daddu $s0, $v0, $zero -/* 79700C 802A104C 44921000 */ mtc1 $s2, $f2 -/* 797010 802A1050 00000000 */ nop -/* 797014 802A1054 468010A0 */ cvt.s.w $f2, $f2 -/* 797018 802A1058 44051000 */ mfc1 $a1, $f2 -/* 79701C 802A105C 44901000 */ mtc1 $s0, $f2 -/* 797020 802A1060 00000000 */ nop -/* 797024 802A1064 468010A0 */ cvt.s.w $f2, $f2 -/* 797028 802A1068 44061000 */ mfc1 $a2, $f2 -/* 79702C 802A106C 44821000 */ mtc1 $v0, $f2 -/* 797030 802A1070 00000000 */ nop -/* 797034 802A1074 468010A0 */ cvt.s.w $f2, $f2 -/* 797038 802A1078 3C014220 */ lui $at, 0x4220 -/* 79703C 802A107C 44810000 */ mtc1 $at, $f0 -/* 797040 802A1080 44071000 */ mfc1 $a3, $f2 -/* 797044 802A1084 0000202D */ daddu $a0, $zero, $zero -/* 797048 802A1088 0C01BFBC */ jal func_8006FEF0 -/* 79704C 802A108C E7A00010 */ swc1 $f0, 0x10($sp) -/* 797050 802A1090 8FBF0024 */ lw $ra, 0x24($sp) -/* 797054 802A1094 8FB20020 */ lw $s2, 0x20($sp) -/* 797058 802A1098 8FB1001C */ lw $s1, 0x1c($sp) -/* 79705C 802A109C 8FB00018 */ lw $s0, 0x18($sp) -/* 797060 802A10A0 24020002 */ addiu $v0, $zero, 2 -/* 797064 802A10A4 03E00008 */ jr $ra -/* 797068 802A10A8 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/code_796FC0/func_802A10AC_79706C.s b/ver/us/asm/nonmatchings/code_796FC0/func_802A10AC_79706C.s deleted file mode 100644 index 91323d6d4f..0000000000 --- a/ver/us/asm/nonmatchings/code_796FC0/func_802A10AC_79706C.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A10AC_79706C -/* 79706C 802A10AC 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 797070 802A10B0 AFB10024 */ sw $s1, 0x24($sp) -/* 797074 802A10B4 0080882D */ daddu $s1, $a0, $zero -/* 797078 802A10B8 AFBF002C */ sw $ra, 0x2c($sp) -/* 79707C 802A10BC AFB20028 */ sw $s2, 0x28($sp) -/* 797080 802A10C0 AFB00020 */ sw $s0, 0x20($sp) -/* 797084 802A10C4 8E30000C */ lw $s0, 0xc($s1) -/* 797088 802A10C8 8E050000 */ lw $a1, ($s0) -/* 79708C 802A10CC 0C0B1EAF */ jal get_variable -/* 797090 802A10D0 26100004 */ addiu $s0, $s0, 4 -/* 797094 802A10D4 8E050000 */ lw $a1, ($s0) -/* 797098 802A10D8 26100004 */ addiu $s0, $s0, 4 -/* 79709C 802A10DC 0220202D */ daddu $a0, $s1, $zero -/* 7970A0 802A10E0 0C0B1EAF */ jal get_variable -/* 7970A4 802A10E4 0040902D */ daddu $s2, $v0, $zero -/* 7970A8 802A10E8 0220202D */ daddu $a0, $s1, $zero -/* 7970AC 802A10EC 8E050000 */ lw $a1, ($s0) -/* 7970B0 802A10F0 0C0B1EAF */ jal get_variable -/* 7970B4 802A10F4 0040802D */ daddu $s0, $v0, $zero -/* 7970B8 802A10F8 24040005 */ addiu $a0, $zero, 5 -/* 7970BC 802A10FC 44921000 */ mtc1 $s2, $f2 -/* 7970C0 802A1100 00000000 */ nop -/* 7970C4 802A1104 468010A0 */ cvt.s.w $f2, $f2 -/* 7970C8 802A1108 44051000 */ mfc1 $a1, $f2 -/* 7970CC 802A110C 44901000 */ mtc1 $s0, $f2 -/* 7970D0 802A1110 00000000 */ nop -/* 7970D4 802A1114 468010A0 */ cvt.s.w $f2, $f2 -/* 7970D8 802A1118 44061000 */ mfc1 $a2, $f2 -/* 7970DC 802A111C 44821000 */ mtc1 $v0, $f2 -/* 7970E0 802A1120 00000000 */ nop -/* 7970E4 802A1124 468010A0 */ cvt.s.w $f2, $f2 -/* 7970E8 802A1128 3C014248 */ lui $at, 0x4248 -/* 7970EC 802A112C 44810000 */ mtc1 $at, $f0 -/* 7970F0 802A1130 44071000 */ mfc1 $a3, $f2 -/* 7970F4 802A1134 24030028 */ addiu $v1, $zero, 0x28 -/* 7970F8 802A1138 AFA30018 */ sw $v1, 0x18($sp) -/* 7970FC 802A113C 2403001E */ addiu $v1, $zero, 0x1e -/* 797100 802A1140 AFA3001C */ sw $v1, 0x1c($sp) -/* 797104 802A1144 E7A00010 */ swc1 $f0, 0x10($sp) -/* 797108 802A1148 0C01C154 */ jal func_80070550 -/* 79710C 802A114C E7A00014 */ swc1 $f0, 0x14($sp) -/* 797110 802A1150 8FBF002C */ lw $ra, 0x2c($sp) -/* 797114 802A1154 8FB20028 */ lw $s2, 0x28($sp) -/* 797118 802A1158 8FB10024 */ lw $s1, 0x24($sp) -/* 79711C 802A115C 8FB00020 */ lw $s0, 0x20($sp) -/* 797120 802A1160 24020002 */ addiu $v0, $zero, 2 -/* 797124 802A1164 03E00008 */ jr $ra -/* 797128 802A1168 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/code_796FC0/func_802A116C_79712C.s b/ver/us/asm/nonmatchings/code_796FC0/func_802A116C_79712C.s deleted file mode 100644 index a547d453ac..0000000000 --- a/ver/us/asm/nonmatchings/code_796FC0/func_802A116C_79712C.s +++ /dev/null @@ -1,47 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A116C_79712C -/* 79712C 802A116C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 797130 802A1170 AFB1001C */ sw $s1, 0x1c($sp) -/* 797134 802A1174 0080882D */ daddu $s1, $a0, $zero -/* 797138 802A1178 AFBF0024 */ sw $ra, 0x24($sp) -/* 79713C 802A117C AFB20020 */ sw $s2, 0x20($sp) -/* 797140 802A1180 AFB00018 */ sw $s0, 0x18($sp) -/* 797144 802A1184 8E30000C */ lw $s0, 0xc($s1) -/* 797148 802A1188 8E050000 */ lw $a1, ($s0) -/* 79714C 802A118C 0C0B1EAF */ jal get_variable -/* 797150 802A1190 26100004 */ addiu $s0, $s0, 4 -/* 797154 802A1194 8E050000 */ lw $a1, ($s0) -/* 797158 802A1198 26100004 */ addiu $s0, $s0, 4 -/* 79715C 802A119C 0220202D */ daddu $a0, $s1, $zero -/* 797160 802A11A0 0C0B1EAF */ jal get_variable -/* 797164 802A11A4 0040902D */ daddu $s2, $v0, $zero -/* 797168 802A11A8 0220202D */ daddu $a0, $s1, $zero -/* 79716C 802A11AC 8E050000 */ lw $a1, ($s0) -/* 797170 802A11B0 0C0B1EAF */ jal get_variable -/* 797174 802A11B4 0040802D */ daddu $s0, $v0, $zero -/* 797178 802A11B8 44921000 */ mtc1 $s2, $f2 -/* 79717C 802A11BC 00000000 */ nop -/* 797180 802A11C0 468010A0 */ cvt.s.w $f2, $f2 -/* 797184 802A11C4 44051000 */ mfc1 $a1, $f2 -/* 797188 802A11C8 44901000 */ mtc1 $s0, $f2 -/* 79718C 802A11CC 00000000 */ nop -/* 797190 802A11D0 468010A0 */ cvt.s.w $f2, $f2 -/* 797194 802A11D4 44061000 */ mfc1 $a2, $f2 -/* 797198 802A11D8 44821000 */ mtc1 $v0, $f2 -/* 79719C 802A11DC 00000000 */ nop -/* 7971A0 802A11E0 468010A0 */ cvt.s.w $f2, $f2 -/* 7971A4 802A11E4 3C0141F0 */ lui $at, 0x41f0 -/* 7971A8 802A11E8 44810000 */ mtc1 $at, $f0 -/* 7971AC 802A11EC 44071000 */ mfc1 $a3, $f2 -/* 7971B0 802A11F0 0000202D */ daddu $a0, $zero, $zero -/* 7971B4 802A11F4 0C01BFBC */ jal func_8006FEF0 -/* 7971B8 802A11F8 E7A00010 */ swc1 $f0, 0x10($sp) -/* 7971BC 802A11FC 8FBF0024 */ lw $ra, 0x24($sp) -/* 7971C0 802A1200 8FB20020 */ lw $s2, 0x20($sp) -/* 7971C4 802A1204 8FB1001C */ lw $s1, 0x1c($sp) -/* 7971C8 802A1208 8FB00018 */ lw $s0, 0x18($sp) -/* 7971CC 802A120C 24020002 */ addiu $v0, $zero, 2 -/* 7971D0 802A1210 03E00008 */ jr $ra -/* 7971D4 802A1214 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/code_796FC0/func_802A1218_7971D8.s b/ver/us/asm/nonmatchings/code_796FC0/func_802A1218_7971D8.s deleted file mode 100644 index a707b21699..0000000000 --- a/ver/us/asm/nonmatchings/code_796FC0/func_802A1218_7971D8.s +++ /dev/null @@ -1,55 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1218_7971D8 -/* 7971D8 802A1218 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* 7971DC 802A121C AFB1002C */ sw $s1, 0x2c($sp) -/* 7971E0 802A1220 0080882D */ daddu $s1, $a0, $zero -/* 7971E4 802A1224 AFBF0034 */ sw $ra, 0x34($sp) -/* 7971E8 802A1228 AFB20030 */ sw $s2, 0x30($sp) -/* 7971EC 802A122C AFB00028 */ sw $s0, 0x28($sp) -/* 7971F0 802A1230 8E30000C */ lw $s0, 0xc($s1) -/* 7971F4 802A1234 8E050000 */ lw $a1, ($s0) -/* 7971F8 802A1238 0C0B1EAF */ jal get_variable -/* 7971FC 802A123C 26100004 */ addiu $s0, $s0, 4 -/* 797200 802A1240 8E050000 */ lw $a1, ($s0) -/* 797204 802A1244 26100004 */ addiu $s0, $s0, 4 -/* 797208 802A1248 0220202D */ daddu $a0, $s1, $zero -/* 79720C 802A124C 0C0B1EAF */ jal get_variable -/* 797210 802A1250 0040902D */ daddu $s2, $v0, $zero -/* 797214 802A1254 0220202D */ daddu $a0, $s1, $zero -/* 797218 802A1258 8E050000 */ lw $a1, ($s0) -/* 79721C 802A125C 0C0B1EAF */ jal get_variable -/* 797220 802A1260 0040802D */ daddu $s0, $v0, $zero -/* 797224 802A1264 24040004 */ addiu $a0, $zero, 4 -/* 797228 802A1268 44922000 */ mtc1 $s2, $f4 -/* 79722C 802A126C 00000000 */ nop -/* 797230 802A1270 46802120 */ cvt.s.w $f4, $f4 -/* 797234 802A1274 44052000 */ mfc1 $a1, $f4 -/* 797238 802A1278 44902000 */ mtc1 $s0, $f4 -/* 79723C 802A127C 00000000 */ nop -/* 797240 802A1280 46802120 */ cvt.s.w $f4, $f4 -/* 797244 802A1284 44062000 */ mfc1 $a2, $f4 -/* 797248 802A1288 44822000 */ mtc1 $v0, $f4 -/* 79724C 802A128C 00000000 */ nop -/* 797250 802A1290 46802120 */ cvt.s.w $f4, $f4 -/* 797254 802A1294 3C0141A0 */ lui $at, 0x41a0 -/* 797258 802A1298 44810000 */ mtc1 $at, $f0 -/* 79725C 802A129C 3C013F80 */ lui $at, 0x3f80 -/* 797260 802A12A0 44811000 */ mtc1 $at, $f2 -/* 797264 802A12A4 44072000 */ mfc1 $a3, $f4 -/* 797268 802A12A8 2403000A */ addiu $v1, $zero, 0xa -/* 79726C 802A12AC AFA3001C */ sw $v1, 0x1c($sp) -/* 797270 802A12B0 2403000F */ addiu $v1, $zero, 0xf -/* 797274 802A12B4 AFA30020 */ sw $v1, 0x20($sp) -/* 797278 802A12B8 E7A00010 */ swc1 $f0, 0x10($sp) -/* 79727C 802A12BC E7A00014 */ swc1 $f0, 0x14($sp) -/* 797280 802A12C0 0C01C8D4 */ jal func_80072350 -/* 797284 802A12C4 E7A20018 */ swc1 $f2, 0x18($sp) -/* 797288 802A12C8 8FBF0034 */ lw $ra, 0x34($sp) -/* 79728C 802A12CC 8FB20030 */ lw $s2, 0x30($sp) -/* 797290 802A12D0 8FB1002C */ lw $s1, 0x2c($sp) -/* 797294 802A12D4 8FB00028 */ lw $s0, 0x28($sp) -/* 797298 802A12D8 24020002 */ addiu $v0, $zero, 2 -/* 79729C 802A12DC 03E00008 */ jr $ra -/* 7972A0 802A12E0 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/ver/us/asm/nonmatchings/code_796FC0/func_802A1414_7973D4.s b/ver/us/asm/nonmatchings/code_796FC0/func_802A1414_7973D4.s deleted file mode 100644 index e92b1c710f..0000000000 --- a/ver/us/asm/nonmatchings/code_796FC0/func_802A1414_7973D4.s +++ /dev/null @@ -1,39 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1414_7973D4 -/* 7973D4 802A1414 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 7973D8 802A1418 AFB00010 */ sw $s0, 0x10($sp) -/* 7973DC 802A141C 0080802D */ daddu $s0, $a0, $zero -/* 7973E0 802A1420 10A00003 */ beqz $a1, .L802A1430 -/* 7973E4 802A1424 AFBF0014 */ sw $ra, 0x14($sp) -/* 7973E8 802A1428 24020014 */ addiu $v0, $zero, 0x14 -/* 7973EC 802A142C AE020070 */ sw $v0, 0x70($s0) -.L802A1430: -/* 7973F0 802A1430 0000202D */ daddu $a0, $zero, $zero -/* 7973F4 802A1434 0080282D */ daddu $a1, $a0, $zero -/* 7973F8 802A1438 8E020070 */ lw $v0, 0x70($s0) -/* 7973FC 802A143C 0080302D */ daddu $a2, $a0, $zero -/* 797400 802A1440 00023880 */ sll $a3, $v0, 2 -/* 797404 802A1444 00E23821 */ addu $a3, $a3, $v0 -/* 797408 802A1448 00073840 */ sll $a3, $a3, 1 -/* 79740C 802A144C 0C046F97 */ jal set_background_color_blend -/* 797410 802A1450 30E700FE */ andi $a3, $a3, 0xfe -/* 797414 802A1454 8E020070 */ lw $v0, 0x70($s0) -/* 797418 802A1458 2442FFFF */ addiu $v0, $v0, -1 -/* 79741C 802A145C 10400003 */ beqz $v0, .L802A146C -/* 797420 802A1460 AE020070 */ sw $v0, 0x70($s0) -/* 797424 802A1464 080A8521 */ j .L802A1484 -/* 797428 802A1468 0000102D */ daddu $v0, $zero, $zero -.L802A146C: -/* 79742C 802A146C 0000202D */ daddu $a0, $zero, $zero -/* 797430 802A1470 0080282D */ daddu $a1, $a0, $zero -/* 797434 802A1474 0080302D */ daddu $a2, $a0, $zero -/* 797438 802A1478 0C046F97 */ jal set_background_color_blend -/* 79743C 802A147C 0080382D */ daddu $a3, $a0, $zero -/* 797440 802A1480 24020002 */ addiu $v0, $zero, 2 -.L802A1484: -/* 797444 802A1484 8FBF0014 */ lw $ra, 0x14($sp) -/* 797448 802A1488 8FB00010 */ lw $s0, 0x10($sp) -/* 79744C 802A148C 03E00008 */ jr $ra -/* 797450 802A1490 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/code_796FC0/func_802A1494_797454.s b/ver/us/asm/nonmatchings/code_796FC0/func_802A1494_797454.s deleted file mode 100644 index e94e89134d..0000000000 --- a/ver/us/asm/nonmatchings/code_796FC0/func_802A1494_797454.s +++ /dev/null @@ -1,25 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1494_797454 -/* 797454 802A1494 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 797458 802A1498 AFBF0010 */ sw $ra, 0x10($sp) -/* 79745C 802A149C 8C82000C */ lw $v0, 0xc($a0) -/* 797460 802A14A0 0C0B1EAF */ jal get_variable -/* 797464 802A14A4 8C450000 */ lw $a1, ($v0) -/* 797468 802A14A8 3C058011 */ lui $a1, %hi(gPlayerData+0x12) -/* 79746C 802A14AC 80A5F2A2 */ lb $a1, %lo(gPlayerData+0x12)($a1) -/* 797470 802A14B0 24040100 */ addiu $a0, $zero, 0x100 -/* 797474 802A14B4 00051880 */ sll $v1, $a1, 2 -/* 797478 802A14B8 00651821 */ addu $v1, $v1, $a1 -/* 79747C 802A14BC 00621821 */ addu $v1, $v1, $v0 -/* 797480 802A14C0 00031880 */ sll $v1, $v1, 2 -/* 797484 802A14C4 3C06802A */ lui $a2, %hi(D_8029C890) -/* 797488 802A14C8 00C33021 */ addu $a2, $a2, $v1 -/* 79748C 802A14CC 8CC6C890 */ lw $a2, %lo(D_8029C890)($a2) -/* 797490 802A14D0 0C098F3F */ jal set_animation -/* 797494 802A14D4 0000282D */ daddu $a1, $zero, $zero -/* 797498 802A14D8 8FBF0010 */ lw $ra, 0x10($sp) -/* 79749C 802A14DC 24020002 */ addiu $v0, $zero, 2 -/* 7974A0 802A14E0 03E00008 */ jr $ra -/* 7974A4 802A14E4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/code_796FC0/func_802A14E8_7974A8.s b/ver/us/asm/nonmatchings/code_796FC0/func_802A14E8_7974A8.s deleted file mode 100644 index f9539b1fc1..0000000000 --- a/ver/us/asm/nonmatchings/code_796FC0/func_802A14E8_7974A8.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A14E8_7974A8 -/* 7974A8 802A14E8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 7974AC 802A14EC AFBF0010 */ sw $ra, 0x10($sp) -/* 7974B0 802A14F0 0C00EABB */ jal get_npc_unsafe -/* 7974B4 802A14F4 24040064 */ addiu $a0, $zero, 0x64 -/* 7974B8 802A14F8 0040202D */ daddu $a0, $v0, $zero -/* 7974BC 802A14FC 24030020 */ addiu $v1, $zero, 0x20 -/* 7974C0 802A1500 A48300A8 */ sh $v1, 0xa8($a0) -/* 7974C4 802A1504 A48300A6 */ sh $v1, 0xa6($a0) -/* 7974C8 802A1508 8FBF0010 */ lw $ra, 0x10($sp) -/* 7974CC 802A150C 24020002 */ addiu $v0, $zero, 2 -/* 7974D0 802A1510 03E00008 */ jr $ra -/* 7974D4 802A1514 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/code_796FC0/func_802A1518_7974D8.s b/ver/us/asm/nonmatchings/code_796FC0/func_802A1518_7974D8.s deleted file mode 100644 index c75eab1ad4..0000000000 --- a/ver/us/asm/nonmatchings/code_796FC0/func_802A1518_7974D8.s +++ /dev/null @@ -1,1068 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1518_7974D8 -/* 7974D8 802A1518 27BDFF68 */ addiu $sp, $sp, -0x98 -/* 7974DC 802A151C AFB50054 */ sw $s5, 0x54($sp) -/* 7974E0 802A1520 3C15800E */ lui $s5, %hi(gBattleStatus+0xD8) -/* 7974E4 802A1524 8EB5C148 */ lw $s5, %lo(gBattleStatus+0xD8)($s5) -/* 7974E8 802A1528 AFBE0060 */ sw $fp, 0x60($sp) -/* 7974EC 802A152C 0080F02D */ daddu $fp, $a0, $zero -/* 7974F0 802A1530 AFBF0064 */ sw $ra, 0x64($sp) -/* 7974F4 802A1534 AFB7005C */ sw $s7, 0x5c($sp) -/* 7974F8 802A1538 AFB60058 */ sw $s6, 0x58($sp) -/* 7974FC 802A153C AFB40050 */ sw $s4, 0x50($sp) -/* 797500 802A1540 AFB3004C */ sw $s3, 0x4c($sp) -/* 797504 802A1544 AFB20048 */ sw $s2, 0x48($sp) -/* 797508 802A1548 AFB10044 */ sw $s1, 0x44($sp) -/* 79750C 802A154C AFB00040 */ sw $s0, 0x40($sp) -/* 797510 802A1550 F7BE0090 */ sdc1 $f30, 0x90($sp) -/* 797514 802A1554 F7BC0088 */ sdc1 $f28, 0x88($sp) -/* 797518 802A1558 F7BA0080 */ sdc1 $f26, 0x80($sp) -/* 79751C 802A155C F7B80078 */ sdc1 $f24, 0x78($sp) -/* 797520 802A1560 F7B60070 */ sdc1 $f22, 0x70($sp) -/* 797524 802A1564 F7B40068 */ sdc1 $f20, 0x68($sp) -/* 797528 802A1568 8FC2000C */ lw $v0, 0xc($fp) -/* 79752C 802A156C 10A00007 */ beqz $a1, .L802A158C -/* 797530 802A1570 26B1000C */ addiu $s1, $s5, 0xc -/* 797534 802A1574 3C01802A */ lui $at, %hi(D_802A3838) -/* 797538 802A1578 AC203838 */ sw $zero, %lo(D_802A3838)($at) -/* 79753C 802A157C 0C0B1EAF */ jal get_variable -/* 797540 802A1580 8C450000 */ lw $a1, ($v0) -/* 797544 802A1584 AFC20078 */ sw $v0, 0x78($fp) -/* 797548 802A1588 AFC00070 */ sw $zero, 0x70($fp) -.L802A158C: -/* 79754C 802A158C 82A3040C */ lb $v1, 0x40c($s5) -/* 797550 802A1590 24020001 */ addiu $v0, $zero, 1 -/* 797554 802A1594 14620040 */ bne $v1, $v0, .L802A1698 -/* 797558 802A1598 00000000 */ nop -/* 79755C 802A159C 0C09A75B */ jal get_actor -/* 797560 802A15A0 86A40428 */ lh $a0, 0x428($s5) -/* 797564 802A15A4 0040802D */ daddu $s0, $v0, $zero -/* 797568 802A15A8 1200039D */ beqz $s0, .L802A2420 -/* 79756C 802A15AC 24020002 */ addiu $v0, $zero, 2 -/* 797570 802A15B0 82A50426 */ lb $a1, 0x426($s5) -/* 797574 802A15B4 0C099117 */ jal get_actor_part -/* 797578 802A15B8 0200202D */ daddu $a0, $s0, $zero -/* 79757C 802A15BC 86020150 */ lh $v0, 0x150($s0) -/* 797580 802A15C0 C6000144 */ lwc1 $f0, 0x144($s0) -/* 797584 802A15C4 8E030000 */ lw $v1, ($s0) -/* 797588 802A15C8 44821000 */ mtc1 $v0, $f2 -/* 79758C 802A15CC 00000000 */ nop -/* 797590 802A15D0 468010A0 */ cvt.s.w $f2, $f2 -/* 797594 802A15D4 30620800 */ andi $v0, $v1, 0x800 -/* 797598 802A15D8 1040000D */ beqz $v0, .L802A1610 -/* 79759C 802A15DC 46020700 */ add.s $f28, $f0, $f2 -/* 7975A0 802A15E0 86020152 */ lh $v0, 0x152($s0) -/* 7975A4 802A15E4 C6000148 */ lwc1 $f0, 0x148($s0) -/* 7975A8 802A15E8 44821000 */ mtc1 $v0, $f2 -/* 7975AC 802A15EC 00000000 */ nop -/* 7975B0 802A15F0 468010A0 */ cvt.s.w $f2, $f2 -/* 7975B4 802A15F4 92020191 */ lbu $v0, 0x191($s0) -/* 7975B8 802A15F8 46020000 */ add.s $f0, $f0, $f2 -/* 7975BC 802A15FC 44821000 */ mtc1 $v0, $f2 -/* 7975C0 802A1600 00000000 */ nop -/* 7975C4 802A1604 468010A0 */ cvt.s.w $f2, $f2 -/* 7975C8 802A1608 080A859F */ j .L802A167C -/* 7975CC 802A160C 46020601 */ sub.s $f24, $f0, $f2 -.L802A1610: -/* 7975D0 802A1610 30628000 */ andi $v0, $v1, 0x8000 -/* 7975D4 802A1614 1440000D */ bnez $v0, .L802A164C -/* 7975D8 802A1618 00000000 */ nop -/* 7975DC 802A161C 86020152 */ lh $v0, 0x152($s0) -/* 7975E0 802A1620 C6000148 */ lwc1 $f0, 0x148($s0) -/* 7975E4 802A1624 44821000 */ mtc1 $v0, $f2 -/* 7975E8 802A1628 00000000 */ nop -/* 7975EC 802A162C 468010A0 */ cvt.s.w $f2, $f2 -/* 7975F0 802A1630 92020191 */ lbu $v0, 0x191($s0) -/* 7975F4 802A1634 46020000 */ add.s $f0, $f0, $f2 -/* 7975F8 802A1638 44821000 */ mtc1 $v0, $f2 -/* 7975FC 802A163C 00000000 */ nop -/* 797600 802A1640 468010A0 */ cvt.s.w $f2, $f2 -/* 797604 802A1644 080A859F */ j .L802A167C -/* 797608 802A1648 46001600 */ add.s $f24, $f2, $f0 -.L802A164C: -/* 79760C 802A164C 86020152 */ lh $v0, 0x152($s0) -/* 797610 802A1650 C6020148 */ lwc1 $f2, 0x148($s0) -/* 797614 802A1654 44820000 */ mtc1 $v0, $f0 -/* 797618 802A1658 00000000 */ nop -/* 79761C 802A165C 46800020 */ cvt.s.w $f0, $f0 -/* 797620 802A1660 92020191 */ lbu $v0, 0x191($s0) -/* 797624 802A1664 46001080 */ add.s $f2, $f2, $f0 -/* 797628 802A1668 00021040 */ sll $v0, $v0, 1 -/* 79762C 802A166C 44820000 */ mtc1 $v0, $f0 -/* 797630 802A1670 00000000 */ nop -/* 797634 802A1674 46800020 */ cvt.s.w $f0, $f0 -/* 797638 802A1678 46001600 */ add.s $f24, $f2, $f0 -.L802A167C: -/* 79763C 802A167C 86020154 */ lh $v0, 0x154($s0) -/* 797640 802A1680 C602014C */ lwc1 $f2, 0x14c($s0) -/* 797644 802A1684 44820000 */ mtc1 $v0, $f0 -/* 797648 802A1688 00000000 */ nop -/* 79764C 802A168C 46800020 */ cvt.s.w $f0, $f0 -/* 797650 802A1690 080A85AB */ j .L802A16AC -/* 797654 802A1694 46001680 */ add.s $f26, $f2, $f0 -.L802A1698: -/* 797658 802A1698 3C014280 */ lui $at, 0x4280 -/* 79765C 802A169C 4481E000 */ mtc1 $at, $f28 -/* 797660 802A16A0 3C0142A0 */ lui $at, 0x42a0 -/* 797664 802A16A4 4481C000 */ mtc1 $at, $f24 -/* 797668 802A16A8 4480D000 */ mtc1 $zero, $f26 -.L802A16AC: -/* 79766C 802A16AC 8FC30070 */ lw $v1, 0x70($fp) -/* 797670 802A16B0 18600077 */ blez $v1, .L802A1890 -/* 797674 802A16B4 2862000A */ slti $v0, $v1, 0xa -/* 797678 802A16B8 14400006 */ bnez $v0, .L802A16D4 -/* 79767C 802A16BC 0000902D */ daddu $s2, $zero, $zero -/* 797680 802A16C0 2402000A */ addiu $v0, $zero, 0xa -/* 797684 802A16C4 1062003B */ beq $v1, $v0, .L802A17B4 -/* 797688 802A16C8 2C620016 */ sltiu $v0, $v1, 0x16 -/* 79768C 802A16CC 080A8625 */ j .L802A1894 -/* 797690 802A16D0 00000000 */ nop -.L802A16D4: -/* 797694 802A16D4 24160014 */ addiu $s6, $zero, 0x14 -/* 797698 802A16D8 2417000A */ addiu $s7, $zero, 0xa -/* 79769C 802A16DC 3C13802A */ lui $s3, %hi(D_802A37F8) -/* 7976A0 802A16E0 267337F8 */ addiu $s3, $s3, %lo(D_802A37F8) -/* 7976A4 802A16E4 3C0141A0 */ lui $at, 0x41a0 -/* 7976A8 802A16E8 4481A000 */ mtc1 $at, $f20 -/* 7976AC 802A16EC 3C02802A */ lui $v0, %hi(D_802A37F0) -/* 7976B0 802A16F0 8C4237F0 */ lw $v0, %lo(D_802A37F0)($v0) -/* 7976B4 802A16F4 3C013F80 */ lui $at, 0x3f80 -/* 7976B8 802A16F8 4481B000 */ mtc1 $at, $f22 -/* 7976BC 802A16FC 8C42000C */ lw $v0, 0xc($v0) -/* 7976C0 802A1700 2414005C */ addiu $s4, $zero, 0x5c -/* 7976C4 802A1704 AFA20028 */ sw $v0, 0x28($sp) -.L802A1708: -/* 7976C8 802A1708 8FC20078 */ lw $v0, 0x78($fp) -/* 7976CC 802A170C 14400003 */ bnez $v0, .L802A171C -/* 7976D0 802A1710 00121880 */ sll $v1, $s2, 2 -/* 7976D4 802A1714 52400021 */ beql $s2, $zero, .L802A179C -/* 7976D8 802A1718 26730004 */ addiu $s3, $s3, 4 -.L802A171C: -/* 7976DC 802A171C 8FA80028 */ lw $t0, 0x28($sp) -/* 7976E0 802A1720 8E620000 */ lw $v0, ($s3) -/* 7976E4 802A1724 10400004 */ beqz $v0, .L802A1738 -/* 7976E8 802A1728 01148021 */ addu $s0, $t0, $s4 -/* 7976EC 802A172C 2442FFFF */ addiu $v0, $v0, -1 -/* 7976F0 802A1730 080A85E6 */ j .L802A1798 -/* 7976F4 802A1734 AE620000 */ sw $v0, ($s3) -.L802A1738: -/* 7976F8 802A1738 3C08802A */ lui $t0, %hi(D_802A3514_7994D4) -/* 7976FC 802A173C 25083514 */ addiu $t0, $t0, %lo(D_802A3514_7994D4) -/* 797700 802A1740 00681021 */ addu $v0, $v1, $t0 -/* 797704 802A1744 AE760000 */ sw $s6, ($s3) -/* 797708 802A1748 8C420000 */ lw $v0, ($v0) -/* 79770C 802A174C 1C400009 */ bgtz $v0, .L802A1774 -/* 797710 802A1750 E7B40010 */ swc1 $f20, 0x10($sp) -/* 797714 802A1754 E7B40014 */ swc1 $f20, 0x14($sp) -/* 797718 802A1758 E7B60018 */ swc1 $f22, 0x18($sp) -/* 79771C 802A175C AFB7001C */ sw $s7, 0x1c($sp) -/* 797720 802A1760 AFB60020 */ sw $s6, 0x20($sp) -/* 797724 802A1764 8E050010 */ lw $a1, 0x10($s0) -/* 797728 802A1768 8E060014 */ lw $a2, 0x14($s0) -/* 79772C 802A176C 080A85E4 */ j .L802A1790 -/* 797730 802A1770 8E070018 */ lw $a3, 0x18($s0) -.L802A1774: -/* 797734 802A1774 E7B40014 */ swc1 $f20, 0x14($sp) -/* 797738 802A1778 E7B60018 */ swc1 $f22, 0x18($sp) -/* 79773C 802A177C AFB7001C */ sw $s7, 0x1c($sp) -/* 797740 802A1780 AFB60020 */ sw $s6, 0x20($sp) -/* 797744 802A1784 8E050004 */ lw $a1, 4($s0) -/* 797748 802A1788 8E060008 */ lw $a2, 8($s0) -/* 79774C 802A178C 8E07000C */ lw $a3, 0xc($s0) -.L802A1790: -/* 797750 802A1790 0C01C8D4 */ jal func_80072350 -/* 797754 802A1794 24040004 */ addiu $a0, $zero, 4 -.L802A1798: -/* 797758 802A1798 26730004 */ addiu $s3, $s3, 4 -.L802A179C: -/* 79775C 802A179C 26520001 */ addiu $s2, $s2, 1 -/* 797760 802A17A0 2A420008 */ slti $v0, $s2, 8 -/* 797764 802A17A4 1440FFD8 */ bnez $v0, .L802A1708 -/* 797768 802A17A8 2694001C */ addiu $s4, $s4, 0x1c -/* 79776C 802A17AC 080A8623 */ j .L802A188C -/* 797770 802A17B0 00000000 */ nop -.L802A17B4: -/* 797774 802A17B4 24160014 */ addiu $s6, $zero, 0x14 -/* 797778 802A17B8 2417000A */ addiu $s7, $zero, 0xa -/* 79777C 802A17BC 3C13802A */ lui $s3, %hi(D_802A37F8) -/* 797780 802A17C0 267337F8 */ addiu $s3, $s3, %lo(D_802A37F8) -/* 797784 802A17C4 3C0141A0 */ lui $at, 0x41a0 -/* 797788 802A17C8 4481A000 */ mtc1 $at, $f20 -/* 79778C 802A17CC 3C02802A */ lui $v0, %hi(D_802A37F0) -/* 797790 802A17D0 8C4237F0 */ lw $v0, %lo(D_802A37F0)($v0) -/* 797794 802A17D4 3C013F80 */ lui $at, 0x3f80 -/* 797798 802A17D8 4481B000 */ mtc1 $at, $f22 -/* 79779C 802A17DC 8C42000C */ lw $v0, 0xc($v0) -/* 7977A0 802A17E0 2414005C */ addiu $s4, $zero, 0x5c -/* 7977A4 802A17E4 AFA20028 */ sw $v0, 0x28($sp) -.L802A17E8: -/* 7977A8 802A17E8 8FC20078 */ lw $v0, 0x78($fp) -/* 7977AC 802A17EC 14400003 */ bnez $v0, .L802A17FC -/* 7977B0 802A17F0 00121880 */ sll $v1, $s2, 2 -/* 7977B4 802A17F4 52400021 */ beql $s2, $zero, .L802A187C -/* 7977B8 802A17F8 26730004 */ addiu $s3, $s3, 4 -.L802A17FC: -/* 7977BC 802A17FC 8FA80028 */ lw $t0, 0x28($sp) -/* 7977C0 802A1800 8E620000 */ lw $v0, ($s3) -/* 7977C4 802A1804 10400004 */ beqz $v0, .L802A1818 -/* 7977C8 802A1808 01148021 */ addu $s0, $t0, $s4 -/* 7977CC 802A180C 2442FFFF */ addiu $v0, $v0, -1 -/* 7977D0 802A1810 080A861E */ j .L802A1878 -/* 7977D4 802A1814 AE620000 */ sw $v0, ($s3) -.L802A1818: -/* 7977D8 802A1818 3C08802A */ lui $t0, %hi(D_802A3534_7994F4) -/* 7977DC 802A181C 25083534 */ addiu $t0, $t0, %lo(D_802A3534_7994F4) -/* 7977E0 802A1820 00681021 */ addu $v0, $v1, $t0 -/* 7977E4 802A1824 AE760000 */ sw $s6, ($s3) -/* 7977E8 802A1828 8C420000 */ lw $v0, ($v0) -/* 7977EC 802A182C 1C400009 */ bgtz $v0, .L802A1854 -/* 7977F0 802A1830 E7B40010 */ swc1 $f20, 0x10($sp) -/* 7977F4 802A1834 E7B40014 */ swc1 $f20, 0x14($sp) -/* 7977F8 802A1838 E7B60018 */ swc1 $f22, 0x18($sp) -/* 7977FC 802A183C AFB7001C */ sw $s7, 0x1c($sp) -/* 797800 802A1840 AFB60020 */ sw $s6, 0x20($sp) -/* 797804 802A1844 8E050010 */ lw $a1, 0x10($s0) -/* 797808 802A1848 8E060014 */ lw $a2, 0x14($s0) -/* 79780C 802A184C 080A861C */ j .L802A1870 -/* 797810 802A1850 8E070018 */ lw $a3, 0x18($s0) -.L802A1854: -/* 797814 802A1854 E7B40014 */ swc1 $f20, 0x14($sp) -/* 797818 802A1858 E7B60018 */ swc1 $f22, 0x18($sp) -/* 79781C 802A185C AFB7001C */ sw $s7, 0x1c($sp) -/* 797820 802A1860 AFB60020 */ sw $s6, 0x20($sp) -/* 797824 802A1864 8E050004 */ lw $a1, 4($s0) -/* 797828 802A1868 8E060008 */ lw $a2, 8($s0) -/* 79782C 802A186C 8E07000C */ lw $a3, 0xc($s0) -.L802A1870: -/* 797830 802A1870 0C01C8D4 */ jal func_80072350 -/* 797834 802A1874 24040004 */ addiu $a0, $zero, 4 -.L802A1878: -/* 797838 802A1878 26730004 */ addiu $s3, $s3, 4 -.L802A187C: -/* 79783C 802A187C 26520001 */ addiu $s2, $s2, 1 -/* 797840 802A1880 2A420008 */ slti $v0, $s2, 8 -/* 797844 802A1884 1440FFD8 */ bnez $v0, .L802A17E8 -/* 797848 802A1888 2694001C */ addiu $s4, $s4, 0x1c -.L802A188C: -/* 79784C 802A188C 8FC30070 */ lw $v1, 0x70($fp) -.L802A1890: -/* 797850 802A1890 2C620016 */ sltiu $v0, $v1, 0x16 -.L802A1894: -/* 797854 802A1894 104002E1 */ beqz $v0, .L802A241C -/* 797858 802A1898 00031080 */ sll $v0, $v1, 2 -/* 79785C 802A189C 3C01802A */ lui $at, %hi(jtbl_802A3790_799750) -/* 797860 802A18A0 00220821 */ addu $at, $at, $v0 -/* 797864 802A18A4 8C223790 */ lw $v0, %lo(jtbl_802A3790_799750)($at) -/* 797868 802A18A8 00400008 */ jr $v0 -/* 79786C 802A18AC 00000000 */ nop -glabel L802A18B0_797870 -/* 797870 802A18B0 C6B40144 */ lwc1 $f20, 0x144($s5) -/* 797874 802A18B4 C6BE014C */ lwc1 $f30, 0x14c($s5) -/* 797878 802A18B8 92A20191 */ lbu $v0, 0x191($s5) -/* 79787C 802A18BC C6A20148 */ lwc1 $f2, 0x148($s5) -/* 797880 802A18C0 3C0141F0 */ lui $at, 0x41f0 -/* 797884 802A18C4 44812000 */ mtc1 $at, $f4 -/* 797888 802A18C8 44820000 */ mtc1 $v0, $f0 -/* 79788C 802A18CC 00000000 */ nop -/* 797890 802A18D0 46800020 */ cvt.s.w $f0, $f0 -/* 797894 802A18D4 46001080 */ add.s $f2, $f2, $f0 -/* 797898 802A18D8 3C014316 */ lui $at, 0x4316 -/* 79789C 802A18DC 44810000 */ mtc1 $at, $f0 -/* 7978A0 802A18E0 E6340000 */ swc1 $f20, ($s1) -/* 7978A4 802A18E4 46041580 */ add.s $f22, $f2, $f4 -/* 7978A8 802A18E8 E63E0008 */ swc1 $f30, 8($s1) -/* 7978AC 802A18EC E634000C */ swc1 $f20, 0xc($s1) -/* 7978B0 802A18F0 4600B000 */ add.s $f0, $f22, $f0 -/* 7978B4 802A18F4 E63E0014 */ swc1 $f30, 0x14($s1) -/* 7978B8 802A18F8 E6360010 */ swc1 $f22, 0x10($s1) -/* 7978BC 802A18FC E6200004 */ swc1 $f0, 4($s1) -/* 7978C0 802A1900 8FC20078 */ lw $v0, 0x78($fp) -/* 7978C4 802A1904 54400008 */ bnel $v0, $zero, .L802A1928 -/* 7978C8 802A1908 24040001 */ addiu $a0, $zero, 1 -/* 7978CC 802A190C 4405A000 */ mfc1 $a1, $f20 -/* 7978D0 802A1910 4406B000 */ mfc1 $a2, $f22 -/* 7978D4 802A1914 4407F000 */ mfc1 $a3, $f30 -/* 7978D8 802A1918 3C013F80 */ lui $at, 0x3f80 -/* 7978DC 802A191C 44810000 */ mtc1 $at, $f0 -/* 7978E0 802A1920 080A864F */ j .L802A193C -/* 7978E4 802A1924 0000202D */ daddu $a0, $zero, $zero -.L802A1928: -/* 7978E8 802A1928 4405A000 */ mfc1 $a1, $f20 -/* 7978EC 802A192C 4406B000 */ mfc1 $a2, $f22 -/* 7978F0 802A1930 4407F000 */ mfc1 $a3, $f30 -/* 7978F4 802A1934 3C013F80 */ lui $at, 0x3f80 -/* 7978F8 802A1938 44810000 */ mtc1 $at, $f0 -.L802A193C: -/* 7978FC 802A193C AFA00014 */ sw $zero, 0x14($sp) -/* 797900 802A1940 0C01C964 */ jal func_80072590 -/* 797904 802A1944 E7A00010 */ swc1 $f0, 0x10($sp) -/* 797908 802A1948 3C01802A */ lui $at, %hi(D_802A37F0) -/* 79790C 802A194C AC2237F0 */ sw $v0, %lo(D_802A37F0)($at) -/* 797910 802A1950 3C014240 */ lui $at, 0x4240 -/* 797914 802A1954 44810000 */ mtc1 $at, $f0 -/* 797918 802A1958 3C03802A */ lui $v1, %hi(D_802A37F0) -/* 79791C 802A195C 8C6337F0 */ lw $v1, %lo(D_802A37F0)($v1) -/* 797920 802A1960 E620004C */ swc1 $f0, 0x4c($s1) -/* 797924 802A1964 8C62000C */ lw $v0, 0xc($v1) -/* 797928 802A1968 AC40003C */ sw $zero, 0x3c($v0) -/* 79792C 802A196C 8C62000C */ lw $v0, 0xc($v1) -/* 797930 802A1970 C620004C */ lwc1 $f0, 0x4c($s1) -/* 797934 802A1974 E4400048 */ swc1 $f0, 0x48($v0) -/* 797938 802A1978 8C62000C */ lw $v0, 0xc($v1) -/* 79793C 802A197C 3C0141F0 */ lui $at, 0x41f0 -/* 797940 802A1980 44810000 */ mtc1 $at, $f0 -/* 797944 802A1984 AC400024 */ sw $zero, 0x24($v0) -/* 797948 802A1988 8C62000C */ lw $v0, 0xc($v1) -/* 79794C 802A198C 0000902D */ daddu $s2, $zero, $zero -/* 797950 802A1990 E4400058 */ swc1 $f0, 0x58($v0) -/* 797954 802A1994 8C62000C */ lw $v0, 0xc($v1) -/* 797958 802A1998 3C0140A0 */ lui $at, 0x40a0 -/* 79795C 802A199C 44810000 */ mtc1 $at, $f0 -/* 797960 802A19A0 3C10802A */ lui $s0, %hi(D_802A37F8) -/* 797964 802A19A4 261037F8 */ addiu $s0, $s0, %lo(D_802A37F8) -/* 797968 802A19A8 E4400040 */ swc1 $f0, 0x40($v0) -.L802A19AC: -/* 79796C 802A19AC 0C00A67F */ jal rand_int -/* 797970 802A19B0 24040014 */ addiu $a0, $zero, 0x14 -/* 797974 802A19B4 AE020000 */ sw $v0, ($s0) -/* 797978 802A19B8 26520001 */ addiu $s2, $s2, 1 -/* 79797C 802A19BC 2A420008 */ slti $v0, $s2, 8 -/* 797980 802A19C0 1440FFFA */ bnez $v0, .L802A19AC -/* 797984 802A19C4 26100004 */ addiu $s0, $s0, 4 -/* 797988 802A19C8 8FC30078 */ lw $v1, 0x78($fp) -/* 79798C 802A19CC 24020028 */ addiu $v0, $zero, 0x28 -/* 797990 802A19D0 14600004 */ bnez $v1, .L802A19E4 -/* 797994 802A19D4 AFC20074 */ sw $v0, 0x74($fp) -/* 797998 802A19D8 3C048000 */ lui $a0, 0x8000 -/* 79799C 802A19DC 080A867B */ j .L802A19EC -/* 7979A0 802A19E0 34840068 */ ori $a0, $a0, 0x68 -.L802A19E4: -/* 7979A4 802A19E4 3C048000 */ lui $a0, 0x8000 -/* 7979A8 802A19E8 34840069 */ ori $a0, $a0, 0x69 -.L802A19EC: -/* 7979AC 802A19EC 0C05272D */ jal play_sound -/* 7979B0 802A19F0 00000000 */ nop -/* 7979B4 802A19F4 24020001 */ addiu $v0, $zero, 1 -/* 7979B8 802A19F8 080A8907 */ j .L802A241C -/* 7979BC 802A19FC AFC20070 */ sw $v0, 0x70($fp) -glabel L802A1A00_7979C0 -/* 7979C0 802A1A00 C6200010 */ lwc1 $f0, 0x10($s1) -/* 7979C4 802A1A04 C6240004 */ lwc1 $f4, 4($s1) -/* 7979C8 802A1A08 46040001 */ sub.s $f0, $f0, $f4 -/* 7979CC 802A1A0C 3C014120 */ lui $at, 0x4120 -/* 7979D0 802A1A10 44811000 */ mtc1 $at, $f2 -/* 7979D4 802A1A14 3C03802A */ lui $v1, %hi(D_802A37F0) -/* 7979D8 802A1A18 8C6337F0 */ lw $v1, %lo(D_802A37F0)($v1) -/* 7979DC 802A1A1C 46020003 */ div.s $f0, $f0, $f2 -/* 7979E0 802A1A20 46002100 */ add.s $f4, $f4, $f0 -/* 7979E4 802A1A24 C6200000 */ lwc1 $f0, ($s1) -/* 7979E8 802A1A28 E6240004 */ swc1 $f4, 4($s1) -/* 7979EC 802A1A2C 8C62000C */ lw $v0, 0xc($v1) -/* 7979F0 802A1A30 E440004C */ swc1 $f0, 0x4c($v0) -/* 7979F4 802A1A34 8C62000C */ lw $v0, 0xc($v1) -/* 7979F8 802A1A38 C6200004 */ lwc1 $f0, 4($s1) -/* 7979FC 802A1A3C E4400050 */ swc1 $f0, 0x50($v0) -/* 797A00 802A1A40 8C62000C */ lw $v0, 0xc($v1) -/* 797A04 802A1A44 C6200008 */ lwc1 $f0, 8($s1) -/* 797A08 802A1A48 E4400054 */ swc1 $f0, 0x54($v0) -/* 797A0C 802A1A4C 8C62000C */ lw $v0, 0xc($v1) -/* 797A10 802A1A50 AC40003C */ sw $zero, 0x3c($v0) -/* 797A14 802A1A54 8C62000C */ lw $v0, 0xc($v1) -/* 797A18 802A1A58 C620004C */ lwc1 $f0, 0x4c($s1) -/* 797A1C 802A1A5C E4400048 */ swc1 $f0, 0x48($v0) -/* 797A20 802A1A60 8C62000C */ lw $v0, 0xc($v1) -/* 797A24 802A1A64 AC400024 */ sw $zero, 0x24($v0) -/* 797A28 802A1A68 8FC20074 */ lw $v0, 0x74($fp) -/* 797A2C 802A1A6C 14400177 */ bnez $v0, .L802A204C -/* 797A30 802A1A70 2442FFFF */ addiu $v0, $v0, -1 -/* 797A34 802A1A74 24020014 */ addiu $v0, $zero, 0x14 -/* 797A38 802A1A78 AFC20074 */ sw $v0, 0x74($fp) -/* 797A3C 802A1A7C 24020002 */ addiu $v0, $zero, 2 -/* 797A40 802A1A80 080A8907 */ j .L802A241C -/* 797A44 802A1A84 AFC20070 */ sw $v0, 0x70($fp) -glabel L802A1A88_797A48 -/* 797A48 802A1A88 8FC20074 */ lw $v0, 0x74($fp) -/* 797A4C 802A1A8C 1440016F */ bnez $v0, .L802A204C -/* 797A50 802A1A90 2442FFFF */ addiu $v0, $v0, -1 -/* 797A54 802A1A94 0C093903 */ jal func_8024E40C -/* 797A58 802A1A98 24040002 */ addiu $a0, $zero, 2 -/* 797A5C 802A1A9C 0C093936 */ jal move_cam_over -/* 797A60 802A1AA0 2404000A */ addiu $a0, $zero, 0xa -/* 797A64 802A1AA4 2402000F */ addiu $v0, $zero, 0xf -/* 797A68 802A1AA8 AFC20074 */ sw $v0, 0x74($fp) -/* 797A6C 802A1AAC 24020003 */ addiu $v0, $zero, 3 -/* 797A70 802A1AB0 080A8907 */ j .L802A241C -/* 797A74 802A1AB4 AFC20070 */ sw $v0, 0x70($fp) -glabel L802A1AB8_797A78 -/* 797A78 802A1AB8 C624004C */ lwc1 $f4, 0x4c($s1) -/* 797A7C 802A1ABC 3C0141C0 */ lui $at, 0x41c0 -/* 797A80 802A1AC0 44810000 */ mtc1 $at, $f0 -/* 797A84 802A1AC4 00000000 */ nop -/* 797A88 802A1AC8 46040001 */ sub.s $f0, $f0, $f4 -/* 797A8C 802A1ACC 3C013E00 */ lui $at, 0x3e00 -/* 797A90 802A1AD0 44811000 */ mtc1 $at, $f2 -/* 797A94 802A1AD4 00000000 */ nop -/* 797A98 802A1AD8 46020002 */ mul.s $f0, $f0, $f2 -/* 797A9C 802A1ADC 00000000 */ nop -/* 797AA0 802A1AE0 46002100 */ add.s $f4, $f4, $f0 -/* 797AA4 802A1AE4 3C02802A */ lui $v0, %hi(D_802A37F0) -/* 797AA8 802A1AE8 8C4237F0 */ lw $v0, %lo(D_802A37F0)($v0) -/* 797AAC 802A1AEC E624004C */ swc1 $f4, 0x4c($s1) -/* 797AB0 802A1AF0 8C42000C */ lw $v0, 0xc($v0) -/* 797AB4 802A1AF4 E4440048 */ swc1 $f4, 0x48($v0) -/* 797AB8 802A1AF8 8FC20074 */ lw $v0, 0x74($fp) -/* 797ABC 802A1AFC 54400153 */ bnel $v0, $zero, .L802A204C -/* 797AC0 802A1B00 2442FFFF */ addiu $v0, $v0, -1 -/* 797AC4 802A1B04 2403001E */ addiu $v1, $zero, 0x1e -/* 797AC8 802A1B08 24120007 */ addiu $s2, $zero, 7 -/* 797ACC 802A1B0C 3C02802A */ lui $v0, %hi(D_802A3834) -/* 797AD0 802A1B10 24423834 */ addiu $v0, $v0, %lo(D_802A3834) -/* 797AD4 802A1B14 E63C000C */ swc1 $f28, 0xc($s1) -/* 797AD8 802A1B18 E6380010 */ swc1 $f24, 0x10($s1) -/* 797ADC 802A1B1C E63A0014 */ swc1 $f26, 0x14($s1) -.L802A1B20: -/* 797AE0 802A1B20 AC430000 */ sw $v1, ($v0) -/* 797AE4 802A1B24 2652FFFF */ addiu $s2, $s2, -1 -/* 797AE8 802A1B28 0641FFFD */ bgez $s2, .L802A1B20 -/* 797AEC 802A1B2C 2442FFFC */ addiu $v0, $v0, -4 -/* 797AF0 802A1B30 8FC20078 */ lw $v0, 0x78($fp) -/* 797AF4 802A1B34 14400002 */ bnez $v0, .L802A1B40 -/* 797AF8 802A1B38 24040649 */ addiu $a0, $zero, 0x649 -/* 797AFC 802A1B3C 24040648 */ addiu $a0, $zero, 0x648 -.L802A1B40: -/* 797B00 802A1B40 0C05272D */ jal play_sound -/* 797B04 802A1B44 00000000 */ nop -/* 797B08 802A1B48 24020004 */ addiu $v0, $zero, 4 -/* 797B0C 802A1B4C 080A8907 */ j .L802A241C -/* 797B10 802A1B50 AFC20070 */ sw $v0, 0x70($fp) -glabel L802A1B54_797B14 -/* 797B14 802A1B54 C624004C */ lwc1 $f4, 0x4c($s1) -/* 797B18 802A1B58 3C014240 */ lui $at, 0x4240 -/* 797B1C 802A1B5C 44811000 */ mtc1 $at, $f2 -/* 797B20 802A1B60 00000000 */ nop -/* 797B24 802A1B64 46041081 */ sub.s $f2, $f2, $f4 -/* 797B28 802A1B68 3C013E80 */ lui $at, 0x3e80 -/* 797B2C 802A1B6C 44810000 */ mtc1 $at, $f0 -/* 797B30 802A1B70 00000000 */ nop -/* 797B34 802A1B74 46001082 */ mul.s $f2, $f2, $f0 -/* 797B38 802A1B78 00000000 */ nop -/* 797B3C 802A1B7C 0000B82D */ daddu $s7, $zero, $zero -/* 797B40 802A1B80 02E0902D */ daddu $s2, $s7, $zero -/* 797B44 802A1B84 3C13802A */ lui $s3, %hi(D_802A3818) -/* 797B48 802A1B88 26733818 */ addiu $s3, $s3, %lo(D_802A3818) -/* 797B4C 802A1B8C 0260A82D */ daddu $s5, $s3, $zero -/* 797B50 802A1B90 46022100 */ add.s $f4, $f4, $f2 -/* 797B54 802A1B94 3C02802A */ lui $v0, %hi(D_802A37F0) -/* 797B58 802A1B98 8C4237F0 */ lw $v0, %lo(D_802A37F0)($v0) -/* 797B5C 802A1B9C 02E0A02D */ daddu $s4, $s7, $zero -/* 797B60 802A1BA0 E624004C */ swc1 $f4, 0x4c($s1) -/* 797B64 802A1BA4 8C42000C */ lw $v0, 0xc($v0) -/* 797B68 802A1BA8 3C10802A */ lui $s0, %hi(D_802A3514_7994D4) -/* 797B6C 802A1BAC 26103514 */ addiu $s0, $s0, %lo(D_802A3514_7994D4) -/* 797B70 802A1BB0 E4440048 */ swc1 $f4, 0x48($v0) -.L802A1BB4: -/* 797B74 802A1BB4 5240004F */ beql $s2, $zero, .L802A1CF4 -/* 797B78 802A1BB8 26730004 */ addiu $s3, $s3, 4 -/* 797B7C 802A1BBC 8E020000 */ lw $v0, ($s0) -/* 797B80 802A1BC0 04410013 */ bgez $v0, .L802A1C10 -/* 797B84 802A1BC4 00000000 */ nop -/* 797B88 802A1BC8 C6340000 */ lwc1 $f20, ($s1) -/* 797B8C 802A1BCC C638000C */ lwc1 $f24, 0xc($s1) -/* 797B90 802A1BD0 C6360004 */ lwc1 $f22, 4($s1) -/* 797B94 802A1BD4 4614C181 */ sub.s $f6, $f24, $f20 -/* 797B98 802A1BD8 C63C0010 */ lwc1 $f28, 0x10($s1) -/* 797B9C 802A1BDC C63E0008 */ lwc1 $f30, 8($s1) -/* 797BA0 802A1BE0 4616E001 */ sub.s $f0, $f28, $f22 -/* 797BA4 802A1BE4 C63A0014 */ lwc1 $f26, 0x14($s1) -/* 797BA8 802A1BE8 461ED081 */ sub.s $f2, $f26, $f30 -/* 797BAC 802A1BEC 4606A180 */ add.s $f6, $f20, $f6 -/* 797BB0 802A1BF0 4600B106 */ mov.s $f4, $f22 -/* 797BB4 802A1BF4 46002100 */ add.s $f4, $f4, $f0 -/* 797BB8 802A1BF8 4600F006 */ mov.s $f0, $f30 -/* 797BBC 802A1BFC 46020000 */ add.s $f0, $f0, $f2 -/* 797BC0 802A1C00 E6260000 */ swc1 $f6, ($s1) -/* 797BC4 802A1C04 E6240004 */ swc1 $f4, 4($s1) -/* 797BC8 802A1C08 080A873C */ j .L802A1CF0 -/* 797BCC 802A1C0C E6200008 */ swc1 $f0, 8($s1) -.L802A1C10: -/* 797BD0 802A1C10 10400004 */ beqz $v0, .L802A1C24 -/* 797BD4 802A1C14 24170001 */ addiu $s7, $zero, 1 -/* 797BD8 802A1C18 2442FFFF */ addiu $v0, $v0, -1 -/* 797BDC 802A1C1C 080A873C */ j .L802A1CF0 -/* 797BE0 802A1C20 AE020000 */ sw $v0, ($s0) -.L802A1C24: -/* 797BE4 802A1C24 C6340000 */ lwc1 $f20, ($s1) -/* 797BE8 802A1C28 C6360004 */ lwc1 $f22, 4($s1) -/* 797BEC 802A1C2C C63E0008 */ lwc1 $f30, 8($s1) -/* 797BF0 802A1C30 C638000C */ lwc1 $f24, 0xc($s1) -/* 797BF4 802A1C34 C63C0010 */ lwc1 $f28, 0x10($s1) -/* 797BF8 802A1C38 C63A0014 */ lwc1 $f26, 0x14($s1) -/* 797BFC 802A1C3C 4600A306 */ mov.s $f12, $f20 -/* 797C00 802A1C40 4406C000 */ mfc1 $a2, $f24 -/* 797C04 802A1C44 4407D000 */ mfc1 $a3, $f26 -/* 797C08 802A1C48 0C00A7B5 */ jal dist2D -/* 797C0C 802A1C4C 4600F386 */ mov.s $f14, $f30 -/* 797C10 802A1C50 02951021 */ addu $v0, $s4, $s5 -/* 797C14 802A1C54 4614C101 */ sub.s $f4, $f24, $f20 -/* 797C18 802A1C58 C4460000 */ lwc1 $f6, ($v0) -/* 797C1C 802A1C5C 468031A0 */ cvt.s.w $f6, $f6 -/* 797C20 802A1C60 C6220000 */ lwc1 $f2, ($s1) -/* 797C24 802A1C64 46062103 */ div.s $f4, $f4, $f6 -/* 797C28 802A1C68 46041080 */ add.s $f2, $f2, $f4 -/* 797C2C 802A1C6C 4616E101 */ sub.s $f4, $f28, $f22 -/* 797C30 802A1C70 E6220000 */ swc1 $f2, ($s1) -/* 797C34 802A1C74 C4460000 */ lwc1 $f6, ($v0) -/* 797C38 802A1C78 468031A0 */ cvt.s.w $f6, $f6 -/* 797C3C 802A1C7C C6220004 */ lwc1 $f2, 4($s1) -/* 797C40 802A1C80 46062103 */ div.s $f4, $f4, $f6 -/* 797C44 802A1C84 46041080 */ add.s $f2, $f2, $f4 -/* 797C48 802A1C88 461ED101 */ sub.s $f4, $f26, $f30 -/* 797C4C 802A1C8C E6220004 */ swc1 $f2, 4($s1) -/* 797C50 802A1C90 C4460000 */ lwc1 $f6, ($v0) -/* 797C54 802A1C94 468031A0 */ cvt.s.w $f6, $f6 -/* 797C58 802A1C98 C6220008 */ lwc1 $f2, 8($s1) -/* 797C5C 802A1C9C 46062103 */ div.s $f4, $f4, $f6 -/* 797C60 802A1CA0 46041080 */ add.s $f2, $f2, $f4 -/* 797C64 802A1CA4 E6220008 */ swc1 $f2, 8($s1) -/* 797C68 802A1CA8 8C420000 */ lw $v0, ($v0) -/* 797C6C 802A1CAC 14570007 */ bne $v0, $s7, .L802A1CCC -/* 797C70 802A1CB0 46000106 */ mov.s $f4, $f0 -/* 797C74 802A1CB4 2402FFFF */ addiu $v0, $zero, -1 -/* 797C78 802A1CB8 AE020000 */ sw $v0, ($s0) -/* 797C7C 802A1CBC E6380000 */ swc1 $f24, ($s1) -/* 797C80 802A1CC0 E63C0004 */ swc1 $f28, 4($s1) -/* 797C84 802A1CC4 080A8739 */ j .L802A1CE4 -/* 797C88 802A1CC8 E63A0008 */ swc1 $f26, 8($s1) -.L802A1CCC: -/* 797C8C 802A1CCC 3C014270 */ lui $at, 0x4270 -/* 797C90 802A1CD0 44810000 */ mtc1 $at, $f0 -/* 797C94 802A1CD4 C6220004 */ lwc1 $f2, 4($s1) -/* 797C98 802A1CD8 46002003 */ div.s $f0, $f4, $f0 -/* 797C9C 802A1CDC 46001080 */ add.s $f2, $f2, $f0 -/* 797CA0 802A1CE0 E6220004 */ swc1 $f2, 4($s1) -.L802A1CE4: -/* 797CA4 802A1CE4 8E620000 */ lw $v0, ($s3) -/* 797CA8 802A1CE8 2442FFFF */ addiu $v0, $v0, -1 -/* 797CAC 802A1CEC AE620000 */ sw $v0, ($s3) -.L802A1CF0: -/* 797CB0 802A1CF0 26730004 */ addiu $s3, $s3, 4 -.L802A1CF4: -/* 797CB4 802A1CF4 26940004 */ addiu $s4, $s4, 4 -/* 797CB8 802A1CF8 26520001 */ addiu $s2, $s2, 1 -/* 797CBC 802A1CFC 2A420002 */ slti $v0, $s2, 2 -/* 797CC0 802A1D00 1440FFAC */ bnez $v0, .L802A1BB4 -/* 797CC4 802A1D04 26100004 */ addiu $s0, $s0, 4 -/* 797CC8 802A1D08 3C03802A */ lui $v1, %hi(D_802A37F0) -/* 797CCC 802A1D0C 8C6337F0 */ lw $v1, %lo(D_802A37F0)($v1) -/* 797CD0 802A1D10 C6200000 */ lwc1 $f0, ($s1) -/* 797CD4 802A1D14 8C62000C */ lw $v0, 0xc($v1) -/* 797CD8 802A1D18 E440004C */ swc1 $f0, 0x4c($v0) -/* 797CDC 802A1D1C 8C62000C */ lw $v0, 0xc($v1) -/* 797CE0 802A1D20 C6200004 */ lwc1 $f0, 4($s1) -/* 797CE4 802A1D24 E4400050 */ swc1 $f0, 0x50($v0) -/* 797CE8 802A1D28 8C62000C */ lw $v0, 0xc($v1) -/* 797CEC 802A1D2C C6200008 */ lwc1 $f0, 8($s1) -/* 797CF0 802A1D30 E4400054 */ swc1 $f0, 0x54($v0) -/* 797CF4 802A1D34 8C62000C */ lw $v0, 0xc($v1) -/* 797CF8 802A1D38 C6200000 */ lwc1 $f0, ($s1) -/* 797CFC 802A1D3C E4400004 */ swc1 $f0, 4($v0) -/* 797D00 802A1D40 8C62000C */ lw $v0, 0xc($v1) -/* 797D04 802A1D44 AC400008 */ sw $zero, 8($v0) -/* 797D08 802A1D48 8C62000C */ lw $v0, 0xc($v1) -/* 797D0C 802A1D4C C6200008 */ lwc1 $f0, 8($s1) -/* 797D10 802A1D50 16E001B2 */ bnez $s7, .L802A241C -/* 797D14 802A1D54 E440000C */ swc1 $f0, 0xc($v0) -/* 797D18 802A1D58 C620000C */ lwc1 $f0, 0xc($s1) -/* 797D1C 802A1D5C C6220010 */ lwc1 $f2, 0x10($s1) -/* 797D20 802A1D60 C6240014 */ lwc1 $f4, 0x14($s1) -/* 797D24 802A1D64 E6200000 */ swc1 $f0, ($s1) -/* 797D28 802A1D68 E6220004 */ swc1 $f2, 4($s1) -/* 797D2C 802A1D6C E6240008 */ swc1 $f4, 8($s1) -/* 797D30 802A1D70 8C62000C */ lw $v0, 0xc($v1) -/* 797D34 802A1D74 E440004C */ swc1 $f0, 0x4c($v0) -/* 797D38 802A1D78 8C62000C */ lw $v0, 0xc($v1) -/* 797D3C 802A1D7C C6200004 */ lwc1 $f0, 4($s1) -/* 797D40 802A1D80 E4400050 */ swc1 $f0, 0x50($v0) -/* 797D44 802A1D84 8C62000C */ lw $v0, 0xc($v1) -/* 797D48 802A1D88 C6200008 */ lwc1 $f0, 8($s1) -/* 797D4C 802A1D8C 0000902D */ daddu $s2, $zero, $zero -/* 797D50 802A1D90 E4400054 */ swc1 $f0, 0x54($v0) -/* 797D54 802A1D94 8C62000C */ lw $v0, 0xc($v1) -/* 797D58 802A1D98 C6200000 */ lwc1 $f0, ($s1) -/* 797D5C 802A1D9C 24070001 */ addiu $a3, $zero, 1 -/* 797D60 802A1DA0 E4400004 */ swc1 $f0, 4($v0) -/* 797D64 802A1DA4 8C62000C */ lw $v0, 0xc($v1) -/* 797D68 802A1DA8 2406FFFD */ addiu $a2, $zero, -3 -/* 797D6C 802A1DAC AC400008 */ sw $zero, 8($v0) -/* 797D70 802A1DB0 8C62000C */ lw $v0, 0xc($v1) -/* 797D74 802A1DB4 C6200008 */ lwc1 $f0, 8($s1) -/* 797D78 802A1DB8 3C05802A */ lui $a1, %hi(D_802A3514_7994D4) -/* 797D7C 802A1DBC 24A53514 */ addiu $a1, $a1, %lo(D_802A3514_7994D4) -/* 797D80 802A1DC0 E440000C */ swc1 $f0, 0xc($v0) -/* 797D84 802A1DC4 8C63000C */ lw $v1, 0xc($v1) -/* 797D88 802A1DC8 2404005C */ addiu $a0, $zero, 0x5c -/* 797D8C 802A1DCC AFA30028 */ sw $v1, 0x28($sp) -.L802A1DD0: -/* 797D90 802A1DD0 8FC20078 */ lw $v0, 0x78($fp) -/* 797D94 802A1DD4 14400003 */ bnez $v0, .L802A1DE4 -/* 797D98 802A1DD8 00000000 */ nop -/* 797D9C 802A1DDC 52400008 */ beql $s2, $zero, .L802A1E00 -/* 797DA0 802A1DE0 24A50004 */ addiu $a1, $a1, 4 -.L802A1DE4: -/* 797DA4 802A1DE4 8FA80028 */ lw $t0, 0x28($sp) -/* 797DA8 802A1DE8 ACA70000 */ sw $a3, ($a1) -/* 797DAC 802A1DEC 01048021 */ addu $s0, $t0, $a0 -/* 797DB0 802A1DF0 8E020000 */ lw $v0, ($s0) -/* 797DB4 802A1DF4 00461024 */ and $v0, $v0, $a2 -/* 797DB8 802A1DF8 AE020000 */ sw $v0, ($s0) -/* 797DBC 802A1DFC 24A50004 */ addiu $a1, $a1, 4 -.L802A1E00: -/* 797DC0 802A1E00 26520001 */ addiu $s2, $s2, 1 -/* 797DC4 802A1E04 2A420008 */ slti $v0, $s2, 8 -/* 797DC8 802A1E08 1440FFF1 */ bnez $v0, .L802A1DD0 -/* 797DCC 802A1E0C 2484001C */ addiu $a0, $a0, 0x1c -/* 797DD0 802A1E10 0C093903 */ jal func_8024E40C -/* 797DD4 802A1E14 24040003 */ addiu $a0, $zero, 3 -/* 797DD8 802A1E18 0C093936 */ jal move_cam_over -/* 797DDC 802A1E1C 2404001E */ addiu $a0, $zero, 0x1e -/* 797DE0 802A1E20 2402000F */ addiu $v0, $zero, 0xf -/* 797DE4 802A1E24 AFC20074 */ sw $v0, 0x74($fp) -/* 797DE8 802A1E28 24020005 */ addiu $v0, $zero, 5 -/* 797DEC 802A1E2C 080A8907 */ j .L802A241C -/* 797DF0 802A1E30 AFC20070 */ sw $v0, 0x70($fp) -glabel L802A1E34_797DF4 -/* 797DF4 802A1E34 8FC20074 */ lw $v0, 0x74($fp) -/* 797DF8 802A1E38 14400084 */ bnez $v0, .L802A204C -/* 797DFC 802A1E3C 2442FFFF */ addiu $v0, $v0, -1 -/* 797E00 802A1E40 3C05802A */ lui $a1, %hi(D_802A37F0) -/* 797E04 802A1E44 8CA537F0 */ lw $a1, %lo(D_802A37F0)($a1) -/* 797E08 802A1E48 A6200064 */ sh $zero, 0x64($s1) -/* 797E0C 802A1E4C 8CA2000C */ lw $v0, 0xc($a1) -/* 797E10 802A1E50 AC40003C */ sw $zero, 0x3c($v0) -/* 797E14 802A1E54 8CA2000C */ lw $v0, 0xc($a1) -/* 797E18 802A1E58 AC400024 */ sw $zero, 0x24($v0) -/* 797E1C 802A1E5C 8FC20078 */ lw $v0, 0x78($fp) -/* 797E20 802A1E60 1040000F */ beqz $v0, .L802A1EA0 -/* 797E24 802A1E64 240400F0 */ addiu $a0, $zero, 0xf0 -/* 797E28 802A1E68 8CA2000C */ lw $v0, 0xc($a1) -/* 797E2C 802A1E6C AC440018 */ sw $a0, 0x18($v0) -/* 797E30 802A1E70 8CA3000C */ lw $v1, 0xc($a1) -/* 797E34 802A1E74 24020050 */ addiu $v0, $zero, 0x50 -/* 797E38 802A1E78 AC62001C */ sw $v0, 0x1c($v1) -/* 797E3C 802A1E7C 8CA3000C */ lw $v1, 0xc($a1) -/* 797E40 802A1E80 240200C8 */ addiu $v0, $zero, 0xc8 -/* 797E44 802A1E84 AC620020 */ sw $v0, 0x20($v1) -/* 797E48 802A1E88 8CA2000C */ lw $v0, 0xc($a1) -/* 797E4C 802A1E8C AC440028 */ sw $a0, 0x28($v0) -/* 797E50 802A1E90 8CA2000C */ lw $v0, 0xc($a1) -/* 797E54 802A1E94 AC44002C */ sw $a0, 0x2c($v0) -/* 797E58 802A1E98 8CA2000C */ lw $v0, 0xc($a1) -/* 797E5C 802A1E9C AC440030 */ sw $a0, 0x30($v0) -.L802A1EA0: -/* 797E60 802A1EA0 3C04802A */ lui $a0, %hi(D_802A33A8_799368) -/* 797E64 802A1EA4 248433A8 */ addiu $a0, $a0, %lo(D_802A33A8_799368) -/* 797E68 802A1EA8 2405000A */ addiu $a1, $zero, 0xa -/* 797E6C 802A1EAC 0C0B0CF8 */ jal start_script -/* 797E70 802A1EB0 0000302D */ daddu $a2, $zero, $zero -/* 797E74 802A1EB4 C6200000 */ lwc1 $f0, ($s1) -/* 797E78 802A1EB8 3C013F00 */ lui $at, 0x3f00 -/* 797E7C 802A1EBC 44811000 */ mtc1 $at, $f2 -/* 797E80 802A1EC0 4600020D */ trunc.w.s $f8, $f0 -/* 797E84 802A1EC4 E4480084 */ swc1 $f8, 0x84($v0) -/* 797E88 802A1EC8 C6200004 */ lwc1 $f0, 4($s1) -/* 797E8C 802A1ECC 46020002 */ mul.s $f0, $f0, $f2 -/* 797E90 802A1ED0 00000000 */ nop -/* 797E94 802A1ED4 4600020D */ trunc.w.s $f8, $f0 -/* 797E98 802A1ED8 E4480088 */ swc1 $f8, 0x88($v0) -/* 797E9C 802A1EDC C6200008 */ lwc1 $f0, 8($s1) -/* 797EA0 802A1EE0 4600020D */ trunc.w.s $f8, $f0 -/* 797EA4 802A1EE4 E448008C */ swc1 $f8, 0x8c($v0) -/* 797EA8 802A1EE8 8FC30078 */ lw $v1, 0x78($fp) -/* 797EAC 802A1EEC AC4300AC */ sw $v1, 0xac($v0) -/* 797EB0 802A1EF0 0C05272D */ jal play_sound -/* 797EB4 802A1EF4 2404024A */ addiu $a0, $zero, 0x24a -/* 797EB8 802A1EF8 2402002D */ addiu $v0, $zero, 0x2d -/* 797EBC 802A1EFC AFC20074 */ sw $v0, 0x74($fp) -/* 797EC0 802A1F00 24020006 */ addiu $v0, $zero, 6 -/* 797EC4 802A1F04 080A8907 */ j .L802A241C -/* 797EC8 802A1F08 AFC20070 */ sw $v0, 0x70($fp) -glabel L802A1F0C_797ECC -/* 797ECC 802A1F0C 96220064 */ lhu $v0, 0x64($s1) -/* 797ED0 802A1F10 2442001E */ addiu $v0, $v0, 0x1e -/* 797ED4 802A1F14 A6220064 */ sh $v0, 0x64($s1) -/* 797ED8 802A1F18 00021400 */ sll $v0, $v0, 0x10 -/* 797EDC 802A1F1C 00021403 */ sra $v0, $v0, 0x10 -/* 797EE0 802A1F20 28420100 */ slti $v0, $v0, 0x100 -/* 797EE4 802A1F24 14400002 */ bnez $v0, .L802A1F30 -/* 797EE8 802A1F28 240200FF */ addiu $v0, $zero, 0xff -/* 797EEC 802A1F2C A6220064 */ sh $v0, 0x64($s1) -.L802A1F30: -/* 797EF0 802A1F30 3C04802A */ lui $a0, %hi(D_802A37F0) -/* 797EF4 802A1F34 8C8437F0 */ lw $a0, %lo(D_802A37F0)($a0) -/* 797EF8 802A1F38 86220064 */ lh $v0, 0x64($s1) -/* 797EFC 802A1F3C 8C83000C */ lw $v1, 0xc($a0) -/* 797F00 802A1F40 AC62003C */ sw $v0, 0x3c($v1) -/* 797F04 802A1F44 8C83000C */ lw $v1, 0xc($a0) -/* 797F08 802A1F48 86220064 */ lh $v0, 0x64($s1) -/* 797F0C 802A1F4C AC620024 */ sw $v0, 0x24($v1) -/* 797F10 802A1F50 8FC20074 */ lw $v0, 0x74($fp) -/* 797F14 802A1F54 1440003D */ bnez $v0, .L802A204C -/* 797F18 802A1F58 2442FFFF */ addiu $v0, $v0, -1 -/* 797F1C 802A1F5C 8FC20078 */ lw $v0, 0x78($fp) -/* 797F20 802A1F60 24030001 */ addiu $v1, $zero, 1 -/* 797F24 802A1F64 3C01802A */ lui $at, %hi(D_802A3838) -/* 797F28 802A1F68 AC233838 */ sw $v1, %lo(D_802A3838)($at) -/* 797F2C 802A1F6C 14400012 */ bnez $v0, .L802A1FB8 -/* 797F30 802A1F70 2402000F */ addiu $v0, $zero, 0xf -/* 797F34 802A1F74 82A2040C */ lb $v0, 0x40c($s5) -/* 797F38 802A1F78 1443000F */ bne $v0, $v1, .L802A1FB8 -/* 797F3C 802A1F7C 2402000F */ addiu $v0, $zero, 0xf -/* 797F40 802A1F80 86A40428 */ lh $a0, 0x428($s5) -/* 797F44 802A1F84 0C09A75B */ jal get_actor -/* 797F48 802A1F88 00000000 */ nop -/* 797F4C 802A1F8C 82A50426 */ lb $a1, 0x426($s5) -/* 797F50 802A1F90 0C099117 */ jal get_actor_part -/* 797F54 802A1F94 0040202D */ daddu $a0, $v0, $zero -/* 797F58 802A1F98 8C42007C */ lw $v0, 0x7c($v0) -/* 797F5C 802A1F9C 3C030008 */ lui $v1, 8 -/* 797F60 802A1FA0 00431024 */ and $v0, $v0, $v1 -/* 797F64 802A1FA4 10400003 */ beqz $v0, .L802A1FB4 -/* 797F68 802A1FA8 24020014 */ addiu $v0, $zero, 0x14 -/* 797F6C 802A1FAC 080A8907 */ j .L802A241C -/* 797F70 802A1FB0 AFC20070 */ sw $v0, 0x70($fp) -.L802A1FB4: -/* 797F74 802A1FB4 2402000F */ addiu $v0, $zero, 0xf -.L802A1FB8: -/* 797F78 802A1FB8 AFC20074 */ sw $v0, 0x74($fp) -/* 797F7C 802A1FBC 24020007 */ addiu $v0, $zero, 7 -/* 797F80 802A1FC0 080A8907 */ j .L802A241C -/* 797F84 802A1FC4 AFC20070 */ sw $v0, 0x70($fp) -glabel L802A1FC8_797F88 -/* 797F88 802A1FC8 8FC20074 */ lw $v0, 0x74($fp) -/* 797F8C 802A1FCC 1440001F */ bnez $v0, .L802A204C -/* 797F90 802A1FD0 2442FFFF */ addiu $v0, $v0, -1 -/* 797F94 802A1FD4 2402000A */ addiu $v0, $zero, 0xa -/* 797F98 802A1FD8 AFC20074 */ sw $v0, 0x74($fp) -/* 797F9C 802A1FDC 24020008 */ addiu $v0, $zero, 8 -/* 797FA0 802A1FE0 080A8907 */ j .L802A241C -/* 797FA4 802A1FE4 AFC20070 */ sw $v0, 0x70($fp) -glabel L802A1FE8_797FA8 -/* 797FA8 802A1FE8 96220064 */ lhu $v0, 0x64($s1) -/* 797FAC 802A1FEC 2442FFE2 */ addiu $v0, $v0, -0x1e -/* 797FB0 802A1FF0 A6220064 */ sh $v0, 0x64($s1) -/* 797FB4 802A1FF4 00021400 */ sll $v0, $v0, 0x10 -/* 797FB8 802A1FF8 04420001 */ bltzl $v0, .L802A2000 -/* 797FBC 802A1FFC A6200064 */ sh $zero, 0x64($s1) -.L802A2000: -/* 797FC0 802A2000 3C04802A */ lui $a0, %hi(D_802A37F0) -/* 797FC4 802A2004 8C8437F0 */ lw $a0, %lo(D_802A37F0)($a0) -/* 797FC8 802A2008 86220064 */ lh $v0, 0x64($s1) -/* 797FCC 802A200C 8C83000C */ lw $v1, 0xc($a0) -/* 797FD0 802A2010 AC62003C */ sw $v0, 0x3c($v1) -/* 797FD4 802A2014 8C83000C */ lw $v1, 0xc($a0) -/* 797FD8 802A2018 86220064 */ lh $v0, 0x64($s1) -/* 797FDC 802A201C AC620024 */ sw $v0, 0x24($v1) -/* 797FE0 802A2020 8FC20074 */ lw $v0, 0x74($fp) -/* 797FE4 802A2024 14400009 */ bnez $v0, .L802A204C -/* 797FE8 802A2028 2442FFFF */ addiu $v0, $v0, -1 -/* 797FEC 802A202C 2402000A */ addiu $v0, $zero, 0xa -/* 797FF0 802A2030 AFC20074 */ sw $v0, 0x74($fp) -/* 797FF4 802A2034 24020009 */ addiu $v0, $zero, 9 -/* 797FF8 802A2038 080A8907 */ j .L802A241C -/* 797FFC 802A203C AFC20070 */ sw $v0, 0x70($fp) -glabel L802A2040_798000 -/* 798000 802A2040 8FC20074 */ lw $v0, 0x74($fp) -/* 798004 802A2044 10400003 */ beqz $v0, .L802A2054 -/* 798008 802A2048 2442FFFF */ addiu $v0, $v0, -1 -.L802A204C: -/* 79800C 802A204C 080A8907 */ j .L802A241C -/* 798010 802A2050 AFC20074 */ sw $v0, 0x74($fp) -.L802A2054: -/* 798014 802A2054 3C01432A */ lui $at, 0x432a -/* 798018 802A2058 44810000 */ mtc1 $at, $f0 -/* 79801C 802A205C 24020014 */ addiu $v0, $zero, 0x14 -/* 798020 802A2060 4600C000 */ add.s $f0, $f24, $f0 -/* 798024 802A2064 E63C000C */ swc1 $f28, 0xc($s1) -/* 798028 802A2068 E63A0014 */ swc1 $f26, 0x14($s1) -/* 79802C 802A206C E6200010 */ swc1 $f0, 0x10($s1) -/* 798030 802A2070 AFC20074 */ sw $v0, 0x74($fp) -/* 798034 802A2074 2402000A */ addiu $v0, $zero, 0xa -/* 798038 802A2078 080A8907 */ j .L802A241C -/* 79803C 802A207C AFC20070 */ sw $v0, 0x70($fp) -glabel L802A2080_798040 -/* 798040 802A2080 8FC20074 */ lw $v0, 0x74($fp) -/* 798044 802A2084 10400010 */ beqz $v0, .L802A20C8 -/* 798048 802A2088 2442FFFF */ addiu $v0, $v0, -1 -/* 79804C 802A208C 1440000E */ bnez $v0, .L802A20C8 -/* 798050 802A2090 AFC20074 */ sw $v0, 0x74($fp) -/* 798054 802A2094 8FC20078 */ lw $v0, 0x78($fp) -/* 798058 802A2098 54400006 */ bnel $v0, $zero, .L802A20B4 -/* 79805C 802A209C 24040249 */ addiu $a0, $zero, 0x249 -/* 798060 802A20A0 24040248 */ addiu $a0, $zero, 0x248 -/* 798064 802A20A4 0C05269B */ jal func_80149A6C -/* 798068 802A20A8 24050001 */ addiu $a1, $zero, 1 -/* 79806C 802A20AC 080A8830 */ j .L802A20C0 -/* 798070 802A20B0 24040648 */ addiu $a0, $zero, 0x648 -.L802A20B4: -/* 798074 802A20B4 0C05269B */ jal func_80149A6C -/* 798078 802A20B8 24050001 */ addiu $a1, $zero, 1 -/* 79807C 802A20BC 24040649 */ addiu $a0, $zero, 0x649 -.L802A20C0: -/* 798080 802A20C0 0C05272D */ jal play_sound -/* 798084 802A20C4 00000000 */ nop -.L802A20C8: -/* 798088 802A20C8 0000B82D */ daddu $s7, $zero, $zero -/* 79808C 802A20CC 02E0902D */ daddu $s2, $s7, $zero -/* 798090 802A20D0 2405FFFF */ addiu $a1, $zero, -1 -/* 798094 802A20D4 3C03802A */ lui $v1, %hi(D_802A3534_7994F4) -/* 798098 802A20D8 24633534 */ addiu $v1, $v1, %lo(D_802A3534_7994F4) -/* 79809C 802A20DC 3C014120 */ lui $at, 0x4120 -/* 7980A0 802A20E0 44813000 */ mtc1 $at, $f6 -/* 7980A4 802A20E4 3C02802A */ lui $v0, %hi(D_802A37F0) -/* 7980A8 802A20E8 8C4237F0 */ lw $v0, %lo(D_802A37F0)($v0) -/* 7980AC 802A20EC 3C013FF0 */ lui $at, 0x3ff0 -/* 7980B0 802A20F0 44812800 */ mtc1 $at, $f5 -/* 7980B4 802A20F4 44802000 */ mtc1 $zero, $f4 -/* 7980B8 802A20F8 8C42000C */ lw $v0, 0xc($v0) -/* 7980BC 802A20FC 2404005C */ addiu $a0, $zero, 0x5c -/* 7980C0 802A2100 AFA20028 */ sw $v0, 0x28($sp) -.L802A2104: -/* 7980C4 802A2104 8FC20078 */ lw $v0, 0x78($fp) -/* 7980C8 802A2108 14400003 */ bnez $v0, .L802A2118 -/* 7980CC 802A210C 00000000 */ nop -/* 7980D0 802A2110 5240001C */ beql $s2, $zero, .L802A2184 -/* 7980D4 802A2114 24630004 */ addiu $v1, $v1, 4 -.L802A2118: -/* 7980D8 802A2118 8FA80028 */ lw $t0, 0x28($sp) -/* 7980DC 802A211C 8C620000 */ lw $v0, ($v1) -/* 7980E0 802A2120 04400017 */ bltz $v0, .L802A2180 -/* 7980E4 802A2124 01048021 */ addu $s0, $t0, $a0 -/* 7980E8 802A2128 10400004 */ beqz $v0, .L802A213C -/* 7980EC 802A212C 24170001 */ addiu $s7, $zero, 1 -/* 7980F0 802A2130 2442FFFF */ addiu $v0, $v0, -1 -/* 7980F4 802A2134 080A8860 */ j .L802A2180 -/* 7980F8 802A2138 AC620000 */ sw $v0, ($v1) -.L802A213C: -/* 7980FC 802A213C 8E020000 */ lw $v0, ($s0) -/* 798100 802A2140 C6160014 */ lwc1 $f22, 0x14($s0) -/* 798104 802A2144 34420002 */ ori $v0, $v0, 2 -/* 798108 802A2148 AE020000 */ sw $v0, ($s0) -/* 79810C 802A214C C6200010 */ lwc1 $f0, 0x10($s1) -/* 798110 802A2150 46160001 */ sub.s $f0, $f0, $f22 -/* 798114 802A2154 46060003 */ div.s $f0, $f0, $f6 -/* 798118 802A2158 4600B000 */ add.s $f0, $f22, $f0 -/* 79811C 802A215C E6000014 */ swc1 $f0, 0x14($s0) -/* 798120 802A2160 C6220010 */ lwc1 $f2, 0x10($s1) -/* 798124 802A2164 46020001 */ sub.s $f0, $f0, $f2 -/* 798128 802A2168 46000005 */ abs.s $f0, $f0 -/* 79812C 802A216C 46000021 */ cvt.d.s $f0, $f0 -/* 798130 802A2170 4624003C */ c.lt.d $f0, $f4 -/* 798134 802A2174 00000000 */ nop -/* 798138 802A2178 45030001 */ bc1tl .L802A2180 -/* 79813C 802A217C AC650000 */ sw $a1, ($v1) -.L802A2180: -/* 798140 802A2180 24630004 */ addiu $v1, $v1, 4 -.L802A2184: -/* 798144 802A2184 26520001 */ addiu $s2, $s2, 1 -/* 798148 802A2188 2A420008 */ slti $v0, $s2, 8 -/* 79814C 802A218C 1440FFDD */ bnez $v0, .L802A2104 -/* 798150 802A2190 2484001C */ addiu $a0, $a0, 0x1c -/* 798154 802A2194 080A88FB */ j .L802A23EC -/* 798158 802A2198 00000000 */ nop -glabel L802A219C_79815C -/* 79815C 802A219C 3C02802A */ lui $v0, %hi(D_802A37F0) -/* 798160 802A21A0 8C4237F0 */ lw $v0, %lo(D_802A37F0)($v0) -/* 798164 802A21A4 2404000F */ addiu $a0, $zero, 0xf -/* 798168 802A21A8 8C43000C */ lw $v1, 0xc($v0) -/* 79816C 802A21AC 24120007 */ addiu $s2, $zero, 7 -/* 798170 802A21B0 AC60003C */ sw $zero, 0x3c($v1) -/* 798174 802A21B4 8C42000C */ lw $v0, 0xc($v0) -/* 798178 802A21B8 3C03802A */ lui $v1, %hi(D_802A3834) -/* 79817C 802A21BC 24633834 */ addiu $v1, $v1, %lo(D_802A3834) -/* 798180 802A21C0 AC400024 */ sw $zero, 0x24($v0) -.L802A21C4: -/* 798184 802A21C4 AC640000 */ sw $a0, ($v1) -/* 798188 802A21C8 2652FFFF */ addiu $s2, $s2, -1 -/* 79818C 802A21CC 0641FFFD */ bgez $s2, .L802A21C4 -/* 798190 802A21D0 2463FFFC */ addiu $v1, $v1, -4 -/* 798194 802A21D4 8FC20078 */ lw $v0, 0x78($fp) -/* 798198 802A21D8 14400002 */ bnez $v0, .L802A21E4 -/* 79819C 802A21DC 24040249 */ addiu $a0, $zero, 0x249 -/* 7981A0 802A21E0 24040248 */ addiu $a0, $zero, 0x248 -.L802A21E4: -/* 7981A4 802A21E4 0C05269B */ jal func_80149A6C -/* 7981A8 802A21E8 0000282D */ daddu $a1, $zero, $zero -/* 7981AC 802A21EC 24020015 */ addiu $v0, $zero, 0x15 -/* 7981B0 802A21F0 080A8907 */ j .L802A241C -/* 7981B4 802A21F4 AFC20070 */ sw $v0, 0x70($fp) -glabel L802A21F8_7981B8 -/* 7981B8 802A21F8 0000B82D */ daddu $s7, $zero, $zero -/* 7981BC 802A21FC 02E0902D */ daddu $s2, $s7, $zero -/* 7981C0 802A2200 3C13802A */ lui $s3, %hi(D_802A3818) -/* 7981C4 802A2204 26733818 */ addiu $s3, $s3, %lo(D_802A3818) -/* 7981C8 802A2208 02E0282D */ daddu $a1, $s7, $zero -/* 7981CC 802A220C 24160008 */ addiu $s6, $zero, 8 -/* 7981D0 802A2210 24150004 */ addiu $s5, $zero, 4 -/* 7981D4 802A2214 3C03802A */ lui $v1, %hi(D_802A3554_799514) -/* 7981D8 802A2218 24633554 */ addiu $v1, $v1, %lo(D_802A3554_799514) -/* 7981DC 802A221C 0060A02D */ daddu $s4, $v1, $zero -/* 7981E0 802A2220 3C02802A */ lui $v0, %hi(D_802A37F0) -/* 7981E4 802A2224 8C4237F0 */ lw $v0, %lo(D_802A37F0)($v0) -/* 7981E8 802A2228 3C11802A */ lui $s1, %hi(D_802A3514_7994D4) -/* 7981EC 802A222C 26313514 */ addiu $s1, $s1, %lo(D_802A3514_7994D4) -/* 7981F0 802A2230 8C42000C */ lw $v0, 0xc($v0) -/* 7981F4 802A2234 2404005C */ addiu $a0, $zero, 0x5c -/* 7981F8 802A2238 AFA20028 */ sw $v0, 0x28($sp) -.L802A223C: -/* 7981FC 802A223C 8FC20078 */ lw $v0, 0x78($fp) -/* 798200 802A2240 14400003 */ bnez $v0, .L802A2250 -/* 798204 802A2244 00000000 */ nop -/* 798208 802A2248 5240005F */ beql $s2, $zero, .L802A23C8 -/* 79820C 802A224C 26730004 */ addiu $s3, $s3, 4 -.L802A2250: -/* 798210 802A2250 8FA80028 */ lw $t0, 0x28($sp) -/* 798214 802A2254 8E220000 */ lw $v0, ($s1) -/* 798218 802A2258 04410015 */ bgez $v0, .L802A22B0 -/* 79821C 802A225C 01048021 */ addu $s0, $t0, $a0 -/* 798220 802A2260 02A31021 */ addu $v0, $s5, $v1 -/* 798224 802A2264 C6140010 */ lwc1 $f20, 0x10($s0) -/* 798228 802A2268 C6980000 */ lwc1 $f24, ($s4) -/* 79822C 802A226C C45C0000 */ lwc1 $f28, ($v0) -/* 798230 802A2270 02C31021 */ addu $v0, $s6, $v1 -/* 798234 802A2274 4614C181 */ sub.s $f6, $f24, $f20 -/* 798238 802A2278 C6160014 */ lwc1 $f22, 0x14($s0) -/* 79823C 802A227C C61E0018 */ lwc1 $f30, 0x18($s0) -/* 798240 802A2280 4616E001 */ sub.s $f0, $f28, $f22 -/* 798244 802A2284 C45A0000 */ lwc1 $f26, ($v0) -/* 798248 802A2288 461ED081 */ sub.s $f2, $f26, $f30 -/* 79824C 802A228C 4606A180 */ add.s $f6, $f20, $f6 -/* 798250 802A2290 4600B106 */ mov.s $f4, $f22 -/* 798254 802A2294 46002100 */ add.s $f4, $f4, $f0 -/* 798258 802A2298 4600F006 */ mov.s $f0, $f30 -/* 79825C 802A229C 46020000 */ add.s $f0, $f0, $f2 -/* 798260 802A22A0 E6060010 */ swc1 $f6, 0x10($s0) -/* 798264 802A22A4 E6040014 */ swc1 $f4, 0x14($s0) -/* 798268 802A22A8 080A88F1 */ j .L802A23C4 -/* 79826C 802A22AC E6000018 */ swc1 $f0, 0x18($s0) -.L802A22B0: -/* 798270 802A22B0 10400004 */ beqz $v0, .L802A22C4 -/* 798274 802A22B4 24170001 */ addiu $s7, $zero, 1 -/* 798278 802A22B8 2442FFFF */ addiu $v0, $v0, -1 -/* 79827C 802A22BC 080A88F1 */ j .L802A23C4 -/* 798280 802A22C0 AE220000 */ sw $v0, ($s1) -.L802A22C4: -/* 798284 802A22C4 C6140010 */ lwc1 $f20, 0x10($s0) -/* 798288 802A22C8 C6160014 */ lwc1 $f22, 0x14($s0) -/* 79828C 802A22CC C61E0018 */ lwc1 $f30, 0x18($s0) -/* 798290 802A22D0 8E020000 */ lw $v0, ($s0) -/* 798294 802A22D4 4600A306 */ mov.s $f12, $f20 -/* 798298 802A22D8 34420002 */ ori $v0, $v0, 2 -/* 79829C 802A22DC AE020000 */ sw $v0, ($s0) -/* 7982A0 802A22E0 02C31021 */ addu $v0, $s6, $v1 -/* 7982A4 802A22E4 C45A0000 */ lwc1 $f26, ($v0) -/* 7982A8 802A22E8 02A31021 */ addu $v0, $s5, $v1 -/* 7982AC 802A22EC C6980000 */ lwc1 $f24, ($s4) -/* 7982B0 802A22F0 C45C0000 */ lwc1 $f28, ($v0) -/* 7982B4 802A22F4 4406C000 */ mfc1 $a2, $f24 -/* 7982B8 802A22F8 4407D000 */ mfc1 $a3, $f26 -/* 7982BC 802A22FC 4600F386 */ mov.s $f14, $f30 -/* 7982C0 802A2300 AFA30030 */ sw $v1, 0x30($sp) -/* 7982C4 802A2304 AFA40034 */ sw $a0, 0x34($sp) -/* 7982C8 802A2308 0C00A7B5 */ jal dist2D -/* 7982CC 802A230C AFA50038 */ sw $a1, 0x38($sp) -/* 7982D0 802A2310 3C08802A */ lui $t0, %hi(D_802A3818) -/* 7982D4 802A2314 25083818 */ addiu $t0, $t0, %lo(D_802A3818) -/* 7982D8 802A2318 4614C101 */ sub.s $f4, $f24, $f20 -/* 7982DC 802A231C 8FA50038 */ lw $a1, 0x38($sp) -/* 7982E0 802A2320 C6020010 */ lwc1 $f2, 0x10($s0) -/* 7982E4 802A2324 00A81021 */ addu $v0, $a1, $t0 -/* 7982E8 802A2328 C4460000 */ lwc1 $f6, ($v0) -/* 7982EC 802A232C 468031A0 */ cvt.s.w $f6, $f6 -/* 7982F0 802A2330 46062103 */ div.s $f4, $f4, $f6 -/* 7982F4 802A2334 46041080 */ add.s $f2, $f2, $f4 -/* 7982F8 802A2338 4616E101 */ sub.s $f4, $f28, $f22 -/* 7982FC 802A233C E6020010 */ swc1 $f2, 0x10($s0) -/* 798300 802A2340 C4460000 */ lwc1 $f6, ($v0) -/* 798304 802A2344 468031A0 */ cvt.s.w $f6, $f6 -/* 798308 802A2348 C6020014 */ lwc1 $f2, 0x14($s0) -/* 79830C 802A234C 46062103 */ div.s $f4, $f4, $f6 -/* 798310 802A2350 46041080 */ add.s $f2, $f2, $f4 -/* 798314 802A2354 461ED101 */ sub.s $f4, $f26, $f30 -/* 798318 802A2358 E6020014 */ swc1 $f2, 0x14($s0) -/* 79831C 802A235C C4460000 */ lwc1 $f6, ($v0) -/* 798320 802A2360 468031A0 */ cvt.s.w $f6, $f6 -/* 798324 802A2364 C6020018 */ lwc1 $f2, 0x18($s0) -/* 798328 802A2368 46062103 */ div.s $f4, $f4, $f6 -/* 79832C 802A236C 46041080 */ add.s $f2, $f2, $f4 -/* 798330 802A2370 E6020018 */ swc1 $f2, 0x18($s0) -/* 798334 802A2374 8C420000 */ lw $v0, ($v0) -/* 798338 802A2378 8FA30030 */ lw $v1, 0x30($sp) -/* 79833C 802A237C 8FA40034 */ lw $a0, 0x34($sp) -/* 798340 802A2380 14570007 */ bne $v0, $s7, .L802A23A0 -/* 798344 802A2384 46000106 */ mov.s $f4, $f0 -/* 798348 802A2388 2402FFFF */ addiu $v0, $zero, -1 -/* 79834C 802A238C AE220000 */ sw $v0, ($s1) -/* 798350 802A2390 E6180010 */ swc1 $f24, 0x10($s0) -/* 798354 802A2394 E61C0014 */ swc1 $f28, 0x14($s0) -/* 798358 802A2398 080A88EE */ j .L802A23B8 -/* 79835C 802A239C E61A0018 */ swc1 $f26, 0x18($s0) -.L802A23A0: -/* 798360 802A23A0 3C014270 */ lui $at, 0x4270 -/* 798364 802A23A4 44810000 */ mtc1 $at, $f0 -/* 798368 802A23A8 C6020014 */ lwc1 $f2, 0x14($s0) -/* 79836C 802A23AC 46002003 */ div.s $f0, $f4, $f0 -/* 798370 802A23B0 46001080 */ add.s $f2, $f2, $f0 -/* 798374 802A23B4 E6020014 */ swc1 $f2, 0x14($s0) -.L802A23B8: -/* 798378 802A23B8 8E620000 */ lw $v0, ($s3) -/* 79837C 802A23BC 2442FFFF */ addiu $v0, $v0, -1 -/* 798380 802A23C0 AE620000 */ sw $v0, ($s3) -.L802A23C4: -/* 798384 802A23C4 26730004 */ addiu $s3, $s3, 4 -.L802A23C8: -/* 798388 802A23C8 24A50004 */ addiu $a1, $a1, 4 -/* 79838C 802A23CC 26D6000C */ addiu $s6, $s6, 0xc -/* 798390 802A23D0 26B5000C */ addiu $s5, $s5, 0xc -/* 798394 802A23D4 2694000C */ addiu $s4, $s4, 0xc -/* 798398 802A23D8 26310004 */ addiu $s1, $s1, 4 -/* 79839C 802A23DC 26520001 */ addiu $s2, $s2, 1 -/* 7983A0 802A23E0 2A420008 */ slti $v0, $s2, 8 -/* 7983A4 802A23E4 1440FF95 */ bnez $v0, .L802A223C -/* 7983A8 802A23E8 2484001C */ addiu $a0, $a0, 0x1c -.L802A23EC: -/* 7983AC 802A23EC 16E0000C */ bnez $s7, .L802A2420 -/* 7983B0 802A23F0 0000102D */ daddu $v0, $zero, $zero -/* 7983B4 802A23F4 3C03802A */ lui $v1, %hi(D_802A37F0) -/* 7983B8 802A23F8 8C6337F0 */ lw $v1, %lo(D_802A37F0)($v1) -/* 7983BC 802A23FC 24020002 */ addiu $v0, $zero, 2 -/* 7983C0 802A2400 8C640000 */ lw $a0, ($v1) -/* 7983C4 802A2404 0040282D */ daddu $a1, $v0, $zero -/* 7983C8 802A2408 3C01802A */ lui $at, %hi(D_802A3838) -/* 7983CC 802A240C AC253838 */ sw $a1, %lo(D_802A3838)($at) -/* 7983D0 802A2410 34840010 */ ori $a0, $a0, 0x10 -/* 7983D4 802A2414 080A8908 */ j .L802A2420 -/* 7983D8 802A2418 AC640000 */ sw $a0, ($v1) -.L802A241C: -glabel L802A241C_7983DC -/* 7983DC 802A241C 0000102D */ daddu $v0, $zero, $zero -.L802A2420: -/* 7983E0 802A2420 8FBF0064 */ lw $ra, 0x64($sp) -/* 7983E4 802A2424 8FBE0060 */ lw $fp, 0x60($sp) -/* 7983E8 802A2428 8FB7005C */ lw $s7, 0x5c($sp) -/* 7983EC 802A242C 8FB60058 */ lw $s6, 0x58($sp) -/* 7983F0 802A2430 8FB50054 */ lw $s5, 0x54($sp) -/* 7983F4 802A2434 8FB40050 */ lw $s4, 0x50($sp) -/* 7983F8 802A2438 8FB3004C */ lw $s3, 0x4c($sp) -/* 7983FC 802A243C 8FB20048 */ lw $s2, 0x48($sp) -/* 798400 802A2440 8FB10044 */ lw $s1, 0x44($sp) -/* 798404 802A2444 8FB00040 */ lw $s0, 0x40($sp) -/* 798408 802A2448 D7BE0090 */ ldc1 $f30, 0x90($sp) -/* 79840C 802A244C D7BC0088 */ ldc1 $f28, 0x88($sp) -/* 798410 802A2450 D7BA0080 */ ldc1 $f26, 0x80($sp) -/* 798414 802A2454 D7B80078 */ ldc1 $f24, 0x78($sp) -/* 798418 802A2458 D7B60070 */ ldc1 $f22, 0x70($sp) -/* 79841C 802A245C D7B40068 */ ldc1 $f20, 0x68($sp) -/* 798420 802A2460 03E00008 */ jr $ra -/* 798424 802A2464 27BD0098 */ addiu $sp, $sp, 0x98 diff --git a/ver/us/asm/nonmatchings/code_796FC0/func_802A2468_798428.s b/ver/us/asm/nonmatchings/code_796FC0/func_802A2468_798428.s deleted file mode 100644 index a48a6e4424..0000000000 --- a/ver/us/asm/nonmatchings/code_796FC0/func_802A2468_798428.s +++ /dev/null @@ -1,9 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A2468_798428 -/* 798428 802A2468 3C02802A */ lui $v0, %hi(D_802A3838) -/* 79842C 802A246C 8C423838 */ lw $v0, %lo(D_802A3838)($v0) -/* 798430 802A2470 AC820084 */ sw $v0, 0x84($a0) -/* 798434 802A2474 03E00008 */ jr $ra -/* 798438 802A2478 24020002 */ addiu $v0, $zero, 2 diff --git a/ver/us/asm/nonmatchings/code_796FC0/func_802A247C_79843C.s b/ver/us/asm/nonmatchings/code_796FC0/func_802A247C_79843C.s deleted file mode 100644 index 8bd0c66984..0000000000 --- a/ver/us/asm/nonmatchings/code_796FC0/func_802A247C_79843C.s +++ /dev/null @@ -1,36 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A247C_79843C -/* 79843C 802A247C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 798440 802A2480 AFB00010 */ sw $s0, 0x10($sp) -/* 798444 802A2484 0080802D */ daddu $s0, $a0, $zero -/* 798448 802A2488 10A00003 */ beqz $a1, .L802A2498 -/* 79844C 802A248C AFBF0014 */ sw $ra, 0x14($sp) -/* 798450 802A2490 240200E6 */ addiu $v0, $zero, 0xe6 -/* 798454 802A2494 AE020070 */ sw $v0, 0x70($s0) -.L802A2498: -/* 798458 802A2498 0000202D */ daddu $a0, $zero, $zero -/* 79845C 802A249C 0080282D */ daddu $a1, $a0, $zero -/* 798460 802A24A0 92070073 */ lbu $a3, 0x73($s0) -/* 798464 802A24A4 0C046F97 */ jal set_background_color_blend -/* 798468 802A24A8 0080302D */ daddu $a2, $a0, $zero -/* 79846C 802A24AC 8E020070 */ lw $v0, 0x70($s0) -/* 798470 802A24B0 2442FFFB */ addiu $v0, $v0, -5 -/* 798474 802A24B4 AE020070 */ sw $v0, 0x70($s0) -/* 798478 802A24B8 284200C9 */ slti $v0, $v0, 0xc9 -/* 79847C 802A24BC 14400003 */ bnez $v0, .L802A24CC -/* 798480 802A24C0 0000202D */ daddu $a0, $zero, $zero -/* 798484 802A24C4 080A8938 */ j .L802A24E0 -/* 798488 802A24C8 0000102D */ daddu $v0, $zero, $zero -.L802A24CC: -/* 79848C 802A24CC 0080282D */ daddu $a1, $a0, $zero -/* 798490 802A24D0 0080302D */ daddu $a2, $a0, $zero -/* 798494 802A24D4 0C046F97 */ jal set_background_color_blend -/* 798498 802A24D8 240700C8 */ addiu $a3, $zero, 0xc8 -/* 79849C 802A24DC 24020002 */ addiu $v0, $zero, 2 -.L802A24E0: -/* 7984A0 802A24E0 8FBF0014 */ lw $ra, 0x14($sp) -/* 7984A4 802A24E4 8FB00010 */ lw $s0, 0x10($sp) -/* 7984A8 802A24E8 03E00008 */ jr $ra -/* 7984AC 802A24EC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/code_7997B0/func_802A1000_7997B0.s b/ver/us/asm/nonmatchings/code_7997B0/func_802A1000_7997B0.s deleted file mode 100644 index 6c2d867d4f..0000000000 --- a/ver/us/asm/nonmatchings/code_7997B0/func_802A1000_7997B0.s +++ /dev/null @@ -1,47 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1000_7997B0 -/* 7997B0 802A1000 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 7997B4 802A1004 AFB1001C */ sw $s1, 0x1c($sp) -/* 7997B8 802A1008 0080882D */ daddu $s1, $a0, $zero -/* 7997BC 802A100C AFBF0024 */ sw $ra, 0x24($sp) -/* 7997C0 802A1010 AFB20020 */ sw $s2, 0x20($sp) -/* 7997C4 802A1014 AFB00018 */ sw $s0, 0x18($sp) -/* 7997C8 802A1018 8E30000C */ lw $s0, 0xc($s1) -/* 7997CC 802A101C 8E050000 */ lw $a1, ($s0) -/* 7997D0 802A1020 0C0B1EAF */ jal get_variable -/* 7997D4 802A1024 26100004 */ addiu $s0, $s0, 4 -/* 7997D8 802A1028 8E050000 */ lw $a1, ($s0) -/* 7997DC 802A102C 26100004 */ addiu $s0, $s0, 4 -/* 7997E0 802A1030 0220202D */ daddu $a0, $s1, $zero -/* 7997E4 802A1034 0C0B1EAF */ jal get_variable -/* 7997E8 802A1038 0040902D */ daddu $s2, $v0, $zero -/* 7997EC 802A103C 0220202D */ daddu $a0, $s1, $zero -/* 7997F0 802A1040 8E050000 */ lw $a1, ($s0) -/* 7997F4 802A1044 0C0B1EAF */ jal get_variable -/* 7997F8 802A1048 0040802D */ daddu $s0, $v0, $zero -/* 7997FC 802A104C 44921000 */ mtc1 $s2, $f2 -/* 799800 802A1050 00000000 */ nop -/* 799804 802A1054 468010A0 */ cvt.s.w $f2, $f2 -/* 799808 802A1058 44051000 */ mfc1 $a1, $f2 -/* 79980C 802A105C 44901000 */ mtc1 $s0, $f2 -/* 799810 802A1060 00000000 */ nop -/* 799814 802A1064 468010A0 */ cvt.s.w $f2, $f2 -/* 799818 802A1068 44061000 */ mfc1 $a2, $f2 -/* 79981C 802A106C 44821000 */ mtc1 $v0, $f2 -/* 799820 802A1070 00000000 */ nop -/* 799824 802A1074 468010A0 */ cvt.s.w $f2, $f2 -/* 799828 802A1078 3C014220 */ lui $at, 0x4220 -/* 79982C 802A107C 44810000 */ mtc1 $at, $f0 -/* 799830 802A1080 44071000 */ mfc1 $a3, $f2 -/* 799834 802A1084 0000202D */ daddu $a0, $zero, $zero -/* 799838 802A1088 0C01BFBC */ jal func_8006FEF0 -/* 79983C 802A108C E7A00010 */ swc1 $f0, 0x10($sp) -/* 799840 802A1090 8FBF0024 */ lw $ra, 0x24($sp) -/* 799844 802A1094 8FB20020 */ lw $s2, 0x20($sp) -/* 799848 802A1098 8FB1001C */ lw $s1, 0x1c($sp) -/* 79984C 802A109C 8FB00018 */ lw $s0, 0x18($sp) -/* 799850 802A10A0 24020002 */ addiu $v0, $zero, 2 -/* 799854 802A10A4 03E00008 */ jr $ra -/* 799858 802A10A8 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/code_7997B0/func_802A10AC_79985C.s b/ver/us/asm/nonmatchings/code_7997B0/func_802A10AC_79985C.s deleted file mode 100644 index 30a8dd2802..0000000000 --- a/ver/us/asm/nonmatchings/code_7997B0/func_802A10AC_79985C.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A10AC_79985C -/* 79985C 802A10AC 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 799860 802A10B0 AFB10024 */ sw $s1, 0x24($sp) -/* 799864 802A10B4 0080882D */ daddu $s1, $a0, $zero -/* 799868 802A10B8 AFBF002C */ sw $ra, 0x2c($sp) -/* 79986C 802A10BC AFB20028 */ sw $s2, 0x28($sp) -/* 799870 802A10C0 AFB00020 */ sw $s0, 0x20($sp) -/* 799874 802A10C4 8E30000C */ lw $s0, 0xc($s1) -/* 799878 802A10C8 8E050000 */ lw $a1, ($s0) -/* 79987C 802A10CC 0C0B1EAF */ jal get_variable -/* 799880 802A10D0 26100004 */ addiu $s0, $s0, 4 -/* 799884 802A10D4 8E050000 */ lw $a1, ($s0) -/* 799888 802A10D8 26100004 */ addiu $s0, $s0, 4 -/* 79988C 802A10DC 0220202D */ daddu $a0, $s1, $zero -/* 799890 802A10E0 0C0B1EAF */ jal get_variable -/* 799894 802A10E4 0040902D */ daddu $s2, $v0, $zero -/* 799898 802A10E8 0220202D */ daddu $a0, $s1, $zero -/* 79989C 802A10EC 8E050000 */ lw $a1, ($s0) -/* 7998A0 802A10F0 0C0B1EAF */ jal get_variable -/* 7998A4 802A10F4 0040802D */ daddu $s0, $v0, $zero -/* 7998A8 802A10F8 24040005 */ addiu $a0, $zero, 5 -/* 7998AC 802A10FC 44921000 */ mtc1 $s2, $f2 -/* 7998B0 802A1100 00000000 */ nop -/* 7998B4 802A1104 468010A0 */ cvt.s.w $f2, $f2 -/* 7998B8 802A1108 44051000 */ mfc1 $a1, $f2 -/* 7998BC 802A110C 44901000 */ mtc1 $s0, $f2 -/* 7998C0 802A1110 00000000 */ nop -/* 7998C4 802A1114 468010A0 */ cvt.s.w $f2, $f2 -/* 7998C8 802A1118 44061000 */ mfc1 $a2, $f2 -/* 7998CC 802A111C 44821000 */ mtc1 $v0, $f2 -/* 7998D0 802A1120 00000000 */ nop -/* 7998D4 802A1124 468010A0 */ cvt.s.w $f2, $f2 -/* 7998D8 802A1128 3C014248 */ lui $at, 0x4248 -/* 7998DC 802A112C 44810000 */ mtc1 $at, $f0 -/* 7998E0 802A1130 44071000 */ mfc1 $a3, $f2 -/* 7998E4 802A1134 24030028 */ addiu $v1, $zero, 0x28 -/* 7998E8 802A1138 AFA30018 */ sw $v1, 0x18($sp) -/* 7998EC 802A113C 2403001E */ addiu $v1, $zero, 0x1e -/* 7998F0 802A1140 AFA3001C */ sw $v1, 0x1c($sp) -/* 7998F4 802A1144 E7A00010 */ swc1 $f0, 0x10($sp) -/* 7998F8 802A1148 0C01C154 */ jal func_80070550 -/* 7998FC 802A114C E7A00014 */ swc1 $f0, 0x14($sp) -/* 799900 802A1150 8FBF002C */ lw $ra, 0x2c($sp) -/* 799904 802A1154 8FB20028 */ lw $s2, 0x28($sp) -/* 799908 802A1158 8FB10024 */ lw $s1, 0x24($sp) -/* 79990C 802A115C 8FB00020 */ lw $s0, 0x20($sp) -/* 799910 802A1160 24020002 */ addiu $v0, $zero, 2 -/* 799914 802A1164 03E00008 */ jr $ra -/* 799918 802A1168 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/code_7997B0/func_802A116C_79991C.s b/ver/us/asm/nonmatchings/code_7997B0/func_802A116C_79991C.s deleted file mode 100644 index 57b95963d2..0000000000 --- a/ver/us/asm/nonmatchings/code_7997B0/func_802A116C_79991C.s +++ /dev/null @@ -1,47 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A116C_79991C -/* 79991C 802A116C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 799920 802A1170 AFB1001C */ sw $s1, 0x1c($sp) -/* 799924 802A1174 0080882D */ daddu $s1, $a0, $zero -/* 799928 802A1178 AFBF0024 */ sw $ra, 0x24($sp) -/* 79992C 802A117C AFB20020 */ sw $s2, 0x20($sp) -/* 799930 802A1180 AFB00018 */ sw $s0, 0x18($sp) -/* 799934 802A1184 8E30000C */ lw $s0, 0xc($s1) -/* 799938 802A1188 8E050000 */ lw $a1, ($s0) -/* 79993C 802A118C 0C0B1EAF */ jal get_variable -/* 799940 802A1190 26100004 */ addiu $s0, $s0, 4 -/* 799944 802A1194 8E050000 */ lw $a1, ($s0) -/* 799948 802A1198 26100004 */ addiu $s0, $s0, 4 -/* 79994C 802A119C 0220202D */ daddu $a0, $s1, $zero -/* 799950 802A11A0 0C0B1EAF */ jal get_variable -/* 799954 802A11A4 0040902D */ daddu $s2, $v0, $zero -/* 799958 802A11A8 0220202D */ daddu $a0, $s1, $zero -/* 79995C 802A11AC 8E050000 */ lw $a1, ($s0) -/* 799960 802A11B0 0C0B1EAF */ jal get_variable -/* 799964 802A11B4 0040802D */ daddu $s0, $v0, $zero -/* 799968 802A11B8 44921000 */ mtc1 $s2, $f2 -/* 79996C 802A11BC 00000000 */ nop -/* 799970 802A11C0 468010A0 */ cvt.s.w $f2, $f2 -/* 799974 802A11C4 44051000 */ mfc1 $a1, $f2 -/* 799978 802A11C8 44901000 */ mtc1 $s0, $f2 -/* 79997C 802A11CC 00000000 */ nop -/* 799980 802A11D0 468010A0 */ cvt.s.w $f2, $f2 -/* 799984 802A11D4 44061000 */ mfc1 $a2, $f2 -/* 799988 802A11D8 44821000 */ mtc1 $v0, $f2 -/* 79998C 802A11DC 00000000 */ nop -/* 799990 802A11E0 468010A0 */ cvt.s.w $f2, $f2 -/* 799994 802A11E4 3C0141F0 */ lui $at, 0x41f0 -/* 799998 802A11E8 44810000 */ mtc1 $at, $f0 -/* 79999C 802A11EC 44071000 */ mfc1 $a3, $f2 -/* 7999A0 802A11F0 0000202D */ daddu $a0, $zero, $zero -/* 7999A4 802A11F4 0C01BFBC */ jal func_8006FEF0 -/* 7999A8 802A11F8 E7A00010 */ swc1 $f0, 0x10($sp) -/* 7999AC 802A11FC 8FBF0024 */ lw $ra, 0x24($sp) -/* 7999B0 802A1200 8FB20020 */ lw $s2, 0x20($sp) -/* 7999B4 802A1204 8FB1001C */ lw $s1, 0x1c($sp) -/* 7999B8 802A1208 8FB00018 */ lw $s0, 0x18($sp) -/* 7999BC 802A120C 24020002 */ addiu $v0, $zero, 2 -/* 7999C0 802A1210 03E00008 */ jr $ra -/* 7999C4 802A1214 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/code_7997B0/func_802A1218_7999C8.s b/ver/us/asm/nonmatchings/code_7997B0/func_802A1218_7999C8.s deleted file mode 100644 index 9a05c56611..0000000000 --- a/ver/us/asm/nonmatchings/code_7997B0/func_802A1218_7999C8.s +++ /dev/null @@ -1,55 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1218_7999C8 -/* 7999C8 802A1218 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* 7999CC 802A121C AFB1002C */ sw $s1, 0x2c($sp) -/* 7999D0 802A1220 0080882D */ daddu $s1, $a0, $zero -/* 7999D4 802A1224 AFBF0034 */ sw $ra, 0x34($sp) -/* 7999D8 802A1228 AFB20030 */ sw $s2, 0x30($sp) -/* 7999DC 802A122C AFB00028 */ sw $s0, 0x28($sp) -/* 7999E0 802A1230 8E30000C */ lw $s0, 0xc($s1) -/* 7999E4 802A1234 8E050000 */ lw $a1, ($s0) -/* 7999E8 802A1238 0C0B1EAF */ jal get_variable -/* 7999EC 802A123C 26100004 */ addiu $s0, $s0, 4 -/* 7999F0 802A1240 8E050000 */ lw $a1, ($s0) -/* 7999F4 802A1244 26100004 */ addiu $s0, $s0, 4 -/* 7999F8 802A1248 0220202D */ daddu $a0, $s1, $zero -/* 7999FC 802A124C 0C0B1EAF */ jal get_variable -/* 799A00 802A1250 0040902D */ daddu $s2, $v0, $zero -/* 799A04 802A1254 0220202D */ daddu $a0, $s1, $zero -/* 799A08 802A1258 8E050000 */ lw $a1, ($s0) -/* 799A0C 802A125C 0C0B1EAF */ jal get_variable -/* 799A10 802A1260 0040802D */ daddu $s0, $v0, $zero -/* 799A14 802A1264 24040004 */ addiu $a0, $zero, 4 -/* 799A18 802A1268 44922000 */ mtc1 $s2, $f4 -/* 799A1C 802A126C 00000000 */ nop -/* 799A20 802A1270 46802120 */ cvt.s.w $f4, $f4 -/* 799A24 802A1274 44052000 */ mfc1 $a1, $f4 -/* 799A28 802A1278 44902000 */ mtc1 $s0, $f4 -/* 799A2C 802A127C 00000000 */ nop -/* 799A30 802A1280 46802120 */ cvt.s.w $f4, $f4 -/* 799A34 802A1284 44062000 */ mfc1 $a2, $f4 -/* 799A38 802A1288 44822000 */ mtc1 $v0, $f4 -/* 799A3C 802A128C 00000000 */ nop -/* 799A40 802A1290 46802120 */ cvt.s.w $f4, $f4 -/* 799A44 802A1294 3C0141A0 */ lui $at, 0x41a0 -/* 799A48 802A1298 44810000 */ mtc1 $at, $f0 -/* 799A4C 802A129C 3C013F80 */ lui $at, 0x3f80 -/* 799A50 802A12A0 44811000 */ mtc1 $at, $f2 -/* 799A54 802A12A4 44072000 */ mfc1 $a3, $f4 -/* 799A58 802A12A8 2403000A */ addiu $v1, $zero, 0xa -/* 799A5C 802A12AC AFA3001C */ sw $v1, 0x1c($sp) -/* 799A60 802A12B0 2403000F */ addiu $v1, $zero, 0xf -/* 799A64 802A12B4 AFA30020 */ sw $v1, 0x20($sp) -/* 799A68 802A12B8 E7A00010 */ swc1 $f0, 0x10($sp) -/* 799A6C 802A12BC E7A00014 */ swc1 $f0, 0x14($sp) -/* 799A70 802A12C0 0C01C8D4 */ jal func_80072350 -/* 799A74 802A12C4 E7A20018 */ swc1 $f2, 0x18($sp) -/* 799A78 802A12C8 8FBF0034 */ lw $ra, 0x34($sp) -/* 799A7C 802A12CC 8FB20030 */ lw $s2, 0x30($sp) -/* 799A80 802A12D0 8FB1002C */ lw $s1, 0x2c($sp) -/* 799A84 802A12D4 8FB00028 */ lw $s0, 0x28($sp) -/* 799A88 802A12D8 24020002 */ addiu $v0, $zero, 2 -/* 799A8C 802A12DC 03E00008 */ jr $ra -/* 799A90 802A12E0 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/ver/us/asm/nonmatchings/code_7997B0/func_802A137C_799B2C.s b/ver/us/asm/nonmatchings/code_7997B0/func_802A137C_799B2C.s deleted file mode 100644 index ced30c2da4..0000000000 --- a/ver/us/asm/nonmatchings/code_7997B0/func_802A137C_799B2C.s +++ /dev/null @@ -1,44 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A137C_799B2C -/* 799B2C 802A137C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 799B30 802A1380 AFB00010 */ sw $s0, 0x10($sp) -/* 799B34 802A1384 0080802D */ daddu $s0, $a0, $zero -/* 799B38 802A1388 10A0000D */ beqz $a1, .L802A13C0 -/* 799B3C 802A138C AFBF0014 */ sw $ra, 0x14($sp) -/* 799B40 802A1390 0C04760B */ jal func_8011D82C -/* 799B44 802A1394 24040001 */ addiu $a0, $zero, 1 -/* 799B48 802A1398 0000202D */ daddu $a0, $zero, $zero -/* 799B4C 802A139C 0080282D */ daddu $a1, $a0, $zero -/* 799B50 802A13A0 0080302D */ daddu $a2, $a0, $zero -/* 799B54 802A13A4 0080382D */ daddu $a3, $a0, $zero -/* 799B58 802A13A8 3C038015 */ lui $v1, %hi(D_801512F0) -/* 799B5C 802A13AC 8C6312F0 */ lw $v1, %lo(D_801512F0)($v1) -/* 799B60 802A13B0 24020001 */ addiu $v0, $zero, 1 -/* 799B64 802A13B4 0C046F97 */ jal set_background_color_blend -/* 799B68 802A13B8 A0620000 */ sb $v0, ($v1) -/* 799B6C 802A13BC AE000070 */ sw $zero, 0x70($s0) -.L802A13C0: -/* 799B70 802A13C0 0000202D */ daddu $a0, $zero, $zero -/* 799B74 802A13C4 0080282D */ daddu $a1, $a0, $zero -/* 799B78 802A13C8 92070073 */ lbu $a3, 0x73($s0) -/* 799B7C 802A13CC 0C046F97 */ jal set_background_color_blend -/* 799B80 802A13D0 0080302D */ daddu $a2, $a0, $zero -/* 799B84 802A13D4 8E020070 */ lw $v0, 0x70($s0) -/* 799B88 802A13D8 2442000A */ addiu $v0, $v0, 0xa -/* 799B8C 802A13DC AE020070 */ sw $v0, 0x70($s0) -/* 799B90 802A13E0 284200E6 */ slti $v0, $v0, 0xe6 -/* 799B94 802A13E4 14400007 */ bnez $v0, .L802A1404 -/* 799B98 802A13E8 0000102D */ daddu $v0, $zero, $zero -/* 799B9C 802A13EC 0000202D */ daddu $a0, $zero, $zero -/* 799BA0 802A13F0 0080282D */ daddu $a1, $a0, $zero -/* 799BA4 802A13F4 0080302D */ daddu $a2, $a0, $zero -/* 799BA8 802A13F8 0C046F97 */ jal set_background_color_blend -/* 799BAC 802A13FC 240700E6 */ addiu $a3, $zero, 0xe6 -/* 799BB0 802A1400 24020002 */ addiu $v0, $zero, 2 -.L802A1404: -/* 799BB4 802A1404 8FBF0014 */ lw $ra, 0x14($sp) -/* 799BB8 802A1408 8FB00010 */ lw $s0, 0x10($sp) -/* 799BBC 802A140C 03E00008 */ jr $ra -/* 799BC0 802A1410 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/code_7997B0/func_802A1414_799BC4.s b/ver/us/asm/nonmatchings/code_7997B0/func_802A1414_799BC4.s deleted file mode 100644 index 09eb179f84..0000000000 --- a/ver/us/asm/nonmatchings/code_7997B0/func_802A1414_799BC4.s +++ /dev/null @@ -1,39 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1414_799BC4 -/* 799BC4 802A1414 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 799BC8 802A1418 AFB00010 */ sw $s0, 0x10($sp) -/* 799BCC 802A141C 0080802D */ daddu $s0, $a0, $zero -/* 799BD0 802A1420 10A00003 */ beqz $a1, .L802A1430 -/* 799BD4 802A1424 AFBF0014 */ sw $ra, 0x14($sp) -/* 799BD8 802A1428 24020014 */ addiu $v0, $zero, 0x14 -/* 799BDC 802A142C AE020070 */ sw $v0, 0x70($s0) -.L802A1430: -/* 799BE0 802A1430 0000202D */ daddu $a0, $zero, $zero -/* 799BE4 802A1434 0080282D */ daddu $a1, $a0, $zero -/* 799BE8 802A1438 8E020070 */ lw $v0, 0x70($s0) -/* 799BEC 802A143C 0080302D */ daddu $a2, $a0, $zero -/* 799BF0 802A1440 00023880 */ sll $a3, $v0, 2 -/* 799BF4 802A1444 00E23821 */ addu $a3, $a3, $v0 -/* 799BF8 802A1448 00073840 */ sll $a3, $a3, 1 -/* 799BFC 802A144C 0C046F97 */ jal set_background_color_blend -/* 799C00 802A1450 30E700FE */ andi $a3, $a3, 0xfe -/* 799C04 802A1454 8E020070 */ lw $v0, 0x70($s0) -/* 799C08 802A1458 2442FFFF */ addiu $v0, $v0, -1 -/* 799C0C 802A145C 10400003 */ beqz $v0, .L802A146C -/* 799C10 802A1460 AE020070 */ sw $v0, 0x70($s0) -/* 799C14 802A1464 080A8521 */ j .L802A1484 -/* 799C18 802A1468 0000102D */ daddu $v0, $zero, $zero -.L802A146C: -/* 799C1C 802A146C 0000202D */ daddu $a0, $zero, $zero -/* 799C20 802A1470 0080282D */ daddu $a1, $a0, $zero -/* 799C24 802A1474 0080302D */ daddu $a2, $a0, $zero -/* 799C28 802A1478 0C046F97 */ jal set_background_color_blend -/* 799C2C 802A147C 0080382D */ daddu $a3, $a0, $zero -/* 799C30 802A1480 24020002 */ addiu $v0, $zero, 2 -.L802A1484: -/* 799C34 802A1484 8FBF0014 */ lw $ra, 0x14($sp) -/* 799C38 802A1488 8FB00010 */ lw $s0, 0x10($sp) -/* 799C3C 802A148C 03E00008 */ jr $ra -/* 799C40 802A1490 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/code_7997B0/func_802A1494_799C44.s b/ver/us/asm/nonmatchings/code_7997B0/func_802A1494_799C44.s deleted file mode 100644 index 35a64cc11c..0000000000 --- a/ver/us/asm/nonmatchings/code_7997B0/func_802A1494_799C44.s +++ /dev/null @@ -1,25 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1494_799C44 -/* 799C44 802A1494 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 799C48 802A1498 AFBF0010 */ sw $ra, 0x10($sp) -/* 799C4C 802A149C 8C82000C */ lw $v0, 0xc($a0) -/* 799C50 802A14A0 0C0B1EAF */ jal get_variable -/* 799C54 802A14A4 8C450000 */ lw $a1, ($v0) -/* 799C58 802A14A8 3C058011 */ lui $a1, %hi(gPlayerData+0x12) -/* 799C5C 802A14AC 80A5F2A2 */ lb $a1, %lo(gPlayerData+0x12)($a1) -/* 799C60 802A14B0 24040100 */ addiu $a0, $zero, 0x100 -/* 799C64 802A14B4 00051880 */ sll $v1, $a1, 2 -/* 799C68 802A14B8 00651821 */ addu $v1, $v1, $a1 -/* 799C6C 802A14BC 00621821 */ addu $v1, $v1, $v0 -/* 799C70 802A14C0 00031880 */ sll $v1, $v1, 2 -/* 799C74 802A14C4 3C06802A */ lui $a2, %hi(D_8029C890) -/* 799C78 802A14C8 00C33021 */ addu $a2, $a2, $v1 -/* 799C7C 802A14CC 8CC6C890 */ lw $a2, %lo(D_8029C890)($a2) -/* 799C80 802A14D0 0C098F3F */ jal set_animation -/* 799C84 802A14D4 0000282D */ daddu $a1, $zero, $zero -/* 799C88 802A14D8 8FBF0010 */ lw $ra, 0x10($sp) -/* 799C8C 802A14DC 24020002 */ addiu $v0, $zero, 2 -/* 799C90 802A14E0 03E00008 */ jr $ra -/* 799C94 802A14E4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/code_7997B0/func_802A14E8_799C98.s b/ver/us/asm/nonmatchings/code_7997B0/func_802A14E8_799C98.s deleted file mode 100644 index 60417c330a..0000000000 --- a/ver/us/asm/nonmatchings/code_7997B0/func_802A14E8_799C98.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A14E8_799C98 -/* 799C98 802A14E8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 799C9C 802A14EC AFBF0010 */ sw $ra, 0x10($sp) -/* 799CA0 802A14F0 0C00EABB */ jal get_npc_unsafe -/* 799CA4 802A14F4 24040064 */ addiu $a0, $zero, 0x64 -/* 799CA8 802A14F8 0040202D */ daddu $a0, $v0, $zero -/* 799CAC 802A14FC 24030020 */ addiu $v1, $zero, 0x20 -/* 799CB0 802A1500 A48300A8 */ sh $v1, 0xa8($a0) -/* 799CB4 802A1504 A48300A6 */ sh $v1, 0xa6($a0) -/* 799CB8 802A1508 8FBF0010 */ lw $ra, 0x10($sp) -/* 799CBC 802A150C 24020002 */ addiu $v0, $zero, 2 -/* 799CC0 802A1510 03E00008 */ jr $ra -/* 799CC4 802A1514 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/code_7997B0/func_802A1518_799CC8.s b/ver/us/asm/nonmatchings/code_7997B0/func_802A1518_799CC8.s deleted file mode 100644 index 468a8e6c91..0000000000 --- a/ver/us/asm/nonmatchings/code_7997B0/func_802A1518_799CC8.s +++ /dev/null @@ -1,1068 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1518_799CC8 -/* 799CC8 802A1518 27BDFF68 */ addiu $sp, $sp, -0x98 -/* 799CCC 802A151C AFB50054 */ sw $s5, 0x54($sp) -/* 799CD0 802A1520 3C15800E */ lui $s5, %hi(gBattleStatus+0xD8) -/* 799CD4 802A1524 8EB5C148 */ lw $s5, %lo(gBattleStatus+0xD8)($s5) -/* 799CD8 802A1528 AFBE0060 */ sw $fp, 0x60($sp) -/* 799CDC 802A152C 0080F02D */ daddu $fp, $a0, $zero -/* 799CE0 802A1530 AFBF0064 */ sw $ra, 0x64($sp) -/* 799CE4 802A1534 AFB7005C */ sw $s7, 0x5c($sp) -/* 799CE8 802A1538 AFB60058 */ sw $s6, 0x58($sp) -/* 799CEC 802A153C AFB40050 */ sw $s4, 0x50($sp) -/* 799CF0 802A1540 AFB3004C */ sw $s3, 0x4c($sp) -/* 799CF4 802A1544 AFB20048 */ sw $s2, 0x48($sp) -/* 799CF8 802A1548 AFB10044 */ sw $s1, 0x44($sp) -/* 799CFC 802A154C AFB00040 */ sw $s0, 0x40($sp) -/* 799D00 802A1550 F7BE0090 */ sdc1 $f30, 0x90($sp) -/* 799D04 802A1554 F7BC0088 */ sdc1 $f28, 0x88($sp) -/* 799D08 802A1558 F7BA0080 */ sdc1 $f26, 0x80($sp) -/* 799D0C 802A155C F7B80078 */ sdc1 $f24, 0x78($sp) -/* 799D10 802A1560 F7B60070 */ sdc1 $f22, 0x70($sp) -/* 799D14 802A1564 F7B40068 */ sdc1 $f20, 0x68($sp) -/* 799D18 802A1568 8FC2000C */ lw $v0, 0xc($fp) -/* 799D1C 802A156C 10A00007 */ beqz $a1, .L802A158C -/* 799D20 802A1570 26B1000C */ addiu $s1, $s5, 0xc -/* 799D24 802A1574 3C01802A */ lui $at, %hi(D_802A3838) -/* 799D28 802A1578 AC203838 */ sw $zero, %lo(D_802A3838)($at) -/* 799D2C 802A157C 0C0B1EAF */ jal get_variable -/* 799D30 802A1580 8C450000 */ lw $a1, ($v0) -/* 799D34 802A1584 AFC20078 */ sw $v0, 0x78($fp) -/* 799D38 802A1588 AFC00070 */ sw $zero, 0x70($fp) -.L802A158C: -/* 799D3C 802A158C 82A3040C */ lb $v1, 0x40c($s5) -/* 799D40 802A1590 24020001 */ addiu $v0, $zero, 1 -/* 799D44 802A1594 14620040 */ bne $v1, $v0, .L802A1698 -/* 799D48 802A1598 00000000 */ nop -/* 799D4C 802A159C 0C09A75B */ jal get_actor -/* 799D50 802A15A0 86A40428 */ lh $a0, 0x428($s5) -/* 799D54 802A15A4 0040802D */ daddu $s0, $v0, $zero -/* 799D58 802A15A8 1200039D */ beqz $s0, .L802A2420 -/* 799D5C 802A15AC 24020002 */ addiu $v0, $zero, 2 -/* 799D60 802A15B0 82A50426 */ lb $a1, 0x426($s5) -/* 799D64 802A15B4 0C099117 */ jal get_actor_part -/* 799D68 802A15B8 0200202D */ daddu $a0, $s0, $zero -/* 799D6C 802A15BC 86020150 */ lh $v0, 0x150($s0) -/* 799D70 802A15C0 C6000144 */ lwc1 $f0, 0x144($s0) -/* 799D74 802A15C4 8E030000 */ lw $v1, ($s0) -/* 799D78 802A15C8 44821000 */ mtc1 $v0, $f2 -/* 799D7C 802A15CC 00000000 */ nop -/* 799D80 802A15D0 468010A0 */ cvt.s.w $f2, $f2 -/* 799D84 802A15D4 30620800 */ andi $v0, $v1, 0x800 -/* 799D88 802A15D8 1040000D */ beqz $v0, .L802A1610 -/* 799D8C 802A15DC 46020700 */ add.s $f28, $f0, $f2 -/* 799D90 802A15E0 86020152 */ lh $v0, 0x152($s0) -/* 799D94 802A15E4 C6000148 */ lwc1 $f0, 0x148($s0) -/* 799D98 802A15E8 44821000 */ mtc1 $v0, $f2 -/* 799D9C 802A15EC 00000000 */ nop -/* 799DA0 802A15F0 468010A0 */ cvt.s.w $f2, $f2 -/* 799DA4 802A15F4 92020191 */ lbu $v0, 0x191($s0) -/* 799DA8 802A15F8 46020000 */ add.s $f0, $f0, $f2 -/* 799DAC 802A15FC 44821000 */ mtc1 $v0, $f2 -/* 799DB0 802A1600 00000000 */ nop -/* 799DB4 802A1604 468010A0 */ cvt.s.w $f2, $f2 -/* 799DB8 802A1608 080A859F */ j .L802A167C -/* 799DBC 802A160C 46020601 */ sub.s $f24, $f0, $f2 -.L802A1610: -/* 799DC0 802A1610 30628000 */ andi $v0, $v1, 0x8000 -/* 799DC4 802A1614 1440000D */ bnez $v0, .L802A164C -/* 799DC8 802A1618 00000000 */ nop -/* 799DCC 802A161C 86020152 */ lh $v0, 0x152($s0) -/* 799DD0 802A1620 C6000148 */ lwc1 $f0, 0x148($s0) -/* 799DD4 802A1624 44821000 */ mtc1 $v0, $f2 -/* 799DD8 802A1628 00000000 */ nop -/* 799DDC 802A162C 468010A0 */ cvt.s.w $f2, $f2 -/* 799DE0 802A1630 92020191 */ lbu $v0, 0x191($s0) -/* 799DE4 802A1634 46020000 */ add.s $f0, $f0, $f2 -/* 799DE8 802A1638 44821000 */ mtc1 $v0, $f2 -/* 799DEC 802A163C 00000000 */ nop -/* 799DF0 802A1640 468010A0 */ cvt.s.w $f2, $f2 -/* 799DF4 802A1644 080A859F */ j .L802A167C -/* 799DF8 802A1648 46001600 */ add.s $f24, $f2, $f0 -.L802A164C: -/* 799DFC 802A164C 86020152 */ lh $v0, 0x152($s0) -/* 799E00 802A1650 C6020148 */ lwc1 $f2, 0x148($s0) -/* 799E04 802A1654 44820000 */ mtc1 $v0, $f0 -/* 799E08 802A1658 00000000 */ nop -/* 799E0C 802A165C 46800020 */ cvt.s.w $f0, $f0 -/* 799E10 802A1660 92020191 */ lbu $v0, 0x191($s0) -/* 799E14 802A1664 46001080 */ add.s $f2, $f2, $f0 -/* 799E18 802A1668 00021040 */ sll $v0, $v0, 1 -/* 799E1C 802A166C 44820000 */ mtc1 $v0, $f0 -/* 799E20 802A1670 00000000 */ nop -/* 799E24 802A1674 46800020 */ cvt.s.w $f0, $f0 -/* 799E28 802A1678 46001600 */ add.s $f24, $f2, $f0 -.L802A167C: -/* 799E2C 802A167C 86020154 */ lh $v0, 0x154($s0) -/* 799E30 802A1680 C602014C */ lwc1 $f2, 0x14c($s0) -/* 799E34 802A1684 44820000 */ mtc1 $v0, $f0 -/* 799E38 802A1688 00000000 */ nop -/* 799E3C 802A168C 46800020 */ cvt.s.w $f0, $f0 -/* 799E40 802A1690 080A85AB */ j .L802A16AC -/* 799E44 802A1694 46001680 */ add.s $f26, $f2, $f0 -.L802A1698: -/* 799E48 802A1698 3C014280 */ lui $at, 0x4280 -/* 799E4C 802A169C 4481E000 */ mtc1 $at, $f28 -/* 799E50 802A16A0 3C0142A0 */ lui $at, 0x42a0 -/* 799E54 802A16A4 4481C000 */ mtc1 $at, $f24 -/* 799E58 802A16A8 4480D000 */ mtc1 $zero, $f26 -.L802A16AC: -/* 799E5C 802A16AC 8FC30070 */ lw $v1, 0x70($fp) -/* 799E60 802A16B0 18600077 */ blez $v1, .L802A1890 -/* 799E64 802A16B4 2862000A */ slti $v0, $v1, 0xa -/* 799E68 802A16B8 14400006 */ bnez $v0, .L802A16D4 -/* 799E6C 802A16BC 0000902D */ daddu $s2, $zero, $zero -/* 799E70 802A16C0 2402000A */ addiu $v0, $zero, 0xa -/* 799E74 802A16C4 1062003B */ beq $v1, $v0, .L802A17B4 -/* 799E78 802A16C8 2C620016 */ sltiu $v0, $v1, 0x16 -/* 799E7C 802A16CC 080A8625 */ j .L802A1894 -/* 799E80 802A16D0 00000000 */ nop -.L802A16D4: -/* 799E84 802A16D4 24160014 */ addiu $s6, $zero, 0x14 -/* 799E88 802A16D8 2417000A */ addiu $s7, $zero, 0xa -/* 799E8C 802A16DC 3C13802A */ lui $s3, %hi(D_802A37F8) -/* 799E90 802A16E0 267337F8 */ addiu $s3, $s3, %lo(D_802A37F8) -/* 799E94 802A16E4 3C0141A0 */ lui $at, 0x41a0 -/* 799E98 802A16E8 4481A000 */ mtc1 $at, $f20 -/* 799E9C 802A16EC 3C02802A */ lui $v0, %hi(D_802A37F0) -/* 799EA0 802A16F0 8C4237F0 */ lw $v0, %lo(D_802A37F0)($v0) -/* 799EA4 802A16F4 3C013F80 */ lui $at, 0x3f80 -/* 799EA8 802A16F8 4481B000 */ mtc1 $at, $f22 -/* 799EAC 802A16FC 8C42000C */ lw $v0, 0xc($v0) -/* 799EB0 802A1700 2414005C */ addiu $s4, $zero, 0x5c -/* 799EB4 802A1704 AFA20028 */ sw $v0, 0x28($sp) -.L802A1708: -/* 799EB8 802A1708 8FC20078 */ lw $v0, 0x78($fp) -/* 799EBC 802A170C 14400003 */ bnez $v0, .L802A171C -/* 799EC0 802A1710 00121880 */ sll $v1, $s2, 2 -/* 799EC4 802A1714 52400021 */ beql $s2, $zero, .L802A179C -/* 799EC8 802A1718 26730004 */ addiu $s3, $s3, 4 -.L802A171C: -/* 799ECC 802A171C 8FA80028 */ lw $t0, 0x28($sp) -/* 799ED0 802A1720 8E620000 */ lw $v0, ($s3) -/* 799ED4 802A1724 10400004 */ beqz $v0, .L802A1738 -/* 799ED8 802A1728 01148021 */ addu $s0, $t0, $s4 -/* 799EDC 802A172C 2442FFFF */ addiu $v0, $v0, -1 -/* 799EE0 802A1730 080A85E6 */ j .L802A1798 -/* 799EE4 802A1734 AE620000 */ sw $v0, ($s3) -.L802A1738: -/* 799EE8 802A1738 3C08802A */ lui $t0, %hi(D_802A3514_79BCC4) -/* 799EEC 802A173C 25083514 */ addiu $t0, $t0, %lo(D_802A3514_79BCC4) -/* 799EF0 802A1740 00681021 */ addu $v0, $v1, $t0 -/* 799EF4 802A1744 AE760000 */ sw $s6, ($s3) -/* 799EF8 802A1748 8C420000 */ lw $v0, ($v0) -/* 799EFC 802A174C 1C400009 */ bgtz $v0, .L802A1774 -/* 799F00 802A1750 E7B40010 */ swc1 $f20, 0x10($sp) -/* 799F04 802A1754 E7B40014 */ swc1 $f20, 0x14($sp) -/* 799F08 802A1758 E7B60018 */ swc1 $f22, 0x18($sp) -/* 799F0C 802A175C AFB7001C */ sw $s7, 0x1c($sp) -/* 799F10 802A1760 AFB60020 */ sw $s6, 0x20($sp) -/* 799F14 802A1764 8E050010 */ lw $a1, 0x10($s0) -/* 799F18 802A1768 8E060014 */ lw $a2, 0x14($s0) -/* 799F1C 802A176C 080A85E4 */ j .L802A1790 -/* 799F20 802A1770 8E070018 */ lw $a3, 0x18($s0) -.L802A1774: -/* 799F24 802A1774 E7B40014 */ swc1 $f20, 0x14($sp) -/* 799F28 802A1778 E7B60018 */ swc1 $f22, 0x18($sp) -/* 799F2C 802A177C AFB7001C */ sw $s7, 0x1c($sp) -/* 799F30 802A1780 AFB60020 */ sw $s6, 0x20($sp) -/* 799F34 802A1784 8E050004 */ lw $a1, 4($s0) -/* 799F38 802A1788 8E060008 */ lw $a2, 8($s0) -/* 799F3C 802A178C 8E07000C */ lw $a3, 0xc($s0) -.L802A1790: -/* 799F40 802A1790 0C01C8D4 */ jal func_80072350 -/* 799F44 802A1794 24040004 */ addiu $a0, $zero, 4 -.L802A1798: -/* 799F48 802A1798 26730004 */ addiu $s3, $s3, 4 -.L802A179C: -/* 799F4C 802A179C 26520001 */ addiu $s2, $s2, 1 -/* 799F50 802A17A0 2A420008 */ slti $v0, $s2, 8 -/* 799F54 802A17A4 1440FFD8 */ bnez $v0, .L802A1708 -/* 799F58 802A17A8 2694001C */ addiu $s4, $s4, 0x1c -/* 799F5C 802A17AC 080A8623 */ j .L802A188C -/* 799F60 802A17B0 00000000 */ nop -.L802A17B4: -/* 799F64 802A17B4 24160014 */ addiu $s6, $zero, 0x14 -/* 799F68 802A17B8 2417000A */ addiu $s7, $zero, 0xa -/* 799F6C 802A17BC 3C13802A */ lui $s3, %hi(D_802A37F8) -/* 799F70 802A17C0 267337F8 */ addiu $s3, $s3, %lo(D_802A37F8) -/* 799F74 802A17C4 3C0141A0 */ lui $at, 0x41a0 -/* 799F78 802A17C8 4481A000 */ mtc1 $at, $f20 -/* 799F7C 802A17CC 3C02802A */ lui $v0, %hi(D_802A37F0) -/* 799F80 802A17D0 8C4237F0 */ lw $v0, %lo(D_802A37F0)($v0) -/* 799F84 802A17D4 3C013F80 */ lui $at, 0x3f80 -/* 799F88 802A17D8 4481B000 */ mtc1 $at, $f22 -/* 799F8C 802A17DC 8C42000C */ lw $v0, 0xc($v0) -/* 799F90 802A17E0 2414005C */ addiu $s4, $zero, 0x5c -/* 799F94 802A17E4 AFA20028 */ sw $v0, 0x28($sp) -.L802A17E8: -/* 799F98 802A17E8 8FC20078 */ lw $v0, 0x78($fp) -/* 799F9C 802A17EC 14400003 */ bnez $v0, .L802A17FC -/* 799FA0 802A17F0 00121880 */ sll $v1, $s2, 2 -/* 799FA4 802A17F4 52400021 */ beql $s2, $zero, .L802A187C -/* 799FA8 802A17F8 26730004 */ addiu $s3, $s3, 4 -.L802A17FC: -/* 799FAC 802A17FC 8FA80028 */ lw $t0, 0x28($sp) -/* 799FB0 802A1800 8E620000 */ lw $v0, ($s3) -/* 799FB4 802A1804 10400004 */ beqz $v0, .L802A1818 -/* 799FB8 802A1808 01148021 */ addu $s0, $t0, $s4 -/* 799FBC 802A180C 2442FFFF */ addiu $v0, $v0, -1 -/* 799FC0 802A1810 080A861E */ j .L802A1878 -/* 799FC4 802A1814 AE620000 */ sw $v0, ($s3) -.L802A1818: -/* 799FC8 802A1818 3C08802A */ lui $t0, %hi(D_802A3534_79BCE4) -/* 799FCC 802A181C 25083534 */ addiu $t0, $t0, %lo(D_802A3534_79BCE4) -/* 799FD0 802A1820 00681021 */ addu $v0, $v1, $t0 -/* 799FD4 802A1824 AE760000 */ sw $s6, ($s3) -/* 799FD8 802A1828 8C420000 */ lw $v0, ($v0) -/* 799FDC 802A182C 1C400009 */ bgtz $v0, .L802A1854 -/* 799FE0 802A1830 E7B40010 */ swc1 $f20, 0x10($sp) -/* 799FE4 802A1834 E7B40014 */ swc1 $f20, 0x14($sp) -/* 799FE8 802A1838 E7B60018 */ swc1 $f22, 0x18($sp) -/* 799FEC 802A183C AFB7001C */ sw $s7, 0x1c($sp) -/* 799FF0 802A1840 AFB60020 */ sw $s6, 0x20($sp) -/* 799FF4 802A1844 8E050010 */ lw $a1, 0x10($s0) -/* 799FF8 802A1848 8E060014 */ lw $a2, 0x14($s0) -/* 799FFC 802A184C 080A861C */ j .L802A1870 -/* 79A000 802A1850 8E070018 */ lw $a3, 0x18($s0) -.L802A1854: -/* 79A004 802A1854 E7B40014 */ swc1 $f20, 0x14($sp) -/* 79A008 802A1858 E7B60018 */ swc1 $f22, 0x18($sp) -/* 79A00C 802A185C AFB7001C */ sw $s7, 0x1c($sp) -/* 79A010 802A1860 AFB60020 */ sw $s6, 0x20($sp) -/* 79A014 802A1864 8E050004 */ lw $a1, 4($s0) -/* 79A018 802A1868 8E060008 */ lw $a2, 8($s0) -/* 79A01C 802A186C 8E07000C */ lw $a3, 0xc($s0) -.L802A1870: -/* 79A020 802A1870 0C01C8D4 */ jal func_80072350 -/* 79A024 802A1874 24040004 */ addiu $a0, $zero, 4 -.L802A1878: -/* 79A028 802A1878 26730004 */ addiu $s3, $s3, 4 -.L802A187C: -/* 79A02C 802A187C 26520001 */ addiu $s2, $s2, 1 -/* 79A030 802A1880 2A420008 */ slti $v0, $s2, 8 -/* 79A034 802A1884 1440FFD8 */ bnez $v0, .L802A17E8 -/* 79A038 802A1888 2694001C */ addiu $s4, $s4, 0x1c -.L802A188C: -/* 79A03C 802A188C 8FC30070 */ lw $v1, 0x70($fp) -.L802A1890: -/* 79A040 802A1890 2C620016 */ sltiu $v0, $v1, 0x16 -.L802A1894: -/* 79A044 802A1894 104002E1 */ beqz $v0, .L802A241C -/* 79A048 802A1898 00031080 */ sll $v0, $v1, 2 -/* 79A04C 802A189C 3C01802A */ lui $at, %hi(jtbl_802A3790_79BF40) -/* 79A050 802A18A0 00220821 */ addu $at, $at, $v0 -/* 79A054 802A18A4 8C223790 */ lw $v0, %lo(jtbl_802A3790_79BF40)($at) -/* 79A058 802A18A8 00400008 */ jr $v0 -/* 79A05C 802A18AC 00000000 */ nop -glabel L802A18B0_79A060 -/* 79A060 802A18B0 C6B40144 */ lwc1 $f20, 0x144($s5) -/* 79A064 802A18B4 C6BE014C */ lwc1 $f30, 0x14c($s5) -/* 79A068 802A18B8 92A20191 */ lbu $v0, 0x191($s5) -/* 79A06C 802A18BC C6A20148 */ lwc1 $f2, 0x148($s5) -/* 79A070 802A18C0 3C0141F0 */ lui $at, 0x41f0 -/* 79A074 802A18C4 44812000 */ mtc1 $at, $f4 -/* 79A078 802A18C8 44820000 */ mtc1 $v0, $f0 -/* 79A07C 802A18CC 00000000 */ nop -/* 79A080 802A18D0 46800020 */ cvt.s.w $f0, $f0 -/* 79A084 802A18D4 46001080 */ add.s $f2, $f2, $f0 -/* 79A088 802A18D8 3C014316 */ lui $at, 0x4316 -/* 79A08C 802A18DC 44810000 */ mtc1 $at, $f0 -/* 79A090 802A18E0 E6340000 */ swc1 $f20, ($s1) -/* 79A094 802A18E4 46041580 */ add.s $f22, $f2, $f4 -/* 79A098 802A18E8 E63E0008 */ swc1 $f30, 8($s1) -/* 79A09C 802A18EC E634000C */ swc1 $f20, 0xc($s1) -/* 79A0A0 802A18F0 4600B000 */ add.s $f0, $f22, $f0 -/* 79A0A4 802A18F4 E63E0014 */ swc1 $f30, 0x14($s1) -/* 79A0A8 802A18F8 E6360010 */ swc1 $f22, 0x10($s1) -/* 79A0AC 802A18FC E6200004 */ swc1 $f0, 4($s1) -/* 79A0B0 802A1900 8FC20078 */ lw $v0, 0x78($fp) -/* 79A0B4 802A1904 54400008 */ bnel $v0, $zero, .L802A1928 -/* 79A0B8 802A1908 24040001 */ addiu $a0, $zero, 1 -/* 79A0BC 802A190C 4405A000 */ mfc1 $a1, $f20 -/* 79A0C0 802A1910 4406B000 */ mfc1 $a2, $f22 -/* 79A0C4 802A1914 4407F000 */ mfc1 $a3, $f30 -/* 79A0C8 802A1918 3C013F80 */ lui $at, 0x3f80 -/* 79A0CC 802A191C 44810000 */ mtc1 $at, $f0 -/* 79A0D0 802A1920 080A864F */ j .L802A193C -/* 79A0D4 802A1924 0000202D */ daddu $a0, $zero, $zero -.L802A1928: -/* 79A0D8 802A1928 4405A000 */ mfc1 $a1, $f20 -/* 79A0DC 802A192C 4406B000 */ mfc1 $a2, $f22 -/* 79A0E0 802A1930 4407F000 */ mfc1 $a3, $f30 -/* 79A0E4 802A1934 3C013F80 */ lui $at, 0x3f80 -/* 79A0E8 802A1938 44810000 */ mtc1 $at, $f0 -.L802A193C: -/* 79A0EC 802A193C AFA00014 */ sw $zero, 0x14($sp) -/* 79A0F0 802A1940 0C01C964 */ jal func_80072590 -/* 79A0F4 802A1944 E7A00010 */ swc1 $f0, 0x10($sp) -/* 79A0F8 802A1948 3C01802A */ lui $at, %hi(D_802A37F0) -/* 79A0FC 802A194C AC2237F0 */ sw $v0, %lo(D_802A37F0)($at) -/* 79A100 802A1950 3C014240 */ lui $at, 0x4240 -/* 79A104 802A1954 44810000 */ mtc1 $at, $f0 -/* 79A108 802A1958 3C03802A */ lui $v1, %hi(D_802A37F0) -/* 79A10C 802A195C 8C6337F0 */ lw $v1, %lo(D_802A37F0)($v1) -/* 79A110 802A1960 E620004C */ swc1 $f0, 0x4c($s1) -/* 79A114 802A1964 8C62000C */ lw $v0, 0xc($v1) -/* 79A118 802A1968 AC40003C */ sw $zero, 0x3c($v0) -/* 79A11C 802A196C 8C62000C */ lw $v0, 0xc($v1) -/* 79A120 802A1970 C620004C */ lwc1 $f0, 0x4c($s1) -/* 79A124 802A1974 E4400048 */ swc1 $f0, 0x48($v0) -/* 79A128 802A1978 8C62000C */ lw $v0, 0xc($v1) -/* 79A12C 802A197C 3C0141F0 */ lui $at, 0x41f0 -/* 79A130 802A1980 44810000 */ mtc1 $at, $f0 -/* 79A134 802A1984 AC400024 */ sw $zero, 0x24($v0) -/* 79A138 802A1988 8C62000C */ lw $v0, 0xc($v1) -/* 79A13C 802A198C 0000902D */ daddu $s2, $zero, $zero -/* 79A140 802A1990 E4400058 */ swc1 $f0, 0x58($v0) -/* 79A144 802A1994 8C62000C */ lw $v0, 0xc($v1) -/* 79A148 802A1998 3C0140A0 */ lui $at, 0x40a0 -/* 79A14C 802A199C 44810000 */ mtc1 $at, $f0 -/* 79A150 802A19A0 3C10802A */ lui $s0, %hi(D_802A37F8) -/* 79A154 802A19A4 261037F8 */ addiu $s0, $s0, %lo(D_802A37F8) -/* 79A158 802A19A8 E4400040 */ swc1 $f0, 0x40($v0) -.L802A19AC: -/* 79A15C 802A19AC 0C00A67F */ jal rand_int -/* 79A160 802A19B0 24040014 */ addiu $a0, $zero, 0x14 -/* 79A164 802A19B4 AE020000 */ sw $v0, ($s0) -/* 79A168 802A19B8 26520001 */ addiu $s2, $s2, 1 -/* 79A16C 802A19BC 2A420008 */ slti $v0, $s2, 8 -/* 79A170 802A19C0 1440FFFA */ bnez $v0, .L802A19AC -/* 79A174 802A19C4 26100004 */ addiu $s0, $s0, 4 -/* 79A178 802A19C8 8FC30078 */ lw $v1, 0x78($fp) -/* 79A17C 802A19CC 24020028 */ addiu $v0, $zero, 0x28 -/* 79A180 802A19D0 14600004 */ bnez $v1, .L802A19E4 -/* 79A184 802A19D4 AFC20074 */ sw $v0, 0x74($fp) -/* 79A188 802A19D8 3C048000 */ lui $a0, 0x8000 -/* 79A18C 802A19DC 080A867B */ j .L802A19EC -/* 79A190 802A19E0 34840068 */ ori $a0, $a0, 0x68 -.L802A19E4: -/* 79A194 802A19E4 3C048000 */ lui $a0, 0x8000 -/* 79A198 802A19E8 34840069 */ ori $a0, $a0, 0x69 -.L802A19EC: -/* 79A19C 802A19EC 0C05272D */ jal play_sound -/* 79A1A0 802A19F0 00000000 */ nop -/* 79A1A4 802A19F4 24020001 */ addiu $v0, $zero, 1 -/* 79A1A8 802A19F8 080A8907 */ j .L802A241C -/* 79A1AC 802A19FC AFC20070 */ sw $v0, 0x70($fp) -glabel L802A1A00_79A1B0 -/* 79A1B0 802A1A00 C6200010 */ lwc1 $f0, 0x10($s1) -/* 79A1B4 802A1A04 C6240004 */ lwc1 $f4, 4($s1) -/* 79A1B8 802A1A08 46040001 */ sub.s $f0, $f0, $f4 -/* 79A1BC 802A1A0C 3C014120 */ lui $at, 0x4120 -/* 79A1C0 802A1A10 44811000 */ mtc1 $at, $f2 -/* 79A1C4 802A1A14 3C03802A */ lui $v1, %hi(D_802A37F0) -/* 79A1C8 802A1A18 8C6337F0 */ lw $v1, %lo(D_802A37F0)($v1) -/* 79A1CC 802A1A1C 46020003 */ div.s $f0, $f0, $f2 -/* 79A1D0 802A1A20 46002100 */ add.s $f4, $f4, $f0 -/* 79A1D4 802A1A24 C6200000 */ lwc1 $f0, ($s1) -/* 79A1D8 802A1A28 E6240004 */ swc1 $f4, 4($s1) -/* 79A1DC 802A1A2C 8C62000C */ lw $v0, 0xc($v1) -/* 79A1E0 802A1A30 E440004C */ swc1 $f0, 0x4c($v0) -/* 79A1E4 802A1A34 8C62000C */ lw $v0, 0xc($v1) -/* 79A1E8 802A1A38 C6200004 */ lwc1 $f0, 4($s1) -/* 79A1EC 802A1A3C E4400050 */ swc1 $f0, 0x50($v0) -/* 79A1F0 802A1A40 8C62000C */ lw $v0, 0xc($v1) -/* 79A1F4 802A1A44 C6200008 */ lwc1 $f0, 8($s1) -/* 79A1F8 802A1A48 E4400054 */ swc1 $f0, 0x54($v0) -/* 79A1FC 802A1A4C 8C62000C */ lw $v0, 0xc($v1) -/* 79A200 802A1A50 AC40003C */ sw $zero, 0x3c($v0) -/* 79A204 802A1A54 8C62000C */ lw $v0, 0xc($v1) -/* 79A208 802A1A58 C620004C */ lwc1 $f0, 0x4c($s1) -/* 79A20C 802A1A5C E4400048 */ swc1 $f0, 0x48($v0) -/* 79A210 802A1A60 8C62000C */ lw $v0, 0xc($v1) -/* 79A214 802A1A64 AC400024 */ sw $zero, 0x24($v0) -/* 79A218 802A1A68 8FC20074 */ lw $v0, 0x74($fp) -/* 79A21C 802A1A6C 14400177 */ bnez $v0, .L802A204C -/* 79A220 802A1A70 2442FFFF */ addiu $v0, $v0, -1 -/* 79A224 802A1A74 24020014 */ addiu $v0, $zero, 0x14 -/* 79A228 802A1A78 AFC20074 */ sw $v0, 0x74($fp) -/* 79A22C 802A1A7C 24020002 */ addiu $v0, $zero, 2 -/* 79A230 802A1A80 080A8907 */ j .L802A241C -/* 79A234 802A1A84 AFC20070 */ sw $v0, 0x70($fp) -glabel L802A1A88_79A238 -/* 79A238 802A1A88 8FC20074 */ lw $v0, 0x74($fp) -/* 79A23C 802A1A8C 1440016F */ bnez $v0, .L802A204C -/* 79A240 802A1A90 2442FFFF */ addiu $v0, $v0, -1 -/* 79A244 802A1A94 0C093903 */ jal func_8024E40C -/* 79A248 802A1A98 24040002 */ addiu $a0, $zero, 2 -/* 79A24C 802A1A9C 0C093936 */ jal move_cam_over -/* 79A250 802A1AA0 2404000A */ addiu $a0, $zero, 0xa -/* 79A254 802A1AA4 2402000F */ addiu $v0, $zero, 0xf -/* 79A258 802A1AA8 AFC20074 */ sw $v0, 0x74($fp) -/* 79A25C 802A1AAC 24020003 */ addiu $v0, $zero, 3 -/* 79A260 802A1AB0 080A8907 */ j .L802A241C -/* 79A264 802A1AB4 AFC20070 */ sw $v0, 0x70($fp) -glabel L802A1AB8_79A268 -/* 79A268 802A1AB8 C624004C */ lwc1 $f4, 0x4c($s1) -/* 79A26C 802A1ABC 3C0141C0 */ lui $at, 0x41c0 -/* 79A270 802A1AC0 44810000 */ mtc1 $at, $f0 -/* 79A274 802A1AC4 00000000 */ nop -/* 79A278 802A1AC8 46040001 */ sub.s $f0, $f0, $f4 -/* 79A27C 802A1ACC 3C013E00 */ lui $at, 0x3e00 -/* 79A280 802A1AD0 44811000 */ mtc1 $at, $f2 -/* 79A284 802A1AD4 00000000 */ nop -/* 79A288 802A1AD8 46020002 */ mul.s $f0, $f0, $f2 -/* 79A28C 802A1ADC 00000000 */ nop -/* 79A290 802A1AE0 46002100 */ add.s $f4, $f4, $f0 -/* 79A294 802A1AE4 3C02802A */ lui $v0, %hi(D_802A37F0) -/* 79A298 802A1AE8 8C4237F0 */ lw $v0, %lo(D_802A37F0)($v0) -/* 79A29C 802A1AEC E624004C */ swc1 $f4, 0x4c($s1) -/* 79A2A0 802A1AF0 8C42000C */ lw $v0, 0xc($v0) -/* 79A2A4 802A1AF4 E4440048 */ swc1 $f4, 0x48($v0) -/* 79A2A8 802A1AF8 8FC20074 */ lw $v0, 0x74($fp) -/* 79A2AC 802A1AFC 54400153 */ bnel $v0, $zero, .L802A204C -/* 79A2B0 802A1B00 2442FFFF */ addiu $v0, $v0, -1 -/* 79A2B4 802A1B04 2403001E */ addiu $v1, $zero, 0x1e -/* 79A2B8 802A1B08 24120007 */ addiu $s2, $zero, 7 -/* 79A2BC 802A1B0C 3C02802A */ lui $v0, %hi(D_802A3834) -/* 79A2C0 802A1B10 24423834 */ addiu $v0, $v0, %lo(D_802A3834) -/* 79A2C4 802A1B14 E63C000C */ swc1 $f28, 0xc($s1) -/* 79A2C8 802A1B18 E6380010 */ swc1 $f24, 0x10($s1) -/* 79A2CC 802A1B1C E63A0014 */ swc1 $f26, 0x14($s1) -.L802A1B20: -/* 79A2D0 802A1B20 AC430000 */ sw $v1, ($v0) -/* 79A2D4 802A1B24 2652FFFF */ addiu $s2, $s2, -1 -/* 79A2D8 802A1B28 0641FFFD */ bgez $s2, .L802A1B20 -/* 79A2DC 802A1B2C 2442FFFC */ addiu $v0, $v0, -4 -/* 79A2E0 802A1B30 8FC20078 */ lw $v0, 0x78($fp) -/* 79A2E4 802A1B34 14400002 */ bnez $v0, .L802A1B40 -/* 79A2E8 802A1B38 24040649 */ addiu $a0, $zero, 0x649 -/* 79A2EC 802A1B3C 24040648 */ addiu $a0, $zero, 0x648 -.L802A1B40: -/* 79A2F0 802A1B40 0C05272D */ jal play_sound -/* 79A2F4 802A1B44 00000000 */ nop -/* 79A2F8 802A1B48 24020004 */ addiu $v0, $zero, 4 -/* 79A2FC 802A1B4C 080A8907 */ j .L802A241C -/* 79A300 802A1B50 AFC20070 */ sw $v0, 0x70($fp) -glabel L802A1B54_79A304 -/* 79A304 802A1B54 C624004C */ lwc1 $f4, 0x4c($s1) -/* 79A308 802A1B58 3C014240 */ lui $at, 0x4240 -/* 79A30C 802A1B5C 44811000 */ mtc1 $at, $f2 -/* 79A310 802A1B60 00000000 */ nop -/* 79A314 802A1B64 46041081 */ sub.s $f2, $f2, $f4 -/* 79A318 802A1B68 3C013E80 */ lui $at, 0x3e80 -/* 79A31C 802A1B6C 44810000 */ mtc1 $at, $f0 -/* 79A320 802A1B70 00000000 */ nop -/* 79A324 802A1B74 46001082 */ mul.s $f2, $f2, $f0 -/* 79A328 802A1B78 00000000 */ nop -/* 79A32C 802A1B7C 0000B82D */ daddu $s7, $zero, $zero -/* 79A330 802A1B80 02E0902D */ daddu $s2, $s7, $zero -/* 79A334 802A1B84 3C13802A */ lui $s3, %hi(D_802A3818) -/* 79A338 802A1B88 26733818 */ addiu $s3, $s3, %lo(D_802A3818) -/* 79A33C 802A1B8C 0260A82D */ daddu $s5, $s3, $zero -/* 79A340 802A1B90 46022100 */ add.s $f4, $f4, $f2 -/* 79A344 802A1B94 3C02802A */ lui $v0, %hi(D_802A37F0) -/* 79A348 802A1B98 8C4237F0 */ lw $v0, %lo(D_802A37F0)($v0) -/* 79A34C 802A1B9C 02E0A02D */ daddu $s4, $s7, $zero -/* 79A350 802A1BA0 E624004C */ swc1 $f4, 0x4c($s1) -/* 79A354 802A1BA4 8C42000C */ lw $v0, 0xc($v0) -/* 79A358 802A1BA8 3C10802A */ lui $s0, %hi(D_802A3514_79BCC4) -/* 79A35C 802A1BAC 26103514 */ addiu $s0, $s0, %lo(D_802A3514_79BCC4) -/* 79A360 802A1BB0 E4440048 */ swc1 $f4, 0x48($v0) -.L802A1BB4: -/* 79A364 802A1BB4 5240004F */ beql $s2, $zero, .L802A1CF4 -/* 79A368 802A1BB8 26730004 */ addiu $s3, $s3, 4 -/* 79A36C 802A1BBC 8E020000 */ lw $v0, ($s0) -/* 79A370 802A1BC0 04410013 */ bgez $v0, .L802A1C10 -/* 79A374 802A1BC4 00000000 */ nop -/* 79A378 802A1BC8 C6340000 */ lwc1 $f20, ($s1) -/* 79A37C 802A1BCC C638000C */ lwc1 $f24, 0xc($s1) -/* 79A380 802A1BD0 C6360004 */ lwc1 $f22, 4($s1) -/* 79A384 802A1BD4 4614C181 */ sub.s $f6, $f24, $f20 -/* 79A388 802A1BD8 C63C0010 */ lwc1 $f28, 0x10($s1) -/* 79A38C 802A1BDC C63E0008 */ lwc1 $f30, 8($s1) -/* 79A390 802A1BE0 4616E001 */ sub.s $f0, $f28, $f22 -/* 79A394 802A1BE4 C63A0014 */ lwc1 $f26, 0x14($s1) -/* 79A398 802A1BE8 461ED081 */ sub.s $f2, $f26, $f30 -/* 79A39C 802A1BEC 4606A180 */ add.s $f6, $f20, $f6 -/* 79A3A0 802A1BF0 4600B106 */ mov.s $f4, $f22 -/* 79A3A4 802A1BF4 46002100 */ add.s $f4, $f4, $f0 -/* 79A3A8 802A1BF8 4600F006 */ mov.s $f0, $f30 -/* 79A3AC 802A1BFC 46020000 */ add.s $f0, $f0, $f2 -/* 79A3B0 802A1C00 E6260000 */ swc1 $f6, ($s1) -/* 79A3B4 802A1C04 E6240004 */ swc1 $f4, 4($s1) -/* 79A3B8 802A1C08 080A873C */ j .L802A1CF0 -/* 79A3BC 802A1C0C E6200008 */ swc1 $f0, 8($s1) -.L802A1C10: -/* 79A3C0 802A1C10 10400004 */ beqz $v0, .L802A1C24 -/* 79A3C4 802A1C14 24170001 */ addiu $s7, $zero, 1 -/* 79A3C8 802A1C18 2442FFFF */ addiu $v0, $v0, -1 -/* 79A3CC 802A1C1C 080A873C */ j .L802A1CF0 -/* 79A3D0 802A1C20 AE020000 */ sw $v0, ($s0) -.L802A1C24: -/* 79A3D4 802A1C24 C6340000 */ lwc1 $f20, ($s1) -/* 79A3D8 802A1C28 C6360004 */ lwc1 $f22, 4($s1) -/* 79A3DC 802A1C2C C63E0008 */ lwc1 $f30, 8($s1) -/* 79A3E0 802A1C30 C638000C */ lwc1 $f24, 0xc($s1) -/* 79A3E4 802A1C34 C63C0010 */ lwc1 $f28, 0x10($s1) -/* 79A3E8 802A1C38 C63A0014 */ lwc1 $f26, 0x14($s1) -/* 79A3EC 802A1C3C 4600A306 */ mov.s $f12, $f20 -/* 79A3F0 802A1C40 4406C000 */ mfc1 $a2, $f24 -/* 79A3F4 802A1C44 4407D000 */ mfc1 $a3, $f26 -/* 79A3F8 802A1C48 0C00A7B5 */ jal dist2D -/* 79A3FC 802A1C4C 4600F386 */ mov.s $f14, $f30 -/* 79A400 802A1C50 02951021 */ addu $v0, $s4, $s5 -/* 79A404 802A1C54 4614C101 */ sub.s $f4, $f24, $f20 -/* 79A408 802A1C58 C4460000 */ lwc1 $f6, ($v0) -/* 79A40C 802A1C5C 468031A0 */ cvt.s.w $f6, $f6 -/* 79A410 802A1C60 C6220000 */ lwc1 $f2, ($s1) -/* 79A414 802A1C64 46062103 */ div.s $f4, $f4, $f6 -/* 79A418 802A1C68 46041080 */ add.s $f2, $f2, $f4 -/* 79A41C 802A1C6C 4616E101 */ sub.s $f4, $f28, $f22 -/* 79A420 802A1C70 E6220000 */ swc1 $f2, ($s1) -/* 79A424 802A1C74 C4460000 */ lwc1 $f6, ($v0) -/* 79A428 802A1C78 468031A0 */ cvt.s.w $f6, $f6 -/* 79A42C 802A1C7C C6220004 */ lwc1 $f2, 4($s1) -/* 79A430 802A1C80 46062103 */ div.s $f4, $f4, $f6 -/* 79A434 802A1C84 46041080 */ add.s $f2, $f2, $f4 -/* 79A438 802A1C88 461ED101 */ sub.s $f4, $f26, $f30 -/* 79A43C 802A1C8C E6220004 */ swc1 $f2, 4($s1) -/* 79A440 802A1C90 C4460000 */ lwc1 $f6, ($v0) -/* 79A444 802A1C94 468031A0 */ cvt.s.w $f6, $f6 -/* 79A448 802A1C98 C6220008 */ lwc1 $f2, 8($s1) -/* 79A44C 802A1C9C 46062103 */ div.s $f4, $f4, $f6 -/* 79A450 802A1CA0 46041080 */ add.s $f2, $f2, $f4 -/* 79A454 802A1CA4 E6220008 */ swc1 $f2, 8($s1) -/* 79A458 802A1CA8 8C420000 */ lw $v0, ($v0) -/* 79A45C 802A1CAC 14570007 */ bne $v0, $s7, .L802A1CCC -/* 79A460 802A1CB0 46000106 */ mov.s $f4, $f0 -/* 79A464 802A1CB4 2402FFFF */ addiu $v0, $zero, -1 -/* 79A468 802A1CB8 AE020000 */ sw $v0, ($s0) -/* 79A46C 802A1CBC E6380000 */ swc1 $f24, ($s1) -/* 79A470 802A1CC0 E63C0004 */ swc1 $f28, 4($s1) -/* 79A474 802A1CC4 080A8739 */ j .L802A1CE4 -/* 79A478 802A1CC8 E63A0008 */ swc1 $f26, 8($s1) -.L802A1CCC: -/* 79A47C 802A1CCC 3C014270 */ lui $at, 0x4270 -/* 79A480 802A1CD0 44810000 */ mtc1 $at, $f0 -/* 79A484 802A1CD4 C6220004 */ lwc1 $f2, 4($s1) -/* 79A488 802A1CD8 46002003 */ div.s $f0, $f4, $f0 -/* 79A48C 802A1CDC 46001080 */ add.s $f2, $f2, $f0 -/* 79A490 802A1CE0 E6220004 */ swc1 $f2, 4($s1) -.L802A1CE4: -/* 79A494 802A1CE4 8E620000 */ lw $v0, ($s3) -/* 79A498 802A1CE8 2442FFFF */ addiu $v0, $v0, -1 -/* 79A49C 802A1CEC AE620000 */ sw $v0, ($s3) -.L802A1CF0: -/* 79A4A0 802A1CF0 26730004 */ addiu $s3, $s3, 4 -.L802A1CF4: -/* 79A4A4 802A1CF4 26940004 */ addiu $s4, $s4, 4 -/* 79A4A8 802A1CF8 26520001 */ addiu $s2, $s2, 1 -/* 79A4AC 802A1CFC 2A420002 */ slti $v0, $s2, 2 -/* 79A4B0 802A1D00 1440FFAC */ bnez $v0, .L802A1BB4 -/* 79A4B4 802A1D04 26100004 */ addiu $s0, $s0, 4 -/* 79A4B8 802A1D08 3C03802A */ lui $v1, %hi(D_802A37F0) -/* 79A4BC 802A1D0C 8C6337F0 */ lw $v1, %lo(D_802A37F0)($v1) -/* 79A4C0 802A1D10 C6200000 */ lwc1 $f0, ($s1) -/* 79A4C4 802A1D14 8C62000C */ lw $v0, 0xc($v1) -/* 79A4C8 802A1D18 E440004C */ swc1 $f0, 0x4c($v0) -/* 79A4CC 802A1D1C 8C62000C */ lw $v0, 0xc($v1) -/* 79A4D0 802A1D20 C6200004 */ lwc1 $f0, 4($s1) -/* 79A4D4 802A1D24 E4400050 */ swc1 $f0, 0x50($v0) -/* 79A4D8 802A1D28 8C62000C */ lw $v0, 0xc($v1) -/* 79A4DC 802A1D2C C6200008 */ lwc1 $f0, 8($s1) -/* 79A4E0 802A1D30 E4400054 */ swc1 $f0, 0x54($v0) -/* 79A4E4 802A1D34 8C62000C */ lw $v0, 0xc($v1) -/* 79A4E8 802A1D38 C6200000 */ lwc1 $f0, ($s1) -/* 79A4EC 802A1D3C E4400004 */ swc1 $f0, 4($v0) -/* 79A4F0 802A1D40 8C62000C */ lw $v0, 0xc($v1) -/* 79A4F4 802A1D44 AC400008 */ sw $zero, 8($v0) -/* 79A4F8 802A1D48 8C62000C */ lw $v0, 0xc($v1) -/* 79A4FC 802A1D4C C6200008 */ lwc1 $f0, 8($s1) -/* 79A500 802A1D50 16E001B2 */ bnez $s7, .L802A241C -/* 79A504 802A1D54 E440000C */ swc1 $f0, 0xc($v0) -/* 79A508 802A1D58 C620000C */ lwc1 $f0, 0xc($s1) -/* 79A50C 802A1D5C C6220010 */ lwc1 $f2, 0x10($s1) -/* 79A510 802A1D60 C6240014 */ lwc1 $f4, 0x14($s1) -/* 79A514 802A1D64 E6200000 */ swc1 $f0, ($s1) -/* 79A518 802A1D68 E6220004 */ swc1 $f2, 4($s1) -/* 79A51C 802A1D6C E6240008 */ swc1 $f4, 8($s1) -/* 79A520 802A1D70 8C62000C */ lw $v0, 0xc($v1) -/* 79A524 802A1D74 E440004C */ swc1 $f0, 0x4c($v0) -/* 79A528 802A1D78 8C62000C */ lw $v0, 0xc($v1) -/* 79A52C 802A1D7C C6200004 */ lwc1 $f0, 4($s1) -/* 79A530 802A1D80 E4400050 */ swc1 $f0, 0x50($v0) -/* 79A534 802A1D84 8C62000C */ lw $v0, 0xc($v1) -/* 79A538 802A1D88 C6200008 */ lwc1 $f0, 8($s1) -/* 79A53C 802A1D8C 0000902D */ daddu $s2, $zero, $zero -/* 79A540 802A1D90 E4400054 */ swc1 $f0, 0x54($v0) -/* 79A544 802A1D94 8C62000C */ lw $v0, 0xc($v1) -/* 79A548 802A1D98 C6200000 */ lwc1 $f0, ($s1) -/* 79A54C 802A1D9C 24070001 */ addiu $a3, $zero, 1 -/* 79A550 802A1DA0 E4400004 */ swc1 $f0, 4($v0) -/* 79A554 802A1DA4 8C62000C */ lw $v0, 0xc($v1) -/* 79A558 802A1DA8 2406FFFD */ addiu $a2, $zero, -3 -/* 79A55C 802A1DAC AC400008 */ sw $zero, 8($v0) -/* 79A560 802A1DB0 8C62000C */ lw $v0, 0xc($v1) -/* 79A564 802A1DB4 C6200008 */ lwc1 $f0, 8($s1) -/* 79A568 802A1DB8 3C05802A */ lui $a1, %hi(D_802A3514_79BCC4) -/* 79A56C 802A1DBC 24A53514 */ addiu $a1, $a1, %lo(D_802A3514_79BCC4) -/* 79A570 802A1DC0 E440000C */ swc1 $f0, 0xc($v0) -/* 79A574 802A1DC4 8C63000C */ lw $v1, 0xc($v1) -/* 79A578 802A1DC8 2404005C */ addiu $a0, $zero, 0x5c -/* 79A57C 802A1DCC AFA30028 */ sw $v1, 0x28($sp) -.L802A1DD0: -/* 79A580 802A1DD0 8FC20078 */ lw $v0, 0x78($fp) -/* 79A584 802A1DD4 14400003 */ bnez $v0, .L802A1DE4 -/* 79A588 802A1DD8 00000000 */ nop -/* 79A58C 802A1DDC 52400008 */ beql $s2, $zero, .L802A1E00 -/* 79A590 802A1DE0 24A50004 */ addiu $a1, $a1, 4 -.L802A1DE4: -/* 79A594 802A1DE4 8FA80028 */ lw $t0, 0x28($sp) -/* 79A598 802A1DE8 ACA70000 */ sw $a3, ($a1) -/* 79A59C 802A1DEC 01048021 */ addu $s0, $t0, $a0 -/* 79A5A0 802A1DF0 8E020000 */ lw $v0, ($s0) -/* 79A5A4 802A1DF4 00461024 */ and $v0, $v0, $a2 -/* 79A5A8 802A1DF8 AE020000 */ sw $v0, ($s0) -/* 79A5AC 802A1DFC 24A50004 */ addiu $a1, $a1, 4 -.L802A1E00: -/* 79A5B0 802A1E00 26520001 */ addiu $s2, $s2, 1 -/* 79A5B4 802A1E04 2A420008 */ slti $v0, $s2, 8 -/* 79A5B8 802A1E08 1440FFF1 */ bnez $v0, .L802A1DD0 -/* 79A5BC 802A1E0C 2484001C */ addiu $a0, $a0, 0x1c -/* 79A5C0 802A1E10 0C093903 */ jal func_8024E40C -/* 79A5C4 802A1E14 24040003 */ addiu $a0, $zero, 3 -/* 79A5C8 802A1E18 0C093936 */ jal move_cam_over -/* 79A5CC 802A1E1C 2404001E */ addiu $a0, $zero, 0x1e -/* 79A5D0 802A1E20 2402000F */ addiu $v0, $zero, 0xf -/* 79A5D4 802A1E24 AFC20074 */ sw $v0, 0x74($fp) -/* 79A5D8 802A1E28 24020005 */ addiu $v0, $zero, 5 -/* 79A5DC 802A1E2C 080A8907 */ j .L802A241C -/* 79A5E0 802A1E30 AFC20070 */ sw $v0, 0x70($fp) -glabel L802A1E34_79A5E4 -/* 79A5E4 802A1E34 8FC20074 */ lw $v0, 0x74($fp) -/* 79A5E8 802A1E38 14400084 */ bnez $v0, .L802A204C -/* 79A5EC 802A1E3C 2442FFFF */ addiu $v0, $v0, -1 -/* 79A5F0 802A1E40 3C05802A */ lui $a1, %hi(D_802A37F0) -/* 79A5F4 802A1E44 8CA537F0 */ lw $a1, %lo(D_802A37F0)($a1) -/* 79A5F8 802A1E48 A6200064 */ sh $zero, 0x64($s1) -/* 79A5FC 802A1E4C 8CA2000C */ lw $v0, 0xc($a1) -/* 79A600 802A1E50 AC40003C */ sw $zero, 0x3c($v0) -/* 79A604 802A1E54 8CA2000C */ lw $v0, 0xc($a1) -/* 79A608 802A1E58 AC400024 */ sw $zero, 0x24($v0) -/* 79A60C 802A1E5C 8FC20078 */ lw $v0, 0x78($fp) -/* 79A610 802A1E60 1040000F */ beqz $v0, .L802A1EA0 -/* 79A614 802A1E64 240400F0 */ addiu $a0, $zero, 0xf0 -/* 79A618 802A1E68 8CA2000C */ lw $v0, 0xc($a1) -/* 79A61C 802A1E6C AC440018 */ sw $a0, 0x18($v0) -/* 79A620 802A1E70 8CA3000C */ lw $v1, 0xc($a1) -/* 79A624 802A1E74 24020050 */ addiu $v0, $zero, 0x50 -/* 79A628 802A1E78 AC62001C */ sw $v0, 0x1c($v1) -/* 79A62C 802A1E7C 8CA3000C */ lw $v1, 0xc($a1) -/* 79A630 802A1E80 240200C8 */ addiu $v0, $zero, 0xc8 -/* 79A634 802A1E84 AC620020 */ sw $v0, 0x20($v1) -/* 79A638 802A1E88 8CA2000C */ lw $v0, 0xc($a1) -/* 79A63C 802A1E8C AC440028 */ sw $a0, 0x28($v0) -/* 79A640 802A1E90 8CA2000C */ lw $v0, 0xc($a1) -/* 79A644 802A1E94 AC44002C */ sw $a0, 0x2c($v0) -/* 79A648 802A1E98 8CA2000C */ lw $v0, 0xc($a1) -/* 79A64C 802A1E9C AC440030 */ sw $a0, 0x30($v0) -.L802A1EA0: -/* 79A650 802A1EA0 3C04802A */ lui $a0, %hi(D_802A33A8_79BB58) -/* 79A654 802A1EA4 248433A8 */ addiu $a0, $a0, %lo(D_802A33A8_79BB58) -/* 79A658 802A1EA8 2405000A */ addiu $a1, $zero, 0xa -/* 79A65C 802A1EAC 0C0B0CF8 */ jal start_script -/* 79A660 802A1EB0 0000302D */ daddu $a2, $zero, $zero -/* 79A664 802A1EB4 C6200000 */ lwc1 $f0, ($s1) -/* 79A668 802A1EB8 3C013F00 */ lui $at, 0x3f00 -/* 79A66C 802A1EBC 44811000 */ mtc1 $at, $f2 -/* 79A670 802A1EC0 4600020D */ trunc.w.s $f8, $f0 -/* 79A674 802A1EC4 E4480084 */ swc1 $f8, 0x84($v0) -/* 79A678 802A1EC8 C6200004 */ lwc1 $f0, 4($s1) -/* 79A67C 802A1ECC 46020002 */ mul.s $f0, $f0, $f2 -/* 79A680 802A1ED0 00000000 */ nop -/* 79A684 802A1ED4 4600020D */ trunc.w.s $f8, $f0 -/* 79A688 802A1ED8 E4480088 */ swc1 $f8, 0x88($v0) -/* 79A68C 802A1EDC C6200008 */ lwc1 $f0, 8($s1) -/* 79A690 802A1EE0 4600020D */ trunc.w.s $f8, $f0 -/* 79A694 802A1EE4 E448008C */ swc1 $f8, 0x8c($v0) -/* 79A698 802A1EE8 8FC30078 */ lw $v1, 0x78($fp) -/* 79A69C 802A1EEC AC4300AC */ sw $v1, 0xac($v0) -/* 79A6A0 802A1EF0 0C05272D */ jal play_sound -/* 79A6A4 802A1EF4 2404024A */ addiu $a0, $zero, 0x24a -/* 79A6A8 802A1EF8 2402002D */ addiu $v0, $zero, 0x2d -/* 79A6AC 802A1EFC AFC20074 */ sw $v0, 0x74($fp) -/* 79A6B0 802A1F00 24020006 */ addiu $v0, $zero, 6 -/* 79A6B4 802A1F04 080A8907 */ j .L802A241C -/* 79A6B8 802A1F08 AFC20070 */ sw $v0, 0x70($fp) -glabel L802A1F0C_79A6BC -/* 79A6BC 802A1F0C 96220064 */ lhu $v0, 0x64($s1) -/* 79A6C0 802A1F10 2442001E */ addiu $v0, $v0, 0x1e -/* 79A6C4 802A1F14 A6220064 */ sh $v0, 0x64($s1) -/* 79A6C8 802A1F18 00021400 */ sll $v0, $v0, 0x10 -/* 79A6CC 802A1F1C 00021403 */ sra $v0, $v0, 0x10 -/* 79A6D0 802A1F20 28420100 */ slti $v0, $v0, 0x100 -/* 79A6D4 802A1F24 14400002 */ bnez $v0, .L802A1F30 -/* 79A6D8 802A1F28 240200FF */ addiu $v0, $zero, 0xff -/* 79A6DC 802A1F2C A6220064 */ sh $v0, 0x64($s1) -.L802A1F30: -/* 79A6E0 802A1F30 3C04802A */ lui $a0, %hi(D_802A37F0) -/* 79A6E4 802A1F34 8C8437F0 */ lw $a0, %lo(D_802A37F0)($a0) -/* 79A6E8 802A1F38 86220064 */ lh $v0, 0x64($s1) -/* 79A6EC 802A1F3C 8C83000C */ lw $v1, 0xc($a0) -/* 79A6F0 802A1F40 AC62003C */ sw $v0, 0x3c($v1) -/* 79A6F4 802A1F44 8C83000C */ lw $v1, 0xc($a0) -/* 79A6F8 802A1F48 86220064 */ lh $v0, 0x64($s1) -/* 79A6FC 802A1F4C AC620024 */ sw $v0, 0x24($v1) -/* 79A700 802A1F50 8FC20074 */ lw $v0, 0x74($fp) -/* 79A704 802A1F54 1440003D */ bnez $v0, .L802A204C -/* 79A708 802A1F58 2442FFFF */ addiu $v0, $v0, -1 -/* 79A70C 802A1F5C 8FC20078 */ lw $v0, 0x78($fp) -/* 79A710 802A1F60 24030001 */ addiu $v1, $zero, 1 -/* 79A714 802A1F64 3C01802A */ lui $at, %hi(D_802A3838) -/* 79A718 802A1F68 AC233838 */ sw $v1, %lo(D_802A3838)($at) -/* 79A71C 802A1F6C 14400012 */ bnez $v0, .L802A1FB8 -/* 79A720 802A1F70 2402000F */ addiu $v0, $zero, 0xf -/* 79A724 802A1F74 82A2040C */ lb $v0, 0x40c($s5) -/* 79A728 802A1F78 1443000F */ bne $v0, $v1, .L802A1FB8 -/* 79A72C 802A1F7C 2402000F */ addiu $v0, $zero, 0xf -/* 79A730 802A1F80 86A40428 */ lh $a0, 0x428($s5) -/* 79A734 802A1F84 0C09A75B */ jal get_actor -/* 79A738 802A1F88 00000000 */ nop -/* 79A73C 802A1F8C 82A50426 */ lb $a1, 0x426($s5) -/* 79A740 802A1F90 0C099117 */ jal get_actor_part -/* 79A744 802A1F94 0040202D */ daddu $a0, $v0, $zero -/* 79A748 802A1F98 8C42007C */ lw $v0, 0x7c($v0) -/* 79A74C 802A1F9C 3C030008 */ lui $v1, 8 -/* 79A750 802A1FA0 00431024 */ and $v0, $v0, $v1 -/* 79A754 802A1FA4 10400003 */ beqz $v0, .L802A1FB4 -/* 79A758 802A1FA8 24020014 */ addiu $v0, $zero, 0x14 -/* 79A75C 802A1FAC 080A8907 */ j .L802A241C -/* 79A760 802A1FB0 AFC20070 */ sw $v0, 0x70($fp) -.L802A1FB4: -/* 79A764 802A1FB4 2402000F */ addiu $v0, $zero, 0xf -.L802A1FB8: -/* 79A768 802A1FB8 AFC20074 */ sw $v0, 0x74($fp) -/* 79A76C 802A1FBC 24020007 */ addiu $v0, $zero, 7 -/* 79A770 802A1FC0 080A8907 */ j .L802A241C -/* 79A774 802A1FC4 AFC20070 */ sw $v0, 0x70($fp) -glabel L802A1FC8_79A778 -/* 79A778 802A1FC8 8FC20074 */ lw $v0, 0x74($fp) -/* 79A77C 802A1FCC 1440001F */ bnez $v0, .L802A204C -/* 79A780 802A1FD0 2442FFFF */ addiu $v0, $v0, -1 -/* 79A784 802A1FD4 2402000A */ addiu $v0, $zero, 0xa -/* 79A788 802A1FD8 AFC20074 */ sw $v0, 0x74($fp) -/* 79A78C 802A1FDC 24020008 */ addiu $v0, $zero, 8 -/* 79A790 802A1FE0 080A8907 */ j .L802A241C -/* 79A794 802A1FE4 AFC20070 */ sw $v0, 0x70($fp) -glabel L802A1FE8_79A798 -/* 79A798 802A1FE8 96220064 */ lhu $v0, 0x64($s1) -/* 79A79C 802A1FEC 2442FFE2 */ addiu $v0, $v0, -0x1e -/* 79A7A0 802A1FF0 A6220064 */ sh $v0, 0x64($s1) -/* 79A7A4 802A1FF4 00021400 */ sll $v0, $v0, 0x10 -/* 79A7A8 802A1FF8 04420001 */ bltzl $v0, .L802A2000 -/* 79A7AC 802A1FFC A6200064 */ sh $zero, 0x64($s1) -.L802A2000: -/* 79A7B0 802A2000 3C04802A */ lui $a0, %hi(D_802A37F0) -/* 79A7B4 802A2004 8C8437F0 */ lw $a0, %lo(D_802A37F0)($a0) -/* 79A7B8 802A2008 86220064 */ lh $v0, 0x64($s1) -/* 79A7BC 802A200C 8C83000C */ lw $v1, 0xc($a0) -/* 79A7C0 802A2010 AC62003C */ sw $v0, 0x3c($v1) -/* 79A7C4 802A2014 8C83000C */ lw $v1, 0xc($a0) -/* 79A7C8 802A2018 86220064 */ lh $v0, 0x64($s1) -/* 79A7CC 802A201C AC620024 */ sw $v0, 0x24($v1) -/* 79A7D0 802A2020 8FC20074 */ lw $v0, 0x74($fp) -/* 79A7D4 802A2024 14400009 */ bnez $v0, .L802A204C -/* 79A7D8 802A2028 2442FFFF */ addiu $v0, $v0, -1 -/* 79A7DC 802A202C 2402000A */ addiu $v0, $zero, 0xa -/* 79A7E0 802A2030 AFC20074 */ sw $v0, 0x74($fp) -/* 79A7E4 802A2034 24020009 */ addiu $v0, $zero, 9 -/* 79A7E8 802A2038 080A8907 */ j .L802A241C -/* 79A7EC 802A203C AFC20070 */ sw $v0, 0x70($fp) -glabel L802A2040_79A7F0 -/* 79A7F0 802A2040 8FC20074 */ lw $v0, 0x74($fp) -/* 79A7F4 802A2044 10400003 */ beqz $v0, .L802A2054 -/* 79A7F8 802A2048 2442FFFF */ addiu $v0, $v0, -1 -.L802A204C: -/* 79A7FC 802A204C 080A8907 */ j .L802A241C -/* 79A800 802A2050 AFC20074 */ sw $v0, 0x74($fp) -.L802A2054: -/* 79A804 802A2054 3C01432A */ lui $at, 0x432a -/* 79A808 802A2058 44810000 */ mtc1 $at, $f0 -/* 79A80C 802A205C 24020014 */ addiu $v0, $zero, 0x14 -/* 79A810 802A2060 4600C000 */ add.s $f0, $f24, $f0 -/* 79A814 802A2064 E63C000C */ swc1 $f28, 0xc($s1) -/* 79A818 802A2068 E63A0014 */ swc1 $f26, 0x14($s1) -/* 79A81C 802A206C E6200010 */ swc1 $f0, 0x10($s1) -/* 79A820 802A2070 AFC20074 */ sw $v0, 0x74($fp) -/* 79A824 802A2074 2402000A */ addiu $v0, $zero, 0xa -/* 79A828 802A2078 080A8907 */ j .L802A241C -/* 79A82C 802A207C AFC20070 */ sw $v0, 0x70($fp) -glabel L802A2080_79A830 -/* 79A830 802A2080 8FC20074 */ lw $v0, 0x74($fp) -/* 79A834 802A2084 10400010 */ beqz $v0, .L802A20C8 -/* 79A838 802A2088 2442FFFF */ addiu $v0, $v0, -1 -/* 79A83C 802A208C 1440000E */ bnez $v0, .L802A20C8 -/* 79A840 802A2090 AFC20074 */ sw $v0, 0x74($fp) -/* 79A844 802A2094 8FC20078 */ lw $v0, 0x78($fp) -/* 79A848 802A2098 54400006 */ bnel $v0, $zero, .L802A20B4 -/* 79A84C 802A209C 24040249 */ addiu $a0, $zero, 0x249 -/* 79A850 802A20A0 24040248 */ addiu $a0, $zero, 0x248 -/* 79A854 802A20A4 0C05269B */ jal func_80149A6C -/* 79A858 802A20A8 24050001 */ addiu $a1, $zero, 1 -/* 79A85C 802A20AC 080A8830 */ j .L802A20C0 -/* 79A860 802A20B0 24040648 */ addiu $a0, $zero, 0x648 -.L802A20B4: -/* 79A864 802A20B4 0C05269B */ jal func_80149A6C -/* 79A868 802A20B8 24050001 */ addiu $a1, $zero, 1 -/* 79A86C 802A20BC 24040649 */ addiu $a0, $zero, 0x649 -.L802A20C0: -/* 79A870 802A20C0 0C05272D */ jal play_sound -/* 79A874 802A20C4 00000000 */ nop -.L802A20C8: -/* 79A878 802A20C8 0000B82D */ daddu $s7, $zero, $zero -/* 79A87C 802A20CC 02E0902D */ daddu $s2, $s7, $zero -/* 79A880 802A20D0 2405FFFF */ addiu $a1, $zero, -1 -/* 79A884 802A20D4 3C03802A */ lui $v1, %hi(D_802A3534_79BCE4) -/* 79A888 802A20D8 24633534 */ addiu $v1, $v1, %lo(D_802A3534_79BCE4) -/* 79A88C 802A20DC 3C014120 */ lui $at, 0x4120 -/* 79A890 802A20E0 44813000 */ mtc1 $at, $f6 -/* 79A894 802A20E4 3C02802A */ lui $v0, %hi(D_802A37F0) -/* 79A898 802A20E8 8C4237F0 */ lw $v0, %lo(D_802A37F0)($v0) -/* 79A89C 802A20EC 3C013FF0 */ lui $at, 0x3ff0 -/* 79A8A0 802A20F0 44812800 */ mtc1 $at, $f5 -/* 79A8A4 802A20F4 44802000 */ mtc1 $zero, $f4 -/* 79A8A8 802A20F8 8C42000C */ lw $v0, 0xc($v0) -/* 79A8AC 802A20FC 2404005C */ addiu $a0, $zero, 0x5c -/* 79A8B0 802A2100 AFA20028 */ sw $v0, 0x28($sp) -.L802A2104: -/* 79A8B4 802A2104 8FC20078 */ lw $v0, 0x78($fp) -/* 79A8B8 802A2108 14400003 */ bnez $v0, .L802A2118 -/* 79A8BC 802A210C 00000000 */ nop -/* 79A8C0 802A2110 5240001C */ beql $s2, $zero, .L802A2184 -/* 79A8C4 802A2114 24630004 */ addiu $v1, $v1, 4 -.L802A2118: -/* 79A8C8 802A2118 8FA80028 */ lw $t0, 0x28($sp) -/* 79A8CC 802A211C 8C620000 */ lw $v0, ($v1) -/* 79A8D0 802A2120 04400017 */ bltz $v0, .L802A2180 -/* 79A8D4 802A2124 01048021 */ addu $s0, $t0, $a0 -/* 79A8D8 802A2128 10400004 */ beqz $v0, .L802A213C -/* 79A8DC 802A212C 24170001 */ addiu $s7, $zero, 1 -/* 79A8E0 802A2130 2442FFFF */ addiu $v0, $v0, -1 -/* 79A8E4 802A2134 080A8860 */ j .L802A2180 -/* 79A8E8 802A2138 AC620000 */ sw $v0, ($v1) -.L802A213C: -/* 79A8EC 802A213C 8E020000 */ lw $v0, ($s0) -/* 79A8F0 802A2140 C6160014 */ lwc1 $f22, 0x14($s0) -/* 79A8F4 802A2144 34420002 */ ori $v0, $v0, 2 -/* 79A8F8 802A2148 AE020000 */ sw $v0, ($s0) -/* 79A8FC 802A214C C6200010 */ lwc1 $f0, 0x10($s1) -/* 79A900 802A2150 46160001 */ sub.s $f0, $f0, $f22 -/* 79A904 802A2154 46060003 */ div.s $f0, $f0, $f6 -/* 79A908 802A2158 4600B000 */ add.s $f0, $f22, $f0 -/* 79A90C 802A215C E6000014 */ swc1 $f0, 0x14($s0) -/* 79A910 802A2160 C6220010 */ lwc1 $f2, 0x10($s1) -/* 79A914 802A2164 46020001 */ sub.s $f0, $f0, $f2 -/* 79A918 802A2168 46000005 */ abs.s $f0, $f0 -/* 79A91C 802A216C 46000021 */ cvt.d.s $f0, $f0 -/* 79A920 802A2170 4624003C */ c.lt.d $f0, $f4 -/* 79A924 802A2174 00000000 */ nop -/* 79A928 802A2178 45030001 */ bc1tl .L802A2180 -/* 79A92C 802A217C AC650000 */ sw $a1, ($v1) -.L802A2180: -/* 79A930 802A2180 24630004 */ addiu $v1, $v1, 4 -.L802A2184: -/* 79A934 802A2184 26520001 */ addiu $s2, $s2, 1 -/* 79A938 802A2188 2A420008 */ slti $v0, $s2, 8 -/* 79A93C 802A218C 1440FFDD */ bnez $v0, .L802A2104 -/* 79A940 802A2190 2484001C */ addiu $a0, $a0, 0x1c -/* 79A944 802A2194 080A88FB */ j .L802A23EC -/* 79A948 802A2198 00000000 */ nop -glabel L802A219C_79A94C -/* 79A94C 802A219C 3C02802A */ lui $v0, %hi(D_802A37F0) -/* 79A950 802A21A0 8C4237F0 */ lw $v0, %lo(D_802A37F0)($v0) -/* 79A954 802A21A4 2404000F */ addiu $a0, $zero, 0xf -/* 79A958 802A21A8 8C43000C */ lw $v1, 0xc($v0) -/* 79A95C 802A21AC 24120007 */ addiu $s2, $zero, 7 -/* 79A960 802A21B0 AC60003C */ sw $zero, 0x3c($v1) -/* 79A964 802A21B4 8C42000C */ lw $v0, 0xc($v0) -/* 79A968 802A21B8 3C03802A */ lui $v1, %hi(D_802A3834) -/* 79A96C 802A21BC 24633834 */ addiu $v1, $v1, %lo(D_802A3834) -/* 79A970 802A21C0 AC400024 */ sw $zero, 0x24($v0) -.L802A21C4: -/* 79A974 802A21C4 AC640000 */ sw $a0, ($v1) -/* 79A978 802A21C8 2652FFFF */ addiu $s2, $s2, -1 -/* 79A97C 802A21CC 0641FFFD */ bgez $s2, .L802A21C4 -/* 79A980 802A21D0 2463FFFC */ addiu $v1, $v1, -4 -/* 79A984 802A21D4 8FC20078 */ lw $v0, 0x78($fp) -/* 79A988 802A21D8 14400002 */ bnez $v0, .L802A21E4 -/* 79A98C 802A21DC 24040249 */ addiu $a0, $zero, 0x249 -/* 79A990 802A21E0 24040248 */ addiu $a0, $zero, 0x248 -.L802A21E4: -/* 79A994 802A21E4 0C05269B */ jal func_80149A6C -/* 79A998 802A21E8 0000282D */ daddu $a1, $zero, $zero -/* 79A99C 802A21EC 24020015 */ addiu $v0, $zero, 0x15 -/* 79A9A0 802A21F0 080A8907 */ j .L802A241C -/* 79A9A4 802A21F4 AFC20070 */ sw $v0, 0x70($fp) -glabel L802A21F8_79A9A8 -/* 79A9A8 802A21F8 0000B82D */ daddu $s7, $zero, $zero -/* 79A9AC 802A21FC 02E0902D */ daddu $s2, $s7, $zero -/* 79A9B0 802A2200 3C13802A */ lui $s3, %hi(D_802A3818) -/* 79A9B4 802A2204 26733818 */ addiu $s3, $s3, %lo(D_802A3818) -/* 79A9B8 802A2208 02E0282D */ daddu $a1, $s7, $zero -/* 79A9BC 802A220C 24160008 */ addiu $s6, $zero, 8 -/* 79A9C0 802A2210 24150004 */ addiu $s5, $zero, 4 -/* 79A9C4 802A2214 3C03802A */ lui $v1, %hi(D_802A3554_79BD04) -/* 79A9C8 802A2218 24633554 */ addiu $v1, $v1, %lo(D_802A3554_79BD04) -/* 79A9CC 802A221C 0060A02D */ daddu $s4, $v1, $zero -/* 79A9D0 802A2220 3C02802A */ lui $v0, %hi(D_802A37F0) -/* 79A9D4 802A2224 8C4237F0 */ lw $v0, %lo(D_802A37F0)($v0) -/* 79A9D8 802A2228 3C11802A */ lui $s1, %hi(D_802A3514_79BCC4) -/* 79A9DC 802A222C 26313514 */ addiu $s1, $s1, %lo(D_802A3514_79BCC4) -/* 79A9E0 802A2230 8C42000C */ lw $v0, 0xc($v0) -/* 79A9E4 802A2234 2404005C */ addiu $a0, $zero, 0x5c -/* 79A9E8 802A2238 AFA20028 */ sw $v0, 0x28($sp) -.L802A223C: -/* 79A9EC 802A223C 8FC20078 */ lw $v0, 0x78($fp) -/* 79A9F0 802A2240 14400003 */ bnez $v0, .L802A2250 -/* 79A9F4 802A2244 00000000 */ nop -/* 79A9F8 802A2248 5240005F */ beql $s2, $zero, .L802A23C8 -/* 79A9FC 802A224C 26730004 */ addiu $s3, $s3, 4 -.L802A2250: -/* 79AA00 802A2250 8FA80028 */ lw $t0, 0x28($sp) -/* 79AA04 802A2254 8E220000 */ lw $v0, ($s1) -/* 79AA08 802A2258 04410015 */ bgez $v0, .L802A22B0 -/* 79AA0C 802A225C 01048021 */ addu $s0, $t0, $a0 -/* 79AA10 802A2260 02A31021 */ addu $v0, $s5, $v1 -/* 79AA14 802A2264 C6140010 */ lwc1 $f20, 0x10($s0) -/* 79AA18 802A2268 C6980000 */ lwc1 $f24, ($s4) -/* 79AA1C 802A226C C45C0000 */ lwc1 $f28, ($v0) -/* 79AA20 802A2270 02C31021 */ addu $v0, $s6, $v1 -/* 79AA24 802A2274 4614C181 */ sub.s $f6, $f24, $f20 -/* 79AA28 802A2278 C6160014 */ lwc1 $f22, 0x14($s0) -/* 79AA2C 802A227C C61E0018 */ lwc1 $f30, 0x18($s0) -/* 79AA30 802A2280 4616E001 */ sub.s $f0, $f28, $f22 -/* 79AA34 802A2284 C45A0000 */ lwc1 $f26, ($v0) -/* 79AA38 802A2288 461ED081 */ sub.s $f2, $f26, $f30 -/* 79AA3C 802A228C 4606A180 */ add.s $f6, $f20, $f6 -/* 79AA40 802A2290 4600B106 */ mov.s $f4, $f22 -/* 79AA44 802A2294 46002100 */ add.s $f4, $f4, $f0 -/* 79AA48 802A2298 4600F006 */ mov.s $f0, $f30 -/* 79AA4C 802A229C 46020000 */ add.s $f0, $f0, $f2 -/* 79AA50 802A22A0 E6060010 */ swc1 $f6, 0x10($s0) -/* 79AA54 802A22A4 E6040014 */ swc1 $f4, 0x14($s0) -/* 79AA58 802A22A8 080A88F1 */ j .L802A23C4 -/* 79AA5C 802A22AC E6000018 */ swc1 $f0, 0x18($s0) -.L802A22B0: -/* 79AA60 802A22B0 10400004 */ beqz $v0, .L802A22C4 -/* 79AA64 802A22B4 24170001 */ addiu $s7, $zero, 1 -/* 79AA68 802A22B8 2442FFFF */ addiu $v0, $v0, -1 -/* 79AA6C 802A22BC 080A88F1 */ j .L802A23C4 -/* 79AA70 802A22C0 AE220000 */ sw $v0, ($s1) -.L802A22C4: -/* 79AA74 802A22C4 C6140010 */ lwc1 $f20, 0x10($s0) -/* 79AA78 802A22C8 C6160014 */ lwc1 $f22, 0x14($s0) -/* 79AA7C 802A22CC C61E0018 */ lwc1 $f30, 0x18($s0) -/* 79AA80 802A22D0 8E020000 */ lw $v0, ($s0) -/* 79AA84 802A22D4 4600A306 */ mov.s $f12, $f20 -/* 79AA88 802A22D8 34420002 */ ori $v0, $v0, 2 -/* 79AA8C 802A22DC AE020000 */ sw $v0, ($s0) -/* 79AA90 802A22E0 02C31021 */ addu $v0, $s6, $v1 -/* 79AA94 802A22E4 C45A0000 */ lwc1 $f26, ($v0) -/* 79AA98 802A22E8 02A31021 */ addu $v0, $s5, $v1 -/* 79AA9C 802A22EC C6980000 */ lwc1 $f24, ($s4) -/* 79AAA0 802A22F0 C45C0000 */ lwc1 $f28, ($v0) -/* 79AAA4 802A22F4 4406C000 */ mfc1 $a2, $f24 -/* 79AAA8 802A22F8 4407D000 */ mfc1 $a3, $f26 -/* 79AAAC 802A22FC 4600F386 */ mov.s $f14, $f30 -/* 79AAB0 802A2300 AFA30030 */ sw $v1, 0x30($sp) -/* 79AAB4 802A2304 AFA40034 */ sw $a0, 0x34($sp) -/* 79AAB8 802A2308 0C00A7B5 */ jal dist2D -/* 79AABC 802A230C AFA50038 */ sw $a1, 0x38($sp) -/* 79AAC0 802A2310 3C08802A */ lui $t0, %hi(D_802A3818) -/* 79AAC4 802A2314 25083818 */ addiu $t0, $t0, %lo(D_802A3818) -/* 79AAC8 802A2318 4614C101 */ sub.s $f4, $f24, $f20 -/* 79AACC 802A231C 8FA50038 */ lw $a1, 0x38($sp) -/* 79AAD0 802A2320 C6020010 */ lwc1 $f2, 0x10($s0) -/* 79AAD4 802A2324 00A81021 */ addu $v0, $a1, $t0 -/* 79AAD8 802A2328 C4460000 */ lwc1 $f6, ($v0) -/* 79AADC 802A232C 468031A0 */ cvt.s.w $f6, $f6 -/* 79AAE0 802A2330 46062103 */ div.s $f4, $f4, $f6 -/* 79AAE4 802A2334 46041080 */ add.s $f2, $f2, $f4 -/* 79AAE8 802A2338 4616E101 */ sub.s $f4, $f28, $f22 -/* 79AAEC 802A233C E6020010 */ swc1 $f2, 0x10($s0) -/* 79AAF0 802A2340 C4460000 */ lwc1 $f6, ($v0) -/* 79AAF4 802A2344 468031A0 */ cvt.s.w $f6, $f6 -/* 79AAF8 802A2348 C6020014 */ lwc1 $f2, 0x14($s0) -/* 79AAFC 802A234C 46062103 */ div.s $f4, $f4, $f6 -/* 79AB00 802A2350 46041080 */ add.s $f2, $f2, $f4 -/* 79AB04 802A2354 461ED101 */ sub.s $f4, $f26, $f30 -/* 79AB08 802A2358 E6020014 */ swc1 $f2, 0x14($s0) -/* 79AB0C 802A235C C4460000 */ lwc1 $f6, ($v0) -/* 79AB10 802A2360 468031A0 */ cvt.s.w $f6, $f6 -/* 79AB14 802A2364 C6020018 */ lwc1 $f2, 0x18($s0) -/* 79AB18 802A2368 46062103 */ div.s $f4, $f4, $f6 -/* 79AB1C 802A236C 46041080 */ add.s $f2, $f2, $f4 -/* 79AB20 802A2370 E6020018 */ swc1 $f2, 0x18($s0) -/* 79AB24 802A2374 8C420000 */ lw $v0, ($v0) -/* 79AB28 802A2378 8FA30030 */ lw $v1, 0x30($sp) -/* 79AB2C 802A237C 8FA40034 */ lw $a0, 0x34($sp) -/* 79AB30 802A2380 14570007 */ bne $v0, $s7, .L802A23A0 -/* 79AB34 802A2384 46000106 */ mov.s $f4, $f0 -/* 79AB38 802A2388 2402FFFF */ addiu $v0, $zero, -1 -/* 79AB3C 802A238C AE220000 */ sw $v0, ($s1) -/* 79AB40 802A2390 E6180010 */ swc1 $f24, 0x10($s0) -/* 79AB44 802A2394 E61C0014 */ swc1 $f28, 0x14($s0) -/* 79AB48 802A2398 080A88EE */ j .L802A23B8 -/* 79AB4C 802A239C E61A0018 */ swc1 $f26, 0x18($s0) -.L802A23A0: -/* 79AB50 802A23A0 3C014270 */ lui $at, 0x4270 -/* 79AB54 802A23A4 44810000 */ mtc1 $at, $f0 -/* 79AB58 802A23A8 C6020014 */ lwc1 $f2, 0x14($s0) -/* 79AB5C 802A23AC 46002003 */ div.s $f0, $f4, $f0 -/* 79AB60 802A23B0 46001080 */ add.s $f2, $f2, $f0 -/* 79AB64 802A23B4 E6020014 */ swc1 $f2, 0x14($s0) -.L802A23B8: -/* 79AB68 802A23B8 8E620000 */ lw $v0, ($s3) -/* 79AB6C 802A23BC 2442FFFF */ addiu $v0, $v0, -1 -/* 79AB70 802A23C0 AE620000 */ sw $v0, ($s3) -.L802A23C4: -/* 79AB74 802A23C4 26730004 */ addiu $s3, $s3, 4 -.L802A23C8: -/* 79AB78 802A23C8 24A50004 */ addiu $a1, $a1, 4 -/* 79AB7C 802A23CC 26D6000C */ addiu $s6, $s6, 0xc -/* 79AB80 802A23D0 26B5000C */ addiu $s5, $s5, 0xc -/* 79AB84 802A23D4 2694000C */ addiu $s4, $s4, 0xc -/* 79AB88 802A23D8 26310004 */ addiu $s1, $s1, 4 -/* 79AB8C 802A23DC 26520001 */ addiu $s2, $s2, 1 -/* 79AB90 802A23E0 2A420008 */ slti $v0, $s2, 8 -/* 79AB94 802A23E4 1440FF95 */ bnez $v0, .L802A223C -/* 79AB98 802A23E8 2484001C */ addiu $a0, $a0, 0x1c -.L802A23EC: -/* 79AB9C 802A23EC 16E0000C */ bnez $s7, .L802A2420 -/* 79ABA0 802A23F0 0000102D */ daddu $v0, $zero, $zero -/* 79ABA4 802A23F4 3C03802A */ lui $v1, %hi(D_802A37F0) -/* 79ABA8 802A23F8 8C6337F0 */ lw $v1, %lo(D_802A37F0)($v1) -/* 79ABAC 802A23FC 24020002 */ addiu $v0, $zero, 2 -/* 79ABB0 802A2400 8C640000 */ lw $a0, ($v1) -/* 79ABB4 802A2404 0040282D */ daddu $a1, $v0, $zero -/* 79ABB8 802A2408 3C01802A */ lui $at, %hi(D_802A3838) -/* 79ABBC 802A240C AC253838 */ sw $a1, %lo(D_802A3838)($at) -/* 79ABC0 802A2410 34840010 */ ori $a0, $a0, 0x10 -/* 79ABC4 802A2414 080A8908 */ j .L802A2420 -/* 79ABC8 802A2418 AC640000 */ sw $a0, ($v1) -.L802A241C: -glabel L802A241C_79ABCC -/* 79ABCC 802A241C 0000102D */ daddu $v0, $zero, $zero -.L802A2420: -/* 79ABD0 802A2420 8FBF0064 */ lw $ra, 0x64($sp) -/* 79ABD4 802A2424 8FBE0060 */ lw $fp, 0x60($sp) -/* 79ABD8 802A2428 8FB7005C */ lw $s7, 0x5c($sp) -/* 79ABDC 802A242C 8FB60058 */ lw $s6, 0x58($sp) -/* 79ABE0 802A2430 8FB50054 */ lw $s5, 0x54($sp) -/* 79ABE4 802A2434 8FB40050 */ lw $s4, 0x50($sp) -/* 79ABE8 802A2438 8FB3004C */ lw $s3, 0x4c($sp) -/* 79ABEC 802A243C 8FB20048 */ lw $s2, 0x48($sp) -/* 79ABF0 802A2440 8FB10044 */ lw $s1, 0x44($sp) -/* 79ABF4 802A2444 8FB00040 */ lw $s0, 0x40($sp) -/* 79ABF8 802A2448 D7BE0090 */ ldc1 $f30, 0x90($sp) -/* 79ABFC 802A244C D7BC0088 */ ldc1 $f28, 0x88($sp) -/* 79AC00 802A2450 D7BA0080 */ ldc1 $f26, 0x80($sp) -/* 79AC04 802A2454 D7B80078 */ ldc1 $f24, 0x78($sp) -/* 79AC08 802A2458 D7B60070 */ ldc1 $f22, 0x70($sp) -/* 79AC0C 802A245C D7B40068 */ ldc1 $f20, 0x68($sp) -/* 79AC10 802A2460 03E00008 */ jr $ra -/* 79AC14 802A2464 27BD0098 */ addiu $sp, $sp, 0x98 diff --git a/ver/us/asm/nonmatchings/code_7997B0/func_802A2468_79AC18.s b/ver/us/asm/nonmatchings/code_7997B0/func_802A2468_79AC18.s deleted file mode 100644 index 7a0e2931e6..0000000000 --- a/ver/us/asm/nonmatchings/code_7997B0/func_802A2468_79AC18.s +++ /dev/null @@ -1,9 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A2468_79AC18 -/* 79AC18 802A2468 3C02802A */ lui $v0, %hi(D_802A3838) -/* 79AC1C 802A246C 8C423838 */ lw $v0, %lo(D_802A3838)($v0) -/* 79AC20 802A2470 AC820084 */ sw $v0, 0x84($a0) -/* 79AC24 802A2474 03E00008 */ jr $ra -/* 79AC28 802A2478 24020002 */ addiu $v0, $zero, 2 diff --git a/ver/us/asm/nonmatchings/code_7997B0/func_802A247C_79AC2C.s b/ver/us/asm/nonmatchings/code_7997B0/func_802A247C_79AC2C.s deleted file mode 100644 index db773de1b2..0000000000 --- a/ver/us/asm/nonmatchings/code_7997B0/func_802A247C_79AC2C.s +++ /dev/null @@ -1,36 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A247C_79AC2C -/* 79AC2C 802A247C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 79AC30 802A2480 AFB00010 */ sw $s0, 0x10($sp) -/* 79AC34 802A2484 0080802D */ daddu $s0, $a0, $zero -/* 79AC38 802A2488 10A00003 */ beqz $a1, .L802A2498 -/* 79AC3C 802A248C AFBF0014 */ sw $ra, 0x14($sp) -/* 79AC40 802A2490 240200E6 */ addiu $v0, $zero, 0xe6 -/* 79AC44 802A2494 AE020070 */ sw $v0, 0x70($s0) -.L802A2498: -/* 79AC48 802A2498 0000202D */ daddu $a0, $zero, $zero -/* 79AC4C 802A249C 0080282D */ daddu $a1, $a0, $zero -/* 79AC50 802A24A0 92070073 */ lbu $a3, 0x73($s0) -/* 79AC54 802A24A4 0C046F97 */ jal set_background_color_blend -/* 79AC58 802A24A8 0080302D */ daddu $a2, $a0, $zero -/* 79AC5C 802A24AC 8E020070 */ lw $v0, 0x70($s0) -/* 79AC60 802A24B0 2442FFFB */ addiu $v0, $v0, -5 -/* 79AC64 802A24B4 AE020070 */ sw $v0, 0x70($s0) -/* 79AC68 802A24B8 284200C9 */ slti $v0, $v0, 0xc9 -/* 79AC6C 802A24BC 14400003 */ bnez $v0, .L802A24CC -/* 79AC70 802A24C0 0000202D */ daddu $a0, $zero, $zero -/* 79AC74 802A24C4 080A8938 */ j .L802A24E0 -/* 79AC78 802A24C8 0000102D */ daddu $v0, $zero, $zero -.L802A24CC: -/* 79AC7C 802A24CC 0080282D */ daddu $a1, $a0, $zero -/* 79AC80 802A24D0 0080302D */ daddu $a2, $a0, $zero -/* 79AC84 802A24D4 0C046F97 */ jal set_background_color_blend -/* 79AC88 802A24D8 240700C8 */ addiu $a3, $zero, 0xc8 -/* 79AC8C 802A24DC 24020002 */ addiu $v0, $zero, 2 -.L802A24E0: -/* 79AC90 802A24E0 8FBF0014 */ lw $ra, 0x14($sp) -/* 79AC94 802A24E4 8FB00010 */ lw $s0, 0x10($sp) -/* 79AC98 802A24E8 03E00008 */ jr $ra -/* 79AC9C 802A24EC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/code_79BFA0/func_802A1000_79BFA0.s b/ver/us/asm/nonmatchings/code_79BFA0/func_802A1000_79BFA0.s deleted file mode 100644 index f2b5fffd2d..0000000000 --- a/ver/us/asm/nonmatchings/code_79BFA0/func_802A1000_79BFA0.s +++ /dev/null @@ -1,47 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1000_79BFA0 -/* 79BFA0 802A1000 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 79BFA4 802A1004 AFB1001C */ sw $s1, 0x1c($sp) -/* 79BFA8 802A1008 0080882D */ daddu $s1, $a0, $zero -/* 79BFAC 802A100C AFBF0024 */ sw $ra, 0x24($sp) -/* 79BFB0 802A1010 AFB20020 */ sw $s2, 0x20($sp) -/* 79BFB4 802A1014 AFB00018 */ sw $s0, 0x18($sp) -/* 79BFB8 802A1018 8E30000C */ lw $s0, 0xc($s1) -/* 79BFBC 802A101C 8E050000 */ lw $a1, ($s0) -/* 79BFC0 802A1020 0C0B1EAF */ jal get_variable -/* 79BFC4 802A1024 26100004 */ addiu $s0, $s0, 4 -/* 79BFC8 802A1028 8E050000 */ lw $a1, ($s0) -/* 79BFCC 802A102C 26100004 */ addiu $s0, $s0, 4 -/* 79BFD0 802A1030 0220202D */ daddu $a0, $s1, $zero -/* 79BFD4 802A1034 0C0B1EAF */ jal get_variable -/* 79BFD8 802A1038 0040902D */ daddu $s2, $v0, $zero -/* 79BFDC 802A103C 0220202D */ daddu $a0, $s1, $zero -/* 79BFE0 802A1040 8E050000 */ lw $a1, ($s0) -/* 79BFE4 802A1044 0C0B1EAF */ jal get_variable -/* 79BFE8 802A1048 0040802D */ daddu $s0, $v0, $zero -/* 79BFEC 802A104C 44921000 */ mtc1 $s2, $f2 -/* 79BFF0 802A1050 00000000 */ nop -/* 79BFF4 802A1054 468010A0 */ cvt.s.w $f2, $f2 -/* 79BFF8 802A1058 44051000 */ mfc1 $a1, $f2 -/* 79BFFC 802A105C 44901000 */ mtc1 $s0, $f2 -/* 79C000 802A1060 00000000 */ nop -/* 79C004 802A1064 468010A0 */ cvt.s.w $f2, $f2 -/* 79C008 802A1068 44061000 */ mfc1 $a2, $f2 -/* 79C00C 802A106C 44821000 */ mtc1 $v0, $f2 -/* 79C010 802A1070 00000000 */ nop -/* 79C014 802A1074 468010A0 */ cvt.s.w $f2, $f2 -/* 79C018 802A1078 3C014220 */ lui $at, 0x4220 -/* 79C01C 802A107C 44810000 */ mtc1 $at, $f0 -/* 79C020 802A1080 44071000 */ mfc1 $a3, $f2 -/* 79C024 802A1084 0000202D */ daddu $a0, $zero, $zero -/* 79C028 802A1088 0C01BFBC */ jal func_8006FEF0 -/* 79C02C 802A108C E7A00010 */ swc1 $f0, 0x10($sp) -/* 79C030 802A1090 8FBF0024 */ lw $ra, 0x24($sp) -/* 79C034 802A1094 8FB20020 */ lw $s2, 0x20($sp) -/* 79C038 802A1098 8FB1001C */ lw $s1, 0x1c($sp) -/* 79C03C 802A109C 8FB00018 */ lw $s0, 0x18($sp) -/* 79C040 802A10A0 24020002 */ addiu $v0, $zero, 2 -/* 79C044 802A10A4 03E00008 */ jr $ra -/* 79C048 802A10A8 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/code_79BFA0/func_802A10AC_79C04C.s b/ver/us/asm/nonmatchings/code_79BFA0/func_802A10AC_79C04C.s deleted file mode 100644 index d333785388..0000000000 --- a/ver/us/asm/nonmatchings/code_79BFA0/func_802A10AC_79C04C.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A10AC_79C04C -/* 79C04C 802A10AC 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 79C050 802A10B0 AFB10024 */ sw $s1, 0x24($sp) -/* 79C054 802A10B4 0080882D */ daddu $s1, $a0, $zero -/* 79C058 802A10B8 AFBF002C */ sw $ra, 0x2c($sp) -/* 79C05C 802A10BC AFB20028 */ sw $s2, 0x28($sp) -/* 79C060 802A10C0 AFB00020 */ sw $s0, 0x20($sp) -/* 79C064 802A10C4 8E30000C */ lw $s0, 0xc($s1) -/* 79C068 802A10C8 8E050000 */ lw $a1, ($s0) -/* 79C06C 802A10CC 0C0B1EAF */ jal get_variable -/* 79C070 802A10D0 26100004 */ addiu $s0, $s0, 4 -/* 79C074 802A10D4 8E050000 */ lw $a1, ($s0) -/* 79C078 802A10D8 26100004 */ addiu $s0, $s0, 4 -/* 79C07C 802A10DC 0220202D */ daddu $a0, $s1, $zero -/* 79C080 802A10E0 0C0B1EAF */ jal get_variable -/* 79C084 802A10E4 0040902D */ daddu $s2, $v0, $zero -/* 79C088 802A10E8 0220202D */ daddu $a0, $s1, $zero -/* 79C08C 802A10EC 8E050000 */ lw $a1, ($s0) -/* 79C090 802A10F0 0C0B1EAF */ jal get_variable -/* 79C094 802A10F4 0040802D */ daddu $s0, $v0, $zero -/* 79C098 802A10F8 24040005 */ addiu $a0, $zero, 5 -/* 79C09C 802A10FC 44921000 */ mtc1 $s2, $f2 -/* 79C0A0 802A1100 00000000 */ nop -/* 79C0A4 802A1104 468010A0 */ cvt.s.w $f2, $f2 -/* 79C0A8 802A1108 44051000 */ mfc1 $a1, $f2 -/* 79C0AC 802A110C 44901000 */ mtc1 $s0, $f2 -/* 79C0B0 802A1110 00000000 */ nop -/* 79C0B4 802A1114 468010A0 */ cvt.s.w $f2, $f2 -/* 79C0B8 802A1118 44061000 */ mfc1 $a2, $f2 -/* 79C0BC 802A111C 44821000 */ mtc1 $v0, $f2 -/* 79C0C0 802A1120 00000000 */ nop -/* 79C0C4 802A1124 468010A0 */ cvt.s.w $f2, $f2 -/* 79C0C8 802A1128 3C014248 */ lui $at, 0x4248 -/* 79C0CC 802A112C 44810000 */ mtc1 $at, $f0 -/* 79C0D0 802A1130 44071000 */ mfc1 $a3, $f2 -/* 79C0D4 802A1134 24030028 */ addiu $v1, $zero, 0x28 -/* 79C0D8 802A1138 AFA30018 */ sw $v1, 0x18($sp) -/* 79C0DC 802A113C 2403001E */ addiu $v1, $zero, 0x1e -/* 79C0E0 802A1140 AFA3001C */ sw $v1, 0x1c($sp) -/* 79C0E4 802A1144 E7A00010 */ swc1 $f0, 0x10($sp) -/* 79C0E8 802A1148 0C01C154 */ jal func_80070550 -/* 79C0EC 802A114C E7A00014 */ swc1 $f0, 0x14($sp) -/* 79C0F0 802A1150 8FBF002C */ lw $ra, 0x2c($sp) -/* 79C0F4 802A1154 8FB20028 */ lw $s2, 0x28($sp) -/* 79C0F8 802A1158 8FB10024 */ lw $s1, 0x24($sp) -/* 79C0FC 802A115C 8FB00020 */ lw $s0, 0x20($sp) -/* 79C100 802A1160 24020002 */ addiu $v0, $zero, 2 -/* 79C104 802A1164 03E00008 */ jr $ra -/* 79C108 802A1168 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/code_79BFA0/func_802A116C_79C10C.s b/ver/us/asm/nonmatchings/code_79BFA0/func_802A116C_79C10C.s deleted file mode 100644 index 0189e3a3b9..0000000000 --- a/ver/us/asm/nonmatchings/code_79BFA0/func_802A116C_79C10C.s +++ /dev/null @@ -1,47 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A116C_79C10C -/* 79C10C 802A116C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 79C110 802A1170 AFB1001C */ sw $s1, 0x1c($sp) -/* 79C114 802A1174 0080882D */ daddu $s1, $a0, $zero -/* 79C118 802A1178 AFBF0024 */ sw $ra, 0x24($sp) -/* 79C11C 802A117C AFB20020 */ sw $s2, 0x20($sp) -/* 79C120 802A1180 AFB00018 */ sw $s0, 0x18($sp) -/* 79C124 802A1184 8E30000C */ lw $s0, 0xc($s1) -/* 79C128 802A1188 8E050000 */ lw $a1, ($s0) -/* 79C12C 802A118C 0C0B1EAF */ jal get_variable -/* 79C130 802A1190 26100004 */ addiu $s0, $s0, 4 -/* 79C134 802A1194 8E050000 */ lw $a1, ($s0) -/* 79C138 802A1198 26100004 */ addiu $s0, $s0, 4 -/* 79C13C 802A119C 0220202D */ daddu $a0, $s1, $zero -/* 79C140 802A11A0 0C0B1EAF */ jal get_variable -/* 79C144 802A11A4 0040902D */ daddu $s2, $v0, $zero -/* 79C148 802A11A8 0220202D */ daddu $a0, $s1, $zero -/* 79C14C 802A11AC 8E050000 */ lw $a1, ($s0) -/* 79C150 802A11B0 0C0B1EAF */ jal get_variable -/* 79C154 802A11B4 0040802D */ daddu $s0, $v0, $zero -/* 79C158 802A11B8 44921000 */ mtc1 $s2, $f2 -/* 79C15C 802A11BC 00000000 */ nop -/* 79C160 802A11C0 468010A0 */ cvt.s.w $f2, $f2 -/* 79C164 802A11C4 44051000 */ mfc1 $a1, $f2 -/* 79C168 802A11C8 44901000 */ mtc1 $s0, $f2 -/* 79C16C 802A11CC 00000000 */ nop -/* 79C170 802A11D0 468010A0 */ cvt.s.w $f2, $f2 -/* 79C174 802A11D4 44061000 */ mfc1 $a2, $f2 -/* 79C178 802A11D8 44821000 */ mtc1 $v0, $f2 -/* 79C17C 802A11DC 00000000 */ nop -/* 79C180 802A11E0 468010A0 */ cvt.s.w $f2, $f2 -/* 79C184 802A11E4 3C0141F0 */ lui $at, 0x41f0 -/* 79C188 802A11E8 44810000 */ mtc1 $at, $f0 -/* 79C18C 802A11EC 44071000 */ mfc1 $a3, $f2 -/* 79C190 802A11F0 0000202D */ daddu $a0, $zero, $zero -/* 79C194 802A11F4 0C01BFBC */ jal func_8006FEF0 -/* 79C198 802A11F8 E7A00010 */ swc1 $f0, 0x10($sp) -/* 79C19C 802A11FC 8FBF0024 */ lw $ra, 0x24($sp) -/* 79C1A0 802A1200 8FB20020 */ lw $s2, 0x20($sp) -/* 79C1A4 802A1204 8FB1001C */ lw $s1, 0x1c($sp) -/* 79C1A8 802A1208 8FB00018 */ lw $s0, 0x18($sp) -/* 79C1AC 802A120C 24020002 */ addiu $v0, $zero, 2 -/* 79C1B0 802A1210 03E00008 */ jr $ra -/* 79C1B4 802A1214 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/code_79BFA0/func_802A1218_79C1B8.s b/ver/us/asm/nonmatchings/code_79BFA0/func_802A1218_79C1B8.s deleted file mode 100644 index bec665a6a3..0000000000 --- a/ver/us/asm/nonmatchings/code_79BFA0/func_802A1218_79C1B8.s +++ /dev/null @@ -1,55 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1218_79C1B8 -/* 79C1B8 802A1218 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* 79C1BC 802A121C AFB1002C */ sw $s1, 0x2c($sp) -/* 79C1C0 802A1220 0080882D */ daddu $s1, $a0, $zero -/* 79C1C4 802A1224 AFBF0034 */ sw $ra, 0x34($sp) -/* 79C1C8 802A1228 AFB20030 */ sw $s2, 0x30($sp) -/* 79C1CC 802A122C AFB00028 */ sw $s0, 0x28($sp) -/* 79C1D0 802A1230 8E30000C */ lw $s0, 0xc($s1) -/* 79C1D4 802A1234 8E050000 */ lw $a1, ($s0) -/* 79C1D8 802A1238 0C0B1EAF */ jal get_variable -/* 79C1DC 802A123C 26100004 */ addiu $s0, $s0, 4 -/* 79C1E0 802A1240 8E050000 */ lw $a1, ($s0) -/* 79C1E4 802A1244 26100004 */ addiu $s0, $s0, 4 -/* 79C1E8 802A1248 0220202D */ daddu $a0, $s1, $zero -/* 79C1EC 802A124C 0C0B1EAF */ jal get_variable -/* 79C1F0 802A1250 0040902D */ daddu $s2, $v0, $zero -/* 79C1F4 802A1254 0220202D */ daddu $a0, $s1, $zero -/* 79C1F8 802A1258 8E050000 */ lw $a1, ($s0) -/* 79C1FC 802A125C 0C0B1EAF */ jal get_variable -/* 79C200 802A1260 0040802D */ daddu $s0, $v0, $zero -/* 79C204 802A1264 24040004 */ addiu $a0, $zero, 4 -/* 79C208 802A1268 44922000 */ mtc1 $s2, $f4 -/* 79C20C 802A126C 00000000 */ nop -/* 79C210 802A1270 46802120 */ cvt.s.w $f4, $f4 -/* 79C214 802A1274 44052000 */ mfc1 $a1, $f4 -/* 79C218 802A1278 44902000 */ mtc1 $s0, $f4 -/* 79C21C 802A127C 00000000 */ nop -/* 79C220 802A1280 46802120 */ cvt.s.w $f4, $f4 -/* 79C224 802A1284 44062000 */ mfc1 $a2, $f4 -/* 79C228 802A1288 44822000 */ mtc1 $v0, $f4 -/* 79C22C 802A128C 00000000 */ nop -/* 79C230 802A1290 46802120 */ cvt.s.w $f4, $f4 -/* 79C234 802A1294 3C0141A0 */ lui $at, 0x41a0 -/* 79C238 802A1298 44810000 */ mtc1 $at, $f0 -/* 79C23C 802A129C 3C013F80 */ lui $at, 0x3f80 -/* 79C240 802A12A0 44811000 */ mtc1 $at, $f2 -/* 79C244 802A12A4 44072000 */ mfc1 $a3, $f4 -/* 79C248 802A12A8 2403000A */ addiu $v1, $zero, 0xa -/* 79C24C 802A12AC AFA3001C */ sw $v1, 0x1c($sp) -/* 79C250 802A12B0 2403000F */ addiu $v1, $zero, 0xf -/* 79C254 802A12B4 AFA30020 */ sw $v1, 0x20($sp) -/* 79C258 802A12B8 E7A00010 */ swc1 $f0, 0x10($sp) -/* 79C25C 802A12BC E7A00014 */ swc1 $f0, 0x14($sp) -/* 79C260 802A12C0 0C01C8D4 */ jal func_80072350 -/* 79C264 802A12C4 E7A20018 */ swc1 $f2, 0x18($sp) -/* 79C268 802A12C8 8FBF0034 */ lw $ra, 0x34($sp) -/* 79C26C 802A12CC 8FB20030 */ lw $s2, 0x30($sp) -/* 79C270 802A12D0 8FB1002C */ lw $s1, 0x2c($sp) -/* 79C274 802A12D4 8FB00028 */ lw $s0, 0x28($sp) -/* 79C278 802A12D8 24020002 */ addiu $v0, $zero, 2 -/* 79C27C 802A12DC 03E00008 */ jr $ra -/* 79C280 802A12E0 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/ver/us/asm/nonmatchings/code_79BFA0/func_802A137C_79C31C.s b/ver/us/asm/nonmatchings/code_79BFA0/func_802A137C_79C31C.s deleted file mode 100644 index 2f355df1c3..0000000000 --- a/ver/us/asm/nonmatchings/code_79BFA0/func_802A137C_79C31C.s +++ /dev/null @@ -1,44 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A137C_79C31C -/* 79C31C 802A137C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 79C320 802A1380 AFB00010 */ sw $s0, 0x10($sp) -/* 79C324 802A1384 0080802D */ daddu $s0, $a0, $zero -/* 79C328 802A1388 10A0000D */ beqz $a1, .L802A13C0 -/* 79C32C 802A138C AFBF0014 */ sw $ra, 0x14($sp) -/* 79C330 802A1390 0C04760B */ jal func_8011D82C -/* 79C334 802A1394 24040001 */ addiu $a0, $zero, 1 -/* 79C338 802A1398 0000202D */ daddu $a0, $zero, $zero -/* 79C33C 802A139C 0080282D */ daddu $a1, $a0, $zero -/* 79C340 802A13A0 0080302D */ daddu $a2, $a0, $zero -/* 79C344 802A13A4 0080382D */ daddu $a3, $a0, $zero -/* 79C348 802A13A8 3C038015 */ lui $v1, %hi(D_801512F0) -/* 79C34C 802A13AC 8C6312F0 */ lw $v1, %lo(D_801512F0)($v1) -/* 79C350 802A13B0 24020001 */ addiu $v0, $zero, 1 -/* 79C354 802A13B4 0C046F97 */ jal set_background_color_blend -/* 79C358 802A13B8 A0620000 */ sb $v0, ($v1) -/* 79C35C 802A13BC AE000070 */ sw $zero, 0x70($s0) -.L802A13C0: -/* 79C360 802A13C0 0000202D */ daddu $a0, $zero, $zero -/* 79C364 802A13C4 0080282D */ daddu $a1, $a0, $zero -/* 79C368 802A13C8 92070073 */ lbu $a3, 0x73($s0) -/* 79C36C 802A13CC 0C046F97 */ jal set_background_color_blend -/* 79C370 802A13D0 0080302D */ daddu $a2, $a0, $zero -/* 79C374 802A13D4 8E020070 */ lw $v0, 0x70($s0) -/* 79C378 802A13D8 2442000A */ addiu $v0, $v0, 0xa -/* 79C37C 802A13DC AE020070 */ sw $v0, 0x70($s0) -/* 79C380 802A13E0 284200E6 */ slti $v0, $v0, 0xe6 -/* 79C384 802A13E4 14400007 */ bnez $v0, .L802A1404 -/* 79C388 802A13E8 0000102D */ daddu $v0, $zero, $zero -/* 79C38C 802A13EC 0000202D */ daddu $a0, $zero, $zero -/* 79C390 802A13F0 0080282D */ daddu $a1, $a0, $zero -/* 79C394 802A13F4 0080302D */ daddu $a2, $a0, $zero -/* 79C398 802A13F8 0C046F97 */ jal set_background_color_blend -/* 79C39C 802A13FC 240700E6 */ addiu $a3, $zero, 0xe6 -/* 79C3A0 802A1400 24020002 */ addiu $v0, $zero, 2 -.L802A1404: -/* 79C3A4 802A1404 8FBF0014 */ lw $ra, 0x14($sp) -/* 79C3A8 802A1408 8FB00010 */ lw $s0, 0x10($sp) -/* 79C3AC 802A140C 03E00008 */ jr $ra -/* 79C3B0 802A1410 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/code_79BFA0/func_802A1414_79C3B4.s b/ver/us/asm/nonmatchings/code_79BFA0/func_802A1414_79C3B4.s deleted file mode 100644 index 8207aa615f..0000000000 --- a/ver/us/asm/nonmatchings/code_79BFA0/func_802A1414_79C3B4.s +++ /dev/null @@ -1,39 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1414_79C3B4 -/* 79C3B4 802A1414 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 79C3B8 802A1418 AFB00010 */ sw $s0, 0x10($sp) -/* 79C3BC 802A141C 0080802D */ daddu $s0, $a0, $zero -/* 79C3C0 802A1420 10A00003 */ beqz $a1, .L802A1430 -/* 79C3C4 802A1424 AFBF0014 */ sw $ra, 0x14($sp) -/* 79C3C8 802A1428 24020014 */ addiu $v0, $zero, 0x14 -/* 79C3CC 802A142C AE020070 */ sw $v0, 0x70($s0) -.L802A1430: -/* 79C3D0 802A1430 0000202D */ daddu $a0, $zero, $zero -/* 79C3D4 802A1434 0080282D */ daddu $a1, $a0, $zero -/* 79C3D8 802A1438 8E020070 */ lw $v0, 0x70($s0) -/* 79C3DC 802A143C 0080302D */ daddu $a2, $a0, $zero -/* 79C3E0 802A1440 00023880 */ sll $a3, $v0, 2 -/* 79C3E4 802A1444 00E23821 */ addu $a3, $a3, $v0 -/* 79C3E8 802A1448 00073840 */ sll $a3, $a3, 1 -/* 79C3EC 802A144C 0C046F97 */ jal set_background_color_blend -/* 79C3F0 802A1450 30E700FE */ andi $a3, $a3, 0xfe -/* 79C3F4 802A1454 8E020070 */ lw $v0, 0x70($s0) -/* 79C3F8 802A1458 2442FFFF */ addiu $v0, $v0, -1 -/* 79C3FC 802A145C 10400003 */ beqz $v0, .L802A146C -/* 79C400 802A1460 AE020070 */ sw $v0, 0x70($s0) -/* 79C404 802A1464 080A8521 */ j .L802A1484 -/* 79C408 802A1468 0000102D */ daddu $v0, $zero, $zero -.L802A146C: -/* 79C40C 802A146C 0000202D */ daddu $a0, $zero, $zero -/* 79C410 802A1470 0080282D */ daddu $a1, $a0, $zero -/* 79C414 802A1474 0080302D */ daddu $a2, $a0, $zero -/* 79C418 802A1478 0C046F97 */ jal set_background_color_blend -/* 79C41C 802A147C 0080382D */ daddu $a3, $a0, $zero -/* 79C420 802A1480 24020002 */ addiu $v0, $zero, 2 -.L802A1484: -/* 79C424 802A1484 8FBF0014 */ lw $ra, 0x14($sp) -/* 79C428 802A1488 8FB00010 */ lw $s0, 0x10($sp) -/* 79C42C 802A148C 03E00008 */ jr $ra -/* 79C430 802A1490 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/code_79BFA0/func_802A1494_79C434.s b/ver/us/asm/nonmatchings/code_79BFA0/func_802A1494_79C434.s deleted file mode 100644 index 7ee45c5cc4..0000000000 --- a/ver/us/asm/nonmatchings/code_79BFA0/func_802A1494_79C434.s +++ /dev/null @@ -1,25 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1494_79C434 -/* 79C434 802A1494 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 79C438 802A1498 AFBF0010 */ sw $ra, 0x10($sp) -/* 79C43C 802A149C 8C82000C */ lw $v0, 0xc($a0) -/* 79C440 802A14A0 0C0B1EAF */ jal get_variable -/* 79C444 802A14A4 8C450000 */ lw $a1, ($v0) -/* 79C448 802A14A8 3C058011 */ lui $a1, %hi(gPlayerData+0x12) -/* 79C44C 802A14AC 80A5F2A2 */ lb $a1, %lo(gPlayerData+0x12)($a1) -/* 79C450 802A14B0 24040100 */ addiu $a0, $zero, 0x100 -/* 79C454 802A14B4 00051880 */ sll $v1, $a1, 2 -/* 79C458 802A14B8 00651821 */ addu $v1, $v1, $a1 -/* 79C45C 802A14BC 00621821 */ addu $v1, $v1, $v0 -/* 79C460 802A14C0 00031880 */ sll $v1, $v1, 2 -/* 79C464 802A14C4 3C06802A */ lui $a2, %hi(D_8029C890) -/* 79C468 802A14C8 00C33021 */ addu $a2, $a2, $v1 -/* 79C46C 802A14CC 8CC6C890 */ lw $a2, %lo(D_8029C890)($a2) -/* 79C470 802A14D0 0C098F3F */ jal set_animation -/* 79C474 802A14D4 0000282D */ daddu $a1, $zero, $zero -/* 79C478 802A14D8 8FBF0010 */ lw $ra, 0x10($sp) -/* 79C47C 802A14DC 24020002 */ addiu $v0, $zero, 2 -/* 79C480 802A14E0 03E00008 */ jr $ra -/* 79C484 802A14E4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/code_79BFA0/func_802A14E8_79C488.s b/ver/us/asm/nonmatchings/code_79BFA0/func_802A14E8_79C488.s deleted file mode 100644 index 2f12beac8d..0000000000 --- a/ver/us/asm/nonmatchings/code_79BFA0/func_802A14E8_79C488.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A14E8_79C488 -/* 79C488 802A14E8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 79C48C 802A14EC AFBF0010 */ sw $ra, 0x10($sp) -/* 79C490 802A14F0 0C00EABB */ jal get_npc_unsafe -/* 79C494 802A14F4 24040064 */ addiu $a0, $zero, 0x64 -/* 79C498 802A14F8 0040202D */ daddu $a0, $v0, $zero -/* 79C49C 802A14FC 24030020 */ addiu $v1, $zero, 0x20 -/* 79C4A0 802A1500 A48300A8 */ sh $v1, 0xa8($a0) -/* 79C4A4 802A1504 A48300A6 */ sh $v1, 0xa6($a0) -/* 79C4A8 802A1508 8FBF0010 */ lw $ra, 0x10($sp) -/* 79C4AC 802A150C 24020002 */ addiu $v0, $zero, 2 -/* 79C4B0 802A1510 03E00008 */ jr $ra -/* 79C4B4 802A1514 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/code_79BFA0/func_802A1518_79C4B8.s b/ver/us/asm/nonmatchings/code_79BFA0/func_802A1518_79C4B8.s deleted file mode 100644 index 65b7e49e1c..0000000000 --- a/ver/us/asm/nonmatchings/code_79BFA0/func_802A1518_79C4B8.s +++ /dev/null @@ -1,10 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1518_79C4B8 -/* 79C4B8 802A1518 8C830084 */ lw $v1, 0x84($a0) -/* 79C4BC 802A151C 8C620004 */ lw $v0, 4($v1) -/* 79C4C0 802A1520 24420001 */ addiu $v0, $v0, 1 -/* 79C4C4 802A1524 AC620004 */ sw $v0, 4($v1) -/* 79C4C8 802A1528 03E00008 */ jr $ra -/* 79C4CC 802A152C 24020002 */ addiu $v0, $zero, 2 diff --git a/ver/us/asm/nonmatchings/code_79D8A0/func_802A1000_79D8A0.s b/ver/us/asm/nonmatchings/code_79D8A0/func_802A1000_79D8A0.s deleted file mode 100644 index ad98f40aac..0000000000 --- a/ver/us/asm/nonmatchings/code_79D8A0/func_802A1000_79D8A0.s +++ /dev/null @@ -1,47 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1000_79D8A0 -/* 79D8A0 802A1000 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 79D8A4 802A1004 AFB1001C */ sw $s1, 0x1c($sp) -/* 79D8A8 802A1008 0080882D */ daddu $s1, $a0, $zero -/* 79D8AC 802A100C AFBF0024 */ sw $ra, 0x24($sp) -/* 79D8B0 802A1010 AFB20020 */ sw $s2, 0x20($sp) -/* 79D8B4 802A1014 AFB00018 */ sw $s0, 0x18($sp) -/* 79D8B8 802A1018 8E30000C */ lw $s0, 0xc($s1) -/* 79D8BC 802A101C 8E050000 */ lw $a1, ($s0) -/* 79D8C0 802A1020 0C0B1EAF */ jal func_802C7ABC_7C435C -/* 79D8C4 802A1024 26100004 */ addiu $s0, $s0, 4 -/* 79D8C8 802A1028 8E050000 */ lw $a1, ($s0) -/* 79D8CC 802A102C 26100004 */ addiu $s0, $s0, 4 -/* 79D8D0 802A1030 0220202D */ daddu $a0, $s1, $zero -/* 79D8D4 802A1034 0C0B1EAF */ jal func_802C7ABC_7C435C -/* 79D8D8 802A1038 0040902D */ daddu $s2, $v0, $zero -/* 79D8DC 802A103C 0220202D */ daddu $a0, $s1, $zero -/* 79D8E0 802A1040 8E050000 */ lw $a1, ($s0) -/* 79D8E4 802A1044 0C0B1EAF */ jal func_802C7ABC_7C435C -/* 79D8E8 802A1048 0040802D */ daddu $s0, $v0, $zero -/* 79D8EC 802A104C 44921000 */ mtc1 $s2, $f2 -/* 79D8F0 802A1050 00000000 */ nop -/* 79D8F4 802A1054 468010A0 */ cvt.s.w $f2, $f2 -/* 79D8F8 802A1058 44051000 */ mfc1 $a1, $f2 -/* 79D8FC 802A105C 44901000 */ mtc1 $s0, $f2 -/* 79D900 802A1060 00000000 */ nop -/* 79D904 802A1064 468010A0 */ cvt.s.w $f2, $f2 -/* 79D908 802A1068 44061000 */ mfc1 $a2, $f2 -/* 79D90C 802A106C 44821000 */ mtc1 $v0, $f2 -/* 79D910 802A1070 00000000 */ nop -/* 79D914 802A1074 468010A0 */ cvt.s.w $f2, $f2 -/* 79D918 802A1078 3C014220 */ lui $at, 0x4220 -/* 79D91C 802A107C 44810000 */ mtc1 $at, $f0 -/* 79D920 802A1080 44071000 */ mfc1 $a3, $f2 -/* 79D924 802A1084 0000202D */ daddu $a0, $zero, $zero -/* 79D928 802A1088 0C01BFBC */ jal func_8006FEF0 -/* 79D92C 802A108C E7A00010 */ swc1 $f0, 0x10($sp) -/* 79D930 802A1090 8FBF0024 */ lw $ra, 0x24($sp) -/* 79D934 802A1094 8FB20020 */ lw $s2, 0x20($sp) -/* 79D938 802A1098 8FB1001C */ lw $s1, 0x1c($sp) -/* 79D93C 802A109C 8FB00018 */ lw $s0, 0x18($sp) -/* 79D940 802A10A0 24020002 */ addiu $v0, $zero, 2 -/* 79D944 802A10A4 03E00008 */ jr $ra -/* 79D948 802A10A8 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/code_79D8A0/func_802A10AC_79D94C.s b/ver/us/asm/nonmatchings/code_79D8A0/func_802A10AC_79D94C.s deleted file mode 100644 index 7047e7f969..0000000000 --- a/ver/us/asm/nonmatchings/code_79D8A0/func_802A10AC_79D94C.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A10AC_79D94C -/* 79D94C 802A10AC 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 79D950 802A10B0 AFB10024 */ sw $s1, 0x24($sp) -/* 79D954 802A10B4 0080882D */ daddu $s1, $a0, $zero -/* 79D958 802A10B8 AFBF002C */ sw $ra, 0x2c($sp) -/* 79D95C 802A10BC AFB20028 */ sw $s2, 0x28($sp) -/* 79D960 802A10C0 AFB00020 */ sw $s0, 0x20($sp) -/* 79D964 802A10C4 8E30000C */ lw $s0, 0xc($s1) -/* 79D968 802A10C8 8E050000 */ lw $a1, ($s0) -/* 79D96C 802A10CC 0C0B1EAF */ jal func_802C7ABC_7C435C -/* 79D970 802A10D0 26100004 */ addiu $s0, $s0, 4 -/* 79D974 802A10D4 8E050000 */ lw $a1, ($s0) -/* 79D978 802A10D8 26100004 */ addiu $s0, $s0, 4 -/* 79D97C 802A10DC 0220202D */ daddu $a0, $s1, $zero -/* 79D980 802A10E0 0C0B1EAF */ jal func_802C7ABC_7C435C -/* 79D984 802A10E4 0040902D */ daddu $s2, $v0, $zero -/* 79D988 802A10E8 0220202D */ daddu $a0, $s1, $zero -/* 79D98C 802A10EC 8E050000 */ lw $a1, ($s0) -/* 79D990 802A10F0 0C0B1EAF */ jal func_802C7ABC_7C435C -/* 79D994 802A10F4 0040802D */ daddu $s0, $v0, $zero -/* 79D998 802A10F8 24040005 */ addiu $a0, $zero, 5 -/* 79D99C 802A10FC 44921000 */ mtc1 $s2, $f2 -/* 79D9A0 802A1100 00000000 */ nop -/* 79D9A4 802A1104 468010A0 */ cvt.s.w $f2, $f2 -/* 79D9A8 802A1108 44051000 */ mfc1 $a1, $f2 -/* 79D9AC 802A110C 44901000 */ mtc1 $s0, $f2 -/* 79D9B0 802A1110 00000000 */ nop -/* 79D9B4 802A1114 468010A0 */ cvt.s.w $f2, $f2 -/* 79D9B8 802A1118 44061000 */ mfc1 $a2, $f2 -/* 79D9BC 802A111C 44821000 */ mtc1 $v0, $f2 -/* 79D9C0 802A1120 00000000 */ nop -/* 79D9C4 802A1124 468010A0 */ cvt.s.w $f2, $f2 -/* 79D9C8 802A1128 3C014248 */ lui $at, 0x4248 -/* 79D9CC 802A112C 44810000 */ mtc1 $at, $f0 -/* 79D9D0 802A1130 44071000 */ mfc1 $a3, $f2 -/* 79D9D4 802A1134 24030028 */ addiu $v1, $zero, 0x28 -/* 79D9D8 802A1138 AFA30018 */ sw $v1, 0x18($sp) -/* 79D9DC 802A113C 2403001E */ addiu $v1, $zero, 0x1e -/* 79D9E0 802A1140 AFA3001C */ sw $v1, 0x1c($sp) -/* 79D9E4 802A1144 E7A00010 */ swc1 $f0, 0x10($sp) -/* 79D9E8 802A1148 0C01C154 */ jal func_80070550 -/* 79D9EC 802A114C E7A00014 */ swc1 $f0, 0x14($sp) -/* 79D9F0 802A1150 8FBF002C */ lw $ra, 0x2c($sp) -/* 79D9F4 802A1154 8FB20028 */ lw $s2, 0x28($sp) -/* 79D9F8 802A1158 8FB10024 */ lw $s1, 0x24($sp) -/* 79D9FC 802A115C 8FB00020 */ lw $s0, 0x20($sp) -/* 79DA00 802A1160 24020002 */ addiu $v0, $zero, 2 -/* 79DA04 802A1164 03E00008 */ jr $ra -/* 79DA08 802A1168 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/code_79D8A0/func_802A116C_79DA0C.s b/ver/us/asm/nonmatchings/code_79D8A0/func_802A116C_79DA0C.s deleted file mode 100644 index 2ad40aee16..0000000000 --- a/ver/us/asm/nonmatchings/code_79D8A0/func_802A116C_79DA0C.s +++ /dev/null @@ -1,47 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A116C_79DA0C -/* 79DA0C 802A116C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 79DA10 802A1170 AFB1001C */ sw $s1, 0x1c($sp) -/* 79DA14 802A1174 0080882D */ daddu $s1, $a0, $zero -/* 79DA18 802A1178 AFBF0024 */ sw $ra, 0x24($sp) -/* 79DA1C 802A117C AFB20020 */ sw $s2, 0x20($sp) -/* 79DA20 802A1180 AFB00018 */ sw $s0, 0x18($sp) -/* 79DA24 802A1184 8E30000C */ lw $s0, 0xc($s1) -/* 79DA28 802A1188 8E050000 */ lw $a1, ($s0) -/* 79DA2C 802A118C 0C0B1EAF */ jal func_802C7ABC_7C435C -/* 79DA30 802A1190 26100004 */ addiu $s0, $s0, 4 -/* 79DA34 802A1194 8E050000 */ lw $a1, ($s0) -/* 79DA38 802A1198 26100004 */ addiu $s0, $s0, 4 -/* 79DA3C 802A119C 0220202D */ daddu $a0, $s1, $zero -/* 79DA40 802A11A0 0C0B1EAF */ jal func_802C7ABC_7C435C -/* 79DA44 802A11A4 0040902D */ daddu $s2, $v0, $zero -/* 79DA48 802A11A8 0220202D */ daddu $a0, $s1, $zero -/* 79DA4C 802A11AC 8E050000 */ lw $a1, ($s0) -/* 79DA50 802A11B0 0C0B1EAF */ jal func_802C7ABC_7C435C -/* 79DA54 802A11B4 0040802D */ daddu $s0, $v0, $zero -/* 79DA58 802A11B8 44921000 */ mtc1 $s2, $f2 -/* 79DA5C 802A11BC 00000000 */ nop -/* 79DA60 802A11C0 468010A0 */ cvt.s.w $f2, $f2 -/* 79DA64 802A11C4 44051000 */ mfc1 $a1, $f2 -/* 79DA68 802A11C8 44901000 */ mtc1 $s0, $f2 -/* 79DA6C 802A11CC 00000000 */ nop -/* 79DA70 802A11D0 468010A0 */ cvt.s.w $f2, $f2 -/* 79DA74 802A11D4 44061000 */ mfc1 $a2, $f2 -/* 79DA78 802A11D8 44821000 */ mtc1 $v0, $f2 -/* 79DA7C 802A11DC 00000000 */ nop -/* 79DA80 802A11E0 468010A0 */ cvt.s.w $f2, $f2 -/* 79DA84 802A11E4 3C0141F0 */ lui $at, 0x41f0 -/* 79DA88 802A11E8 44810000 */ mtc1 $at, $f0 -/* 79DA8C 802A11EC 44071000 */ mfc1 $a3, $f2 -/* 79DA90 802A11F0 0000202D */ daddu $a0, $zero, $zero -/* 79DA94 802A11F4 0C01BFBC */ jal func_8006FEF0 -/* 79DA98 802A11F8 E7A00010 */ swc1 $f0, 0x10($sp) -/* 79DA9C 802A11FC 8FBF0024 */ lw $ra, 0x24($sp) -/* 79DAA0 802A1200 8FB20020 */ lw $s2, 0x20($sp) -/* 79DAA4 802A1204 8FB1001C */ lw $s1, 0x1c($sp) -/* 79DAA8 802A1208 8FB00018 */ lw $s0, 0x18($sp) -/* 79DAAC 802A120C 24020002 */ addiu $v0, $zero, 2 -/* 79DAB0 802A1210 03E00008 */ jr $ra -/* 79DAB4 802A1214 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/code_79D8A0/func_802A1218_79DAB8.s b/ver/us/asm/nonmatchings/code_79D8A0/func_802A1218_79DAB8.s deleted file mode 100644 index df60680d9b..0000000000 --- a/ver/us/asm/nonmatchings/code_79D8A0/func_802A1218_79DAB8.s +++ /dev/null @@ -1,55 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1218_79DAB8 -/* 79DAB8 802A1218 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* 79DABC 802A121C AFB1002C */ sw $s1, 0x2c($sp) -/* 79DAC0 802A1220 0080882D */ daddu $s1, $a0, $zero -/* 79DAC4 802A1224 AFBF0034 */ sw $ra, 0x34($sp) -/* 79DAC8 802A1228 AFB20030 */ sw $s2, 0x30($sp) -/* 79DACC 802A122C AFB00028 */ sw $s0, 0x28($sp) -/* 79DAD0 802A1230 8E30000C */ lw $s0, 0xc($s1) -/* 79DAD4 802A1234 8E050000 */ lw $a1, ($s0) -/* 79DAD8 802A1238 0C0B1EAF */ jal func_802C7ABC_7C435C -/* 79DADC 802A123C 26100004 */ addiu $s0, $s0, 4 -/* 79DAE0 802A1240 8E050000 */ lw $a1, ($s0) -/* 79DAE4 802A1244 26100004 */ addiu $s0, $s0, 4 -/* 79DAE8 802A1248 0220202D */ daddu $a0, $s1, $zero -/* 79DAEC 802A124C 0C0B1EAF */ jal func_802C7ABC_7C435C -/* 79DAF0 802A1250 0040902D */ daddu $s2, $v0, $zero -/* 79DAF4 802A1254 0220202D */ daddu $a0, $s1, $zero -/* 79DAF8 802A1258 8E050000 */ lw $a1, ($s0) -/* 79DAFC 802A125C 0C0B1EAF */ jal func_802C7ABC_7C435C -/* 79DB00 802A1260 0040802D */ daddu $s0, $v0, $zero -/* 79DB04 802A1264 24040004 */ addiu $a0, $zero, 4 -/* 79DB08 802A1268 44922000 */ mtc1 $s2, $f4 -/* 79DB0C 802A126C 00000000 */ nop -/* 79DB10 802A1270 46802120 */ cvt.s.w $f4, $f4 -/* 79DB14 802A1274 44052000 */ mfc1 $a1, $f4 -/* 79DB18 802A1278 44902000 */ mtc1 $s0, $f4 -/* 79DB1C 802A127C 00000000 */ nop -/* 79DB20 802A1280 46802120 */ cvt.s.w $f4, $f4 -/* 79DB24 802A1284 44062000 */ mfc1 $a2, $f4 -/* 79DB28 802A1288 44822000 */ mtc1 $v0, $f4 -/* 79DB2C 802A128C 00000000 */ nop -/* 79DB30 802A1290 46802120 */ cvt.s.w $f4, $f4 -/* 79DB34 802A1294 3C0141A0 */ lui $at, 0x41a0 -/* 79DB38 802A1298 44810000 */ mtc1 $at, $f0 -/* 79DB3C 802A129C 3C013F80 */ lui $at, 0x3f80 -/* 79DB40 802A12A0 44811000 */ mtc1 $at, $f2 -/* 79DB44 802A12A4 44072000 */ mfc1 $a3, $f4 -/* 79DB48 802A12A8 2403000A */ addiu $v1, $zero, 0xa -/* 79DB4C 802A12AC AFA3001C */ sw $v1, 0x1c($sp) -/* 79DB50 802A12B0 2403000F */ addiu $v1, $zero, 0xf -/* 79DB54 802A12B4 AFA30020 */ sw $v1, 0x20($sp) -/* 79DB58 802A12B8 E7A00010 */ swc1 $f0, 0x10($sp) -/* 79DB5C 802A12BC E7A00014 */ swc1 $f0, 0x14($sp) -/* 79DB60 802A12C0 0C01C8D4 */ jal func_80072350 -/* 79DB64 802A12C4 E7A20018 */ swc1 $f2, 0x18($sp) -/* 79DB68 802A12C8 8FBF0034 */ lw $ra, 0x34($sp) -/* 79DB6C 802A12CC 8FB20030 */ lw $s2, 0x30($sp) -/* 79DB70 802A12D0 8FB1002C */ lw $s1, 0x2c($sp) -/* 79DB74 802A12D4 8FB00028 */ lw $s0, 0x28($sp) -/* 79DB78 802A12D8 24020002 */ addiu $v0, $zero, 2 -/* 79DB7C 802A12DC 03E00008 */ jr $ra -/* 79DB80 802A12E0 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/ver/us/asm/nonmatchings/code_79D8A0/func_802A137C_79DC1C.s b/ver/us/asm/nonmatchings/code_79D8A0/func_802A137C_79DC1C.s deleted file mode 100644 index b5f69a283b..0000000000 --- a/ver/us/asm/nonmatchings/code_79D8A0/func_802A137C_79DC1C.s +++ /dev/null @@ -1,44 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A137C_79DC1C -/* 79DC1C 802A137C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 79DC20 802A1380 AFB00010 */ sw $s0, 0x10($sp) -/* 79DC24 802A1384 0080802D */ daddu $s0, $a0, $zero -/* 79DC28 802A1388 10A0000D */ beqz $a1, .L802A13C0 -/* 79DC2C 802A138C AFBF0014 */ sw $ra, 0x14($sp) -/* 79DC30 802A1390 0C04760B */ jal func_8011D82C -/* 79DC34 802A1394 24040001 */ addiu $a0, $zero, 1 -/* 79DC38 802A1398 0000202D */ daddu $a0, $zero, $zero -/* 79DC3C 802A139C 0080282D */ daddu $a1, $a0, $zero -/* 79DC40 802A13A0 0080302D */ daddu $a2, $a0, $zero -/* 79DC44 802A13A4 0080382D */ daddu $a3, $a0, $zero -/* 79DC48 802A13A8 3C038015 */ lui $v1, %hi(D_801512F0) -/* 79DC4C 802A13AC 8C6312F0 */ lw $v1, %lo(D_801512F0)($v1) -/* 79DC50 802A13B0 24020001 */ addiu $v0, $zero, 1 -/* 79DC54 802A13B4 0C046F97 */ jal set_background_color_blend -/* 79DC58 802A13B8 A0620000 */ sb $v0, ($v1) -/* 79DC5C 802A13BC AE000070 */ sw $zero, 0x70($s0) -.L802A13C0: -/* 79DC60 802A13C0 0000202D */ daddu $a0, $zero, $zero -/* 79DC64 802A13C4 0080282D */ daddu $a1, $a0, $zero -/* 79DC68 802A13C8 92070073 */ lbu $a3, 0x73($s0) -/* 79DC6C 802A13CC 0C046F97 */ jal set_background_color_blend -/* 79DC70 802A13D0 0080302D */ daddu $a2, $a0, $zero -/* 79DC74 802A13D4 8E020070 */ lw $v0, 0x70($s0) -/* 79DC78 802A13D8 2442000A */ addiu $v0, $v0, 0xa -/* 79DC7C 802A13DC AE020070 */ sw $v0, 0x70($s0) -/* 79DC80 802A13E0 284200E6 */ slti $v0, $v0, 0xe6 -/* 79DC84 802A13E4 14400007 */ bnez $v0, .L802A1404 -/* 79DC88 802A13E8 0000102D */ daddu $v0, $zero, $zero -/* 79DC8C 802A13EC 0000202D */ daddu $a0, $zero, $zero -/* 79DC90 802A13F0 0080282D */ daddu $a1, $a0, $zero -/* 79DC94 802A13F4 0080302D */ daddu $a2, $a0, $zero -/* 79DC98 802A13F8 0C046F97 */ jal set_background_color_blend -/* 79DC9C 802A13FC 240700E6 */ addiu $a3, $zero, 0xe6 -/* 79DCA0 802A1400 24020002 */ addiu $v0, $zero, 2 -.L802A1404: -/* 79DCA4 802A1404 8FBF0014 */ lw $ra, 0x14($sp) -/* 79DCA8 802A1408 8FB00010 */ lw $s0, 0x10($sp) -/* 79DCAC 802A140C 03E00008 */ jr $ra -/* 79DCB0 802A1410 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/code_79D8A0/func_802A1414_79DCB4.s b/ver/us/asm/nonmatchings/code_79D8A0/func_802A1414_79DCB4.s deleted file mode 100644 index 98a31379d2..0000000000 --- a/ver/us/asm/nonmatchings/code_79D8A0/func_802A1414_79DCB4.s +++ /dev/null @@ -1,39 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1414_79DCB4 -/* 79DCB4 802A1414 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 79DCB8 802A1418 AFB00010 */ sw $s0, 0x10($sp) -/* 79DCBC 802A141C 0080802D */ daddu $s0, $a0, $zero -/* 79DCC0 802A1420 10A00003 */ beqz $a1, .L802A1430 -/* 79DCC4 802A1424 AFBF0014 */ sw $ra, 0x14($sp) -/* 79DCC8 802A1428 24020014 */ addiu $v0, $zero, 0x14 -/* 79DCCC 802A142C AE020070 */ sw $v0, 0x70($s0) -.L802A1430: -/* 79DCD0 802A1430 0000202D */ daddu $a0, $zero, $zero -/* 79DCD4 802A1434 0080282D */ daddu $a1, $a0, $zero -/* 79DCD8 802A1438 8E020070 */ lw $v0, 0x70($s0) -/* 79DCDC 802A143C 0080302D */ daddu $a2, $a0, $zero -/* 79DCE0 802A1440 00023880 */ sll $a3, $v0, 2 -/* 79DCE4 802A1444 00E23821 */ addu $a3, $a3, $v0 -/* 79DCE8 802A1448 00073840 */ sll $a3, $a3, 1 -/* 79DCEC 802A144C 0C046F97 */ jal set_background_color_blend -/* 79DCF0 802A1450 30E700FE */ andi $a3, $a3, 0xfe -/* 79DCF4 802A1454 8E020070 */ lw $v0, 0x70($s0) -/* 79DCF8 802A1458 2442FFFF */ addiu $v0, $v0, -1 -/* 79DCFC 802A145C 10400003 */ beqz $v0, .L802A146C -/* 79DD00 802A1460 AE020070 */ sw $v0, 0x70($s0) -/* 79DD04 802A1464 080A8521 */ j .L802A1484 -/* 79DD08 802A1468 0000102D */ daddu $v0, $zero, $zero -.L802A146C: -/* 79DD0C 802A146C 0000202D */ daddu $a0, $zero, $zero -/* 79DD10 802A1470 0080282D */ daddu $a1, $a0, $zero -/* 79DD14 802A1474 0080302D */ daddu $a2, $a0, $zero -/* 79DD18 802A1478 0C046F97 */ jal set_background_color_blend -/* 79DD1C 802A147C 0080382D */ daddu $a3, $a0, $zero -/* 79DD20 802A1480 24020002 */ addiu $v0, $zero, 2 -.L802A1484: -/* 79DD24 802A1484 8FBF0014 */ lw $ra, 0x14($sp) -/* 79DD28 802A1488 8FB00010 */ lw $s0, 0x10($sp) -/* 79DD2C 802A148C 03E00008 */ jr $ra -/* 79DD30 802A1490 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/code_79D8A0/func_802A1494_79DD34.s b/ver/us/asm/nonmatchings/code_79D8A0/func_802A1494_79DD34.s deleted file mode 100644 index 6f1b87f42c..0000000000 --- a/ver/us/asm/nonmatchings/code_79D8A0/func_802A1494_79DD34.s +++ /dev/null @@ -1,25 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1494_79DD34 -/* 79DD34 802A1494 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 79DD38 802A1498 AFBF0010 */ sw $ra, 0x10($sp) -/* 79DD3C 802A149C 8C82000C */ lw $v0, 0xc($a0) -/* 79DD40 802A14A0 0C0B1EAF */ jal func_802C7ABC_7C435C -/* 79DD44 802A14A4 8C450000 */ lw $a1, ($v0) -/* 79DD48 802A14A8 3C058011 */ lui $a1, %hi(gPlayerData+0x12) -/* 79DD4C 802A14AC 80A5F2A2 */ lb $a1, %lo(gPlayerData+0x12)($a1) -/* 79DD50 802A14B0 24040100 */ addiu $a0, $zero, 0x100 -/* 79DD54 802A14B4 00051880 */ sll $v1, $a1, 2 -/* 79DD58 802A14B8 00651821 */ addu $v1, $v1, $a1 -/* 79DD5C 802A14BC 00621821 */ addu $v1, $v1, $v0 -/* 79DD60 802A14C0 00031880 */ sll $v1, $v1, 2 -/* 79DD64 802A14C4 3C06802A */ lui $a2, %hi(D_8029C890) -/* 79DD68 802A14C8 00C33021 */ addu $a2, $a2, $v1 -/* 79DD6C 802A14CC 8CC6C890 */ lw $a2, %lo(D_8029C890)($a2) -/* 79DD70 802A14D0 0C098F3F */ jal set_animation -/* 79DD74 802A14D4 0000282D */ daddu $a1, $zero, $zero -/* 79DD78 802A14D8 8FBF0010 */ lw $ra, 0x10($sp) -/* 79DD7C 802A14DC 24020002 */ addiu $v0, $zero, 2 -/* 79DD80 802A14E0 03E00008 */ jr $ra -/* 79DD84 802A14E4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/code_79D8A0/func_802A14E8_79DD88.s b/ver/us/asm/nonmatchings/code_79D8A0/func_802A14E8_79DD88.s deleted file mode 100644 index 57b4a98bc2..0000000000 --- a/ver/us/asm/nonmatchings/code_79D8A0/func_802A14E8_79DD88.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A14E8_79DD88 -/* 79DD88 802A14E8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 79DD8C 802A14EC AFBF0010 */ sw $ra, 0x10($sp) -/* 79DD90 802A14F0 0C00EABB */ jal get_npc_unsafe -/* 79DD94 802A14F4 24040064 */ addiu $a0, $zero, 0x64 -/* 79DD98 802A14F8 0040202D */ daddu $a0, $v0, $zero -/* 79DD9C 802A14FC 24030020 */ addiu $v1, $zero, 0x20 -/* 79DDA0 802A1500 A48300A8 */ sh $v1, 0xa8($a0) -/* 79DDA4 802A1504 A48300A6 */ sh $v1, 0xa6($a0) -/* 79DDA8 802A1508 8FBF0010 */ lw $ra, 0x10($sp) -/* 79DDAC 802A150C 24020002 */ addiu $v0, $zero, 2 -/* 79DDB0 802A1510 03E00008 */ jr $ra -/* 79DDB4 802A1514 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/code_79D8A0/func_802A1518_79DDB8.s b/ver/us/asm/nonmatchings/code_79D8A0/func_802A1518_79DDB8.s deleted file mode 100644 index aeef15e727..0000000000 --- a/ver/us/asm/nonmatchings/code_79D8A0/func_802A1518_79DDB8.s +++ /dev/null @@ -1,45 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1518_79DDB8 -/* 79DDB8 802A1518 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 79DDBC 802A151C 24040030 */ addiu $a0, $zero, 0x30 -/* 79DDC0 802A1520 AFB00010 */ sw $s0, 0x10($sp) -/* 79DDC4 802A1524 3C108011 */ lui $s0, %hi(gPlayerData) -/* 79DDC8 802A1528 2610F290 */ addiu $s0, $s0, %lo(gPlayerData) -/* 79DDCC 802A152C AFB10014 */ sw $s1, 0x14($sp) -/* 79DDD0 802A1530 AFBF0018 */ sw $ra, 0x18($sp) -/* 79DDD4 802A1534 0C03A752 */ jal is_ability_active -/* 79DDD8 802A1538 0200882D */ daddu $s1, $s0, $zero -/* 79DDDC 802A153C 10400004 */ beqz $v0, .L802A1550 -/* 79DDE0 802A1540 00000000 */ nop -/* 79DDE4 802A1544 96020290 */ lhu $v0, 0x290($s0) -/* 79DDE8 802A1548 24420080 */ addiu $v0, $v0, 0x80 -/* 79DDEC 802A154C A6020290 */ sh $v0, 0x290($s0) -.L802A1550: -/* 79DDF0 802A1550 0C03A752 */ jal is_ability_active -/* 79DDF4 802A1554 24040031 */ addiu $a0, $zero, 0x31 -/* 79DDF8 802A1558 10400004 */ beqz $v0, .L802A156C -/* 79DDFC 802A155C 00000000 */ nop -/* 79DE00 802A1560 96020290 */ lhu $v0, 0x290($s0) -/* 79DE04 802A1564 24420100 */ addiu $v0, $v0, 0x100 -/* 79DE08 802A1568 A6020290 */ sh $v0, 0x290($s0) -.L802A156C: -/* 79DE0C 802A156C 96220290 */ lhu $v0, 0x290($s1) -/* 79DE10 802A1570 8223028E */ lb $v1, 0x28e($s1) -/* 79DE14 802A1574 24420080 */ addiu $v0, $v0, 0x80 -/* 79DE18 802A1578 A6220290 */ sh $v0, 0x290($s1) -/* 79DE1C 802A157C 00021400 */ sll $v0, $v0, 0x10 -/* 79DE20 802A1580 00021403 */ sra $v0, $v0, 0x10 -/* 79DE24 802A1584 00031A00 */ sll $v1, $v1, 8 -/* 79DE28 802A1588 0043102A */ slt $v0, $v0, $v1 -/* 79DE2C 802A158C 50400001 */ beql $v0, $zero, .L802A1594 -/* 79DE30 802A1590 A6230290 */ sh $v1, 0x290($s1) -.L802A1594: -/* 79DE34 802A1594 8FBF0018 */ lw $ra, 0x18($sp) -/* 79DE38 802A1598 8FB10014 */ lw $s1, 0x14($sp) -/* 79DE3C 802A159C 8FB00010 */ lw $s0, 0x10($sp) -/* 79DE40 802A15A0 24020002 */ addiu $v0, $zero, 2 -/* 79DE44 802A15A4 03E00008 */ jr $ra -/* 79DE48 802A15A8 27BD0020 */ addiu $sp, $sp, 0x20 -/* 79DE4C 802A15AC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/code_7B440/func_800E24F8.s b/ver/us/asm/nonmatchings/code_7B440/func_800E24F8.s index 17bcacc068..2037c392dd 100644 --- a/ver/us/asm/nonmatchings/code_7B440/func_800E24F8.s +++ b/ver/us/asm/nonmatchings/code_7B440/func_800E24F8.s @@ -1,6 +1,16 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches +.section .rodata + +glabel D_8010BD30 +.double 180.0 + +glabel jtbl_8010BD38 +.word L800E25A4_7BA54, L800E25A4_7BA54, L800E2594_7BA44, L800E2630_7BAE0, L800E2630_7BAE0, L800E2630_7BAE0, L800E2630_7BAE0, L800E2594_7BA44, L800E2630_7BAE0, L800E2630_7BAE0, L800E2630_7BAE0, L800E2630_7BAE0, L800E2630_7BAE0, L800E2630_7BAE0, L800E2630_7BAE0, L800E2630_7BAE0, L800E2620_7BAD0, 0 + +.section .text + glabel func_800E24F8 /* 7B9A8 800E24F8 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 7B9AC 800E24FC AFB00010 */ sw $s0, 0x10($sp) diff --git a/ver/us/asm/nonmatchings/code_7bb60_len_41b0/collision_main_lateral.s b/ver/us/asm/nonmatchings/code_7bb60_len_41b0/collision_main_lateral.s index 8b938ec419..0b42b38c48 100644 --- a/ver/us/asm/nonmatchings/code_7bb60_len_41b0/collision_main_lateral.s +++ b/ver/us/asm/nonmatchings/code_7bb60_len_41b0/collision_main_lateral.s @@ -1,6 +1,16 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches +.section .rodata + +glabel jtbl_8010BE58 +.word L800E42E0_7D790, L800E3B18_7CFC8, L800E3B18_7CFC8, L800E42E0_7D790, L800E42E0_7D790, L800E3B18_7CFC8, L800E3B18_7CFC8, L800E3824_7CCD4, L800E42E0_7D790, L800E3824_7CCD4, L800E42E0_7D790, L800E3940_7CDF0, L800E3B18_7CFC8, L800E3B18_7CFC8, L800E42E0_7D790, L800E3B18_7CFC8, L800E42E0_7D790, L800E3B18_7CFC8, L800E42E0_7D790, L800E3B18_7CFC8, L800E3B18_7CFC8, L800E3B18_7CFC8, L800E3B18_7CFC8, L800E3B18_7CFC8, L800E3B18_7CFC8, L800E3B18_7CFC8, L800E3750_7CC00, L800E36FC_7CBAC, L800E3B18_7CFC8, L800E3B18_7CFC8, L800E3B18_7CFC8, L800E42E0_7D790 + +glabel D_8010BED8 +.double 35.0 + +.section .text + glabel collision_main_lateral /* 7CAEC 800E363C 27BDFF80 */ addiu $sp, $sp, -0x80 /* 7CAF0 800E3640 AFB1005C */ sw $s1, 0x5c($sp) diff --git a/ver/us/asm/nonmatchings/code_7bb60_len_41b0/func_800E2BB0.s b/ver/us/asm/nonmatchings/code_7bb60_len_41b0/func_800E2BB0.s index 828c8c7f98..b492c9b561 100644 --- a/ver/us/asm/nonmatchings/code_7bb60_len_41b0/func_800E2BB0.s +++ b/ver/us/asm/nonmatchings/code_7bb60_len_41b0/func_800E2BB0.s @@ -1,6 +1,19 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches +.section .rodata + +glabel D_8010BD80 +.double -0.47 + +glabel D_8010BD88 +.double 0.001 + +glabel D_8010BD90 +.double -1.2 + +.section .text + glabel func_800E2BB0 /* 7C060 800E2BB0 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 7C064 800E2BB4 AFB00010 */ sw $s0, 0x10($sp) diff --git a/ver/us/asm/nonmatchings/code_7bb60_len_41b0/func_800E2F60.s b/ver/us/asm/nonmatchings/code_7bb60_len_41b0/func_800E2F60.s index 5a9e052f05..b7afa7273a 100644 --- a/ver/us/asm/nonmatchings/code_7bb60_len_41b0/func_800E2F60.s +++ b/ver/us/asm/nonmatchings/code_7bb60_len_41b0/func_800E2F60.s @@ -1,6 +1,13 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches +.section .rodata + +glabel jtbl_8010BDE8 +.word L800E2FD0_7C480, L800E3064_7C514, L800E3064_7C514, L800E3064_7C514, L800E2F98_7C448, L800E3064_7C514, L800E3064_7C514, L800E3064_7C514, L800E3064_7C514, L800E3064_7C514, L800E2FD0_7C480, L800E2FD0_7C480, L800E2FD0_7C480, L800E2FD0_7C480, L800E3064_7C514, L800E3064_7C514, L800E3064_7C514, L800E3064_7C514, L800E2FD0_7C480, L800E3064_7C514, L800E2FD0_7C480, 0 + +.section .text + glabel func_800E2F60 /* 7C410 800E2F60 3C058011 */ lui $a1, %hi(gPlayerStatus) /* 7C414 800E2F64 24A5EFC8 */ addiu $a1, $a1, %lo(gPlayerStatus) diff --git a/ver/us/asm/nonmatchings/code_7bb60_len_41b0/func_800E315C.s b/ver/us/asm/nonmatchings/code_7bb60_len_41b0/func_800E315C.s index dbbe8a16d9..a9b09ba35e 100644 --- a/ver/us/asm/nonmatchings/code_7bb60_len_41b0/func_800E315C.s +++ b/ver/us/asm/nonmatchings/code_7bb60_len_41b0/func_800E315C.s @@ -1,6 +1,13 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches +.section .rodata + +glabel jtbl_8010BE40 +.word L800E31B0_7C660, L800E3200_7C6B0, L800E31C0_7C670, L800E31B0_7C660, L800E31B0_7C660, 0 + +.section .text + glabel func_800E315C /* 7C60C 800E315C 27BDFFE0 */ addiu $sp, $sp, -0x20 /* 7C610 800E3160 AFB00010 */ sw $s0, 0x10($sp) diff --git a/ver/us/asm/nonmatchings/code_7bb60_len_41b0/func_800E45E0.s b/ver/us/asm/nonmatchings/code_7bb60_len_41b0/func_800E45E0.s index a228903cf7..0faac2769d 100644 --- a/ver/us/asm/nonmatchings/code_7bb60_len_41b0/func_800E45E0.s +++ b/ver/us/asm/nonmatchings/code_7bb60_len_41b0/func_800E45E0.s @@ -1,6 +1,13 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches +.section .rodata + +glabel D_8010BEE0 +.double 180.0 + +.section .text + glabel func_800E45E0 /* 7DA90 800E45E0 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 7DA94 800E45E4 AFB00010 */ sw $s0, 0x10($sp) diff --git a/ver/us/asm/nonmatchings/code_7bb60_len_41b0/func_800E46C8.s b/ver/us/asm/nonmatchings/code_7bb60_len_41b0/func_800E46C8.s index 741903f20d..56a488c8fa 100644 --- a/ver/us/asm/nonmatchings/code_7bb60_len_41b0/func_800E46C8.s +++ b/ver/us/asm/nonmatchings/code_7bb60_len_41b0/func_800E46C8.s @@ -1,6 +1,13 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches +.section .rodata + +glabel D_8010BEE8 +.double 180.0 + +.section .text + glabel func_800E46C8 /* 7DB78 800E46C8 3C048011 */ lui $a0, %hi(gPlayerStatus+0xCC) /* 7DB7C 800E46CC 8C84F094 */ lw $a0, %lo(gPlayerStatus+0xCC)($a0) diff --git a/ver/us/asm/nonmatchings/code_7bb60_len_41b0/func_800E4BB8.s b/ver/us/asm/nonmatchings/code_7bb60_len_41b0/func_800E4BB8.s index f104739baa..3dc9347d66 100644 --- a/ver/us/asm/nonmatchings/code_7bb60_len_41b0/func_800E4BB8.s +++ b/ver/us/asm/nonmatchings/code_7bb60_len_41b0/func_800E4BB8.s @@ -1,6 +1,16 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches +.section .rodata + +glabel D_8010BEF0 +.double 90.0 + +glabel D_8010BEF8 +.double 180.0 + +.section .text + glabel func_800E4BB8 /* 7E068 800E4BB8 27BDFFA8 */ addiu $sp, $sp, -0x58 /* 7E06C 800E4BBC 3C038011 */ lui $v1, %hi(gPlayerStatus) diff --git a/ver/us/asm/nonmatchings/code_7bb60_len_41b0/func_800E5530.s b/ver/us/asm/nonmatchings/code_7bb60_len_41b0/func_800E5530.s index 6240ae5709..76f629ea83 100644 --- a/ver/us/asm/nonmatchings/code_7bb60_len_41b0/func_800E5530.s +++ b/ver/us/asm/nonmatchings/code_7bb60_len_41b0/func_800E5530.s @@ -1,6 +1,13 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches +.section .rodata + +glabel jtbl_8010BF00 +.word L800E583C_7ECEC, L800E55A8_7EA58, L800E568C_7EB3C, L800E55F0_7EAA0, L800E5604_7EAB4, L800E56E8_7EB98, L800E5840_7ECF0, L800E5618_7EAC8, L800E5654_7EB04, L800E5840_7ECF0, L800E574C_7EBFC, L800E57B0_7EC60 + +.section .text + glabel func_800E5530 /* 7E9E0 800E5530 27BDFFE0 */ addiu $sp, $sp, -0x20 /* 7E9E4 800E5534 AFB00010 */ sw $s0, 0x10($sp) diff --git a/ver/us/asm/nonmatchings/code_7bb60_len_41b0/update_fall_state.s b/ver/us/asm/nonmatchings/code_7bb60_len_41b0/update_fall_state.s index 5f20a0c778..51e8be3e24 100644 --- a/ver/us/asm/nonmatchings/code_7bb60_len_41b0/update_fall_state.s +++ b/ver/us/asm/nonmatchings/code_7bb60_len_41b0/update_fall_state.s @@ -1,6 +1,13 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches +.section .rodata + +glabel jtbl_8010BD98 +.word L800E2D8C_7C23C, L800E2DFC_7C2AC, L800E2D6C_7C21C, L800E2D7C_7C22C, L800E2E68_7C318, L800E2E68_7C318, L800E2E68_7C318, L800E2E68_7C318, L800E2E68_7C318, L800E2E68_7C318, L800E2E68_7C318, L800E2E68_7C318, L800E2E68_7C318, L800E2E68_7C318, L800E2E68_7C318, L800E2E68_7C318, L800E2E68_7C318, L800E2F4C_7C3FC, L800E2E68_7C318, L800E2F4C_7C3FC + +.section .text + glabel update_fall_state /* 7C1C8 800E2D18 27BDFFE0 */ addiu $sp, $sp, -0x20 /* 7C1CC 800E2D1C AFB00010 */ sw $s0, 0x10($sp) diff --git a/ver/us/asm/nonmatchings/code_7fd10_len_b40/check_input_open_menus.s b/ver/us/asm/nonmatchings/code_7fd10_len_b40/check_input_open_menus.s index cf089327d4..b66925562e 100644 --- a/ver/us/asm/nonmatchings/code_7fd10_len_b40/check_input_open_menus.s +++ b/ver/us/asm/nonmatchings/code_7fd10_len_b40/check_input_open_menus.s @@ -1,6 +1,13 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches +.section .rodata + +glabel jtbl_8010BF30 +.word L800E6DD8_80288, L800E6F14_803C4, L800E6FC8_80478, L800E7044_804F4, L800E7090_80540, L800E726C_8071C, L800E726C_8071C, L800E726C_8071C, L800E726C_8071C, L800E726C_8071C, L800E7208_806B8, 0 + +.section .text + glabel check_input_open_menus /* 80194 800E6CE4 3C038007 */ lui $v1, %hi(gGameStatusPtr) /* 80198 800E6CE8 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) diff --git a/ver/us/asm/nonmatchings/code_80850_len_3060/is_ability_active.s b/ver/us/asm/nonmatchings/code_80850_len_3060/is_ability_active.s index 49afde2639..8d1e4a2594 100644 --- a/ver/us/asm/nonmatchings/code_80850_len_3060/is_ability_active.s +++ b/ver/us/asm/nonmatchings/code_80850_len_3060/is_ability_active.s @@ -1,6 +1,13 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches +.section .rodata + +glabel D_8010BF60 +.word 0x800E9DEC, 0x800EA07C, 0x800E9DF4, 0x800E9DFC, 0x800E9E04, 0x800E9E0C, 0x800E9E14, 0x800E9E34, 0x800E9E3C, 0x800E9E44, 0x800E9E4C, 0x800E9E54, 0x800E9E5C, 0x800E9E64, 0x800E9E6C, 0x800E9E74, 0x800E9F38, 0x800E9F40, 0x800E9F48, 0x800E9F50, 0x800E9F58, 0x800E9F60, 0x800E9F68, 0x800E9F70, 0x800E9F78, 0x800E9F80, 0x800EA008, 0x800E9F88, 0x800E9F90, 0x800E9F98, 0x800E9FA0, 0x800E9FA8, 0x800E9FB0, 0x800E9FB8, 0x800E9FC0, 0x800E9FC8, 0x800E9FD0, 0x800E9FD8, 0x800E9FE0, 0x800E9FE8, 0x800E9FF0, 0x800E9FF8, 0x800EA000, 0x800EA010, 0x800EA018, 0x800EA020, 0x800EA028, 0x800EA030, 0x800EA038, 0x800EA040, 0x800EA048, 0x800EA050, 0x800EA058, 0x800EA060, 0x800EA068, 0x800EA070 + +.section .text + glabel is_ability_active /* 831F8 800E9D48 27BDFFD0 */ addiu $sp, $sp, -0x30 /* 831FC 800E9D4C AFBF0028 */ sw $ra, 0x28($sp) diff --git a/ver/us/asm/nonmatchings/code_891b0_len_fb0/func_800EFD08.s b/ver/us/asm/nonmatchings/code_891b0_len_fb0/func_800EFD08.s index 173b638e52..0717d3d8c2 100644 --- a/ver/us/asm/nonmatchings/code_891b0_len_fb0/func_800EFD08.s +++ b/ver/us/asm/nonmatchings/code_891b0_len_fb0/func_800EFD08.s @@ -1,6 +1,13 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches +.section .rodata + +glabel jtbl_8010C2E8 +.word L800EFDFC_892AC, L800EFE0C_892BC, L800EFE0C_892BC, L800EFE0C_892BC, L800EFE0C_892BC, L800EFDBC_8926C, L800EFDCC_8927C, L800EFDDC_8928C, L800EFDEC_8929C, 0 + +.section .text + glabel func_800EFD08 /* 891B8 800EFD08 27BDFFE0 */ addiu $sp, $sp, -0x20 /* 891BC 800EFD0C AFB00010 */ sw $s0, 0x10($sp) diff --git a/ver/us/asm/nonmatchings/code_8a160_len_700/func_800F0D80.s b/ver/us/asm/nonmatchings/code_8a160_len_700/func_800F0D80.s index 606900c153..b3c335e412 100644 --- a/ver/us/asm/nonmatchings/code_8a160_len_700/func_800F0D80.s +++ b/ver/us/asm/nonmatchings/code_8a160_len_700/func_800F0D80.s @@ -1,6 +1,19 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches +.section .rodata + +glabel D_8010C310 +.double 0.1 + +glabel D_8010C318 +.double 0.92 + +glabel D_8010C320 +.double 0.04, 0.0 + +.section .text + glabel func_800F0D80 /* 8A230 800F0D80 27BDFFA8 */ addiu $sp, $sp, -0x58 /* 8A234 800F0D84 F7B60040 */ sdc1 $f22, 0x40($sp) diff --git a/ver/us/asm/nonmatchings/code_8a860_len_3f30/draw_submenu_title.s b/ver/us/asm/nonmatchings/code_8a860_len_3f30/draw_submenu_title.s index d891fc0ea0..f169ad2b7c 100644 --- a/ver/us/asm/nonmatchings/code_8a860_len_3f30/draw_submenu_title.s +++ b/ver/us/asm/nonmatchings/code_8a860_len_3f30/draw_submenu_title.s @@ -1,6 +1,13 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches +.section .rodata + +glabel jtbl_8010C8A8 +.word L800F4694_8DB44, L800F48A4_8DD54, L800F4694_8DB44, L800F47E4_8DC94, L800F48A4_8DD54, L800F4694_8DB44, L800F4694_8DB44, L800F4694_8DB44, L800F4804_8DCB4, L800F4824_8DCD4, L800F4844_8DCF4, L800F4864_8DD14, L800F4884_8DD34, L800F48A4_8DD54 + +.section .text + glabel draw_submenu_title /* 8DAF8 800F4648 3C028011 */ lui $v0, %hi(D_8010D69C) /* 8DAFC 800F464C 8C42D69C */ lw $v0, %lo(D_8010D69C)($v0) diff --git a/ver/us/asm/nonmatchings/code_8a860_len_3f30/func_800F13B0.s b/ver/us/asm/nonmatchings/code_8a860_len_3f30/func_800F13B0.s index 12b527ba0d..63efcd7abc 100644 --- a/ver/us/asm/nonmatchings/code_8a860_len_3f30/func_800F13B0.s +++ b/ver/us/asm/nonmatchings/code_8a860_len_3f30/func_800F13B0.s @@ -1,6 +1,16 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches +.section .rodata + +glabel jtbl_8010C330 +.word L800F13F8_8A8A8, L800F13F8_8A8A8, L800F13F8_8A8A8, L800F13F8_8A8A8, L800F13F8_8A8A8, L800F13F8_8A8A8, L800F13F8_8A8A8, L800F13F8_8A8A8, L800F13F8_8A8A8, L800F13F8_8A8A8, L800F1414_8A8C4, L800F1414_8A8C4, L800F13F8_8A8A8, L800F1414_8A8C4 + +glabel jtbl_8010C368 +.word L800F145C_8A90C, L800F145C_8A90C, L800F145C_8A90C, L800F145C_8A90C, L800F145C_8A90C, L800F145C_8A90C, L800F145C_8A90C, L800F145C_8A90C, L800F145C_8A90C, L800F145C_8A90C, L800F1470_8A920, L800F1470_8A920, L800F145C_8A90C, L800F1470_8A920 + +.section .text + glabel func_800F13B0 /* 8A860 800F13B0 3C028011 */ lui $v0, %hi(D_8010D68E) /* 8A864 800F13B4 8042D68E */ lb $v0, %lo(D_8010D68E)($v0) diff --git a/ver/us/asm/nonmatchings/code_8a860_len_3f30/func_800F16CC.s b/ver/us/asm/nonmatchings/code_8a860_len_3f30/func_800F16CC.s index 69c66afc61..15825422bd 100644 --- a/ver/us/asm/nonmatchings/code_8a860_len_3f30/func_800F16CC.s +++ b/ver/us/asm/nonmatchings/code_8a860_len_3f30/func_800F16CC.s @@ -1,6 +1,16 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches +.section .rodata + +glabel jtbl_8010C3A0 +.word L800F1718_8ABC8, L800F1734_8ABE4, L800F1718_8ABC8, L800F1718_8ABC8, L800F1734_8ABE4, L800F1718_8ABC8, L800F1718_8ABC8, L800F1718_8ABC8, L800F1718_8ABC8, L800F1718_8ABC8, L800F1768_8AC18, L800F1768_8AC18, L800F1718_8ABC8, L800F1768_8AC18 + +glabel jtbl_8010C3D8 +.word L800F17C0_8AC70, L800F17D4_8AC84, L800F17C0_8AC70, L800F17C0_8AC70, L800F17D4_8AC84, L800F17C0_8AC70, L800F17C0_8AC70, L800F17C0_8AC70, L800F17C0_8AC70, L800F17C0_8AC70, L800F17E8_8AC98, L800F17E8_8AC98, L800F17C0_8AC70, L800F17E8_8AC98 + +.section .text + glabel func_800F16CC /* 8AB7C 800F16CC 3C028011 */ lui $v0, %hi(D_8010D68E) /* 8AB80 800F16D0 8042D68E */ lb $v0, %lo(D_8010D68E)($v0) diff --git a/ver/us/asm/nonmatchings/code_8a860_len_3f30/func_800F1A10.s b/ver/us/asm/nonmatchings/code_8a860_len_3f30/func_800F1A10.s index fd1dd81d95..25aa0a3d07 100644 --- a/ver/us/asm/nonmatchings/code_8a860_len_3f30/func_800F1A10.s +++ b/ver/us/asm/nonmatchings/code_8a860_len_3f30/func_800F1A10.s @@ -1,6 +1,37 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches +.section .rodata + +glabel jtbl_8010C410 +.word L800F2F5C_8C40C, L800F2F44_8C3F4, L800F2F5C_8C40C, L800F2F18_8C3C8, L800F2E84_8C334, L800F2E64_8C314, L800F2CC0_8C170, L800F1A54_8AF04, L800F2860_8BD10, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F2F74_8C424, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F2FB8_8C468, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3010_8C4C0, L800F3034_8C4E4, L800F30EC_8C59C, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3184_8C634, L800F341C_8C8CC, L800F345C_8C90C, L800F3464_8C914, 0 + +glabel jtbl_8010C5D0 +.word L800F1E3C_8B2EC, L800F1EFC_8B3AC, L800F1E3C_8B2EC, L800F1F54_8B404, L800F1FF4_8B4A4, L800F204C_8B4FC, L800F1E3C_8B2EC, L800F1E3C_8B2EC, L800F20EC_8B59C, L800F218C_8B63C, L800F222C_8B6DC, L800F22CC_8B77C, L800F1E3C_8B2EC, L800F236C_8B81C + +glabel jtbl_8010C608 +.word L800F264C_8BAFC, L800F2658_8BB08, L800F2658_8BB08, L800F2668_8BB18, L800F2678_8BB28, L800F2698_8BB48, L800F264C_8BAFC, L800F264C_8BAFC, L800F2688_8BB38, L800F264C_8BAFC, L800F2668_8BB18, L800F2668_8BB18, L800F264C_8BAFC, L800F2658_8BB08 + +glabel jtbl_8010C640 +.word L800F2708_8BBB8, L800F271C_8BBCC, L800F2708_8BBB8, L800F2708_8BBB8, L800F271C_8BBCC, L800F2708_8BBB8, L800F2708_8BBB8, L800F2708_8BBB8, L800F2708_8BBB8, L800F2708_8BBB8, L800F2730_8BBE0, L800F2730_8BBE0, L800F2708_8BBB8, L800F2730_8BBE0 + +glabel jtbl_8010C678 +.word L800F2764_8BC14, L800F2780_8BC30, L800F2764_8BC14, L800F2764_8BC14, L800F2780_8BC30, L800F2764_8BC14, L800F2764_8BC14, L800F2764_8BC14, L800F2764_8BC14, L800F2764_8BC14, L800F27B4_8BC64, L800F27B4_8BC64, L800F2764_8BC14, L800F27B4_8BC64 + +glabel jtbl_8010C6B0 +.word L800F2BBC_8C06C, L800F2BD4_8C084, L800F2BBC_8C06C, L800F2BBC_8C06C, L800F2BD4_8C084, L800F2BBC_8C06C, L800F2BBC_8C06C, L800F2BBC_8C06C, L800F2BEC_8C09C, L800F2BEC_8C09C, L800F2BEC_8C09C, L800F2BEC_8C09C, L800F2BBC_8C06C, L800F2BEC_8C09C + +glabel jtbl_8010C6E8 +.word L800F2EB0_8C360, L800F2EC4_8C374, L800F2EB0_8C360, L800F2EB0_8C360, L800F2EC4_8C374, L800F2EB0_8C360, L800F2EB0_8C360, L800F2EB0_8C360, L800F2EB0_8C360, L800F2EB0_8C360, L800F2ED8_8C388, L800F2ED8_8C388, L800F2EB0_8C360, L800F2ED8_8C388 + +glabel jtbl_8010C720 +.word L800F3328_8C7D8, L800F333C_8C7EC, L800F3328_8C7D8, L800F3328_8C7D8, L800F333C_8C7EC, L800F3328_8C7D8, L800F3328_8C7D8, L800F3328_8C7D8, L800F3328_8C7D8, L800F3328_8C7D8, L800F3350_8C800, L800F3350_8C800, L800F3328_8C7D8, L800F3350_8C800 + +glabel jtbl_8010C758 +.word L800F3608_8CAB8, L800F361C_8CACC, L800F3608_8CAB8, L800F3608_8CAB8, L800F361C_8CACC, L800F3608_8CAB8, L800F3608_8CAB8, L800F3608_8CAB8, L800F3608_8CAB8, L800F3608_8CAB8, L800F3630_8CAE0, L800F3630_8CAE0, L800F3608_8CAB8, L800F3630_8CAE0 + +.section .text + glabel func_800F1A10 /* 8AEC0 800F1A10 3C028011 */ lui $v0, %hi(D_8010D640) /* 8AEC4 800F1A14 8C42D640 */ lw $v0, %lo(D_8010D640)($v0) diff --git a/ver/us/asm/nonmatchings/code_8a860_len_3f30/func_800F3680.s b/ver/us/asm/nonmatchings/code_8a860_len_3f30/func_800F3680.s index 7b27347197..034354474e 100644 --- a/ver/us/asm/nonmatchings/code_8a860_len_3f30/func_800F3680.s +++ b/ver/us/asm/nonmatchings/code_8a860_len_3f30/func_800F3680.s @@ -1,6 +1,25 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches +.section .rodata + +glabel jtbl_8010C790 +.word L800F3878_8CD28, L800F38C8_8CD78, L800F3918_8CDC8, L800F3878_8CD28, L800F38C8_8CD78, L800F3878_8CD28, L800F3878_8CD28, L800F3878_8CD28, L800F3878_8CD28, L800F3878_8CD28, L800F3878_8CD28, L800F3878_8CD28, L800F3878_8CD28, L800F3878_8CD28 + +glabel jtbl_8010C7C8 +.word L800F3C8C_8D13C, L800F3CC0_8D170, L800F3C8C_8D13C, L800F3C8C_8D13C, L800F3CC0_8D170, L800F3C8C_8D13C, L800F3C8C_8D13C, L800F3C8C_8D13C, L800F3CF4_8D1A4, L800F3C8C_8D13C, L800F3D38_8D1E8, L800F3D94_8D244, L800F3C8C_8D13C, L800F3C8C_8D13C + +glabel jtbl_8010C800 +.word L800F4000_8D4B0, L800F4000_8D4B0, L800F4000_8D4B0, L800F4000_8D4B0, L800F4000_8D4B0, L800F4000_8D4B0, L800F4000_8D4B0, L800F4000_8D4B0, L800F4000_8D4B0, L800F4000_8D4B0, L800F40E8_8D598, L800F41D0_8D680, L800F4000_8D4B0, L800F4000_8D4B0 + +glabel jtbl_8010C838 +.word L800F4398_8D848, L800F43E8_8D898, L800F4398_8D848, L800F4398_8D848, L800F43E8_8D898, L800F4398_8D848, L800F4398_8D848, L800F4398_8D848, L800F4398_8D848, L800F4398_8D848, L800F4398_8D848, L800F4398_8D848, L800F4398_8D848, L800F4398_8D848 + +glabel jtbl_8010C870 +.word L800F44EC_8D99C, L800F44F4_8D9A4, L800F453C_8D9EC, L800F44F4_8D9A4, L800F4500_8D9B0, L800F4508_8D9B8, L800F4514_8D9C4, L800F4514_8D9C4, L800F4514_8D9C4, L800F4528_8D9D8, L800F4530_8D9E0, L800F451C_8D9CC, L800F453C_8D9EC, 0 + +.section .text + glabel func_800F3680 /* 8CB30 800F3680 27BDFFA8 */ addiu $sp, $sp, -0x58 /* 8CB34 800F3684 3C038011 */ lui $v1, %hi(D_8010D640) diff --git a/ver/us/asm/nonmatchings/code_8a860_len_3f30/func_800F4944.s b/ver/us/asm/nonmatchings/code_8a860_len_3f30/func_800F4944.s index fff3643128..604139afea 100644 --- a/ver/us/asm/nonmatchings/code_8a860_len_3f30/func_800F4944.s +++ b/ver/us/asm/nonmatchings/code_8a860_len_3f30/func_800F4944.s @@ -1,6 +1,13 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches +.section .rodata + +glabel jtbl_8010C8E0 +.word L800F4994_8DE44, L800F49B0_8DE60, L800F49E4_8DE94, L800F4A18_8DEC8, L800F4A4C_8DEFC, L800F4A80_8DF30, L800F4AA0_8DF50, L800F4ABC_8DF6C, L800F4B0C_8DFBC, L800F4B40_8DFF0, L800F4B5C_8E00C, L800F4B90_8E040, L800F4BC4_8E074, L800F4AD8_8DF88, 0, 0 + +.section .text + glabel func_800F4944 /* 8DDF4 800F4944 3C028011 */ lui $v0, %hi(D_8010D68E) /* 8DDF8 800F4948 8042D68E */ lb $v0, %lo(D_8010D68E)($v0) diff --git a/ver/us/asm/nonmatchings/code_B4580/func_8011EBF0.s b/ver/us/asm/nonmatchings/code_B4580/func_8011EBF0.s index 7542cedaea..3376fc77a1 100644 --- a/ver/us/asm/nonmatchings/code_B4580/func_8011EBF0.s +++ b/ver/us/asm/nonmatchings/code_B4580/func_8011EBF0.s @@ -1,6 +1,31 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches +.section .rodata + +glabel jtbl_8014FE60 +.word L8011EC3C_B533C, L8011EC5C_B535C, L8011F034_B5734, L8011EC7C_B537C, L8011F034_B5734, L8011ED48_B5448, L8011EE10_B5510, L8011F034_B5734, L8011EEF0_B55F0, L8011F034_B5734, L8011EC8C_B538C, L8011F034_B5734, L8011F034_B5734, L8011F034_B5734, L8011EC9C_B539C, L8011ECB8_B53B8, L8011ECEC_B53EC, L8011EF6C_B566C, L8011EC44_B5344, L8011ED2C_B542C + +glabel D_8014FEB0 +.double 180.0 + +glabel D_8014FEB8 +.double 32767.0 + +glabel D_8014FEC0 +.double 180.0 + +glabel D_8014FEC8 +.double 32767.0 + +glabel D_8014FED0 +.double 180.0 + +glabel D_8014FED8 +.double 32767.0 + +.section .text + glabel func_8011EBF0 /* B52F0 8011EBF0 27BDFFC8 */ addiu $sp, $sp, -0x38 /* B52F4 8011EBF4 AFB10014 */ sw $s1, 0x14($sp) diff --git a/ver/us/asm/nonmatchings/code_B4580/func_8011F4D4.s b/ver/us/asm/nonmatchings/code_B4580/func_8011F4D4.s index d59f9a1c0f..c9a5c8cd00 100644 --- a/ver/us/asm/nonmatchings/code_B4580/func_8011F4D4.s +++ b/ver/us/asm/nonmatchings/code_B4580/func_8011F4D4.s @@ -1,6 +1,16 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches +.section .rodata + +glabel jtbl_8014FEE0 +.word L8011F63C_B5D3C, L8011F9FC_B60FC, L8011F9FC_B60FC, L8011F9FC_B60FC, L8011F66C_B5D6C, L8011F9FC_B60FC, L8011F9FC_B60FC, L8011F9FC_B60FC, L8011F69C_B5D9C, L8011F9FC_B60FC, L8011F9FC_B60FC, L8011F9FC_B60FC, L8011F6CC_B5DCC, L8011F9FC_B60FC, L8011F9FC_B60FC, L8011F9FC_B60FC, L8011F6FC_B5DFC, L8011F9FC_B60FC, L8011F9FC_B60FC, L8011F9FC_B60FC, L8011F9FC_B60FC, L8011F9FC_B60FC, L8011F9FC_B60FC, L8011F9FC_B60FC, L8011F9FC_B60FC, L8011F72C_B5E2C, L8011F9FC_B60FC, L8011F9FC_B60FC, L8011F9FC_B60FC, L8011F9FC_B60FC, L8011F9FC_B60FC, L8011F9FC_B60FC, L8011F9FC_B60FC, L8011F9FC_B60FC, L8011F9FC_B60FC, L8011F9FC_B60FC, L8011F9FC_B60FC, L8011F75C_B5E5C + +glabel jtbl_8014FF78 +.word L8011F7BC_B5EBC, L8011F908_B6008, L8011F908_B6008, L8011F908_B6008, L8011F7EC_B5EEC, L8011F908_B6008, L8011F908_B6008, L8011F908_B6008, L8011F81C_B5F1C, L8011F908_B6008, L8011F908_B6008, L8011F908_B6008, L8011F84C_B5F4C, L8011F908_B6008, L8011F908_B6008, L8011F908_B6008, L8011F87C_B5F7C, L8011F908_B6008, L8011F908_B6008, L8011F908_B6008, L8011F908_B6008, L8011F908_B6008, L8011F908_B6008, L8011F908_B6008, L8011F908_B6008, L8011F8AC_B5FAC, L8011F908_B6008, L8011F908_B6008, L8011F908_B6008, L8011F908_B6008, L8011F908_B6008, L8011F908_B6008, L8011F908_B6008, L8011F908_B6008, L8011F908_B6008, L8011F908_B6008, L8011F908_B6008, L8011F8DC_B5FDC + +.section .text + glabel func_8011F4D4 /* B5BD4 8011F4D4 27BDFFA8 */ addiu $sp, $sp, -0x58 /* B5BD8 8011F4D8 AFB00050 */ sw $s0, 0x50($sp) diff --git a/ver/us/asm/nonmatchings/code_B4580/func_80120234.s b/ver/us/asm/nonmatchings/code_B4580/func_80120234.s index d95e152ee4..0de5eb1df6 100644 --- a/ver/us/asm/nonmatchings/code_B4580/func_80120234.s +++ b/ver/us/asm/nonmatchings/code_B4580/func_80120234.s @@ -1,6 +1,16 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches +.section .rodata + +glabel D_80150010 +.double 180.0 + +glabel D_80150018 +.double 32767.0 + +.section .text + glabel func_80120234 /* B6934 80120234 27BDFFB8 */ addiu $sp, $sp, -0x48 /* B6938 80120238 AFB00030 */ sw $s0, 0x30($sp) diff --git a/ver/us/asm/nonmatchings/code_B4580/func_80120530.s b/ver/us/asm/nonmatchings/code_B4580/func_80120530.s index 1893ea78c4..8ad38a86e4 100644 --- a/ver/us/asm/nonmatchings/code_B4580/func_80120530.s +++ b/ver/us/asm/nonmatchings/code_B4580/func_80120530.s @@ -1,6 +1,16 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches +.section .rodata + +glabel D_80150020 +.double 180.0 + +glabel D_80150028 +.double 32767.0 + +.section .text + glabel func_80120530 /* B6C30 80120530 27BDFFC0 */ addiu $sp, $sp, -0x40 /* B6C34 80120534 AFB00030 */ sw $s0, 0x30($sp) diff --git a/ver/us/asm/nonmatchings/code_B4580/func_801206F8.s b/ver/us/asm/nonmatchings/code_B4580/func_801206F8.s index 0b04ee6ea7..288ea72973 100644 --- a/ver/us/asm/nonmatchings/code_B4580/func_801206F8.s +++ b/ver/us/asm/nonmatchings/code_B4580/func_801206F8.s @@ -1,6 +1,31 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches +.section .rodata + +glabel jtbl_80150030 +.word L80120748_B6E48, L80120768_B6E68, L80120B7C_B727C, L80120778_B6E78, L80120798_B6E98, L80120870_B6F70, L8012093C_B703C, L80120B7C_B727C, L80120A20_B7120, L80120B7C_B727C, L801207AC_B6EAC, L80120B7C_B727C, L80120B7C_B727C, L80120B7C_B727C, L801207C4_B6EC4, L801207E0_B6EE0, L80120814_B6F14, L80120AA0_B71A0, L80120750_B6E50, L80120854_B6F54 + +glabel D_80150080 +.double 180.0 + +glabel D_80150088 +.double 32767.0 + +glabel D_80150090 +.double 180.0 + +glabel D_80150098 +.double 32767.0 + +glabel D_801500A0 +.double 180.0 + +glabel D_801500A8 +.double 32767.0 + +.section .text + glabel func_801206F8 /* B6DF8 801206F8 27BDFFC8 */ addiu $sp, $sp, -0x38 /* B6DFC 801206FC AFB10014 */ sw $s1, 0x14($sp) diff --git a/ver/us/asm/nonmatchings/code_B9D60/_update_message.s b/ver/us/asm/nonmatchings/code_B9D60/_update_message.s index 8978d7a5ec..924e7f5f00 100644 --- a/ver/us/asm/nonmatchings/code_B9D60/_update_message.s +++ b/ver/us/asm/nonmatchings/code_B9D60/_update_message.s @@ -1,6 +1,19 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches +.section .rodata + +glabel D_80150370 +.double 3.8 + +glabel D_80150378 +.double 122.0 + +glabel jtbl_80150380 +.word L80123E98_BA598, L80124174_BA874, L80124174_BA874, L80123E50_BA550, L80124174_BA874, L80123F2C_BA62C, L80124174_BA874, L80124174_BA874, L80124174_BA874, L80124174_BA874, L80124018_BA718, L80124174_BA874, L80124174_BA874, L80124174_BA874 + +.section .text + glabel _update_message /* B9F98 80123898 27BDFFE0 */ addiu $sp, $sp, -0x20 /* B9F9C 8012389C AFB00010 */ sw $s0, 0x10($sp) diff --git a/ver/us/asm/nonmatchings/code_B9D60/func_80124570.s b/ver/us/asm/nonmatchings/code_B9D60/func_80124570.s index 73d814f5bb..1d45fc1ed3 100644 --- a/ver/us/asm/nonmatchings/code_B9D60/func_80124570.s +++ b/ver/us/asm/nonmatchings/code_B9D60/func_80124570.s @@ -1,6 +1,25 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches +.section .rodata + +glabel jtbl_801503B8 +.word L80124600_BAD00, L80124664_BAD64, L801246C4_BADC4, L801246EC_BADEC, L801246EC_BADEC, L801246EC_BADEC, L801246EC_BADEC, L80124704_BAE04, L8012470C_BAE0C, L80124714_BAE14, L8012471C_BAE1C, L80124730_BAE30, L801247CC_BAECC, L80124B08_BB208, L801255A4_BBCA4, L80124B7C_BB27C + +glabel jtbl_801503F8 +.word L80124818_BAF18, L80124818_BAF18, L80124818_BAF18, L80124818_BAF18, L80124878_BAF78, L801248BC_BAFBC, L80124990_BB090, L80124984_BB084, L801249B8_BB0B8, L80124AA4_BB1A4, L80124AA4_BB1A4, L80124920_BB020, L801248BC_BAFBC, L80124AE8_BB1E8, L801248BC_BAFBC, 0 + +glabel jtbl_80150438 +.word L80124BA4_BB2A4, L80124BC4_BB2C4, L80125600_BBD00, L80125138_BB838, L80125148_BB848, L80124BE8_BB2E8, L80124BF8_BB2F8, L80124C04_BB304, L80124C18_BB318, L80124C38_BB338, L80124C48_BB348, L80124C28_BB328, L80124C54_BB354, L80124CE8_BB3E8, L80124D54_BB454, L80124D78_BB478, L80124D94_BB494, L80124DB4_BB4B4, L80124DC4_BB4C4, L80124DD4_BB4D4, L80124DE4_BB4E4, L80124DF4_BB4F4, L80124E28_BB528, L80124E7C_BB57C, L80124F18_BB618, L80124FA8_BB6A8, L80124FCC_BB6CC, L80125020_BB720, L80125040_BB740, L80125084_BB784, L801250C4_BB7C4, L801250D4_BB7D4, L80125118_BB818, L80125128_BB828, L80125184_BB884, L80125194_BB894, L801251A4_BB8A4, L801251B4_BB8B4, L801251C4_BB8C4, L80125218_BB918, L80125244_BB944, L8012553C_BBC3C, L80125564_BBC64, L80125594_BBC94, L801254C0_BBBC0, L80125600_BBD00, L801254B0_BBBB0, L8012546C_BBB6C + +glabel jtbl_801504F8 +.word L80125204_BB904, L80125204_BB904, L80125204_BB904, L80125210_BB910, L80125600_BBD00, L80125210_BB910, L80125204_BB904, L80125210_BB910, L80125204_BB904, L80125204_BB904, L80125204_BB904, L80125204_BB904, L80125204_BB904, L80125204_BB904, L80125204_BB904, 0 + +glabel D_80150538 +.word 0x801252CC, 0x801253D4, 0x801253D4, 0x80125300, 0x80125300, 0x80125300, 0x80125300, 0x80125314, 0x801253D4, 0x801253D4, 0x801253D4, 0x801253D4, 0x801253D4, 0x801253D4, 0x801253D4, 0x80125320 + +.section .text + glabel func_80124570 /* BAC70 80124570 27BDFFB8 */ addiu $sp, $sp, -0x48 /* BAC74 80124574 AFB40030 */ sw $s4, 0x30($sp) diff --git a/ver/us/asm/nonmatchings/code_B9D60/func_80125C84.s b/ver/us/asm/nonmatchings/code_B9D60/func_80125C84.s index 68bdab23ba..6211abb3c4 100644 --- a/ver/us/asm/nonmatchings/code_B9D60/func_80125C84.s +++ b/ver/us/asm/nonmatchings/code_B9D60/func_80125C84.s @@ -1,6 +1,13 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches +.section .rodata + +glabel D_80150578 +.double 0.6 + +.section .text + glabel func_80125C84 /* BC384 80125C84 288200F0 */ slti $v0, $a0, 0xf0 /* BC388 80125C88 44871000 */ mtc1 $a3, $f2 diff --git a/ver/us/asm/nonmatchings/code_B9D60/func_80126790.s b/ver/us/asm/nonmatchings/code_B9D60/func_80126790.s index 978e80a951..1e76d27a61 100644 --- a/ver/us/asm/nonmatchings/code_B9D60/func_80126790.s +++ b/ver/us/asm/nonmatchings/code_B9D60/func_80126790.s @@ -1,6 +1,16 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches +.section .rodata + +glabel jtbl_801506F8 +.word L80126874_BCF74, L80126884_BCF84, L801268D8_BCFD8, L80126900_BD000, L8012698C_BD08C, 0 + +glabel D_80150710 +.double 0.2 + +.section .text + glabel func_80126790 /* BCE90 80126790 27BDFF18 */ addiu $sp, $sp, -0xe8 /* BCE94 80126794 F7BA00D8 */ sdc1 $f26, 0xd8($sp) diff --git a/ver/us/asm/nonmatchings/code_B9D60/func_80126F78.s b/ver/us/asm/nonmatchings/code_B9D60/func_80126F78.s index e3a7a47747..be690ceb52 100644 --- a/ver/us/asm/nonmatchings/code_B9D60/func_80126F78.s +++ b/ver/us/asm/nonmatchings/code_B9D60/func_80126F78.s @@ -1,6 +1,19 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches +.section .rodata + +glabel D_80150718 +.double 3.2 + +glabel D_80150720 +.double 255.0 + +glabel D_80150728 +.double 14.4 + +.section .text + glabel func_80126F78 /* BD678 80126F78 27BDFFA0 */ addiu $sp, $sp, -0x60 /* BD67C 80126F7C AFB00038 */ sw $s0, 0x38($sp) diff --git a/ver/us/asm/nonmatchings/code_B9D60/func_80127D90.s b/ver/us/asm/nonmatchings/code_B9D60/func_80127D90.s index 88d237c8c7..040ed78c10 100644 --- a/ver/us/asm/nonmatchings/code_B9D60/func_80127D90.s +++ b/ver/us/asm/nonmatchings/code_B9D60/func_80127D90.s @@ -1,6 +1,100 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches +.section .rodata + +glabel jtbl_80150730 +.word L80127FAC_BE6AC, L8012803C_BE73C, L8012803C_BE73C, L8012803C_BE73C, L8012803C_BE73C, L80128068_BE768, L80128068_BE768, L80128068_BE768, L801280A0_BE7A0, L8012A6C4_C0DC4, L80129ADC_C01DC, L80129BF8_C02F8, L8012AB5C_C125C, L8012AB5C_C125C, L8012AB5C_C125C, L80129C04_C0304 + +glabel jtbl_80150770 +.word L801280DC_BE7DC, L801280DC_BE7DC, L801280DC_BE7DC, L801280DC_BE7DC, L8012897C_BF07C, L80128D28_BF428, L80128F34_BF634, L80128F34_BF634, L801296EC_BFDEC, L80129958_C0058, L80129958_C0058, L80128D28_BF428, L80128D28_BF428, L80129A40_C0140, L80128D28_BF428, 0 + +glabel D_801507B0 +.double 0.35 + +glabel D_801507B8 +.double 0.13333333333333333 + +glabel D_801507C0 +.double 0.2 + +glabel D_801507C8 +.double 255.0 + +glabel D_801507D0 +.double 0.6 + +glabel D_801507D8 +.double 0.6 + +glabel jtbl_801507E0 +.word L80129C44_C0344, L80129C7C_C037C, L8012BF70_C2670, L8012BF70_C2670, L80129CA8_C03A8, L80129CE0_C03E0, L80129D00_C0400, L80129E38_C0538, L80129E84_C0584, L80129EBC_C05BC, L80129EE0_C05E0, L80129F14_C0614, L80129F40_C0640, L8012BF70_C2670, L80129F74_C0674, L8012A0C8_C07C8, L8012A21C_C091C, L8012A350_C0A50, L8012A54C_C0C4C, L8012AB44_C1244, L8012A564_C0C64, L8012A5E0_C0CE0, L8012A634_C0D34, L8012A654_C0D54, L8012A664_C0D64, L8012A68C_C0D8C, L8012A6B4_C0DB4, L8012A6DC_C0DDC, L8012A6FC_C0DFC, L8012A960_C1060, L8012AAD8_C11D8, 0 + +glabel D_80150860 +.double 0.7 + +glabel D_80150868 +.double 0.7 + +glabel D_80150870 +.double 0.7 + +glabel jtbl_80150878 +.word L8012A734_C0E34, L8012A74C_C0E4C, L8012A764_C0E64, L8012A7AC_C0EAC, L8012BF70_C2670, L8012A834_C0F34, L8012A864_C0F64, L8012A87C_C0F7C, L8012A8AC_C0FAC, L8012A8C4_C0FC4, L8012A8DC_C0FDC, L8012A8F4_C0FF4, L8012A90C_C100C, L8012A924_C1024, L8012A93C_C103C, 0 + +glabel jtbl_801508B8 +.word L8012A998_C1098, L8012A9AC_C10AC, L8012A9C0_C10C0, L8012A9D4_C10D4, L8012AB44_C1244, L8012A9EC_C10EC, L8012AA00_C1100, L8012AA10_C1110, L8012AA24_C1124, L8012AA38_C1138, L8012AA60_C1160, L8012AA74_C1174, L8012AA88_C1188, L8012AA9C_C119C, L8012AAB8_C11B8, 0 + +glabel D_801508F8 +.double 0.35 + +glabel D_80150900 +.double 45.0 + +glabel D_80150908 +.double 1.6 + +glabel D_80150910 +.double 180.0 + +glabel D_80150918 +.double 90.0 + +glabel D_80150920 +.double 1.6 + +glabel D_80150928 +.double 180.0 + +glabel D_80150930 +.double 90.0 + +glabel D_80150938 +.double 255.0 + +glabel D_80150940 +.double 1.7 + +glabel D_80150948 +.double 1.4 + +glabel D_80150950 +.double 1.2 + +glabel D_80150958 +.double 0.3 + +glabel jtbl_80150960 +.word L8012BC6C_C236C, L8012BC64_C2364, L8012BC64_C2364, L8012BC64_C2364, L8012BC64_C2364, L8012BC64_C2364, L8012BC64_C2364, L8012BC6C_C236C, L8012BC64_C2364, L8012BC64_C2364, L8012BC30_C2330, L8012BC64_C2364, L8012BC64_C2364, L8012BC64_C2364, L8012BC64_C2364, L8012BC64_C2364, L8012BC6C_C236C, L8012BC6C_C236C, L8012BC6C_C236C, L8012BC6C_C236C, L8012BC6C_C236C, L8012BC64_C2364, L8012BC64_C2364, L8012BC64_C2364, L8012BC64_C2364, L8012BC64_C2364, L8012BC64_C2364, L8012BC64_C2364, L8012BC64_C2364, L8012BC64_C2364, L8012BC64_C2364, L8012BC64_C2364, L8012BC3C_C233C, L8012BC64_C2364, L8012BC44_C2344, L8012BC50_C2350, L8012BC64_C2364, L8012BC58_C2358 + +glabel D_801509F8 +.double 255.0 + +glabel D_80150A00 +.double 255.0 + +.section .text + glabel func_80127D90 /* BE490 80127D90 27BDFEC0 */ addiu $sp, $sp, -0x140 /* BE494 80127D94 AFBE0108 */ sw $fp, 0x108($sp) diff --git a/ver/us/asm/nonmatchings/code_B9D60/func_8012D3DC.s b/ver/us/asm/nonmatchings/code_B9D60/func_8012D3DC.s index f9c6884741..96a2d071f7 100644 --- a/ver/us/asm/nonmatchings/code_B9D60/func_8012D3DC.s +++ b/ver/us/asm/nonmatchings/code_B9D60/func_8012D3DC.s @@ -1,6 +1,28 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches +.section .rodata + +glabel D_80150A08 +.double 0.7 + +glabel D_80150A10 +.double 0.005 + +glabel D_80150A18 +.double 0.67 + +glabel D_80150A20 +.double 0.3 + +glabel D_80150A28 +.double 0.005 + +glabel D_80150A30 +.double 0.38, 0.0 + +.section .text + glabel func_8012D3DC /* C3ADC 8012D3DC 27BDFF58 */ addiu $sp, $sp, -0xa8 /* C3AE0 8012D3E0 AFB10064 */ sw $s1, 0x64($sp) diff --git a/ver/us/asm/nonmatchings/code_B9D60/get_char_width.s b/ver/us/asm/nonmatchings/code_B9D60/get_char_width.s index ed057604c2..3f980e3e68 100644 --- a/ver/us/asm/nonmatchings/code_B9D60/get_char_width.s +++ b/ver/us/asm/nonmatchings/code_B9D60/get_char_width.s @@ -1,6 +1,13 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches +.section .rodata + +glabel D_80150580 +.double 0.6 + +.section .text + glabel get_char_width /* BC4F4 80125DF4 288200F0 */ slti $v0, $a0, 0xf0 /* BC4F8 80125DF8 44871000 */ mtc1 $a3, $f2 diff --git a/ver/us/asm/nonmatchings/code_B9D60/get_string_properties.s b/ver/us/asm/nonmatchings/code_B9D60/get_string_properties.s index 098263c306..c8c926750e 100644 --- a/ver/us/asm/nonmatchings/code_B9D60/get_string_properties.s +++ b/ver/us/asm/nonmatchings/code_B9D60/get_string_properties.s @@ -1,6 +1,22 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches +.section .rodata + +glabel jtbl_80150588 +.word L801260B0_BC7B0, L80126080_BC780, L80126260_BC960, L80126074_BC774, L80126074_BC774, L80126074_BC774, L80126074_BC774, L80126294_BC994, L80126294_BC994, L80126294_BC994, L801262E8_BC9E8, L80126080_BC780, L801260F4_BC7F4, L8012612C_BC82C, L801262A0_BC9A0, L80126158_BC858 + +glabel jtbl_801505C8 +.word L801262E8_BC9E8, L801262E8_BC9E8, L801262E8_BC9E8, L801262E8_BC9E8, L80126124_BC824, L801262E8_BC9E8, L801262E8_BC9E8, L801262E8_BC9E8, L80126260_BC960, L801262E8_BC9E8, L801262E8_BC9E8, 0 + +glabel jtbl_801505F8 +.word L80126184_BC884, L801261D8_BC8D8, L801261D8_BC8D8, L801262E8_BC9E8, L801261C4_BC8C4, L80126260_BC960, L801262E8_BC9E8, L801262E8_BC9E8, L801262E8_BC9E8, L801262E8_BC9E8, L801262E8_BC9E8, L80126260_BC960, L80126260_BC960, L801261E0_BC8E0, L80126224_BC924, L801261A4_BC8A4, L801261A4_BC8A4, L80126260_BC960, L80126260_BC960, L80126260_BC960, L80126260_BC960, L80126260_BC960, L801261A0_BC8A0, L80126260_BC960, L8012619C_BC89C, L80126260_BC960, L801261A0_BC8A0, L801261A4_BC8A4, L80126260_BC960, L801261D8_BC8D8, L80126260_BC960, L80126260_BC960, L80126260_BC960, L80126260_BC960, L801262E8_BC9E8, L801262E8_BC9E8, L801262E8_BC9E8, L801262E8_BC9E8, L80126234_BC934, L80126260_BC960, L80126268_BC968, L801261AC_BC8AC, L80126260_BC960, L801262E8_BC9E8, L80126198_BC898, L801261D8_BC8D8, L801261D8_BC8D8, L80126260_BC960 + +glabel jtbl_801506B8 +.word L801262E8_BC9E8, L801262E8_BC9E8, L801262E8_BC9E8, L80126260_BC960, L801262E8_BC9E8, L80126260_BC960, L801262E8_BC9E8, L80126260_BC960, L801262E8_BC9E8, L801262E8_BC9E8, L801262E8_BC9E8, L801262E8_BC9E8, L801262E8_BC9E8, L801262E8_BC9E8, L801262E8_BC9E8, 0 + +.section .text + glabel get_string_properties /* BC668 80125F68 27BDFEB0 */ addiu $sp, $sp, -0x150 /* BC66C 80125F6C F7B40148 */ sdc1 $f20, 0x148($sp) diff --git a/ver/us/asm/nonmatchings/code_C50A0/func_8012F500.s b/ver/us/asm/nonmatchings/code_C50A0/func_8012F500.s index f83d3a9182..0d6687d4ca 100644 --- a/ver/us/asm/nonmatchings/code_C50A0/func_8012F500.s +++ b/ver/us/asm/nonmatchings/code_C50A0/func_8012F500.s @@ -1,6 +1,16 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches +.section .rodata + +glabel D_80150A40 +.double 0.01 + +glabel D_80150A48 +.double 0.3 + +.section .text + glabel func_8012F500 /* C5C00 8012F500 27BDFF88 */ addiu $sp, $sp, -0x78 /* C5C04 8012F504 C7A800A4 */ lwc1 $f8, 0xa4($sp) diff --git a/ver/us/asm/nonmatchings/code_C50A0/func_8012FE78.s b/ver/us/asm/nonmatchings/code_C50A0/func_8012FE78.s index 7849eedfd4..1c8004ba8b 100644 --- a/ver/us/asm/nonmatchings/code_C50A0/func_8012FE78.s +++ b/ver/us/asm/nonmatchings/code_C50A0/func_8012FE78.s @@ -1,6 +1,13 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches +.section .rodata + +glabel D_80150A50 +.double 0.01, 0.0 + +.section .text + glabel func_8012FE78 /* C6578 8012FE78 27BDFF68 */ addiu $sp, $sp, -0x98 /* C657C 8012FE7C F7B60090 */ sdc1 $f22, 0x90($sp) diff --git a/ver/us/asm/nonmatchings/code_C50A0/func_80130A04.s b/ver/us/asm/nonmatchings/code_C50A0/func_80130A04.s index 9d2d794a1d..04a5855f56 100644 --- a/ver/us/asm/nonmatchings/code_C50A0/func_80130A04.s +++ b/ver/us/asm/nonmatchings/code_C50A0/func_80130A04.s @@ -1,6 +1,13 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches +.section .rodata + +glabel jtbl_80150A60 +.word L80130ABC_C71BC, L80130A30_C7130, L80130A50_C7150, L80130A60_C7160, L80130AB4_C71B4, L80130AC4_C71C4, L80130AC4_C71C4, L80130A70_C7170 + +.section .text + glabel func_80130A04 /* C7104 80130A04 8C830040 */ lw $v1, 0x40($a0) /* C7108 80130A08 8C650000 */ lw $a1, ($v1) diff --git a/ver/us/asm/nonmatchings/code_C50A0/func_80131128.s b/ver/us/asm/nonmatchings/code_C50A0/func_80131128.s index 951c05cf59..ae5aa07c65 100644 --- a/ver/us/asm/nonmatchings/code_C50A0/func_80131128.s +++ b/ver/us/asm/nonmatchings/code_C50A0/func_80131128.s @@ -1,6 +1,13 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches +.section .rodata + +glabel jtbl_80150A80 +.word L801313BC_C7ABC, L801311B8_C78B8, L80131188_C7888, L80131188_C7888, L801311B0_C78B0, 0 + +.section .text + glabel func_80131128 /* C7828 80131128 27BDFFC8 */ addiu $sp, $sp, -0x38 /* C782C 8013112C AFBE0030 */ sw $fp, 0x30($sp) diff --git a/ver/us/asm/nonmatchings/code_C50A0/func_80131DD4.s b/ver/us/asm/nonmatchings/code_C50A0/func_80131DD4.s index 44a5571924..3e60a93015 100644 --- a/ver/us/asm/nonmatchings/code_C50A0/func_80131DD4.s +++ b/ver/us/asm/nonmatchings/code_C50A0/func_80131DD4.s @@ -1,6 +1,13 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches +.section .rodata + +glabel D_80150BC0 +.word 0x80131E38, 0x80131E44, 0x80131EC4, 0x80131E98, 0x80131EA4, 0x00000000 + +.section .text + glabel func_80131DD4 /* C84D4 80131DD4 27BDFFD8 */ addiu $sp, $sp, -0x28 /* C84D8 80131DD8 AFB20018 */ sw $s2, 0x18($sp) diff --git a/ver/us/asm/nonmatchings/code_C50A0/func_80132D94.s b/ver/us/asm/nonmatchings/code_C50A0/func_80132D94.s index b1292ddcdb..ea1bdb1db2 100644 --- a/ver/us/asm/nonmatchings/code_C50A0/func_80132D94.s +++ b/ver/us/asm/nonmatchings/code_C50A0/func_80132D94.s @@ -1,6 +1,13 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches +.section .rodata + +glabel D_80150CC8 +.word 0x80132E08, 0x80132E18, 0x80132E18, 0x80132E28, 0x80132E30, 0x80132E30, 0x80132E30, 0x80132E30, 0x80132E30, 0x80132E30, 0x80132E30, 0x80132E30, 0x80132E28, 0x80132E30, 0x80132E30, 0x80132E30, 0x80132E28, 0x80132E30, 0x80132E30, 0x80132E30, 0x80132E28, 0x80132E30, 0x80132E30, 0x80132E28 + +.section .text + glabel func_80132D94 /* C9494 80132D94 3C02800A */ lui $v0, %hi(D_8009A650) /* C9498 80132D98 8C42A650 */ lw $v0, %lo(D_8009A650)($v0) diff --git a/ver/us/asm/nonmatchings/code_C50A0/func_8013673C.s b/ver/us/asm/nonmatchings/code_C50A0/func_8013673C.s index 912121901d..f1e63d68a2 100644 --- a/ver/us/asm/nonmatchings/code_C50A0/func_8013673C.s +++ b/ver/us/asm/nonmatchings/code_C50A0/func_8013673C.s @@ -1,6 +1,13 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches +.section .rodata + +glabel jtbl_80150E60 +.word L801367A4_CCEA4, L801367A4_CCEA4, L801369B4_CD0B4, L801369B4_CD0B4, L801369B4_CD0B4, L801369B4_CD0B4, L801369B4_CD0B4, L801369B4_CD0B4, L801367A4_CCEA4, L801367A4_CCEA4, L801369B4_CD0B4, L8013694C_CD04C, L8013694C_CD04C, 0, 0, 0 + +.section .text + glabel func_8013673C /* CCE3C 8013673C 27BDFFD0 */ addiu $sp, $sp, -0x30 /* CCE40 80136740 AFB1001C */ sw $s1, 0x1c($sp) diff --git a/ver/us/asm/nonmatchings/code_C50A0/make_item_entity.s b/ver/us/asm/nonmatchings/code_C50A0/make_item_entity.s index bb63815da2..28c53362a9 100644 --- a/ver/us/asm/nonmatchings/code_C50A0/make_item_entity.s +++ b/ver/us/asm/nonmatchings/code_C50A0/make_item_entity.s @@ -1,6 +1,19 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches +.section .rodata + +glabel jtbl_80150A98 +.word L80131468_C7B68, L80131478_C7B78, L80131478_C7B78, L80131478_C7B78, L80131478_C7B78, L80131468_C7B68, L80131468_C7B68, L80131468_C7B68, L80131468_C7B68, L80131478_C7B78, L80131468_C7B68, L80131468_C7B68, L80131478_C7B78, L80131468_C7B68, L80131468_C7B68, L80131468_C7B68, L80131478_C7B78, L80131468_C7B68, L80131468_C7B68, L80131478_C7B78, L80131478_C7B78, L80131468_C7B68, L80131468_C7B68, 0 + +glabel jtbl_80150AF8 +.word L80131620_C7D20, L8013162C_C7D2C, L80131638_C7D38, L8013162C_C7D2C, L80131644_C7D44, L80131660_C7D60, L80131674_C7D74, L80131688_C7D88, L8013169C_C7D9C, L801316B0_C7DB0, L801316C4_C7DC4, L801316E0_C7DE0, L80131708_C7E08, L80131714_C7E14, L80131728_C7E28, L8013173C_C7E3C, L80131750_C7E50, L80131768_C7E68, L80131784_C7E84, L801317A0_C7EA0, L801318B4_C7FB4, L801318C4_C7FC4, L801318E4_C7FE4, L801317BC_C7EBC, L801317E8_C7EE8, L8013181C_C7F1C, L80131850_C7F50, L80131878_C7F78 + +glabel jtbl_80150B68 +.word L8013192C_C802C, L80131A0C_C810C, L80131A0C_C810C, L8013192C_C802C, L80131A0C_C810C, L80131A0C_C810C, L80131A0C_C810C, L80131A0C_C810C, L80131A0C_C810C, L80131A0C_C810C, L80131A0C_C810C, L80131A0C_C810C, L8013192C_C802C, L80131A0C_C810C, L80131A0C_C810C, L80131A0C_C810C, L8013192C_C802C, L80131A0C_C810C, L80131A0C_C810C, L80131A0C_C810C, L8013192C_C802C, 0 + +.section .text + glabel make_item_entity /* C7AF4 801313F4 27BDFFC8 */ addiu $sp, $sp, -0x38 /* C7AF8 801313F8 AFB20028 */ sw $s2, 0x28($sp) diff --git a/ver/us/asm/nonmatchings/code_C50A0/remove_item_entity_by_index.s b/ver/us/asm/nonmatchings/code_C50A0/remove_item_entity_by_index.s index 9e9b7d715b..83d5aa90a9 100644 --- a/ver/us/asm/nonmatchings/code_C50A0/remove_item_entity_by_index.s +++ b/ver/us/asm/nonmatchings/code_C50A0/remove_item_entity_by_index.s @@ -1,6 +1,13 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches +.section .rodata + +glabel jtbl_80150DA0 +.word L80133A48_CA148, L80133A50_CA150, L80133A50_CA150, L80133A48_CA148, L80133A50_CA150, L80133A50_CA150, L80133A50_CA150, L80133A50_CA150, L80133A50_CA150, L80133A50_CA150, L80133A50_CA150, L80133A50_CA150, L80133A48_CA148, L80133A50_CA150, L80133A50_CA150, L80133A50_CA150, L80133A48_CA148, L80133A50_CA150, L80133A50_CA150, L80133A50_CA150, L80133A48_CA148, L80133A50_CA150, L80133A50_CA150, L80133A50_CA150, L80133A50_CA150, L80133A50_CA150, L80133A50_CA150, L80133A50_CA150, L80133A48_CA148, 0 + +.section .text + glabel remove_item_entity_by_index /* CA0FC 801339FC 27BDFFE0 */ addiu $sp, $sp, -0x20 /* CA100 80133A00 AFB00010 */ sw $s0, 0x10($sp) diff --git a/ver/us/asm/nonmatchings/code_C50A0/remove_item_entity_by_reference.s b/ver/us/asm/nonmatchings/code_C50A0/remove_item_entity_by_reference.s index d7a59dc6df..3ac2eecacb 100644 --- a/ver/us/asm/nonmatchings/code_C50A0/remove_item_entity_by_reference.s +++ b/ver/us/asm/nonmatchings/code_C50A0/remove_item_entity_by_reference.s @@ -1,6 +1,13 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches +.section .rodata + +glabel jtbl_80150D28 +.word L801339B0_CA0B0, L801339B8_CA0B8, L801339B8_CA0B8, L801339B0_CA0B0, L801339B8_CA0B8, L801339B8_CA0B8, L801339B8_CA0B8, L801339B8_CA0B8, L801339B8_CA0B8, L801339B8_CA0B8, L801339B8_CA0B8, L801339B8_CA0B8, L801339B0_CA0B0, L801339B8_CA0B8, L801339B8_CA0B8, L801339B8_CA0B8, L801339B0_CA0B0, L801339B8_CA0B8, L801339B8_CA0B8, L801339B8_CA0B8, L801339B0_CA0B0, L801339B8_CA0B8, L801339B8_CA0B8, L801339B8_CA0B8, L801339B8_CA0B8, L801339B8_CA0B8, L801339B8_CA0B8, L801339B8_CA0B8, L801339B0_CA0B0, 0 + +.section .text + glabel remove_item_entity_by_reference /* CA030 80133930 3C038015 */ lui $v1, %hi(D_801565A0) /* CA034 80133934 8C6365A0 */ lw $v1, %lo(D_801565A0)($v1) diff --git a/ver/us/asm/nonmatchings/code_C50A0/update_item_entities.s b/ver/us/asm/nonmatchings/code_C50A0/update_item_entities.s index cfea51a9e1..330c39ff50 100644 --- a/ver/us/asm/nonmatchings/code_C50A0/update_item_entities.s +++ b/ver/us/asm/nonmatchings/code_C50A0/update_item_entities.s @@ -1,6 +1,16 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches +.section .rodata + +glabel jtbl_80150BD8 +.word L80131FD8_C86D8, L80131FE8_C86E8, L80131FE8_C86E8, L80131FF8_C86F8, L80132010_C8710, L80132010_C8710, L80132010_C8710, L80132010_C8710, L80132010_C8710, L80132010_C8710, L80132010_C8710, L80132010_C8710, L80131FF8_C86F8, L80132010_C8710, L80132010_C8710, L80132010_C8710, L80131FF8_C86F8, L80132010_C8710, L80132010_C8710, L80132010_C8710, L80131FF8_C86F8, L80132010_C8710, L80132010_C8710, L80131FF8_C86F8, L80132010_C8710, L80132010_C8710, L80132010_C8710, L80132010_C8710, L80132008_C8708, 0 + +glabel jtbl_80150C50 +.word L8013204C_C874C, L80132140_C8840, L80132140_C8840, L8013204C_C874C, L80132140_C8840, L80132140_C8840, L80132140_C8840, L80132140_C8840, L80132140_C8840, L80132140_C8840, L80132140_C8840, L80132140_C8840, L8013204C_C874C, L80132140_C8840, L80132140_C8840, L80132140_C8840, L8013204C_C874C, L80132140_C8840, L80132140_C8840, L80132140_C8840, L80132140_C8840, L80132140_C8840, L80132140_C8840, L80132140_C8840, L80132140_C8840, L80132140_C8840, L80132140_C8840, L80132140_C8840, L8013204C_C874C, 0 + +.section .text + glabel update_item_entities /* C85EC 80131EEC 3C02800A */ lui $v0, %hi(D_8009A650) /* C85F0 80131EF0 8C42A650 */ lw $v0, %lo(D_8009A650)($v0) diff --git a/ver/us/asm/nonmatchings/code_C50A0/update_item_entity_collectable.s b/ver/us/asm/nonmatchings/code_C50A0/update_item_entity_collectable.s index ae65fa3ebd..e0bc49b4a7 100644 --- a/ver/us/asm/nonmatchings/code_C50A0/update_item_entity_collectable.s +++ b/ver/us/asm/nonmatchings/code_C50A0/update_item_entity_collectable.s @@ -1,6 +1,13 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches +.section .rodata + +glabel D_80150E18 +.double 0.6 + +.section .text + glabel update_item_entity_collectable /* CA950 80134250 3C028015 */ lui $v0, %hi(D_801565A4) /* CA954 80134254 844265A4 */ lh $v0, %lo(D_801565A4)($v0) diff --git a/ver/us/asm/nonmatchings/code_C50A0/update_item_entity_temp.s b/ver/us/asm/nonmatchings/code_C50A0/update_item_entity_temp.s index 7d75cbbf32..44c3705f64 100644 --- a/ver/us/asm/nonmatchings/code_C50A0/update_item_entity_temp.s +++ b/ver/us/asm/nonmatchings/code_C50A0/update_item_entity_temp.s @@ -1,6 +1,13 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches +.section .rodata + +glabel jtbl_80150E20 +.word L801357A8_CBEA8, L80135B24_CC224, L80135E48_CC548, L80135E78_CC578, L80135F08_CC608, L80135F78_CC678, L8013637C_CCA7C, L8013637C_CCA7C, L80135F94_CC694, L80135FE8_CC6E8, L8013610C_CC80C, L8013614C_CC84C, L8013629C_CC99C, L801362D0_CC9D0, L80136310_CCA10, 0 + +.section .text + glabel update_item_entity_temp /* CBDDC 801356DC 27BDFFC0 */ addiu $sp, $sp, -0x40 /* CBDE0 801356E0 AFB10024 */ sw $s1, 0x24($sp) diff --git a/ver/us/asm/nonmatchings/code_CEE40/func_80138E54.s b/ver/us/asm/nonmatchings/code_CEE40/func_80138E54.s index 0c0a0d0e21..a4b5e9d40b 100644 --- a/ver/us/asm/nonmatchings/code_CEE40/func_80138E54.s +++ b/ver/us/asm/nonmatchings/code_CEE40/func_80138E54.s @@ -1,6 +1,22 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches +.section .rodata + +glabel D_80150F80 +.double 0.14 + +glabel D_80150F88 +.double 0.9 + +glabel D_80150F90 +.double 0.05 + +glabel D_80150F98 +.double 0.07 + +.section .text + glabel func_80138E54 /* CF554 80138E54 27BDFF78 */ addiu $sp, $sp, -0x88 /* CF558 80138E58 F7B80068 */ sdc1 $f24, 0x68($sp) diff --git a/ver/us/asm/nonmatchings/code_CEE40/func_80139F10.s b/ver/us/asm/nonmatchings/code_CEE40/func_80139F10.s index 68a4e9d9c8..819d813338 100644 --- a/ver/us/asm/nonmatchings/code_CEE40/func_80139F10.s +++ b/ver/us/asm/nonmatchings/code_CEE40/func_80139F10.s @@ -1,6 +1,13 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches +.section .rodata + +glabel D_80150FA0 +.double 0.09, 0.0 + +.section .text + glabel func_80139F10 /* D0610 80139F10 0080782D */ daddu $t7, $a0, $zero /* D0614 80139F14 8FA3001C */ lw $v1, 0x1c($sp) diff --git a/ver/us/asm/nonmatchings/code_DF950/func_80149250.s b/ver/us/asm/nonmatchings/code_DF950/func_80149250.s index 82afabb87c..4a0126c87d 100644 --- a/ver/us/asm/nonmatchings/code_DF950/func_80149250.s +++ b/ver/us/asm/nonmatchings/code_DF950/func_80149250.s @@ -1,6 +1,22 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches +.section .rodata + +glabel D_80151250 +.double 5550.0 + +glabel D_80151258 +.double 127.0 + +glabel D_80151260 +.double 3.6 + +glabel D_80151268 +.double 127.0 + +.section .text + glabel func_80149250 /* DF950 80149250 44860000 */ mtc1 $a2, $f0 /* DF954 80149254 3C048007 */ lui $a0, %hi(gCurrentCameraID) diff --git a/ver/us/asm/nonmatchings/code_DF950/func_80149F58.s b/ver/us/asm/nonmatchings/code_DF950/func_80149F58.s index e68953091f..5791f0c5b7 100644 --- a/ver/us/asm/nonmatchings/code_DF950/func_80149F58.s +++ b/ver/us/asm/nonmatchings/code_DF950/func_80149F58.s @@ -1,6 +1,22 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches +.section .rodata + +glabel D_80151270 +.double 127.0 + +glabel D_80151278 +.double 90.0 + +glabel D_80151280 +.double 6.283180236816406 + +glabel D_80151288 +.double 360.0 + +.section .text + glabel func_80149F58 /* E0658 80149F58 44860000 */ mtc1 $a2, $f0 /* E065C 80149F5C 27BDFFB8 */ addiu $sp, $sp, -0x48 diff --git a/ver/us/asm/nonmatchings/code_F5750/func_802D2520.s b/ver/us/asm/nonmatchings/code_F5750/func_802D2520.s index e627046720..8ce85cac2e 100644 --- a/ver/us/asm/nonmatchings/code_F5750/func_802D2520.s +++ b/ver/us/asm/nonmatchings/code_F5750/func_802D2520.s @@ -1,6 +1,13 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches +.section .rodata + +glabel jtbl_802DA208 +.word L802D25A8_F6F58, L802D25DC_F6F8C, L802D25D4_F6F84, L802D25D4_F6F84, L802D2604_F6FB4, L802D2760_F7110, L802D2664_F7014, L802D26C4_F7074, L802D2704_F70B4, L802D283C_F71EC, L802D283C_F71EC, L802D283C_F71EC, L802D283C_F71EC, L802D27C0_F7170 + +.section .text + glabel func_802D2520 /* F6ED0 802D2520 27BDFFC0 */ addiu $sp, $sp, -0x40 /* F6ED4 802D2524 AFB40030 */ sw $s4, 0x30($sp) diff --git a/ver/us/asm/nonmatchings/code_F5750/func_802D4050.s b/ver/us/asm/nonmatchings/code_F5750/func_802D4050.s index 95b0469d33..71e679c55c 100644 --- a/ver/us/asm/nonmatchings/code_F5750/func_802D4050.s +++ b/ver/us/asm/nonmatchings/code_F5750/func_802D4050.s @@ -1,6 +1,13 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches +.section .rodata + +glabel jtbl_802DA240 +.word L802D40D4_F8A84, L802D40E0_F8A90, L802D4148_F8AF8, L802D40EC_F8A9C, L802D40F8_F8AA8, L802D4104_F8AB4 + +.section .text + glabel func_802D4050 /* F8A00 802D4050 27BDFFE0 */ addiu $sp, $sp, -0x20 /* F8A04 802D4054 AFB20018 */ sw $s2, 0x18($sp) diff --git a/ver/us/asm/nonmatchings/code_FBE10/PlayEffect.s b/ver/us/asm/nonmatchings/code_FBE10/PlayEffect.s index 8248e487ce..55db16e8bb 100644 --- a/ver/us/asm/nonmatchings/code_FBE10/PlayEffect.s +++ b/ver/us/asm/nonmatchings/code_FBE10/PlayEffect.s @@ -1,6 +1,13 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches +.section .rodata + +glabel jtbl_802DA258 +.word L802D8560_FCF10, L802D858C_FCF3C, L802D9688_FE038, L802D9688_FE038, L802D9688_FE038, L802D9688_FE038, L802D85A4_FCF54, L802D85C0_FCF70, L802D85E0_FCF90, L802D85FC_FCFAC, L802D861C_FCFCC, L802D8638_FCFE8, L802D8654_FD004, L802D8674_FD024, L802D8698_FD048, L802D86B4_FD064, L802D86E0_FD090, L802D870C_FD0BC, L802D8728_FD0D8, L802D8750_FD100, L802D8770_FD120, L802D878C_FD13C, L802D87A8_FD158, L802D87C4_FD174, L802D87E0_FD190, L802D8808_FD1B8, L802D8824_FD1D4, L802D8840_FD1F0, L802D8864_FD214, L802D8880_FD230, L802D88A8_FD258, L802D88E8_FD298, L802D8A68_FD418, L802D8914_FD2C4, L802D893C_FD2EC, L802D8968_FD318, L802D8984_FD334, L802D89A4_FD354, L802D89C0_FD370, L802D89DC_FD38C, L802D89FC_FD3AC, L802D8A24_FD3D4, L802D9688_FE038, L802D8A4C_FD3FC, L802D8A8C_FD43C, L802D8AA8_FD458, L802D8AC8_FD478, L802D8AE8_FD498, L802D8B20_FD4D0, L802D8B3C_FD4EC, L802D8B58_FD508, L802D8B74_FD524, L802D8B94_FD544, L802D8BB8_FD568, L802D8BDC_FD58C, L802D8BFC_FD5AC, L802D8C30_FD5E0, L802D8C50_FD600, L802D8C70_FD620, L802D8C9C_FD64C, L802D8CC0_FD670, L802D8CF4_FD6A4, L802D8D34_FD6E4, L802D8D54_FD704, L802D8D70_FD720, L802D8D8C_FD73C, L802D8DA8_FD758, L802D8DC8_FD778, L802D8DE8_FD798, L802D8E08_FD7B8, L802D8E1C_FD7CC, L802D8E30_FD7E0, L802D8E50_FD800, L802D8E70_FD820, L802D8E90_FD840, L802D8EB0_FD860, L802D8ED0_FD880, L802D8F00_FD8B0, L802D8F44_FD8F4, L802D8F60_FD910, L802D9688_FE038, L802D8FBC_FD96C, L802D8F80_FD930, L802D8FA0_FD950, L802D9688_FE038, L802D94A0_FDE50, L802D8FDC_FD98C, L802D8FFC_FD9AC, L802D901C_FD9CC, L802D903C_FD9EC, L802D906C_FDA1C, L802D908C_FDA3C, L802D90AC_FDA5C, L802D90CC_FDA7C, L802D90EC_FDA9C, L802D911C_FDACC, L802D913C_FDAEC, L802D915C_FDB0C, L802D917C_FDB2C, L802D919C_FDB4C, L802D91D4_FDB84, L802D9204_FDBB4, L802D9224_FDBD4, L802D9244_FDBF4, L802D9264_FDC14, L802D9284_FDC34, L802D9688_FE038, L802D92A4_FDC54, L802D92C4_FDC74, L802D92E4_FDC94, L802D9304_FDCB4, L802D932C_FDCDC, L802D934C_FDCFC, L802D9388_FDD38, L802D93A8_FDD58, L802D93D4_FDD84, L802D93FC_FDDAC, L802D9430_FDDE0, L802D9688_FE038, L802D9450_FDE00, L802D9480_FDE30, L802D94BC_FDE6C, L802D94DC_FDE8C, L802D94FC_FDEAC, L802D951C_FDECC, L802D953C_FDEEC, L802D955C_FDF0C, L802D957C_FDF2C, L802D959C_FDF4C, L802D95BC_FDF6C, L802D95DC_FDF8C, L802D95FC_FDFAC, L802D961C_FDFCC, L802D9648_FDFF8, L802D9668_FE018, 0, 0, 0 + +.section .text + glabel PlayEffect /* FCC4C 802D829C 27BDFF38 */ addiu $sp, $sp, -0xc8 /* FCC50 802D82A0 AFBF0094 */ sw $ra, 0x94($sp) diff --git a/ver/us/asm/nonmatchings/code_a5dd0_len_114e0/appendGfx_model.s b/ver/us/asm/nonmatchings/code_a5dd0_len_114e0/appendGfx_model.s index ee8791bb90..5c572c1fd8 100644 --- a/ver/us/asm/nonmatchings/code_a5dd0_len_114e0/appendGfx_model.s +++ b/ver/us/asm/nonmatchings/code_a5dd0_len_114e0/appendGfx_model.s @@ -1,6 +1,34 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches +.section .rodata + +glabel jtbl_8014F990 +.word L80113428_A9B28, L80113488_A9B88, L801134E8_A9BE8, L80113568_A9C68, L80113608_A9D08, L801136C8_A9DC8, L801137A8_A9EA8, L801138A8_A9FA8 + +glabel jtbl_8014F9B0 +.word L80113C14_AA314, L80113CD8_AA3D8, L80113D94_AA494, L80113F64_AA664, L80113F64_AA664, L801142F4_AA9F4, L80114690_AAD90, L80114690_AAD90, L80114690_AAD90, L8011460C_AAD0C, L8011460C_AAD0C, 0 + +glabel jtbl_8014F9E0 +.word L80113CD0_AA3D0, L80113CD0_AA3D0, L80113C40_AA340, L80113CA8_AA3A8, L80113C48_AA348, L80113CD0_AA3D0, L80113C50_AA350, L80113CD0_AA3D0, L80113C58_AA358, L80113CD0_AA3D0, L80113CD0_AA3D0, L80113CD0_AA3D0, L80113C60_AA360, L80113CD0_AA3D0, L80113C68_AA368, L80113CB0_AA3B0, L80113C78_AA378, L80113CD0_AA3D0, L80113C80_AA380, L80113CB8_AA3B8, L80113C88_AA388, L80113C78_AA378, L80113CD0_AA3D0, L80113CD0_AA3D0, L80113CD0_AA3D0, L80113C90_AA390, L80113CD0_AA3D0, L80113C98_AA398, L80113CD0_AA3D0, L80113CD0_AA3D0, L80113CD0_AA3D0, L80113CD0_AA3D0, L80113CD0_AA3D0, L80113C78_AA378, L80113CD0_AA3D0, L80113CD0_AA3D0, L80113CD0_AA3D0, L80113CA0_AA3A0, L80113CD0_AA3D0, L80113CD0_AA3D0, L80113C70_AA370, L80113CD0_AA3D0, L80113CD0_AA3D0, L80113CD0_AA3D0, L80113CD0_AA3D0, L80113CC0_AA3C0, L80113CC8_AA3C8, 0 + +glabel jtbl_8014FAA0 +.word L80113D8C_AA48C, L80113D8C_AA48C, L80113D04_AA404, L80113D64_AA464, L80113D0C_AA40C, L80113D8C_AA48C, L80113D14_AA414, L80113D8C_AA48C, L80113D1C_AA41C, L80113D8C_AA48C, L80113D8C_AA48C, L80113D8C_AA48C, L80113D24_AA424, L80113D8C_AA48C, L80113D2C_AA42C, L80113D6C_AA46C, L80113D34_AA434, L80113D8C_AA48C, L80113D44_AA444, L80113D74_AA474, L80113D8C_AA48C, L80113D34_AA434, L80113D8C_AA48C, L80113D8C_AA48C, L80113D8C_AA48C, L80113D4C_AA44C, L80113D8C_AA48C, L80113D54_AA454, L80113D8C_AA48C, L80113D8C_AA48C, L80113D8C_AA48C, L80113D8C_AA48C, L80113D8C_AA48C, L80113D34_AA434, L80113D8C_AA48C, L80113D8C_AA48C, L80113D8C_AA48C, L80113D5C_AA45C, L80113D8C_AA48C, L80113D8C_AA48C, L80113D3C_AA43C, L80113D8C_AA48C, L80113D8C_AA48C, L80113D8C_AA48C, L80113D8C_AA48C, L80113D7C_AA47C, L80113D84_AA484, 0 + +glabel jtbl_8014FB60 +.word L80113E48_AA548, L80113E48_AA548, L80113DC0_AA4C0, L80113E20_AA520, L80113DC8_AA4C8, L80113E48_AA548, L80113DD0_AA4D0, L80113E48_AA548, L80113DD8_AA4D8, L80113E48_AA548, L80113E48_AA548, L80113E48_AA548, L80113DE0_AA4E0, L80113E48_AA548, L80113DE8_AA4E8, L80113E28_AA528, L80113DF0_AA4F0, L80113E48_AA548, L80113E00_AA500, L80113E30_AA530, L80113E48_AA548, L80113DF0_AA4F0, L80113E48_AA548, L80113E48_AA548, L80113E48_AA548, L80113E08_AA508, L80113E48_AA548, L80113E10_AA510, L80113E48_AA548, L80113E48_AA548, L80113E48_AA548, L80113E48_AA548, L80113E48_AA548, L80113DF0_AA4F0, L80113E48_AA548, L80113E48_AA548, L80113E48_AA548, L80113E18_AA518, L80113E48_AA548, L80113E48_AA548, L80113DF8_AA4F8, L80113E48_AA548, L80113E48_AA548, L80113E48_AA548, L80113E48_AA548, L80113E38_AA538, L80113E40_AA540, 0 + +glabel jtbl_8014FC20 +.word L80113FC4_AA6C4, L80114234_AA934, L80113FE4_AA6E4, L80114184_AA884, L80114004_AA704, L80114234_AA934, L80114024_AA724, L80114234_AA934, L80114044_AA744, L80114234_AA934, L80114234_AA934, L80114234_AA934, L80114064_AA764, L80114234_AA934, L80114084_AA784, L801141A4_AA8A4, L801140A4_AA7A4, L80114234_AA934, L80114104_AA804, L801141C4_AA8C4, L80114234_AA934, L801140C4_AA7C4, L80114234_AA934, L80114234_AA934, L80114234_AA934, L80114124_AA824, L80114234_AA934, L80114144_AA844, L80114234_AA934, L80114234_AA934, L80114234_AA934, L80114234_AA934, L80114234_AA934, L801140E4_AA7E4, L80114234_AA934, L80114234_AA934, L80114234_AA934, L80114164_AA864, L80114234_AA934, L80114234_AA934, L80114234_AA934, L80114234_AA934, L80114234_AA934, L80114234_AA934, L80114234_AA934, L801141E4_AA8E4, L80114204_AA904, 0 + +glabel jtbl_8014FCE0 +.word L801143A8_AAAA8, L801143A8_AAAA8, L80114320_AAA20, L80114380_AAA80, L80114328_AAA28, L801143A8_AAAA8, L80114330_AAA30, L801143A8_AAAA8, L80114338_AAA38, L801143A8_AAAA8, L801143A8_AAAA8, L801143A8_AAAA8, L80114340_AAA40, L801143A8_AAAA8, L80114348_AAA48, L80114388_AAA88, L80114350_AAA50, L801143A8_AAAA8, L80114360_AAA60, L80114390_AAA90, L801143A8_AAAA8, L80114350_AAA50, L801143A8_AAAA8, L801143A8_AAAA8, L801143A8_AAAA8, L80114368_AAA68, L801143A8_AAAA8, L80114370_AAA70, L801143A8_AAAA8, L801143A8_AAAA8, L801143A8_AAAA8, L801143A8_AAAA8, L801143A8_AAAA8, L80114350_AAA50, L801143A8_AAAA8, L801143A8_AAAA8, L801143A8_AAAA8, L80114378_AAA78, L801143A8_AAAA8, L801143A8_AAAA8, L80114358_AAA58, L801143A8_AAAA8, L801143A8_AAAA8, L801143A8_AAAA8, L801143A8_AAAA8, L80114398_AAA98, L801143A0_AAAA0, 0 + +glabel jtbl_8014FDA0 +.word L80114660_AAD60, L80114660_AAD60, L80114660_AAD60, L80114660_AAD60, L80114638_AAD38, L80114660_AAD60, L80114660_AAD60, L80114660_AAD60, L80114640_AAD40, L80114660_AAD60, L80114660_AAD60, L80114660_AAD60, L80114648_AAD48, L80114660_AAD60, L80114660_AAD60, L80114660_AAD60, L80114660_AAD60, L80114660_AAD60, L80114660_AAD60, L80114660_AAD60, L80114660_AAD60, L80114660_AAD60, L80114660_AAD60, L80114660_AAD60, L80114660_AAD60, L80114660_AAD60, L80114660_AAD60, L80114660_AAD60, L80114660_AAD60, L80114660_AAD60, L80114660_AAD60, L80114660_AAD60, L80114660_AAD60, L80114660_AAD60, L80114660_AAD60, L80114660_AAD60, L80114660_AAD60, L80114660_AAD60, L80114660_AAD60, L80114660_AAD60, L80114660_AAD60, L80114660_AAD60, L80114660_AAD60, L80114660_AAD60, L80114660_AAD60, L80114650_AAD50, L80114658_AAD58, 0 + +.section .text + glabel appendGfx_model /* A9790 80113090 27BDFF88 */ addiu $sp, $sp, -0x78 /* A9794 80113094 AFB60068 */ sw $s6, 0x68($sp) diff --git a/ver/us/asm/nonmatchings/code_a5dd0_len_114e0/create_entity.s b/ver/us/asm/nonmatchings/code_a5dd0_len_114e0/create_entity.s index cf3132f2e7..85a9d41f1f 100644 --- a/ver/us/asm/nonmatchings/code_a5dd0_len_114e0/create_entity.s +++ b/ver/us/asm/nonmatchings/code_a5dd0_len_114e0/create_entity.s @@ -1,6 +1,13 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches +.section .rodata + +glabel jtbl_8014F878 +.word L80111B80_A8280, L80111B80_A8280, L80111B8C_A828C, L80111B8C_A828C, L80111B8C_A828C, L80111B8C_A828C, L80111B8C_A828C, L80111B8C_A828C, L80111B8C_A828C, L80111B8C_A828C, L80111B8C_A828C, L80111B8C_A828C, L80111B8C_A828C, L80111B8C_A828C, L80111B8C_A828C, L80111B8C_A828C, L80111B8C_A828C, L80111B8C_A828C, L80111B8C_A828C, L80111B8C_A828C, L80111B8C_A828C, L80111B8C_A828C, L80111B8C_A828C, L80111B8C_A828C, L80111B8C_A828C, L80111B8C_A828C, L80111B8C_A828C, L80111B8C_A828C, L80111B8C_A828C, L80111B8C_A828C, L80111B8C_A828C, L80111B8C_A828C, L80111B8C_A828C, L80111B8C_A828C, L80111B8C_A828C, L80111B8C_A828C, L80111B8C_A828C, L80111B8C_A828C, L80111B8C_A828C, L80111B80_A8280, L80111B80_A8280, L80111B8C_A828C, L80111B80_A8280, 0 + +.section .text + glabel create_entity /* A7FC4 801118C4 AFA40000 */ sw $a0, ($sp) /* A7FC8 801118C8 AFA50004 */ sw $a1, 4($sp) diff --git a/ver/us/asm/nonmatchings/code_a5dd0_len_114e0/create_shadow_type.s b/ver/us/asm/nonmatchings/code_a5dd0_len_114e0/create_shadow_type.s index 334fce14d9..9d782ae817 100644 --- a/ver/us/asm/nonmatchings/code_a5dd0_len_114e0/create_shadow_type.s +++ b/ver/us/asm/nonmatchings/code_a5dd0_len_114e0/create_shadow_type.s @@ -1,6 +1,13 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches +.section .rodata + +glabel jtbl_8014F928 +.word L801122B0_A89B0, L801122C4_A89C4, L801122AC_A89AC, L801122C0_A89C0, L801122D8_A89D8, L801122D4_A89D4 + +.section .text + glabel create_shadow_type /* A8960 80112260 27BDFFE0 */ addiu $sp, $sp, -0x20 /* A8964 80112264 0080182D */ daddu $v1, $a0, $zero diff --git a/ver/us/asm/nonmatchings/code_a5dd0_len_114e0/func_801109DC.s b/ver/us/asm/nonmatchings/code_a5dd0_len_114e0/func_801109DC.s index 256cca4758..b9a8e161f1 100644 --- a/ver/us/asm/nonmatchings/code_a5dd0_len_114e0/func_801109DC.s +++ b/ver/us/asm/nonmatchings/code_a5dd0_len_114e0/func_801109DC.s @@ -1,6 +1,16 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches +.section .rodata + +glabel jtbl_8014F768 +.word L80110A70_A7170, L80110A70_A7170, L80110A68_A7168, L80110A68_A7168, L80110A70_A7170, L80110A68_A7168, L80110A70_A7170, L80110A70_A7170, L80110A70_A7170, L80110A70_A7170, L80110A70_A7170, L80110A70_A7170, L80110A68_A7168, L80110A70_A7170, L80110A70_A7170, L80110A68_A7168, L80110A68_A7168, L80110A70_A7170, L80110A68_A7168, L80110A68_A7168, L80110A68_A7168, L80110A68_A7168, L80110A68_A7168, L80110A68_A7168, L80110A68_A7168, L80110A68_A7168, L80110A68_A7168, L80110A70_A7170, L80110A68_A7168, L80110A68_A7168, L80110A68_A7168, L80110A70_A7170 + +glabel jtbl_8014F7E8 +.word L80110A70_A7170, L80110A70_A7170, L80110A68_A7168, L80110A68_A7168, L80110A70_A7170, L80110A68_A7168, L80110A70_A7170, L80110A70_A7170, L80110A70_A7170, L80110A70_A7170, L80110A70_A7170, L80110A70_A7170, L80110A68_A7168, L80110A70_A7170, L80110A68_A7168, L80110A68_A7168, L80110A68_A7168, L80110A68_A7168, L80110A68_A7168, L80110A68_A7168, L80110A70_A7170, L80110A70_A7170, L80110A68_A7168, L80110A68_A7168, L80110A68_A7168, L80110A70_A7170, L80110A68_A7168, L80110A70_A7170 + +.section .text + glabel func_801109DC /* A70DC 801109DC 27BDFFE0 */ addiu $sp, $sp, -0x20 /* A70E0 801109E0 AFB20018 */ sw $s2, 0x18($sp) diff --git a/ver/us/asm/nonmatchings/code_a5dd0_len_114e0/func_80112344.s b/ver/us/asm/nonmatchings/code_a5dd0_len_114e0/func_80112344.s index 788d50b61e..90a7d39ca5 100644 --- a/ver/us/asm/nonmatchings/code_a5dd0_len_114e0/func_80112344.s +++ b/ver/us/asm/nonmatchings/code_a5dd0_len_114e0/func_80112344.s @@ -1,6 +1,16 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches +.section .rodata + +glabel D_8014F940 +.double 0.95 + +glabel D_8014F948 +.double 250.0 + +.section .text + glabel func_80112344 /* A8A44 80112344 27BDFFC0 */ addiu $sp, $sp, -0x40 /* A8A48 80112348 AFB10034 */ sw $s1, 0x34($sp) diff --git a/ver/us/asm/nonmatchings/code_a5dd0_len_114e0/load_split_entity_data.s b/ver/us/asm/nonmatchings/code_a5dd0_len_114e0/load_split_entity_data.s index 0abbf1ebaa..4078ddf16d 100644 --- a/ver/us/asm/nonmatchings/code_a5dd0_len_114e0/load_split_entity_data.s +++ b/ver/us/asm/nonmatchings/code_a5dd0_len_114e0/load_split_entity_data.s @@ -1,6 +1,13 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches +.section .rodata + +glabel jtbl_8014F858 +.word L80111478_A7B78, L80111480_A7B80, L80111478_A7B78, L80111480_A7B80, L80111478_A7B78, L80111480_A7B80, L80111478_A7B78, L80111480_A7B80 + +.section .text + glabel load_split_entity_data /* A7B08 80111408 27BDFFC8 */ addiu $sp, $sp, -0x38 /* A7B0C 8011140C AFB40028 */ sw $s4, 0x28($sp) diff --git a/ver/us/asm/nonmatchings/code_a5dd0_len_114e0/set_npc_shadow_scale.s b/ver/us/asm/nonmatchings/code_a5dd0_len_114e0/set_npc_shadow_scale.s index 1cbc3cbab3..1e59cb3559 100644 --- a/ver/us/asm/nonmatchings/code_a5dd0_len_114e0/set_npc_shadow_scale.s +++ b/ver/us/asm/nonmatchings/code_a5dd0_len_114e0/set_npc_shadow_scale.s @@ -1,6 +1,19 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches +.section .rodata + +glabel D_8014F968 +.double 0.13 + +glabel D_8014F970 +.double 0.12 + +glabel D_8014F978 +.double 0.01 + +.section .text + glabel set_npc_shadow_scale /* A9000 80112900 3C028007 */ lui $v0, %hi(gGameStatusPtr) /* A9004 80112904 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) diff --git a/ver/us/asm/nonmatchings/code_a5dd0_len_114e0/set_peach_shadow_scale.s b/ver/us/asm/nonmatchings/code_a5dd0_len_114e0/set_peach_shadow_scale.s index 1572a4a5b4..65cd9376f2 100644 --- a/ver/us/asm/nonmatchings/code_a5dd0_len_114e0/set_peach_shadow_scale.s +++ b/ver/us/asm/nonmatchings/code_a5dd0_len_114e0/set_peach_shadow_scale.s @@ -1,6 +1,16 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches +.section .rodata + +glabel D_8014F980 +.double 0.01 + +glabel D_8014F988 +.double 0.01 + +.section .text + glabel set_peach_shadow_scale /* A90D4 801129D4 3C028007 */ lui $v0, %hi(gGameStatusPtr) /* A90D8 801129D8 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) diff --git a/ver/us/asm/nonmatchings/code_a5dd0_len_114e0/set_standard_shadow_scale.s b/ver/us/asm/nonmatchings/code_a5dd0_len_114e0/set_standard_shadow_scale.s index a9a4e90370..ef29240e23 100644 --- a/ver/us/asm/nonmatchings/code_a5dd0_len_114e0/set_standard_shadow_scale.s +++ b/ver/us/asm/nonmatchings/code_a5dd0_len_114e0/set_standard_shadow_scale.s @@ -1,6 +1,19 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches +.section .rodata + +glabel D_8014F950 +.double 0.13 + +glabel D_8014F958 +.double 0.12 + +glabel D_8014F960 +.double 0.01 + +.section .text + glabel set_standard_shadow_scale /* A8F5C 8011285C 3C028007 */ lui $v0, %hi(gGameStatusPtr) /* A8F60 80112860 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) diff --git a/ver/us/asm/nonmatchings/code_a5dd0_len_114e0/step_entity_updatecmd.s b/ver/us/asm/nonmatchings/code_a5dd0_len_114e0/step_entity_updatecmd.s index 849d054e1c..93f5768184 100644 --- a/ver/us/asm/nonmatchings/code_a5dd0_len_114e0/step_entity_updatecmd.s +++ b/ver/us/asm/nonmatchings/code_a5dd0_len_114e0/step_entity_updatecmd.s @@ -1,6 +1,13 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches +.section .rodata + +glabel jtbl_8014F740 +.word L8010FC18_A6318, L8010FC30_A6330, L8010FC50_A6350, L8010FC6C_A636C, L8010FC90_A6390, L8010FCAC_A63AC, L8010FCCC_A63CC, L8010FCE8_A63E8, L8010FD08_A6408, L8010FD2C_A642C + +.section .text + glabel step_entity_updatecmd /* A62D8 8010FBD8 27BDFFE0 */ addiu $sp, $sp, -0x20 /* A62DC 8010FBDC AFB10014 */ sw $s1, 0x14($sp) diff --git a/ver/us/asm/nonmatchings/code_b72b0_len_15ed0/appendGfx_entity_model.s b/ver/us/asm/nonmatchings/code_b72b0_len_15ed0/appendGfx_entity_model.s index 0406adf4bf..bf97dc7ad0 100644 --- a/ver/us/asm/nonmatchings/code_b72b0_len_15ed0/appendGfx_entity_model.s +++ b/ver/us/asm/nonmatchings/code_b72b0_len_15ed0/appendGfx_entity_model.s @@ -1,6 +1,16 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches +.section .rodata + +glabel jtbl_801500D0 +.word L8012136C_B7A6C, L801218AC_B7FAC, L801218AC_B7FAC, L8012157C_B7C7C, L8012139C_B7A9C, L801218AC_B7FAC, L801218AC_B7FAC, L801218AC_B7FAC, L801213CC_B7ACC, L801218AC_B7FAC, L801218AC_B7FAC, L801218AC_B7FAC, L801213FC_B7AFC, L801218AC_B7FAC, L8012154C_B7C4C, L801215AC_B7CAC, L8012142C_B7B2C, L801218AC_B7FAC, L8012145C_B7B5C, L801215DC_B7CDC, L801218AC_B7FAC, L8012142C_B7B2C, L801218AC_B7FAC, L801218AC_B7FAC, L801218AC_B7FAC, L8012148C_B7B8C, L801218AC_B7FAC, L801214BC_B7BBC, L801218AC_B7FAC, L8012148C_B7B8C, L801218AC_B7FAC, L801214BC_B7BBC, L801218AC_B7FAC, L8012142C_B7B2C, L801218AC_B7FAC, L801218AC_B7FAC, L801218AC_B7FAC, L801214EC_B7BEC, L801218AC_B7FAC, L8012151C_B7C1C, L801218AC_B7FAC, L8012157C_B7C7C, L801215AC_B7CAC, L801215DC_B7CDC, L8012160C_B7D0C, 0 + +glabel jtbl_80150188 +.word L8012166C_B7D6C, L801217B8_B7EB8, L801217B8_B7EB8, L801217B8_B7EB8, L8012169C_B7D9C, L801217B8_B7EB8, L801217B8_B7EB8, L801217B8_B7EB8, L801216CC_B7DCC, L801217B8_B7EB8, L801217B8_B7EB8, L801217B8_B7EB8, L801216FC_B7DFC, L801217B8_B7EB8, L801217B8_B7EB8, L801217B8_B7EB8, L8012172C_B7E2C, L801217B8_B7EB8, L801217B8_B7EB8, L801217B8_B7EB8, L801217B8_B7EB8, L801217B8_B7EB8, L801217B8_B7EB8, L801217B8_B7EB8, L801217B8_B7EB8, L8012175C_B7E5C, L801217B8_B7EB8, L801217B8_B7EB8, L801217B8_B7EB8, L801217B8_B7EB8, L801217B8_B7EB8, L801217B8_B7EB8, L801217B8_B7EB8, L801217B8_B7EB8, L801217B8_B7EB8, L801217B8_B7EB8, L801217B8_B7EB8, L8012178C_B7E8C + +.section .text + glabel appendGfx_entity_model /* B7884 80121184 27BDFF08 */ addiu $sp, $sp, -0xf8 /* B7888 80121188 AFB200F0 */ sw $s2, 0xf0($sp) diff --git a/ver/us/asm/nonmatchings/code_b72b0_len_15ed0/draw_entity_model_extra3.s b/ver/us/asm/nonmatchings/code_b72b0_len_15ed0/draw_entity_model_extra3.s index a32e75c135..a31760b7a8 100644 --- a/ver/us/asm/nonmatchings/code_b72b0_len_15ed0/draw_entity_model_extra3.s +++ b/ver/us/asm/nonmatchings/code_b72b0_len_15ed0/draw_entity_model_extra3.s @@ -1,6 +1,16 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches +.section .rodata + +glabel jtbl_80150220 +.word L80122440_B8B40, L80122980_B9080, L80122980_B9080, L80122650_B8D50, L80122470_B8B70, L80122980_B9080, L80122980_B9080, L80122980_B9080, L801224A0_B8BA0, L80122980_B9080, L80122980_B9080, L80122980_B9080, L801224D0_B8BD0, L80122980_B9080, L80122620_B8D20, L80122680_B8D80, L80122500_B8C00, L80122980_B9080, L80122530_B8C30, L801226B0_B8DB0, L80122980_B9080, L80122500_B8C00, L80122980_B9080, L80122980_B9080, L80122980_B9080, L80122560_B8C60, L80122980_B9080, L80122590_B8C90, L80122980_B9080, L80122560_B8C60, L80122980_B9080, L80122590_B8C90, L80122980_B9080, L80122500_B8C00, L80122980_B9080, L80122980_B9080, L80122980_B9080, L801225C0_B8CC0, L80122980_B9080, L801225F0_B8CF0, L80122980_B9080, L80122650_B8D50, L80122680_B8D80, L801226B0_B8DB0, L801226E0_B8DE0, 0 + +glabel jtbl_801502D8 +.word L80122740_B8E40, L8012288C_B8F8C, L8012288C_B8F8C, L8012288C_B8F8C, L80122770_B8E70, L8012288C_B8F8C, L8012288C_B8F8C, L8012288C_B8F8C, L801227A0_B8EA0, L8012288C_B8F8C, L8012288C_B8F8C, L8012288C_B8F8C, L801227D0_B8ED0, L8012288C_B8F8C, L8012288C_B8F8C, L8012288C_B8F8C, L80122800_B8F00, L8012288C_B8F8C, L8012288C_B8F8C, L8012288C_B8F8C, L8012288C_B8F8C, L8012288C_B8F8C, L8012288C_B8F8C, L8012288C_B8F8C, L8012288C_B8F8C, L80122830_B8F30, L8012288C_B8F8C, L8012288C_B8F8C, L8012288C_B8F8C, L8012288C_B8F8C, L8012288C_B8F8C, L8012288C_B8F8C, L8012288C_B8F8C, L8012288C_B8F8C, L8012288C_B8F8C, L8012288C_B8F8C, L8012288C_B8F8C, L80122860_B8F60 + +.section .text + glabel draw_entity_model_extra3 /* B8988 80122288 27BDFF08 */ addiu $sp, $sp, -0xf8 /* B898C 8012228C 2402F7FF */ addiu $v0, $zero, -0x801 diff --git a/ver/us/asm/nonmatchings/code_b72b0_len_15ed0/step_entity_rendercmd.s b/ver/us/asm/nonmatchings/code_b72b0_len_15ed0/step_entity_rendercmd.s index e5626ccb1d..99e0026b7b 100644 --- a/ver/us/asm/nonmatchings/code_b72b0_len_15ed0/step_entity_rendercmd.s +++ b/ver/us/asm/nonmatchings/code_b72b0_len_15ed0/step_entity_rendercmd.s @@ -1,6 +1,13 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches +.section .rodata + +glabel jtbl_801500B0 +.word L80120FF0_B76F0, L80121000_B7700, L80121048_B7748, L80121058_B7758, L80121068_B7768, L80121080_B7780, L801210A0_B77A0, L801210C4_B77C4 + +.section .text + glabel step_entity_rendercmd /* B76B8 80120FB8 27BDFFE8 */ addiu $sp, $sp, -0x18 /* B76BC 80120FBC 0080302D */ daddu $a2, $a0, $zero diff --git a/ver/us/asm/nonmatchings/code_cd180_len_38f0/_render_transition_stencil.s b/ver/us/asm/nonmatchings/code_cd180_len_38f0/_render_transition_stencil.s index b4a5716db8..355114d9b2 100644 --- a/ver/us/asm/nonmatchings/code_cd180_len_38f0/_render_transition_stencil.s +++ b/ver/us/asm/nonmatchings/code_cd180_len_38f0/_render_transition_stencil.s @@ -1,6 +1,22 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches +.section .rodata + +glabel jtbl_80150EA0 +.word L8013722C_CD92C, L80137170_CD870, L80136FE8_CD6E8, L80137098_CD798, L801371D0_CD8D0, L8013704C_CD74C, L801370FC_CD7FC, L8013755C_CDC5C, L80137954_CE054, L80137C8C_CE38C, L80137C9C_CE39C, L80137CBC_CE3BC, L80137D00_CE400, L80137D00_CE400 + +glabel D_80150ED8 +.double 0.8 + +glabel D_80150EE0 +.double 0.8 + +glabel D_80150EE8 +.double 0.8 + +.section .text + glabel _render_transition_stencil /* CD180 80136A80 27BDFF88 */ addiu $sp, $sp, -0x78 /* CD184 80136A84 F7B80060 */ sdc1 $f24, 0x60($sp) diff --git a/ver/us/asm/nonmatchings/code_cd180_len_38f0/func_801382AC.s b/ver/us/asm/nonmatchings/code_cd180_len_38f0/func_801382AC.s index c3edfc7db0..ba8e7fbbc3 100644 --- a/ver/us/asm/nonmatchings/code_cd180_len_38f0/func_801382AC.s +++ b/ver/us/asm/nonmatchings/code_cd180_len_38f0/func_801382AC.s @@ -1,6 +1,13 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches +.section .rodata + +glabel jtbl_80150EF0 +.word L80138358_CEA58, L80138310_CEA10, L801383A4_CEAA4, L80138318_CEA18, L8013838C_CEA8C, L8013838C_CEA8C, L8013834C_CEA4C, L80138360_CEA60, L801383B0_CEAB0, L801383C4_CEAC4, L801383D0_CEAD0, L80138380_CEA80, L801383E8_CEAE8, L80138410_CEB10, L80138398_CEA98, L80138380_CEA80, L80138428_CEB28, 0 + +.section .text + glabel func_801382AC /* CE9AC 801382AC 3C038015 */ lui $v1, %hi(D_8014C6F0) /* CE9B0 801382B0 8C63C6F0 */ lw $v1, %lo(D_8014C6F0)($v1) diff --git a/ver/us/asm/nonmatchings/code_cd180_len_38f0/func_801385D4.s b/ver/us/asm/nonmatchings/code_cd180_len_38f0/func_801385D4.s index a081562b0c..d4b152f0e6 100644 --- a/ver/us/asm/nonmatchings/code_cd180_len_38f0/func_801385D4.s +++ b/ver/us/asm/nonmatchings/code_cd180_len_38f0/func_801385D4.s @@ -1,6 +1,13 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches +.section .rodata + +glabel jtbl_80150F38 +.word L80138658_CED58, L80138658_CED58, L80138640_CED40, L80138624_CED24, L8013864C_CED4C, L8013864C_CED4C, L80138658_CED58, L8013864C_CED4C, L80138660_CED60, L8013864C_CED4C, L8013864C_CED4C, L80138668_CED68, L80138674_CED74, L80138658_CED58, L80138658_CED58, L80138660_CED60, L80138680_CED80, 0 + +.section .text + glabel func_801385D4 /* CECD4 801385D4 3C038015 */ lui $v1, %hi(D_8014C6F0) /* CECD8 801385D8 8C63C6F0 */ lw $v1, %lo(D_8014C6F0)($v1) diff --git a/ver/us/asm/nonmatchings/code_d0a70_len_4fe0/func_8013AA9C.s b/ver/us/asm/nonmatchings/code_d0a70_len_4fe0/func_8013AA9C.s index e989b7ec58..40806d93f6 100644 --- a/ver/us/asm/nonmatchings/code_d0a70_len_4fe0/func_8013AA9C.s +++ b/ver/us/asm/nonmatchings/code_d0a70_len_4fe0/func_8013AA9C.s @@ -1,6 +1,19 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches +.section .rodata + +glabel jtbl_80150FB0 +.word L8013AB0C_D120C, L8013AB5C_D125C, L8013AB70_D1270, L8013AB0C_D120C, L8013AC14_D1314, L8013ABDC_D12DC, L8013AC14_D1314, L8013AC14_D1314, L8013AC14_D1314, L8013AC14_D1314, L8013AC14_D1314, L8013AC14_D1314, L8013AC14_D1314, L8013AC14_D1314, L8013AC14_D1314, L8013ABB0_D12B0, L8013ABB0_D12B0, L8013AB84_D1284 + +glabel jtbl_80150FF8 +.word L8013ACD8_D13D8, L8013ACE4_D13E4, L8013AD08_D1408, L8013AD30_D1430, L8013AD30_D1430, L8013AD30_D1430, L8013ADAC_D14AC, L8013ADAC_D14AC, L8013ADE4_D14E4, L8013AE58_D1558, L8013AECC_D15CC, L8013AED8_D15D8, L8013AEE4_D15E4, L8013AEE4_D15E4 + +glabel D_80151030 +.double 255.0 + +.section .text + glabel func_8013AA9C /* D119C 8013AA9C 27BDFFE0 */ addiu $sp, $sp, -0x20 /* D11A0 8013AAA0 AFB00010 */ sw $s0, 0x10($sp) diff --git a/ver/us/asm/nonmatchings/code_d0a70_len_4fe0/func_8013B0EC.s b/ver/us/asm/nonmatchings/code_d0a70_len_4fe0/func_8013B0EC.s index acea614dd7..a3ff098aaa 100644 --- a/ver/us/asm/nonmatchings/code_d0a70_len_4fe0/func_8013B0EC.s +++ b/ver/us/asm/nonmatchings/code_d0a70_len_4fe0/func_8013B0EC.s @@ -1,6 +1,13 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches +.section .rodata + +glabel jtbl_80151038 +.word L8013B160_D1860, L8013B140_D1840, L8013B150_D1850, L8013B120_D1820, L8013B160_D1860, 0 + +.section .text + glabel func_8013B0EC /* D17EC 8013B0EC 27BDFFE8 */ addiu $sp, $sp, -0x18 /* D17F0 8013B0F0 AFB00010 */ sw $s0, 0x10($sp) diff --git a/ver/us/asm/nonmatchings/code_d0a70_len_4fe0/func_8013B1B0.s b/ver/us/asm/nonmatchings/code_d0a70_len_4fe0/func_8013B1B0.s index 2505cac51d..18acacef5f 100644 --- a/ver/us/asm/nonmatchings/code_d0a70_len_4fe0/func_8013B1B0.s +++ b/ver/us/asm/nonmatchings/code_d0a70_len_4fe0/func_8013B1B0.s @@ -1,6 +1,22 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches +.section .rodata + +glabel D_80151050 +.double 255.0 + +glabel jtbl_80151058 +.word L8013B350_D1A50, L8013B358_D1A58, L8013B364_D1A64, L8013B364_D1A64, L8013B358_D1A58, L8013B364_D1A64, L8013B364_D1A64, L8013B364_D1A64, L8013B364_D1A64, L8013B360_D1A60, L8013B364_D1A64, L8013B350_D1A50 + +glabel jtbl_80151088 +.word L8013BAEC_D21EC, L8013B484_D1B84, L8013B4B4_D1BB4, L8013B500_D1C00, L8013B56C_D1C6C, L8013B57C_D1C7C, L8013B5E8_D1CE8, L8013B664_D1D64, L8013B678_D1D78, L8013B650_D1D50, L8013B68C_D1D8C, L8013B6F8_D1DF8, L8013B89C_D1F9C, L8013BA84_D2184, L8013BAEC_D21EC, L8013BB20_D2220, L8013BAEC_D21EC, 0 + +glabel jtbl_801510D0 +.word L8013BB8C_D228C, L8013BBA0_D22A0, L8013BBB4_D22B4, L8013BBA0_D22A0, L8013BBC8_D22C8, 0 + +.section .text + glabel func_8013B1B0 /* D18B0 8013B1B0 27BDFFD0 */ addiu $sp, $sp, -0x30 /* D18B4 8013B1B4 AFB20018 */ sw $s2, 0x18($sp) diff --git a/ver/us/asm/nonmatchings/code_d0a70_len_4fe0/func_8013C3F0.s b/ver/us/asm/nonmatchings/code_d0a70_len_4fe0/func_8013C3F0.s index c618cba805..342c5049f2 100644 --- a/ver/us/asm/nonmatchings/code_d0a70_len_4fe0/func_8013C3F0.s +++ b/ver/us/asm/nonmatchings/code_d0a70_len_4fe0/func_8013C3F0.s @@ -1,6 +1,19 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches +.section .rodata + +glabel D_801510E8 +.double 0.01 + +glabel D_801510F0 +.double 1.2 + +glabel D_801510F8 +.double 1.2 + +.section .text + glabel func_8013C3F0 /* D2AF0 8013C3F0 27BDFFC0 */ addiu $sp, $sp, -0x40 /* D2AF4 8013C3F4 AFB20020 */ sw $s2, 0x20($sp) diff --git a/ver/us/asm/nonmatchings/code_d0a70_len_4fe0/func_8013EE68.s b/ver/us/asm/nonmatchings/code_d0a70_len_4fe0/func_8013EE68.s index 52491bac6d..fef8dc040f 100644 --- a/ver/us/asm/nonmatchings/code_d0a70_len_4fe0/func_8013EE68.s +++ b/ver/us/asm/nonmatchings/code_d0a70_len_4fe0/func_8013EE68.s @@ -1,6 +1,31 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches +.section .rodata + +glabel D_80151100 +.double 10.3 + +glabel D_80151108 +.double 360.0 + +glabel D_80151110 +.double 11.2 + +glabel D_80151118 +.double 360.0 + +glabel D_80151120 +.double 10.8 + +glabel D_80151128 +.double 360.0 + +glabel D_80151130 +.double 360.0 + +.section .text + glabel func_8013EE68 /* D5568 8013EE68 3C028007 */ lui $v0, %hi(gGameStatusPtr) /* D556C 8013EE6C 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) diff --git a/ver/us/asm/nonmatchings/code_d0a70_len_4fe0/func_8013F1F8.s b/ver/us/asm/nonmatchings/code_d0a70_len_4fe0/func_8013F1F8.s index 7dd3202883..364dd452ca 100644 --- a/ver/us/asm/nonmatchings/code_d0a70_len_4fe0/func_8013F1F8.s +++ b/ver/us/asm/nonmatchings/code_d0a70_len_4fe0/func_8013F1F8.s @@ -1,6 +1,13 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches +.section .rodata + +glabel D_80151138 +.double 255.0 + +.section .text + glabel func_8013F1F8 /* D58F8 8013F1F8 0080382D */ daddu $a3, $a0, $zero /* D58FC 8013F1FC 0000302D */ daddu $a2, $zero, $zero diff --git a/ver/us/asm/nonmatchings/code_d5a50_len_5fd0/func_8013F350.s b/ver/us/asm/nonmatchings/code_d5a50_len_5fd0/func_8013F350.s index afcde45bae..47cafaa556 100644 --- a/ver/us/asm/nonmatchings/code_d5a50_len_5fd0/func_8013F350.s +++ b/ver/us/asm/nonmatchings/code_d5a50_len_5fd0/func_8013F350.s @@ -1,6 +1,13 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches +.section .rodata + +glabel jtbl_80151140 +.word L8013F6DC_D5DDC, L8013F418_D5B18, L8013F3B4_D5AB4, L8013F38C_D5A8C, L8013F38C_D5A8C, L8013F3BC_D5ABC, L8013F3C8_D5AC8, L8013F3C8_D5AC8, L8013F38C_D5A8C, L8013F38C_D5A8C, L8013F410_D5B10, L8013F410_D5B10, L8013F418_D5B18, L8013F430_D5B30, L8013F410_D5B10, L8013F410_D5B10, L8013F418_D5B18, L8013F38C_D5A8C, L8013F38C_D5A8C, L8013F3DC_D5ADC, L8013F418_D5B18, L8013F410_D5B10, L8013F38C_D5A8C, L8013F410_D5B10, L8013F410_D5B10, L8013F410_D5B10, L8013F410_D5B10, L8013F418_D5B18 + +.section .text + glabel func_8013F350 /* D5A50 8013F350 27BDFFD0 */ addiu $sp, $sp, -0x30 /* D5A54 8013F354 AFB50024 */ sw $s5, 0x24($sp) diff --git a/ver/us/asm/nonmatchings/code_d5a50_len_5fd0/func_80141704.s b/ver/us/asm/nonmatchings/code_d5a50_len_5fd0/func_80141704.s index d0ba495f7f..223b48c665 100644 --- a/ver/us/asm/nonmatchings/code_d5a50_len_5fd0/func_80141704.s +++ b/ver/us/asm/nonmatchings/code_d5a50_len_5fd0/func_80141704.s @@ -1,6 +1,13 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches +.section .rodata + +glabel jtbl_801511B0 +.word L80141750_D7E50, L80141808_D7F08, L80141920_D8020, L80141C6C_D836C, L80141C7C_D837C, L80141CBC_D83BC, L80141CFC_D83FC, L80141DDC_D84DC, L801417A0_D7EA0, L801417B8_D7EB8, L80141E28_D8528, L80141E48_D8548, L80141E74_D8574, L80141A54_D8154, L80141EA8_D85A8, L80142080_D8780, L801420BC_D87BC, L80141768_D7E68, L80141784_D7E84, L801420E4_D87E4, L80141C8C_D838C, L80142144_D8844, L801421F0_D88F0, L80142174_D8874, L801417CC_D7ECC, L801417EC_D7EEC, L801421A4_D88A4, L801421C0_D88C0 + +.section .text + glabel func_80141704 /* D7E04 80141704 27BDFFD8 */ addiu $sp, $sp, -0x28 /* D7E08 80141708 AFB3001C */ sw $s3, 0x1c($sp) diff --git a/ver/us/asm/nonmatchings/code_dc470_len_14c0/enable_background_wave.s b/ver/us/asm/nonmatchings/code_dc470_len_14c0/enable_background_wave.s index 1f6c540622..ed1079e48d 100644 --- a/ver/us/asm/nonmatchings/code_dc470_len_14c0/enable_background_wave.s +++ b/ver/us/asm/nonmatchings/code_dc470_len_14c0/enable_background_wave.s @@ -1,6 +1,13 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches +.section .rodata + +glabel jtbl_80151220 +.word L80146030_DC730, L801461A0_DC8A0, L80146044_DC744, L8014607C_DC77C, L801461A0_DC8A0, 0, 0, 0 + +.section .text + glabel enable_background_wave /* DC5C0 80145EC0 27BDFF48 */ addiu $sp, $sp, -0xb8 /* DC5C4 80145EC4 AFB00080 */ sw $s0, 0x80($sp) diff --git a/ver/us/asm/nonmatchings/code_ddaf0_len_c50/basic_hidden_window_update.s b/ver/us/asm/nonmatchings/code_ddaf0_len_c50/basic_hidden_window_update.s index 9583e091ab..6dba5efab8 100644 --- a/ver/us/asm/nonmatchings/code_ddaf0_len_c50/basic_hidden_window_update.s +++ b/ver/us/asm/nonmatchings/code_ddaf0_len_c50/basic_hidden_window_update.s @@ -1,6 +1,13 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches +.section .rodata + +glabel D_80151248 +.double 0.01 + +.section .text + glabel basic_hidden_window_update /* DDC74 80147574 3C028016 */ lui $v0, %hi(gUIPanels) /* DDC78 80147578 24429D50 */ addiu $v0, $v0, %lo(gUIPanels) diff --git a/ver/us/asm/nonmatchings/code_ddaf0_len_c50/basic_window_update.s b/ver/us/asm/nonmatchings/code_ddaf0_len_c50/basic_window_update.s index 0e20eb4f60..e76ce6b694 100644 --- a/ver/us/asm/nonmatchings/code_ddaf0_len_c50/basic_window_update.s +++ b/ver/us/asm/nonmatchings/code_ddaf0_len_c50/basic_window_update.s @@ -1,6 +1,13 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches +.section .rodata + +glabel D_80151240 +.double 0.01 + +.section .text + glabel basic_window_update /* DDB74 80147474 3C028016 */ lui $v0, %hi(gUIPanels) /* DDB78 80147478 24429D50 */ addiu $v0, $v0, %lo(gUIPanels) diff --git a/ver/us/asm/nonmatchings/code_e0b30_len_b80/func_8014A548.s b/ver/us/asm/nonmatchings/code_e0b30_len_b80/func_8014A548.s index 848c977652..8dbf22c3dd 100644 --- a/ver/us/asm/nonmatchings/code_e0b30_len_b80/func_8014A548.s +++ b/ver/us/asm/nonmatchings/code_e0b30_len_b80/func_8014A548.s @@ -1,6 +1,13 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches +.section .rodata + +glabel jtbl_80151290 +.word L8014A7A0_E0EA0, L8014A5AC_E0CAC, L8014A64C_E0D4C, L8014A68C_E0D8C, L8014A644_E0D44, L8014A698_E0D98, 0, 0 + +.section .text + glabel func_8014A548 /* E0C48 8014A548 27BDFFC8 */ addiu $sp, $sp, -0x38 /* E0C4C 8014A54C AFB1001C */ sw $s1, 0x1c($sp) diff --git a/ver/us/asm/nonmatchings/code_ef070_len_3400/ShakeCam.s b/ver/us/asm/nonmatchings/code_ef070_len_3400/ShakeCam.s index 23d7477463..3be304d504 100644 --- a/ver/us/asm/nonmatchings/code_ef070_len_3400/ShakeCam.s +++ b/ver/us/asm/nonmatchings/code_ef070_len_3400/ShakeCam.s @@ -1,6 +1,13 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches +.section .rodata + +glabel D_802DA1D0 +.double -0.8, 0.0 + +.section .text + glabel ShakeCam /* EFC58 802CB2A8 27BDFFC0 */ addiu $sp, $sp, -0x40 /* EFC5C 802CB2AC AFB5002C */ sw $s5, 0x2c($sp) diff --git a/ver/us/asm/nonmatchings/code_f2470_len_27f0/NpcFlyTo.s b/ver/us/asm/nonmatchings/code_f2470_len_27f0/NpcFlyTo.s index cc57389a7b..16953e08ea 100644 --- a/ver/us/asm/nonmatchings/code_f2470_len_27f0/NpcFlyTo.s +++ b/ver/us/asm/nonmatchings/code_f2470_len_27f0/NpcFlyTo.s @@ -1,6 +1,13 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches +.section .rodata + +glabel D_802DA1E0 +.double 180.0, 0.0 + +.section .text + glabel NpcFlyTo /* F30AC 802CE6FC 27BDFFC0 */ addiu $sp, $sp, -0x40 /* F30B0 802CE700 AFB20020 */ sw $s2, 0x20($sp) diff --git a/ver/us/asm/nonmatchings/code_f4c60_len_4300/_show_message.s b/ver/us/asm/nonmatchings/code_f4c60_len_4300/_show_message.s index 2b86e1dd2f..bf105a08fe 100644 --- a/ver/us/asm/nonmatchings/code_f4c60_len_4300/_show_message.s +++ b/ver/us/asm/nonmatchings/code_f4c60_len_4300/_show_message.s @@ -1,6 +1,13 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches +.section .rodata + +glabel jtbl_802DA1F0 +.word L802D0668_F5018, L802D0674_F5024, L802D0680_F5030, L802D068C_F503C, L802D0698_F5048, L802D069C_F504C + +.section .text + glabel _show_message /* F4CD0 802D0320 27BDFFA0 */ addiu $sp, $sp, -0x60 /* F4CD4 802D0324 AFB20038 */ sw $s2, 0x38($sp) diff --git a/ver/us/asm/nonmatchings/os/code_3c490_len_3c0/__osDevMgrMain.s b/ver/us/asm/nonmatchings/os/code_3c490_len_3c0/__osDevMgrMain.s index 8d9c1d0c32..28f2dbc96e 100644 --- a/ver/us/asm/nonmatchings/os/code_3c490_len_3c0/__osDevMgrMain.s +++ b/ver/us/asm/nonmatchings/os/code_3c490_len_3c0/__osDevMgrMain.s @@ -8,7 +8,6 @@ glabel jtbl_80099B20 .section .text - glabel __osDevMgrMain /* 3C490 80061090 27BDFFB8 */ addiu $sp, $sp, -0x48 /* 3C494 80061094 AFB20030 */ sw $s2, 0x30($sp) diff --git a/ver/us/asm/nonmatchings/os/code_46880_len_260/osPiGetCmdQueue.s b/ver/us/asm/nonmatchings/os/code_46880_len_260/osPiGetCmdQueue.s index 00939250a1..e5b51ee3b2 100644 --- a/ver/us/asm/nonmatchings/os/code_46880_len_260/osPiGetCmdQueue.s +++ b/ver/us/asm/nonmatchings/os/code_46880_len_260/osPiGetCmdQueue.s @@ -6,8 +6,8 @@ glabel osPiGetCmdQueue /* 46954 8006B554 8C633D50 */ lw $v1, %lo(__osPiDevMgr)($v1) /* 46958 8006B558 10600003 */ beqz $v1, .L8006B568 /* 4695C 8006B55C 00001021 */ addu $v0, $zero, $zero -/* 46960 8006B560 3C028009 */ lui $v0, %hi(__osPiDevMgr + 8) -/* 46964 8006B564 8C423D58 */ lw $v0, %lo(__osPiDevMgr + 8)($v0) +/* 46960 8006B560 3C028009 */ lui $v0, %hi(__osPiDevMgr+0x8) +/* 46964 8006B564 8C423D58 */ lw $v0, %lo(__osPiDevMgr+0x8)($v0) .L8006B568: /* 46968 8006B568 03E00008 */ jr $ra /* 4696C 8006B56C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/os/osCreatePiManager/osCreatePiManager.s b/ver/us/asm/nonmatchings/os/osCreatePiManager/osCreatePiManager.s index fa6fda1a41..b1598ebea1 100644 --- a/ver/us/asm/nonmatchings/os/osCreatePiManager/osCreatePiManager.s +++ b/ver/us/asm/nonmatchings/os/osCreatePiManager/osCreatePiManager.s @@ -63,27 +63,27 @@ glabel osCreatePiManager /* 3BEC0 80060AC0 AE830000 */ sw $v1, ($s4) /* 3BEC4 80060AC4 3C03800B */ lui $v1, %hi(gOsPiMessageQueue) /* 3BEC8 80060AC8 24634380 */ addiu $v1, $v1, %lo(gOsPiMessageQueue) -/* 3BECC 80060ACC 3C018009 */ lui $at, %hi(__osPiDevMgr + 0x10) -/* 3BED0 80060AD0 AC233D60 */ sw $v1, %lo(__osPiDevMgr + 0x10)($at) +/* 3BECC 80060ACC 3C018009 */ lui $at, %hi(__osPiDevMgr+0x10) +/* 3BED0 80060AD0 AC233D60 */ sw $v1, %lo(__osPiDevMgr+0x10)($at) /* 3BED4 80060AD4 3C038007 */ lui $v1, %hi(osPiRawStartDma) /* 3BED8 80060AD8 2463B480 */ addiu $v1, $v1, %lo(osPiRawStartDma) -/* 3BEDC 80060ADC 3C018009 */ lui $at, %hi(__osPiDevMgr + 0x14) -/* 3BEE0 80060AE0 AC233D64 */ sw $v1, %lo(__osPiDevMgr + 0x14)($at) +/* 3BEDC 80060ADC 3C018009 */ lui $at, %hi(__osPiDevMgr+0x14) +/* 3BEE0 80060AE0 AC233D64 */ sw $v1, %lo(__osPiDevMgr+0x14)($at) /* 3BEE4 80060AE4 3C038006 */ lui $v1, %hi(osEPiRawStartDma) /* 3BEE8 80060AE8 24630B70 */ addiu $v1, $v1, %lo(osEPiRawStartDma) -/* 3BEEC 80060AEC 3C018009 */ lui $at, %hi(__osPiDevMgr + 0x18) -/* 3BEF0 80060AF0 AC233D68 */ sw $v1, %lo(__osPiDevMgr + 0x18)($at) +/* 3BEEC 80060AEC 3C018009 */ lui $at, %hi(__osPiDevMgr+0x18) +/* 3BEF0 80060AF0 AC233D68 */ sw $v1, %lo(__osPiDevMgr+0x18)($at) /* 3BEF4 80060AF4 3C03800B */ lui $v1, %hi(__osPiMesgQueue) /* 3BEF8 80060AF8 2463F890 */ addiu $v1, $v1, %lo(__osPiMesgQueue) /* 3BEFC 80060AFC AFB00014 */ sw $s0, 0x14($sp) /* 3BF00 80060B00 00408021 */ addu $s0, $v0, $zero /* 3BF04 80060B04 02803821 */ addu $a3, $s4, $zero -/* 3BF08 80060B08 3C018009 */ lui $at, %hi(__osPiDevMgr + 0x4) -/* 3BF0C 80060B0C AC313D54 */ sw $s1, %lo(__osPiDevMgr + 0x4)($at) -/* 3BF10 80060B10 3C018009 */ lui $at, %hi(__osPiDevMgr + 0x8) -/* 3BF14 80060B14 AC353D58 */ sw $s5, %lo(__osPiDevMgr + 0x8)($at) -/* 3BF18 80060B18 3C018009 */ lui $at, %hi(__osPiDevMgr + 0xC) -/* 3BF1C 80060B1C AC333D5C */ sw $s3, %lo(__osPiDevMgr + 0xC)($at) +/* 3BF08 80060B08 3C018009 */ lui $at, %hi(__osPiDevMgr+0x4) +/* 3BF0C 80060B0C AC313D54 */ sw $s1, %lo(__osPiDevMgr+0x4)($at) +/* 3BF10 80060B10 3C018009 */ lui $at, %hi(__osPiDevMgr+0x8) +/* 3BF14 80060B14 AC353D58 */ sw $s5, %lo(__osPiDevMgr+0x8)($at) +/* 3BF18 80060B18 3C018009 */ lui $at, %hi(__osPiDevMgr+0xC) +/* 3BF1C 80060B1C AC333D5C */ sw $s3, %lo(__osPiDevMgr+0xC)($at) /* 3BF20 80060B20 0C019798 */ jal osCreateThread /* 3BF24 80060B24 AFA30010 */ sw $v1, 0x10($sp) /* 3BF28 80060B28 0C019808 */ jal osStartThread diff --git a/ver/us/asm/nonmatchings/si/si_execute_next_command.s b/ver/us/asm/nonmatchings/si/si_execute_next_command.s index e9e38fb69c..183d227db5 100644 --- a/ver/us/asm/nonmatchings/si/si_execute_next_command.s +++ b/ver/us/asm/nonmatchings/si/si_execute_next_command.s @@ -1,6 +1,13 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches +.section .rodata + +glabel jtbl_802D9F20 +.word L802C743C_EBDEC, L802C7A54_EC404, L802C747C_EBE2C, L802C748C_EBE3C, L802C749C_EBE4C, L802C74AC_EBE5C, L802C74BC_EBE6C, L802C74CC_EBE7C, L802C74DC_EBE8C, L802C74EC_EBE9C, L802C74FC_EBEAC, L802C750C_EBEBC, L802C751C_EBECC, L802C752C_EBEDC, L802C753C_EBEEC, L802C754C_EBEFC, L802C755C_EBF0C, L802C756C_EBF1C, L802C757C_EBF2C, L802C758C_EBF3C, L802C759C_EBF4C, L802C75AC_EBF5C, L802C75BC_EBF6C, L802C75CC_EBF7C, L802C75DC_EBF8C, L802C75FC_EBFAC, L802C75EC_EBF9C, L802C760C_EBFBC, L802C761C_EBFCC, L802C763C_EBFEC, L802C765C_EC00C, L802C766C_EC01C, L802C764C_EBFFC, L802C767C_EC02C, L802C762C_EBFDC, L802C768C_EC03C, L802C769C_EC04C, L802C76AC_EC05C, L802C76BC_EC06C, L802C76CC_EC07C, L802C76DC_EC08C, L802C76EC_EC09C, L802C76FC_EC0AC, L802C770C_EC0BC, L802C771C_EC0CC, L802C772C_EC0DC, L802C773C_EC0EC, L802C774C_EC0FC, L802C775C_EC10C, L802C776C_EC11C, L802C777C_EC12C, L802C778C_EC13C, L802C779C_EC14C, L802C77AC_EC15C, L802C77BC_EC16C, L802C77CC_EC17C, L802C77DC_EC18C, L802C77EC_EC19C, L802C77FC_EC1AC, L802C780C_EC1BC, L802C781C_EC1CC, L802C782C_EC1DC, L802C783C_EC1EC, L802C785C_EC20C, L802C786C_EC21C, L802C787C_EC22C, L802C788C_EC23C, L802C789C_EC24C, L802C78AC_EC25C, L802C78BC_EC26C, L802C78CC_EC27C, L802C78DC_EC28C, L802C78EC_EC29C, L802C784C_EC1FC, L802C792C_EC2DC, L802C78FC_EC2AC, L802C790C_EC2BC, L802C791C_EC2CC, L802C793C_EC2EC, L802C794C_EC2FC, L802C795C_EC30C, L802C796C_EC31C, L802C797C_EC32C, L802C798C_EC33C, L802C799C_EC34C, L802C79AC_EC35C, L802C79BC_EC36C, L802C79CC_EC37C, L802C79DC_EC38C, L802C79EC_EC39C, L802C79FC_EC3AC, L802C7A0C_EC3BC, L802C7A1C_EC3CC, L802C7A2C_EC3DC, L802C7A3C_EC3EC, 0 + +.section .text + glabel si_execute_next_command /* EBDB4 802C7404 27BDFFE8 */ addiu $sp, $sp, -0x18 /* EBDB8 802C7408 AFB00010 */ sw $s0, 0x10($sp) diff --git a/ver/us/asm/nonmatchings/si/si_goto_next_case.s b/ver/us/asm/nonmatchings/si/si_goto_next_case.s index 39e161ef26..e959e82e12 100644 --- a/ver/us/asm/nonmatchings/si/si_goto_next_case.s +++ b/ver/us/asm/nonmatchings/si/si_goto_next_case.s @@ -1,6 +1,13 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches +.section .rodata + +glabel D_802DA140 +.word 0x802C8AB0, 0x802C8A74, 0x802C8A74, 0x802C8A74, 0x802C8A74, 0x802C8A74, 0x802C8A74, 0x802C8A74, 0x802C8A74, 0x802C8A74, 0x802C8A74, 0x802C8A74, 0x802C8A74, 0x802C8A74, 0x802C8A74, 0x802C8A74, 0x802C8A74, 0x802C8A74, 0x802C8A74, 0x802C8AB8, 0x802C8A74, 0x802C8AD4, 0x802C8AD4, 0x802C8AD4, 0x802C8AD4, 0x802C8AD4, 0x802C8AD4, 0x802C8AD4, 0x802C8AD4, 0x802C8AD4, 0x802C8A74, 0x802C8AD4, 0x802C8AD4, 0x802C8A74, 0x802C8AC0, 0x00000000 + +.section .text + glabel si_goto_next_case /* ED410 802C8A60 24050001 */ addiu $a1, $zero, 1 /* ED414 802C8A64 8C860008 */ lw $a2, 8($a0) diff --git a/ver/us/asm/nonmatchings/si/si_handle_print_debug_var.s b/ver/us/asm/nonmatchings/si/si_handle_print_debug_var.s index 271c85067a..66d4dd2be5 100644 --- a/ver/us/asm/nonmatchings/si/si_handle_print_debug_var.s +++ b/ver/us/asm/nonmatchings/si/si_handle_print_debug_var.s @@ -1,6 +1,79 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches +.section .rodata + +glabel D_802D9D98 +.ascii "ADDR [%08X]\0" + +glabel D_802D9DA8 +.ascii "FLOAT [%4.2f]\0\0\0\0" + +glabel D_802D9DBC +.ascii "UF(%3d) [%d]\0\0\0" + +glabel D_802D9DCC +.ascii "UW(%3d) [%08X]\0" + +glabel D_802D9DDC +.ascii "UW(%3d) [%4.2f]\0\0\0\0" + +glabel D_802D9DF0 +.ascii "UW(%3d) [%d]\0\0\0" + +glabel D_802D9E00 +.ascii "GSW(%3d) [%08X]\0" + +glabel D_802D9E10 +.ascii "GSW(%3d) [%4.2f]\0\0\0\0" + +glabel D_802D9E24 +.ascii "GSW(%3d) [%d]\0\0\0" + +glabel D_802D9E34 +.ascii "LSW(%3d) [%08X]\0" + +glabel D_802D9E44 +.ascii "LSW(%3d) [%4.2f]\0\0\0" + +glabel D_802D9E58 +.ascii "LSW(%3d) [%d]\0\0\0" + +glabel D_802D9E68 +.ascii "GSWF(%3d)[%d]\0\0\0" + +glabel D_802D9E78 +.ascii "LSWF(%3d)[%d]\0\0\0" + +glabel D_802D9E88 +.ascii "GF(%3d) [%d]\0\0\0" + +glabel D_802D9E98 +.ascii "LF(%3d) [%d]\0\0\0" + +glabel D_802D9EA8 +.ascii "GW(%3d) [%08X]\0" + +glabel D_802D9EB8 +.ascii "GW(%3d) [%4.2f]\0\0\0\0" + +glabel D_802D9ECC +.ascii "GW(%3d) [%d]\0\0\0" + +glabel D_802D9EDC +.ascii "LW(%3d) [%08X]\0" + +glabel D_802D9EEC +.ascii "LW(%3d) [%4.2f]\0\0\0\0" + +glabel D_802D9F00 +.ascii "LW(%3d) [%d]\0\0\0" + +glabel D_802D9F10 +.ascii " [%d]\0\0\0" + +.section .text + glabel si_handle_print_debug_var /* EB7CC 802C6E1C 27BDFFD8 */ addiu $sp, $sp, -0x28 /* EB7D0 802C6E20 0080382D */ daddu $a3, $a0, $zero diff --git a/ver/us/asm/nonmatchings/si/si_skip_else.s b/ver/us/asm/nonmatchings/si/si_skip_else.s index f78a0e05db..06a3be900e 100644 --- a/ver/us/asm/nonmatchings/si/si_skip_else.s +++ b/ver/us/asm/nonmatchings/si/si_skip_else.s @@ -1,6 +1,13 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches +.section .rodata + +glabel D_802DA0F0 +.word 0x802C89C0, 0x802C8988, 0x802C8988, 0x802C8988, 0x802C8988, 0x802C8988, 0x802C8988, 0x802C8988, 0x802C8988, 0x802C89DC, 0x802C89DC, 0x802C89DC, 0x802C89DC, 0x802C89DC, 0x802C89DC, 0x802C89DC, 0x802C89DC, 0x802C8988, 0x802C89C8, 0x00000000 + +.section .text + glabel si_skip_else /* ED328 802C8978 0000282D */ daddu $a1, $zero, $zero /* ED32C 802C897C 8C840008 */ lw $a0, 8($a0) diff --git a/ver/us/asm/nonmatchings/si/si_skip_if.s b/ver/us/asm/nonmatchings/si/si_skip_if.s index 06bf23559a..72067edf7f 100644 --- a/ver/us/asm/nonmatchings/si/si_skip_if.s +++ b/ver/us/asm/nonmatchings/si/si_skip_if.s @@ -1,6 +1,13 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches +.section .rodata + +glabel D_802DA0A0 +.word 0x802C8944, 0x802C890C, 0x802C890C, 0x802C890C, 0x802C890C, 0x802C890C, 0x802C890C, 0x802C890C, 0x802C890C, 0x802C8960, 0x802C8960, 0x802C8960, 0x802C8960, 0x802C8960, 0x802C8960, 0x802C8960, 0x802C8960, 0x802C8968, 0x802C894C, 0x00000000 + +.section .text + glabel si_skip_if /* ED2AC 802C88FC 0000282D */ daddu $a1, $zero, $zero /* ED2B0 802C8900 8C840008 */ lw $a0, 8($a0) diff --git a/ver/us/asm/nonmatchings/world/partner/goombario/func_802BD1D0_3170F0.s b/ver/us/asm/nonmatchings/world/partner/goombario/func_802BD1D0_3170F0.s index 7661f1b2aa..b5c3cedd68 100644 --- a/ver/us/asm/nonmatchings/world/partner/goombario/func_802BD1D0_3170F0.s +++ b/ver/us/asm/nonmatchings/world/partner/goombario/func_802BD1D0_3170F0.s @@ -1,6 +1,13 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches +.section .rodata + +glabel D_802BDE80_317DA0 +.double 0.8 + +.section .text + glabel func_802BD1D0_3170F0 /* 3170F0 802BD1D0 27BDFFC8 */ addiu $sp, $sp, -0x38 /* 3170F4 802BD1D4 AFB00018 */ sw $s0, 0x18($sp) diff --git a/ver/us/asm/nonmatchings/world/partner/goombario/func_802BD5D8_3174F8.s b/ver/us/asm/nonmatchings/world/partner/goombario/func_802BD5D8_3174F8.s index 3d4392eeb3..66e116bd25 100644 --- a/ver/us/asm/nonmatchings/world/partner/goombario/func_802BD5D8_3174F8.s +++ b/ver/us/asm/nonmatchings/world/partner/goombario/func_802BD5D8_3174F8.s @@ -1,6 +1,13 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches +.section .rodata + +glabel D_802BDE88_317DA8 +.word 0x802BD8EC, 0x802BD90C, 0x802BD974, 0x802BD974, 0x802BD974, 0x802BD974, 0x802BD974, 0x802BD974, 0x802BD974, 0x802BD974, 0x802BD974, 0x802BD974, 0x802BD974, 0x802BD858, 0x802BD870, 0x802BD974, 0x802BD858, 0x802BD870, 0x802BD974, 0x802BD974, 0x802BD974, 0x802BD974, 0x802BD974, 0x802BD974, 0x802BD974, 0x802BD974, 0x802BD974, 0x802BD88C, 0x802BD8BC, 0x802BD974, 0x802BD974, 0x802BD974, 0x802BD974, 0x802BD974, 0x802BD974, 0x802BD974, 0x802BD974, 0x802BD974, 0x802BD974, 0x802BD974, 0x802BD92C, 0x802BD94C + +.section .text + glabel func_802BD5D8_3174F8 /* 3174F8 802BD5D8 27BDFFD8 */ addiu $sp, $sp, -0x28 /* 3174FC 802BD5DC AFB10014 */ sw $s1, 0x14($sp) diff --git a/ver/us/asm/nonmatchings/world/partners/_use_partner_ability.s b/ver/us/asm/nonmatchings/world/partners/_use_partner_ability.s index 2740889716..8019873187 100644 --- a/ver/us/asm/nonmatchings/world/partners/_use_partner_ability.s +++ b/ver/us/asm/nonmatchings/world/partners/_use_partner_ability.s @@ -1,6 +1,13 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches +.section .rodata + +glabel jtbl_8010C118 +.word L800EB14C_845FC, L800EB124_845D4, L800EAA48_83EF8, L800EA83C_83CEC, L800EAB90_84040, L800EAC30_840E0, L800EAC7C_8412C, L800EADC0_84270, L800EAEF4_843A4, L800EAFD0_84480, L800EB0E0_84590, 0 + +.section .text + glabel _use_partner_ability /* 83B7C 800EA6CC 27BDFFD8 */ addiu $sp, $sp, -0x28 /* 83B80 800EA6D0 AFB3001C */ sw $s3, 0x1c($sp) diff --git a/ver/us/asm/nonmatchings/world/partners/func_800EA4B0.s b/ver/us/asm/nonmatchings/world/partners/func_800EA4B0.s index 84a129a60a..4607479028 100644 --- a/ver/us/asm/nonmatchings/world/partners/func_800EA4B0.s +++ b/ver/us/asm/nonmatchings/world/partners/func_800EA4B0.s @@ -1,6 +1,13 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches +.section .rodata + +glabel D_8010C040 +.word 0x800EA4F8, 0x800EA4F8, 0x800EA4F8, 0x800EA4F8, 0x800EA500, 0x800EA500, 0x800EA500, 0x800EA500, 0x800EA500, 0x800EA500, 0x800EA500, 0x800EA500, 0x800EA500, 0x800EA500, 0x800EA500, 0x800EA500, 0x800EA500, 0x800EA500, 0x800EA500, 0x800EA500, 0x800EA500, 0x800EA500, 0x800EA500, 0x800EA500, 0x800EA500, 0x800EA500, 0x800EA500, 0x800EA500, 0x800EA500, 0x800EA500, 0x800EA500, 0x800EA500, 0x800EA500, 0x800EA500, 0x800EA500, 0x800EA500, 0x800EA500, 0x800EA500, 0x800EA500, 0x800EA4F8, 0x800EA4F8, 0x800EA500, 0x800EA500, 0x800EA4F8, 0x800EA500, 0x800EA500, 0x800EA4F8, 0x800EA4F8, 0x800EA4F8, 0x800EA4F8, 0x800EA4F8, 0x800EA4F8, 0x800EA4F8, 0x800EA4F8 + +.section .text + glabel func_800EA4B0 /* 83960 800EA4B0 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 83964 800EA4B4 AFBF0010 */ sw $ra, 0x10($sp) diff --git a/ver/us/asm/nonmatchings/world/partners/func_800EBC74.s b/ver/us/asm/nonmatchings/world/partners/func_800EBC74.s index d08c15c658..41010a8557 100644 --- a/ver/us/asm/nonmatchings/world/partners/func_800EBC74.s +++ b/ver/us/asm/nonmatchings/world/partners/func_800EBC74.s @@ -1,6 +1,13 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches +.section .rodata + +glabel jtbl_8010C148 +.word L800EBD18_851C8, L800EC148_855F8, L800EC45C_8590C, L800ED2E4_86794, L800ED2E4_86794, L800EC6FC_85BAC, L800ED2E4_86794, L800ED2E4_86794, L800ED2E4_86794, L800ED2E4_86794, L800ED2E4_86794, L800ED2E4_86794, L800ED2E4_86794, L800ED2E4_86794, L800ED2E4_86794, L800ECCC0_86170, L800ED2E4_86794, L800ED2E4_86794, L800ED2E4_86794, L800ED2E4_86794, L800ED0B0_86560, L800ED2E4_86794, L800ED2E4_86794, L800ED2E4_86794, L800ED2E4_86794, L800ED2E4_86794, L800ED2E4_86794, L800ED2E4_86794, L800ED2E4_86794, L800ED2E4_86794, L800ED2E4_86794, L800ED2E4_86794, L800ED2E4_86794, L800ED2E4_86794, L800ED2E4_86794, L800ED2E4_86794, L800ED2E4_86794, L800ED2E4_86794, L800ED2E4_86794, L800ED2E4_86794, L800ED0C4_86574, L800ED2E4_86794, L800ED2E4_86794, L800ED2E4_86794, L800ED2E4_86794, L800ED2E4_86794, L800ED2E4_86794, L800ED2E4_86794, L800ED2E4_86794, L800ED2E4_86794, L800ED2E4_86794, 0 + +.section .text + glabel func_800EBC74 /* 85124 800EBC74 3C038011 */ lui $v1, %hi(D_8010CFC8) /* 85128 800EBC78 8463CFC8 */ lh $v1, %lo(D_8010CFC8)($v1) diff --git a/ver/us/asm/nonmatchings/world/partners/func_800ED9F8.s b/ver/us/asm/nonmatchings/world/partners/func_800ED9F8.s index 81d5c0e952..563cc5fa44 100644 --- a/ver/us/asm/nonmatchings/world/partners/func_800ED9F8.s +++ b/ver/us/asm/nonmatchings/world/partners/func_800ED9F8.s @@ -1,6 +1,13 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches +.section .rodata + +glabel jtbl_8010C218 +.word L800EDA5C_86F0C, L800EDDEC_8729C, L800EE078_87528, L800EDDEC_8729C, L800EE968_87E18, L800EE18C_8763C, L800EE968_87E18, L800EE968_87E18, L800EE968_87E18, L800EE968_87E18, L800EE968_87E18, L800EE968_87E18, L800EE968_87E18, L800EE968_87E18, L800EE968_87E18, L800EE56C_87A1C, L800EE968_87E18, L800EE968_87E18, L800EE968_87E18, L800EE968_87E18, L800EE930_87DE0, L800EE968_87E18, L800EE968_87E18, L800EE968_87E18, L800EE968_87E18, L800EE968_87E18, L800EE968_87E18, L800EE968_87E18, L800EE968_87E18, L800EE968_87E18, L800EE968_87E18, L800EE968_87E18, L800EE968_87E18, L800EE968_87E18, L800EE968_87E18, L800EE968_87E18, L800EE968_87E18, L800EE968_87E18, L800EE968_87E18, L800EE968_87E18, L800EE944_87DF4, L800EE968_87E18, L800EE968_87E18, L800EE968_87E18, L800EE968_87E18, L800EE968_87E18, L800EE968_87E18, L800EE968_87E18, L800EE968_87E18, L800EE968_87E18, L800EE968_87E18, 0 + +.section .text + glabel func_800ED9F8 /* 86EA8 800ED9F8 3C038011 */ lui $v1, %hi(D_8010CFC8) /* 86EAC 800ED9FC 8463CFC8 */ lh $v1, %lo(D_8010CFC8)($v1) diff --git a/ver/us/splat.yaml b/ver/us/splat.yaml index 71fd5eec45..4c82aeb24e 100644 --- a/ver/us/splat.yaml +++ b/ver/us/splat.yaml @@ -309,8 +309,8 @@ segments: subalign: 4 subsections: - [0x759b0, c, code_759b0_len_61b0] - - [0x77480, c] - - [0x7B440, c] + - [0x77480, c, code_77480] + - [0x7B440, c, code_7B440] - [0x7bb60, c, code_7bb60_len_41b0] - [0x7fd10, c, code_7fd10_len_b40] - [0x80850, c, code_80850_len_3060] @@ -331,18 +331,26 @@ segments: - [0x9DA58, data] - [0x9DA60, rgba32, ui/stat_flower, 16, 16] - [0x9DE60, data] - - [0xA5100, rodata] + - [0xA5100, .rodata, code_77480] + - [0xA51E0, .rodata, code_7B440] + - [0xA5230, .rodata, code_7bb60_len_41b0] + - [0xA53E0, .rodata, code_7fd10_len_b40] + - [0xA5410, .rodata, code_80850_len_3060] + - [0xA54F0, .rodata, world/partners] + - [0xA5798, .rodata, code_891b0_len_fb0] + - [0xA57C0, .rodata, code_8a160_len_700] + - [0xA57E0, .rodata, code_8a860_len_3f30] - type: code start: 0xA5DD0 vram: 0x8010F6D0 subsections: - [0xa5dd0, c, code_a5dd0_len_114e0] - - [0xB4580, c] + - [0xB4580, c, code_B4580] - [0xb72b0, c, code_b72b0_len_15ed0] - [0xB9D60, c, code_B9D60] - - [0xC50A0, c] + - [0xC50A0, c, code_C50A0] - [0xcd180, c, code_cd180_len_38f0] - - [0xCEE40, c] + - [0xCEE40, c, code_CEE40] - [0xd0a70, c, code_d0a70_len_4fe0] - [0xd5a50, c, code_d5a50_len_5fd0] - [0xdba20, c, code_dba20_len_350] @@ -351,7 +359,7 @@ segments: - [0xdd930, c, code_dd930_len_1c0] - [0xddaf0, c, code_ddaf0_len_c50] - [0xde740, c, code_de740_len_23f0] - - [0xDF950, c] + - [0xDF950, c, code_DF950] - [0xe0b30, c, code_e0b30_len_b80] - [0xE16B0, data, code_a5dd0_len_114e0] - [0xE5510, .data, code_d0a70_len_4fe0] @@ -361,7 +369,19 @@ segments: - [0xE5850, .data, code_ddaf0_len_c50] - [0xE59D0, .data, code_DF950] - [0xE5DF0, .data, code_e0b30_len_b80] - - [0xE5E40, rodata] + - [0xE5E40, .rodata, code_a5dd0_len_114e0] + - [0xE6560, .rodata, code_B4580] + - [0xE67B0, .rodata, code_b72b0_len_15ed0] + - [0xE6A70, .rodata, code_B9D60] + - [0xE7140, .rodata, code_C50A0] + - [0xE75A0, .rodata, code_cd180_len_38f0] + - [0xE7680, .rodata, code_CEE40] + - [0xE76B0, .rodata, code_d0a70_len_4fe0] + - [0xE7840, .rodata, code_d5a50_len_5fd0] + - [0xE7920, .rodata, code_dc470_len_14c0] + - [0xE7940, .rodata, code_ddaf0_len_c50] + - [0xE7950, .rodata, code_DF950] + - [0xE7990, .rodata, code_e0b30_len_b80] - type: code start: 0xE79B0 vram: 0x802C3000 @@ -375,12 +395,17 @@ segments: - [0xf5750, c, code_F5750] - [0xf8f60, c, code_f8f60_len_1560] - [0xfa4c0, c, code_fa4c0_len_3bf0] - - [0xFBE10, c] + - [0xFBE10, c, code_FBE10] - [0xfe0b0, c, code_fe0b0_len_5a0] - [0xFE650, .data, code_e79b0_len_1920] - [0xFE660, data, si] - [0xFE730, .rodata, code_e79b0_len_1920] - - [0xFE748, rodata, si] + - [0xFE748, .rodata, si] + - [0xFEB80, .rodata, code_ef070_len_3400] + - [0xFEB90, .rodata, code_f2470_len_27f0] + - [0xFEBA0, .rodata, code_f4c60_len_4300] + - [0xFEBB8, .rodata, code_F5750] + - [0xFEC08, .rodata, code_FBE10] - type: code start: 0xFEE30 vram: 0x802DBD40 @@ -393,28 +418,32 @@ segments: vram: 0x802E0D90 subsections: - [0x102610, c, code_102610_len_2330] - - [0x102C80, c] + - [0x102C80, c, code_102C80] - [0x104730, c, code_104730] - [0x104940, c, code_104940_len_dc0] - [0x105700, c, code_105700_len_2130] - - [0x105F90, c] + - [0x105F90, c, code_105F90] - [0x106EF0, c] - [0x107830, c, code_107830_len_e70] - [0x1086a0, c, code_1086a0_len_fc0] - [0x109660, c, code_109660_len_1270] - [0x10A8D0, c, code_10A8D0] - - [0x10A9F0, bin] + - [0x10A9F0, data] #- [0x10A9F0, i4, shadow/square, 16, 16] #- [0x10AA70, i4, shadow/circle, 16, 16] - - [0x10AAF0, bin] + - [0x10AAF0, data] #- [0x10AB70, i4, shadow/10AB70, 32, 32] #- [0x10AD70, i4, shadow/10AD70, 32, 32] - [0x10AF70, .data, code_104730] - - [0x10B608, bin] - - [0x10C880, rodata, code_102c80] + - [0x10B608, data] + - [0x10C880, .rodata, code_102C80] - [0x10C9E0, .rodata, code_104730] - - [0x10CA50, rodata, code_104940_len_dc0] - - [0x10CAF0, bin] + - [0x10CA50, .rodata, code_104940_len_dc0] + - [0x10CAF0, .rodata, code_105F90] + - [0x10CB30, .rodata, code_107830_len_e70] + - [0x10CB70, .rodata, code_1086a0_len_fc0] + - [0x10CBD0, .rodata, code_109660_len_1270] + - [0x10CC00, bin] - [0x1164B8, ci8, peach_letter, 150, 105] - [0x11A23E, bin] - [0x11A240, palette, peach_letter] @@ -545,7 +574,7 @@ segments: subsections: - [0x317020, c, world/partner/goombario] - [0x317b60, .data, world/partner/goombario] - - [0x317DA0, rodata, world/partner/goombario] # rodata containing a double and a jumptable + - [0x317DA0, .rodata, world/partner/goombario] - type: code ld_name: world_partner_bombette start: 0x317e50 @@ -2733,7 +2762,7 @@ segments: overlay: True subsections: - [0x789E60, c] - - [0x78A480, data] + - [0x78A490, data] - name: battle/star/refresh type: code start: 0x78B600 @@ -2757,7 +2786,7 @@ segments: overlay: True subsections: - [0x78E7D0, c] - - [0x78EEB0, data] + - [0x78EEC0, data] - name: battle/star/chill_out type: code start: 0x7900D0 diff --git a/ver/us/symbol_addrs.txt b/ver/us/symbol_addrs.txt index 0798add364..9581367f51 100644 --- a/ver/us/symbol_addrs.txt +++ b/ver/us/symbol_addrs.txt @@ -1316,12 +1316,23 @@ D_80093D20 = 0x80093D20; // type:data rom:0x6F120 D_80093D24 = 0x80093D24; // type:data rom:0x6F124 D_80093D34 = 0x80093D34; // type:data rom:0x6F134 nuContCallBack = 0x80093D38; // type:data rom:0x6F138 +__osPiDevMgr = 0x80093D50; // type:data rom:0x6F150 size:0x1C +__osPiTable = 0x80093D6C; // type:data rom:0x6F16C +__osCurrentHandle = 0x80093D70; // type:data rom:0x6F170 D_80093D80 = 0x80093D80; // type:data rom:0x6F180 +__osPiAccessQueueEnabled = 0x80093D90; // type:data rom:0x6F190 hdwrBugFlag = 0x80093DA0; // type:data rom:0x6F1A0 dtor = 0x80093DC0; // type:data rom:0x6F1C0 D_80093DD0 = 0x80093DD0; // type:data rom:0x6F1D0 +sintable = 0x80093DE0; // type:data rom:0x6F1E0 spaces = 0x800945E0; // type:data rom:0x6F9E0 zeroes = 0x80094604; // type:data rom:0x6FA04 +__osPreNMI = 0x80094630; // type:data rom:0x6FA30 +__osSiAccessQueueEnabled = 0x80094640; // type:data rom:0x6FA40 +__osThreadTail = 0x80094650; // type:data rom:0x6FA50 +__osRunQueue = 0x80094658; // type:data rom:0x6FA58 +__osActiveQueue = 0x8009465C; // type:data rom:0x6FA5C +__osRunningThread = 0x80094660; // type:data rom:0x6FA60 osViModeTable = 0x800946A0; // rom:0x6FAA0 D_80097DC8 = 0x80097DC8; // type:data rom:0x731C8 D_80097DD0 = 0x80097DD0; // type:data rom:0x731D0 @@ -1751,6 +1762,21 @@ D_800F8034 = 0x800F8034; // type:data rom:0x914E4 D_800F803A = 0x800F803A; // type:data rom:0x914EA wPartners = 0x800F803C; // type:data rom:0x914EC size:0x300 D_80108A64 = 0x80108A64; // type:data rom:0xA1F14 +D_8010BC50 = 0x8010BC50; // type:data rom:0xA5100 +D_8010BD30 = 0x8010BD30; // type:data rom:0xA51E0 +D_8010BD80 = 0x8010BD80; // type:data rom:0xA5230 +D_8010BD88 = 0x8010BD88; // type:data rom:0xA5238 +D_8010BD90 = 0x8010BD90; // type:data rom:0xA5240 +D_8010BED8 = 0x8010BED8; // type:data rom:0xA5388 +D_8010BEE0 = 0x8010BEE0; // type:data rom:0xA5390 +D_8010BEE8 = 0x8010BEE8; // type:data rom:0xA5398 +D_8010BEF0 = 0x8010BEF0; // type:data rom:0xA53A0 +D_8010BEF8 = 0x8010BEF8; // type:data rom:0xA53A8 +D_8010BF60 = 0x8010BF60; // type:data rom:0xA5410 +D_8010C040 = 0x8010C040; // type:data rom:0xA54F0 +D_8010C310 = 0x8010C310; // type:data rom:0xA57C0 +D_8010C318 = 0x8010C318; // type:data rom:0xA57C8 +D_8010C320 = 0x8010C320; // type:data rom:0xA57D0 update_entities = 0x8010F6D0; // type:func rom:0xA5DD0 update_shadows = 0x8010FA98; // type:func rom:0xA6198 set_entity_updatecmd = 0x8010FBC0; // type:func rom:0xA62C0 @@ -2323,6 +2349,108 @@ D_8014F6B4 = 0x8014F6B4; // type:data rom:0xE5DB4 D_8014F6F0 = 0x8014F6F0; // type:data rom:0xE5DF0 gSongsUsingVariationFlag = 0x8014F720; // rom:0xE5E20 D_8014F738 = 0x8014F738; // rom:0xE5E38 +D_8014F940 = 0x8014F940; // type:data rom:0xE6040 +D_8014F948 = 0x8014F948; // type:data rom:0xE6048 +D_8014F950 = 0x8014F950; // type:data rom:0xE6050 +D_8014F958 = 0x8014F958; // type:data rom:0xE6058 +D_8014F960 = 0x8014F960; // type:data rom:0xE6060 +D_8014F968 = 0x8014F968; // type:data rom:0xE6068 +D_8014F970 = 0x8014F970; // type:data rom:0xE6070 +D_8014F978 = 0x8014F978; // type:data rom:0xE6078 +D_8014F980 = 0x8014F980; // type:data rom:0xE6080 +D_8014F988 = 0x8014F988; // type:data rom:0xE6088 +D_8014FEB0 = 0x8014FEB0; // type:data rom:0xE65B0 +D_8014FEB8 = 0x8014FEB8; // type:data rom:0xE65B8 +D_8014FEC0 = 0x8014FEC0; // type:data rom:0xE65C0 +D_8014FEC8 = 0x8014FEC8; // type:data rom:0xE65C8 +D_8014FED0 = 0x8014FED0; // type:data rom:0xE65D0 +D_8014FED8 = 0x8014FED8; // type:data rom:0xE65D8 +D_80150010 = 0x80150010; // type:data rom:0xE6710 +D_80150018 = 0x80150018; // type:data rom:0xE6718 +D_80150020 = 0x80150020; // type:data rom:0xE6720 +D_80150028 = 0x80150028; // type:data rom:0xE6728 +D_80150080 = 0x80150080; // type:data rom:0xE6780 +D_80150088 = 0x80150088; // type:data rom:0xE6788 +D_80150090 = 0x80150090; // type:data rom:0xE6790 +D_80150098 = 0x80150098; // type:data rom:0xE6798 +D_801500A0 = 0x801500A0; // type:data rom:0xE67A0 +D_801500A8 = 0x801500A8; // type:data rom:0xE67A8 +D_80150370 = 0x80150370; // type:data rom:0xE6A70 +D_80150378 = 0x80150378; // type:data rom:0xE6A78 +D_80150538 = 0x80150538; // type:data rom:0xE6C38 +D_80150578 = 0x80150578; // type:data rom:0xE6C78 +D_80150580 = 0x80150580; // type:data rom:0xE6C80 +D_80150710 = 0x80150710; // type:data rom:0xE6E10 +D_80150718 = 0x80150718; // type:data rom:0xE6E18 +D_80150720 = 0x80150720; // type:data rom:0xE6E20 +D_80150728 = 0x80150728; // type:data rom:0xE6E28 +D_801507B0 = 0x801507B0; // type:data rom:0xE6EB0 +D_801507B8 = 0x801507B8; // type:data rom:0xE6EB8 +D_801507C0 = 0x801507C0; // type:data rom:0xE6EC0 +D_801507C8 = 0x801507C8; // type:data rom:0xE6EC8 +D_801507D0 = 0x801507D0; // type:data rom:0xE6ED0 +D_801507D8 = 0x801507D8; // type:data rom:0xE6ED8 +D_80150860 = 0x80150860; // type:data rom:0xE6F60 +D_80150868 = 0x80150868; // type:data rom:0xE6F68 +D_80150870 = 0x80150870; // type:data rom:0xE6F70 +D_801508F8 = 0x801508F8; // type:data rom:0xE6FF8 +D_80150900 = 0x80150900; // type:data rom:0xE7000 +D_80150908 = 0x80150908; // type:data rom:0xE7008 +D_80150910 = 0x80150910; // type:data rom:0xE7010 +D_80150918 = 0x80150918; // type:data rom:0xE7018 +D_80150920 = 0x80150920; // type:data rom:0xE7020 +D_80150928 = 0x80150928; // type:data rom:0xE7028 +D_80150930 = 0x80150930; // type:data rom:0xE7030 +D_80150938 = 0x80150938; // type:data rom:0xE7038 +D_80150940 = 0x80150940; // type:data rom:0xE7040 +D_80150948 = 0x80150948; // type:data rom:0xE7048 +D_80150950 = 0x80150950; // type:data rom:0xE7050 +D_80150958 = 0x80150958; // type:data rom:0xE7058 +D_801509F8 = 0x801509F8; // type:data rom:0xE70F8 +D_80150A00 = 0x80150A00; // type:data rom:0xE7100 +D_80150A08 = 0x80150A08; // type:data rom:0xE7108 +D_80150A10 = 0x80150A10; // type:data rom:0xE7110 +D_80150A18 = 0x80150A18; // type:data rom:0xE7118 +D_80150A20 = 0x80150A20; // type:data rom:0xE7120 +D_80150A28 = 0x80150A28; // type:data rom:0xE7128 +D_80150A30 = 0x80150A30; // type:data rom:0xE7130 +D_80150A40 = 0x80150A40; // type:data rom:0xE7140 +D_80150A48 = 0x80150A48; // type:data rom:0xE7148 +D_80150A50 = 0x80150A50; // type:data rom:0xE7150 +D_80150BC0 = 0x80150BC0; // type:data rom:0xE72C0 +D_80150CC8 = 0x80150CC8; // type:data rom:0xE73C8 +D_80150E18 = 0x80150E18; // type:data rom:0xE7518 +D_80150ED8 = 0x80150ED8; // type:data rom:0xE75D8 +D_80150EE0 = 0x80150EE0; // type:data rom:0xE75E0 +D_80150EE8 = 0x80150EE8; // type:data rom:0xE75E8 +D_80150F80 = 0x80150F80; // type:data rom:0xE7680 +D_80150F88 = 0x80150F88; // type:data rom:0xE7688 +D_80150F90 = 0x80150F90; // type:data rom:0xE7690 +D_80150F98 = 0x80150F98; // type:data rom:0xE7698 +D_80150FA0 = 0x80150FA0; // type:data rom:0xE76A0 +D_80151030 = 0x80151030; // type:data rom:0xE7730 +D_80151050 = 0x80151050; // type:data rom:0xE7750 +D_801510E8 = 0x801510E8; // type:data rom:0xE77E8 +D_801510F0 = 0x801510F0; // type:data rom:0xE77F0 +D_801510F8 = 0x801510F8; // type:data rom:0xE77F8 +D_80151100 = 0x80151100; // type:data rom:0xE7800 +D_80151108 = 0x80151108; // type:data rom:0xE7808 +D_80151110 = 0x80151110; // type:data rom:0xE7810 +D_80151118 = 0x80151118; // type:data rom:0xE7818 +D_80151120 = 0x80151120; // type:data rom:0xE7820 +D_80151128 = 0x80151128; // type:data rom:0xE7828 +D_80151130 = 0x80151130; // type:data rom:0xE7830 +D_80151138 = 0x80151138; // type:data rom:0xE7838 +D_80151240 = 0x80151240; // type:data rom:0xE7940 +D_80151248 = 0x80151248; // type:data rom:0xE7948 +D_80151250 = 0x80151250; // type:data rom:0xE7950 +D_80151258 = 0x80151258; // type:data rom:0xE7958 +D_80151260 = 0x80151260; // type:data rom:0xE7960 +D_80151268 = 0x80151268; // type:data rom:0xE7968 +D_80151270 = 0x80151270; // type:data rom:0xE7970 +D_80151278 = 0x80151278; // type:data rom:0xE7978 +D_80151280 = 0x80151280; // type:data rom:0xE7980 +D_80151288 = 0x80151288; // type:data rom:0xE7988 sort_scripts = 0x802C3000; // type:func rom:0xE79B0 find_script_labels = 0x802C3148; // type:func rom:0xE7AF8 clear_script_list = 0x802C31DC; // type:func rom:0xE7B8C @@ -2843,6 +2971,34 @@ ShakeCam1 = 0x802D9CB0; // rom:0xFE660 ShakeCamX = 0x802D9CE8; // rom:0xFE698 gPlayerNpcPtr = 0x802D9D20; // rom:0xFE6D0 D_802D9D50 = 0x802D9D50; // rom:0xFE700 +D_802D9D98 = 0x802D9D98; // type:data rom:0xFE748 +D_802D9DA8 = 0x802D9DA8; // type:data rom:0xFE758 +D_802D9DBC = 0x802D9DBC; // type:data rom:0xFE76C +D_802D9DCC = 0x802D9DCC; // type:data rom:0xFE77C +D_802D9DDC = 0x802D9DDC; // type:data rom:0xFE78C +D_802D9DF0 = 0x802D9DF0; // type:data rom:0xFE7A0 +D_802D9E00 = 0x802D9E00; // type:data rom:0xFE7B0 +D_802D9E10 = 0x802D9E10; // type:data rom:0xFE7C0 +D_802D9E24 = 0x802D9E24; // type:data rom:0xFE7D4 +D_802D9E34 = 0x802D9E34; // type:data rom:0xFE7E4 +D_802D9E44 = 0x802D9E44; // type:data rom:0xFE7F4 +D_802D9E58 = 0x802D9E58; // type:data rom:0xFE808 +D_802D9E68 = 0x802D9E68; // type:data rom:0xFE818 +D_802D9E78 = 0x802D9E78; // type:data rom:0xFE828 +D_802D9E88 = 0x802D9E88; // type:data rom:0xFE838 +D_802D9E98 = 0x802D9E98; // type:data rom:0xFE848 +D_802D9EA8 = 0x802D9EA8; // type:data rom:0xFE858 +D_802D9EB8 = 0x802D9EB8; // type:data rom:0xFE868 +D_802D9ECC = 0x802D9ECC; // type:data rom:0xFE87C +D_802D9EDC = 0x802D9EDC; // type:data rom:0xFE88C +D_802D9EEC = 0x802D9EEC; // type:data rom:0xFE89C +D_802D9F00 = 0x802D9F00; // type:data rom:0xFE8B0 +D_802D9F10 = 0x802D9F10; // type:data rom:0xFE8C0 +D_802DA0A0 = 0x802DA0A0; // type:data rom:0xFEA50 +D_802DA0F0 = 0x802DA0F0; // type:data rom:0xFEAA0 +D_802DA140 = 0x802DA140; // type:data rom:0xFEAF0 +D_802DA1D0 = 0x802DA1D0; // type:data rom:0xFEB80 +D_802DA1E0 = 0x802DA1E0; // type:data rom:0xFEB90 func_802DBD40 = 0x802DBD40; // type:func rom:0xFEE30 func_802DBD8C = 0x802DBD8C; // type:func rom:0xFEE7C func_802DBDBC = 0x802DBDBC; // type:func rom:0xFEEAC @@ -3072,6 +3228,53 @@ D_802E9BF8 = 0x802E9BF8; // type:data rom:0x10B478 D_802E9C1C = 0x802E9C1C; // type:data rom:0x10B49C D_802E9C40 = 0x802E9C40; // type:data rom:0x10B4C0 D_802E9C70 = 0x802E9C70; // type:data rom:0x10B4F0 +D_802EB028 = 0x802EB028; // type:data rom:0x10C8A8 +D_802EB030 = 0x802EB030; // type:data rom:0x10C8B0 +D_802EB038 = 0x802EB038; // type:data rom:0x10C8B8 +D_802EB040 = 0x802EB040; // type:data rom:0x10C8C0 +D_802EB048 = 0x802EB048; // type:data rom:0x10C8C8 +D_802EB050 = 0x802EB050; // type:data rom:0x10C8D0 +D_802EB058 = 0x802EB058; // type:data rom:0x10C8D8 +D_802EB060 = 0x802EB060; // type:data rom:0x10C8E0 +D_802EB068 = 0x802EB068; // type:data rom:0x10C8E8 +D_802EB088 = 0x802EB088; // type:data rom:0x10C908 +D_802EB090 = 0x802EB090; // type:data rom:0x10C910 +D_802EB098 = 0x802EB098; // type:data rom:0x10C918 +D_802EB0A0 = 0x802EB0A0; // type:data rom:0x10C920 +D_802EB0A8 = 0x802EB0A8; // type:data rom:0x10C928 +D_802EB0B0 = 0x802EB0B0; // type:data rom:0x10C930 +D_802EB0B8 = 0x802EB0B8; // type:data rom:0x10C938 +D_802EB0D8 = 0x802EB0D8; // type:data rom:0x10C958 +D_802EB0E0 = 0x802EB0E0; // type:data rom:0x10C960 +D_802EB0E8 = 0x802EB0E8; // type:data rom:0x10C968 +D_802EB0F0 = 0x802EB0F0; // type:data rom:0x10C970 +D_802EB0F8 = 0x802EB0F8; // type:data rom:0x10C978 +D_802EB100 = 0x802EB100; // type:data rom:0x10C980 +D_802EB108 = 0x802EB108; // type:data rom:0x10C988 +D_802EB110 = 0x802EB110; // type:data rom:0x10C990 +D_802EB118 = 0x802EB118; // type:data rom:0x10C998 +D_802EB120 = 0x802EB120; // type:data rom:0x10C9A0 +D_802EB128 = 0x802EB128; // type:data rom:0x10C9A8 +D_802EB130 = 0x802EB130; // type:data rom:0x10C9B0 +D_802EB138 = 0x802EB138; // type:data rom:0x10C9B8 +D_802EB140 = 0x802EB140; // type:data rom:0x10C9C0 +D_802EB148 = 0x802EB148; // type:data rom:0x10C9C8 +D_802EB150 = 0x802EB150; // type:data rom:0x10C9D0 +D_802EB158 = 0x802EB158; // type:data rom:0x10C9D8 +D_802EB1F0 = 0x802EB1F0; // type:data rom:0x10CA70 +D_802EB1F8 = 0x802EB1F8; // type:data rom:0x10CA78 +D_802EB200 = 0x802EB200; // type:data rom:0x10CA80 +D_802EB208 = 0x802EB208; // type:data rom:0x10CA88 +D_802EB270 = 0x802EB270; // type:data rom:0x10CAF0 +D_802EB290 = 0x802EB290; // type:data rom:0x10CB10 +D_802EB298 = 0x802EB298; // type:data rom:0x10CB18 +D_802EB2A0 = 0x802EB2A0; // type:data rom:0x10CB20 +D_802EB320 = 0x802EB320; // type:data rom:0x10CBA0 +D_802EB328 = 0x802EB328; // type:data rom:0x10CBA8 +D_802EB350 = 0x802EB350; // type:data rom:0x10CBD0 +D_802EB358 = 0x802EB358; // type:data rom:0x10CBD8 +D_802EB360 = 0x802EB360; // type:data rom:0x10CBE0 +D_802EB368 = 0x802EB368; // type:data rom:0x10CBE8 pause_set_cursor_opacity = 0x80242BA0; // type:func rom:0x135EE0 func_80242BAC = 0x80242BAC; // type:func rom:0x135EEC func_80242D04 = 0x80242D04; // type:func rom:0x136044 @@ -4077,6 +4280,8 @@ D_802BDD88_317CA8 = 0x802BDD88; // type:data rom:0x317CA8 world_goombario_update = 0x802BDD8C; // type:data rom:0x317CAC world_goombario_use_ability = 0x802BDDA8; // type:data rom:0x317CC8 world_goombario_put_away = 0x802BDE60; // type:data rom:0x317D80 +D_802BDE80_317DA0 = 0x802BDE80; // type:data rom:0x317DA0 +D_802BDE88_317DA8 = 0x802BDE88; // type:data rom:0x317DA8 func_802BD100_317E50 = 0x802BD100; // type:func rom:0x317E50 func_802BD2D8_318028 = 0x802BD2D8; // type:func rom:0x318028 func_802BD300_318050 = 0x802BD300; // type:func rom:0x318050 @@ -6165,8 +6370,8 @@ func_802A123C_715A8C = 0x802A123C; // type:func rom:0x715A8C func_802A12EC_715B3C = 0x802A12EC; // type:func rom:0x715B3C func_802A1378_715BC8 = 0x802A1378; // type:func rom:0x715BC8 func_802A1438_715C88 = 0x802A1438; // type:func rom:0x715C88 -func_802A14F8_715D48 = 0x802A14F8; // type:func rom:0x715D48 -func_802A154C_715D9C = 0x802A154C; // type:func rom:0x715D9C +battle_item_mushroom_AddHP = 0x802A14F8; // type:func rom:0x715D48 +battle_item_mushroom_AddFP = 0x802A154C; // type:func rom:0x715D9C func_802A15A0_715DF0 = 0x802A15A0; // type:func rom:0x715DF0 func_802A1000_716C60 = 0x802A1000; // type:func rom:0x716C60 func_802A11D4_716E34 = 0x802A11D4; // type:func rom:0x716E34 @@ -6235,7 +6440,7 @@ func_802A123C_724F1C = 0x802A123C; // type:func rom:0x724F1C func_802A12EC_724FCC = 0x802A12EC; // type:func rom:0x724FCC func_802A1378_725058 = 0x802A1378; // type:func rom:0x725058 func_802A1418_7250F8 = 0x802A1418; // type:func rom:0x7250F8 -func_802A14D8_7251B8 = 0x802A14D8; // type:func rom:0x7251B8 +battle_item_super_soda_AddFP = 0x802A14D8; // type:func rom:0x7251B8 func_802A1000_725F60 = 0x802A1000; // type:func rom:0x725F60 func_802A11D4_726134 = 0x802A11D4; // type:func rom:0x726134 func_802A123C_72619C = 0x802A123C; // type:func rom:0x72619C @@ -6293,7 +6498,7 @@ func_802A11D4_730774 = 0x802A11D4; // type:func rom:0x730774 func_802A123C_7307DC = 0x802A123C; // type:func rom:0x7307DC func_802A127C_73081C = 0x802A127C; // type:func rom:0x73081C func_802A133C_7308DC = 0x802A133C; // type:func rom:0x7308DC -func_802A13FC_73099C = 0x802A13FC; // type:func rom:0x73099C +battle_item_electro_pop_AddHP = 0x802A13FC; // type:func rom:0x73099C func_802A1450_7309F0 = 0x802A1450; // type:func rom:0x7309F0 func_802A149C_730A3C = 0x802A149C; // type:func rom:0x730A3C func_802A14F0_730A90 = 0x802A14F0; // type:func rom:0x730A90 @@ -6303,8 +6508,8 @@ func_802A123C_73153C = 0x802A123C; // type:func rom:0x73153C func_802A13E4_7316E4 = 0x802A13E4; // type:func rom:0x7316E4 func_802A1818_731B18 = 0x802A1818; // type:func rom:0x731B18 func_802A18D8_731BD8 = 0x802A18D8; // type:func rom:0x731BD8 -func_802A1998_731C98 = 0x802A1998; // type:func rom:0x731C98 -func_802A19EC_731CEC = 0x802A19EC; // type:func rom:0x731CEC +battle_item_strange_cake_AddHP = 0x802A1998; // type:func rom:0x731C98 +battle_item_strange_cake_AddFP = 0x802A19EC; // type:func rom:0x731CEC func_802A1A40_731D40 = 0x802A1A40; // type:func rom:0x731D40 func_802A1A8C_731D8C = 0x802A1A8C; // type:func rom:0x731D8C func_802A1AD8_731DD8 = 0x802A1AD8; // type:func rom:0x731DD8 @@ -6316,8 +6521,8 @@ func_802A123C_73330C = 0x802A123C; // type:func rom:0x73330C func_802A12EC_7333BC = 0x802A12EC; // type:func rom:0x7333BC func_802A1378_733448 = 0x802A1378; // type:func rom:0x733448 func_802A1438_733508 = 0x802A1438; // type:func rom:0x733508 -func_802A14F8_7335C8 = 0x802A14F8; // type:func rom:0x7335C8 -func_802A154C_73361C = 0x802A154C; // type:func rom:0x73361C +battle_item_food_AddHP = 0x802A14F8; // type:func rom:0x7335C8 +battle_item_food_AddFP = 0x802A154C; // type:func rom:0x73361C func_802A15A0_733670 = 0x802A15A0; // type:func rom:0x733670 battle_move_hammer_IsBerserkerEquipped = 0x802A1000; // type:func rom:0x7345A0 battle_move_hammer_IsRightOnEquipped = 0x802A1050; // type:func rom:0x7345F0 @@ -6403,142 +6608,142 @@ func_802A10E4_781A04 = 0x802A10E4; // type:func rom:0x781A04 battle_move_shrink_stomp_UnkMoveFunc1 = 0x802A1000; // type:func rom:0x783BA0 battle_move_earthquake_jump_UnkMoveFunc1 = 0x802A1000; // type:func rom:0x785B20 func_802A10E4_785C04 = 0x802A10E4; // type:func rom:0x785C04 -func_802A1000_789E60 = 0x802A1000; // type:func rom:0x789E60 -func_802A10AC_789F0C = 0x802A10AC; // type:func rom:0x789F0C -func_802A116C_789FCC = 0x802A116C; // type:func rom:0x789FCC -func_802A1218_78A078 = 0x802A1218; // type:func rom:0x78A078 +battle_star_focus_UnkStarFunc1 = 0x802A1000; // type:func rom:0x789E60 +battle_star_focus_UnkStarFunc2 = 0x802A10AC; // type:func rom:0x789F0C +battle_star_focus_UnkStarFunc3 = 0x802A116C; // type:func rom:0x789FCC +battle_star_focus_UnkStarFunc4 = 0x802A1218; // type:func rom:0x78A078 battle_star_focus_FadeBackgroundToBlack = 0x802A12E4; // type:func rom:0x78A144 -func_802A137C_78A1DC = 0x802A137C; // type:func rom:0x78A1DC -func_802A1414_78A274 = 0x802A1414; // type:func rom:0x78A274 +battle_star_focus_UnkBackgroundFunc2 = 0x802A137C; // type:func rom:0x78A1DC +battle_star_focus_UnkBackgroundFunc = 0x802A1414; // type:func rom:0x78A274 func_802A1494_78A2F4 = 0x802A1494; // type:func rom:0x78A2F4 -func_802A14E8_78A348 = 0x802A14E8; // type:func rom:0x78A348 +battle_star_focus_SetNpcCollision32 = 0x802A14E8; // type:func rom:0x78A348 func_802A1518_78A378 = 0x802A1518; // type:func rom:0x78A378 func_802A15B0_78A410 = 0x802A15B0; // type:func rom:0x78A410 -func_802A1000_78B600 = 0x802A1000; // type:func rom:0x78B600 -func_802A10AC_78B6AC = 0x802A10AC; // type:func rom:0x78B6AC -func_802A116C_78B76C = 0x802A116C; // type:func rom:0x78B76C -func_802A1218_78B818 = 0x802A1218; // type:func rom:0x78B818 +battle_star_refresh_UnkStarFunc1 = 0x802A1000; // type:func rom:0x78B600 +battle_star_refresh_UnkStarFunc2 = 0x802A10AC; // type:func rom:0x78B6AC +battle_star_refresh_UnkStarFunc3 = 0x802A116C; // type:func rom:0x78B76C +battle_star_refresh_UnkStarFunc4 = 0x802A1218; // type:func rom:0x78B818 battle_star_refresh_FadeBackgroundToBlack = 0x802A12E4; // type:func rom:0x78B8E4 -func_802A137C_78B97C = 0x802A137C; // type:func rom:0x78B97C -func_802A1414_78BA14 = 0x802A1414; // type:func rom:0x78BA14 +battle_star_refresh_UnkBackgroundFunc2 = 0x802A137C; // type:func rom:0x78B97C +battle_star_refresh_UnkBackgroundFunc = 0x802A1414; // type:func rom:0x78BA14 func_802A1494_78BA94 = 0x802A1494; // type:func rom:0x78BA94 -func_802A14E8_78BAE8 = 0x802A14E8; // type:func rom:0x78BAE8 +battle_star_refresh_SetNpcCollision32 = 0x802A14E8; // type:func rom:0x78BAE8 func_802A1518_78BB18 = 0x802A1518; // type:func rom:0x78BB18 func_802A17D4_78BDD4 = 0x802A17D4; // type:func rom:0x78BDD4 -func_802A1840_78BE40 = 0x802A1840; // type:func rom:0x78BE40 -func_802A1894_78BE94 = 0x802A1894; // type:func rom:0x78BE94 +battle_star_refresh_AddHP = 0x802A1840; // type:func rom:0x78BE40 +battle_star_refresh_AddFP = 0x802A1894; // type:func rom:0x78BE94 func_802A18E8_78BEE8 = 0x802A18E8; // type:func rom:0x78BEE8 func_802A19A8_78BFA8 = 0x802A19A8; // type:func rom:0x78BFA8 -func_802A1000_78D150 = 0x802A1000; // type:func rom:0x78D150 -func_802A10AC_78D1FC = 0x802A10AC; // type:func rom:0x78D1FC -func_802A116C_78D2BC = 0x802A116C; // type:func rom:0x78D2BC -func_802A1218_78D368 = 0x802A1218; // type:func rom:0x78D368 +battle_star_lullaby_UnkStarFunc1 = 0x802A1000; // type:func rom:0x78D150 +battle_star_lullaby_UnkStarFunc2 = 0x802A10AC; // type:func rom:0x78D1FC +battle_star_lullaby_UnkStarFunc3 = 0x802A116C; // type:func rom:0x78D2BC +battle_star_lullaby_UnkStarFunc4 = 0x802A1218; // type:func rom:0x78D368 battle_star_lullaby_FadeBackgroundToBlack = 0x802A12E4; // type:func rom:0x78D434 -func_802A137C_78D4CC = 0x802A137C; // type:func rom:0x78D4CC -func_802A1414_78D564 = 0x802A1414; // type:func rom:0x78D564 +battle_star_lullaby_UnkBackgroundFunc2 = 0x802A137C; // type:func rom:0x78D4CC +battle_star_lullaby_UnkBackgroundFunc = 0x802A1414; // type:func rom:0x78D564 func_802A1494_78D5E4 = 0x802A1494; // type:func rom:0x78D5E4 -func_802A14E8_78D638 = 0x802A14E8; // type:func rom:0x78D638 +battle_star_lullaby_SetNpcCollision32 = 0x802A14E8; // type:func rom:0x78D638 func_802A1518_78D668 = 0x802A1518; // type:func rom:0x78D668 -func_802A1000_78E7D0 = 0x802A1000; // type:func rom:0x78E7D0 -func_802A10AC_78E87C = 0x802A10AC; // type:func rom:0x78E87C -func_802A116C_78E93C = 0x802A116C; // type:func rom:0x78E93C -func_802A1218_78E9E8 = 0x802A1218; // type:func rom:0x78E9E8 +battle_star_star_storm_UnkStarFunc1 = 0x802A1000; // type:func rom:0x78E7D0 +battle_star_star_storm_UnkStarFunc2 = 0x802A10AC; // type:func rom:0x78E87C +battle_star_star_storm_UnkStarFunc3 = 0x802A116C; // type:func rom:0x78E93C +battle_star_star_storm_UnkStarFunc4 = 0x802A1218; // type:func rom:0x78E9E8 battle_star_star_storm_FadeBackgroundToBlack = 0x802A12E4; // type:func rom:0x78EAB4 -func_802A137C_78EB4C = 0x802A137C; // type:func rom:0x78EB4C -func_802A1414_78EBE4 = 0x802A1414; // type:func rom:0x78EBE4 +battle_star_star_storm_UnkBackgroundFunc2 = 0x802A137C; // type:func rom:0x78EB4C +battle_star_star_storm_UnkBackgroundFunc = 0x802A1414; // type:func rom:0x78EBE4 func_802A1494_78EC64 = 0x802A1494; // type:func rom:0x78EC64 -func_802A14E8_78ECB8 = 0x802A14E8; // type:func rom:0x78ECB8 +battle_star_star_storm_SetNpcCollision32 = 0x802A14E8; // type:func rom:0x78ECB8 func_802A1518_78ECE8 = 0x802A1518; // type:func rom:0x78ECE8 func_802A1628_78EDF8 = 0x802A1628; // type:func rom:0x78EDF8 -func_802A1000_7900D0 = 0x802A1000; // type:func rom:0x7900D0 -func_802A10AC_79017C = 0x802A10AC; // type:func rom:0x79017C -func_802A116C_79023C = 0x802A116C; // type:func rom:0x79023C -func_802A1218_7902E8 = 0x802A1218; // type:func rom:0x7902E8 +battle_star_chill_out_UnkStarFunc1 = 0x802A1000; // type:func rom:0x7900D0 +battle_star_chill_out_UnkStarFunc2 = 0x802A10AC; // type:func rom:0x79017C +battle_star_chill_out_UnkStarFunc3 = 0x802A116C; // type:func rom:0x79023C +battle_star_chill_out_UnkStarFunc4 = 0x802A1218; // type:func rom:0x7902E8 battle_star_chill_out_FadeBackgroundToBlack = 0x802A12E4; // type:func rom:0x7903B4 -func_802A137C_79044C = 0x802A137C; // type:func rom:0x79044C -func_802A1414_7904E4 = 0x802A1414; // type:func rom:0x7904E4 +battle_star_chill_out_UnkBackgroundFunc2 = 0x802A137C; // type:func rom:0x79044C +battle_star_chill_out_UnkBackgroundFunc = 0x802A1414; // type:func rom:0x7904E4 func_802A1494_790564 = 0x802A1494; // type:func rom:0x790564 -func_802A14E8_7905B8 = 0x802A14E8; // type:func rom:0x7905B8 +battle_star_chill_out_SetNpcCollision32 = 0x802A14E8; // type:func rom:0x7905B8 func_802A1518_7905E8 = 0x802A1518; // type:func rom:0x7905E8 func_802A1528_7905F8 = 0x802A1528; // type:func rom:0x7905F8 func_802A153C_79060C = 0x802A153C; // type:func rom:0x79060C func_802A163C_79070C = 0x802A163C; // type:func rom:0x79070C func_802A16F4_7907C4 = 0x802A16F4; // type:func rom:0x7907C4 -func_802A1000_791D90 = 0x802A1000; // type:func rom:0x791D90 -func_802A10AC_791E3C = 0x802A10AC; // type:func rom:0x791E3C -func_802A116C_791EFC = 0x802A116C; // type:func rom:0x791EFC -func_802A1218_791FA8 = 0x802A1218; // type:func rom:0x791FA8 +battle_star_smooch_UnkStarFunc1 = 0x802A1000; // type:func rom:0x791D90 +battle_star_smooch_UnkStarFunc2 = 0x802A10AC; // type:func rom:0x791E3C +battle_star_smooch_UnkStarFunc3 = 0x802A116C; // type:func rom:0x791EFC +battle_star_smooch_UnkStarFunc4 = 0x802A1218; // type:func rom:0x791FA8 battle_star_smooch_FadeBackgroundToBlack = 0x802A12E4; // type:func rom:0x792074 -func_802A137C_79210C = 0x802A137C; // type:func rom:0x79210C -func_802A1414_7921A4 = 0x802A1414; // type:func rom:0x7921A4 +battle_star_smooch_UnkBackgroundFunc2 = 0x802A137C; // type:func rom:0x79210C +battle_star_smooch_UnkBackgroundFunc = 0x802A1414; // type:func rom:0x7921A4 func_802A1494_792224 = 0x802A1494; // type:func rom:0x792224 -func_802A14E8_792278 = 0x802A14E8; // type:func rom:0x792278 -func_802A1518_7922A8 = 0x802A1518; // type:func rom:0x7922A8 +battle_star_smooch_SetNpcCollision32 = 0x802A14E8; // type:func rom:0x792278 +battle_star_smooch_AddHP = 0x802A1518; // type:func rom:0x7922A8 func_802A156C_7922FC = 0x802A156C; // type:func rom:0x7922FC -func_802A1000_793D20 = 0x802A1000; // type:func rom:0x793D20 -func_802A10AC_793DCC = 0x802A10AC; // type:func rom:0x793DCC -func_802A116C_793E8C = 0x802A116C; // type:func rom:0x793E8C -func_802A1218_793F38 = 0x802A1218; // type:func rom:0x793F38 +battle_star_time_out_UnkStarFunc1 = 0x802A1000; // type:func rom:0x793D20 +battle_star_time_out_UnkStarFunc2 = 0x802A10AC; // type:func rom:0x793DCC +battle_star_time_out_UnkStarFunc3 = 0x802A116C; // type:func rom:0x793E8C +battle_star_time_out_UnkStarFunc4 = 0x802A1218; // type:func rom:0x793F38 battle_star_time_out_FadeBackgroundToBlack = 0x802A12E4; // type:func rom:0x794004 -func_802A137C_79409C = 0x802A137C; // type:func rom:0x79409C -func_802A1414_794134 = 0x802A1414; // type:func rom:0x794134 +battle_star_time_out_UnkBackgroundFunc2 = 0x802A137C; // type:func rom:0x79409C +battle_star_time_out_UnkBackgroundFunc = 0x802A1414; // type:func rom:0x794134 func_802A1494_7941B4 = 0x802A1494; // type:func rom:0x7941B4 -func_802A14E8_794208 = 0x802A14E8; // type:func rom:0x794208 -func_802A1000_7952E0 = 0x802A1000; // type:func rom:0x7952E0 -func_802A10AC_79538C = 0x802A10AC; // type:func rom:0x79538C -func_802A116C_79544C = 0x802A116C; // type:func rom:0x79544C -func_802A1218_7954F8 = 0x802A1218; // type:func rom:0x7954F8 +battle_star_time_out_SetNpcCollision32 = 0x802A14E8; // type:func rom:0x794208 +battle_star_up_and_away_UnkStarFunc1 = 0x802A1000; // type:func rom:0x7952E0 +battle_star_up_and_away_UnkStarFunc2 = 0x802A10AC; // type:func rom:0x79538C +battle_star_up_and_away_UnkStarFunc3 = 0x802A116C; // type:func rom:0x79544C +battle_star_up_and_away_UnkStarFunc4 = 0x802A1218; // type:func rom:0x7954F8 battle_star_up_and_away_FadeBackgroundToBlack = 0x802A12E4; // type:func rom:0x7955C4 -func_802A137C_79565C = 0x802A137C; // type:func rom:0x79565C -func_802A1414_7956F4 = 0x802A1414; // type:func rom:0x7956F4 +battle_star_up_and_away_UnkBackgroundFunc2 = 0x802A137C; // type:func rom:0x79565C +battle_star_up_and_away_UnkBackgroundFunc = 0x802A1414; // type:func rom:0x7956F4 func_802A1494_795774 = 0x802A1494; // type:func rom:0x795774 -func_802A14E8_7957C8 = 0x802A14E8; // type:func rom:0x7957C8 +battle_star_up_and_away_SetNpcCollision32 = 0x802A14E8; // type:func rom:0x7957C8 func_802A1518_7957F8 = 0x802A1518; // type:func rom:0x7957F8 func_802A15B4_795894 = 0x802A15B4; // type:func rom:0x795894 func_802A1628_795908 = 0x802A1628; // type:func rom:0x795908 -func_802A1000_796FC0 = 0x802A1000; // type:func rom:0x796FC0 -func_802A10AC_79706C = 0x802A10AC; // type:func rom:0x79706C -func_802A116C_79712C = 0x802A116C; // type:func rom:0x79712C -func_802A1218_7971D8 = 0x802A1218; // type:func rom:0x7971D8 +battle_star_star_beam_UnkStarFunc1 = 0x802A1000; // type:func rom:0x796FC0 +battle_star_star_beam_UnkStarFunc2 = 0x802A10AC; // type:func rom:0x79706C +battle_star_star_beam_UnkStarFunc3 = 0x802A116C; // type:func rom:0x79712C +battle_star_star_beam_UnkStarFunc4 = 0x802A1218; // type:func rom:0x7971D8 battle_star_star_beam_FadeBackgroundToBlack = 0x802A12E4; // type:func rom:0x7972A4 -func_802A137C_79733C = 0x802A137C; // type:func rom:0x79733C -func_802A1414_7973D4 = 0x802A1414; // type:func rom:0x7973D4 +battle_star_star_beam_UnkBackgroundFunc2 = 0x802A137C; // type:func rom:0x79733C +battle_star_star_beam_UnkBackgroundFunc = 0x802A1414; // type:func rom:0x7973D4 func_802A1494_797454 = 0x802A1494; // type:func rom:0x797454 -func_802A14E8_7974A8 = 0x802A14E8; // type:func rom:0x7974A8 +battle_star_star_beam_SetNpcCollision32 = 0x802A14E8; // type:func rom:0x7974A8 func_802A1518_7974D8 = 0x802A1518; // type:func rom:0x7974D8 func_802A2468_798428 = 0x802A2468; // type:func rom:0x798428 func_802A247C_79843C = 0x802A247C; // type:func rom:0x79843C -func_802A1000_7997B0 = 0x802A1000; // type:func rom:0x7997B0 -func_802A10AC_79985C = 0x802A10AC; // type:func rom:0x79985C -func_802A116C_79991C = 0x802A116C; // type:func rom:0x79991C -func_802A1218_7999C8 = 0x802A1218; // type:func rom:0x7999C8 +battle_star_peach_beam_UnkStarFunc1 = 0x802A1000; // type:func rom:0x7997B0 +battle_star_peach_beam_UnkStarFunc2 = 0x802A10AC; // type:func rom:0x79985C +battle_star_peach_beam_UnkStarFunc3 = 0x802A116C; // type:func rom:0x79991C +battle_star_peach_beam_UnkStarFunc4 = 0x802A1218; // type:func rom:0x7999C8 battle_star_peach_beam_FadeBackgroundToBlack = 0x802A12E4; // type:func rom:0x799A94 -func_802A137C_799B2C = 0x802A137C; // type:func rom:0x799B2C -func_802A1414_799BC4 = 0x802A1414; // type:func rom:0x799BC4 +battle_star_peach_beam_UnkBackgroundFunc2 = 0x802A137C; // type:func rom:0x799B2C +battle_star_peach_beam_UnkBackgroundFunc = 0x802A1414; // type:func rom:0x799BC4 func_802A1494_799C44 = 0x802A1494; // type:func rom:0x799C44 -func_802A14E8_799C98 = 0x802A14E8; // type:func rom:0x799C98 +battle_star_peach_beam_SetNpcCollision32 = 0x802A14E8; // type:func rom:0x799C98 func_802A1518_799CC8 = 0x802A1518; // type:func rom:0x799CC8 func_802A2468_79AC18 = 0x802A2468; // type:func rom:0x79AC18 func_802A247C_79AC2C = 0x802A247C; // type:func rom:0x79AC2C -func_802A1000_79BFA0 = 0x802A1000; // type:func rom:0x79BFA0 -func_802A10AC_79C04C = 0x802A10AC; // type:func rom:0x79C04C -func_802A116C_79C10C = 0x802A116C; // type:func rom:0x79C10C -func_802A1218_79C1B8 = 0x802A1218; // type:func rom:0x79C1B8 +battle_star_peach_focus_UnkStarFunc1 = 0x802A1000; // type:func rom:0x79BFA0 +battle_star_peach_focus_UnkStarFunc2 = 0x802A10AC; // type:func rom:0x79C04C +battle_star_peach_focus_UnkStarFunc3 = 0x802A116C; // type:func rom:0x79C10C +battle_star_peach_focus_UnkStarFunc4 = 0x802A1218; // type:func rom:0x79C1B8 battle_star_peach_focus_FadeBackgroundToBlack = 0x802A12E4; // type:func rom:0x79C284 -func_802A137C_79C31C = 0x802A137C; // type:func rom:0x79C31C -func_802A1414_79C3B4 = 0x802A1414; // type:func rom:0x79C3B4 +battle_star_peach_focus_UnkBackgroundFunc2 = 0x802A137C; // type:func rom:0x79C31C +battle_star_peach_focus_UnkBackgroundFunc = 0x802A1414; // type:func rom:0x79C3B4 func_802A1494_79C434 = 0x802A1494; // type:func rom:0x79C434 -func_802A14E8_79C488 = 0x802A14E8; // type:func rom:0x79C488 +battle_star_peach_focus_SetNpcCollision32 = 0x802A14E8; // type:func rom:0x79C488 func_802A1518_79C4B8 = 0x802A1518; // type:func rom:0x79C4B8 -func_802A1000_79D8A0 = 0x802A1000; // type:func rom:0x79D8A0 -func_802A10AC_79D94C = 0x802A10AC; // type:func rom:0x79D94C -func_802A116C_79DA0C = 0x802A116C; // type:func rom:0x79DA0C -func_802A1218_79DAB8 = 0x802A1218; // type:func rom:0x79DAB8 +battle_star_peach_dash_UnkStarFunc1 = 0x802A1000; // type:func rom:0x79D8A0 +battle_star_peach_dash_UnkStarFunc2 = 0x802A10AC; // type:func rom:0x79D94C +battle_star_peach_dash_UnkStarFunc3 = 0x802A116C; // type:func rom:0x79DA0C +battle_star_peach_dash_UnkStarFunc4 = 0x802A1218; // type:func rom:0x79DAB8 battle_star_peach_dash_FadeBackgroundToBlack = 0x802A12E4; // type:func rom:0x79DB84 -func_802A137C_79DC1C = 0x802A137C; // type:func rom:0x79DC1C -func_802A1414_79DCB4 = 0x802A1414; // type:func rom:0x79DCB4 +battle_star_peach_dash_UnkBackgroundFunc2 = 0x802A137C; // type:func rom:0x79DC1C +battle_star_peach_dash_UnkBackgroundFunc = 0x802A1414; // type:func rom:0x79DCB4 func_802A1494_79DD34 = 0x802A1494; // type:func rom:0x79DD34 -func_802A14E8_79DD88 = 0x802A14E8; // type:func rom:0x79DD88 +battle_star_peach_dash_SetNpcCollision32 = 0x802A14E8; // type:func rom:0x79DD88 func_802A1518_79DDB8 = 0x802A1518; // type:func rom:0x79DDB8 func_80280000 = 0x80280000; // type:func rom:0x7E0E80 func_80280088 = 0x80280088; // type:func rom:0x7E0F08 @@ -15009,7 +15214,7 @@ D_80078E60 = 0x80078E60; // type:data D_80079430 = 0x80079430; // type:data D_80079540 = 0x80079540; // type:data D_8007C760 = 0x8007C760; // type:data -gEffectTable = 0x8007F214; // +gEffectTable = 0x8007F210; // type:data size:0xCA8 D_8007FF20 = 0x8007FF20; // type:data D_80080208 = 0x80080208; // type:data D_800806A0 = 0x800806A0; // type:data @@ -15058,6 +15263,8 @@ D_8008FC44 = 0x8008FC44; // type:data D_8008FEE0 = 0x8008FEE0; // type:data gAreas = 0x800934F0; // type:data size:0x1D0 rdpstateinit_dl = 0x80093BB8; // type:data +D_80093DB0 = 0x80093DB0; // type:data +D_80094664 = 0x80094664; // type:data D_80094900 = 0x80094900; // type:data gBattleAreas = 0x80095A30; // type:data size:0x600 D_80097D30 = 0x80097D30; // type:data @@ -17262,21 +17469,6 @@ D_802EACC8 = 0x802EACC8; // type:data D_802EAD7C = 0x802EAD7C; // type:data D_802EAE7C = 0x802EAE7C; // type:data D_802EAFDC = 0x802EAFDC; // type:data -D_802EB270 = 0x802EB270; // type:data -D_802EB278 = 0x802EB278; // type:data -D_802EB290 = 0x802EB290; // type:data -D_802EB298 = 0x802EB298; // type:data -D_802EB2A0 = 0x802EB2A0; // type:data -D_802EB2B0 = 0x802EB2B0; // type:data -D_802EB2F0 = 0x802EB2F0; // type:data -D_802EB308 = 0x802EB308; // type:data -D_802EB320 = 0x802EB320; // type:data -D_802EB328 = 0x802EB328; // type:data -D_802EB330 = 0x802EB330; // type:data -D_802EB350 = 0x802EB350; // type:data -D_802EB358 = 0x802EB358; // type:data -D_802EB360 = 0x802EB360; // type:data -D_802EB368 = 0x802EB368; // type:data D_802EB370 = 0x802EB370; // type:data D_802EB380 = 0x802EB380; // type:data D_802EB390 = 0x802EB390; // type:data diff --git a/ver/us/undefined_syms_auto.txt b/ver/us/undefined_syms_auto.txt index 9ea3205e10..fd0adcf3c7 100644 --- a/ver/us/undefined_syms_auto.txt +++ b/ver/us/undefined_syms_auto.txt @@ -16,6 +16,27 @@ D_80078DB0 = 0x80078DB0; D_80078DB4 = 0x80078DB4; nuContRmbSearchTime = 0x80093CE0; nuContRmbCallBack = 0x80093D00; +nuGfxFunc = 0x80093D10; +nuGfxPreNMIFunc = 0x80093D14; +D_80093D20 = 0x80093D20; +nuContCallBack = 0x80093D38; +__osPiDevMgr = 0x80093D50; +__osPiTable = 0x80093D6C; +__osCurrentHandle = 0x80093D70; +D_80093D80 = 0x80093D80; +__osPiAccessQueueEnabled = 0x80093D90; +hdwrBugFlag = 0x80093DA0; +dtor = 0x80093DC0; +D_80093DD0 = 0x80093DD0; +sintable = 0x80093DE0; +spaces = 0x800945E0; +zeroes = 0x80094604; +__osPreNMI = 0x80094630; +__osSiAccessQueueEnabled = 0x80094640; +__osThreadTail = 0x80094650; +__osRunQueue = 0x80094658; +__osActiveQueue = 0x8009465C; +__osRunningThread = 0x80094660; gPlayerStatusPtr = 0x800F7B30; D_800F7B40 = 0x800F7B40; D_800F7B44 = 0x800F7B44; @@ -55,9 +76,28 @@ D_800F803A = 0x800F803A; wPartners = 0x800F803C; gCloudyFlowerFieldsBg = 0x8014F120; gSunnyFlowerFieldsBg = 0x8014F128; +D_8014F130 = 0x8014F130; +D_8014F134 = 0x8014F134; +D_8014F140 = 0x8014F140; +D_8014F150 = 0x8014F150; +D_8014F250 = 0x8014F250; +D_8014F298 = 0x8014F298; +D_8014F2A0 = 0x8014F2A0; +D_8014F2A4 = 0x8014F2A4; +D_8014F2A8 = 0x8014F2A8; +D_8014F2B4 = 0x8014F2B4; +D_8014F2BD = 0x8014F2BD; +D_8014F2C0 = 0x8014F2C0; +D_8014F2D0 = 0x8014F2D0; +D_8014F5A4 = 0x8014F5A4; +D_8014F6B4 = 0x8014F6B4; +D_8014F6F0 = 0x8014F6F0; +gSongsUsingVariationFlag = 0x8014F720; +D_8014F738 = 0x8014F738; gStaticScriptCounter = 0x802D9CA0; gIsUpdatingScripts = 0x802D9CA4; gGlobalTimeSpace = 0x802D9CA8; +D_802E9828 = 0x802E9828; D_802809F0 = 0x802809F0; D_802809F4 = 0x802809F4; D_802809F5 = 0x802809F5; @@ -1925,6 +1965,8 @@ D_80078E5A = 0x80078E5A; D_80078E5C = 0x80078E5C; D_80078E60 = 0x80078E60; gAreas = 0x800934F0; +D_80093DB0 = 0x80093DB0; +D_80094664 = 0x80094664; gBattleAreas = 0x80095A30; D_80099E40 = 0x80099E40; D_80099F40 = 0x80099F40; @@ -3662,6 +3704,15 @@ gWorldMapVars = 0x802DBCA8; gBattleMapVars = 0x802DBCE8; D_802DBD28 = 0x802DBD28; gBattleMapFlags = 0x802DBD34; +D_802DF390 = 0x802DF390; +D_802DF3D0 = 0x802DF3D0; +D_802DF3E0 = 0x802DF3E0; +D_802DF3F0 = 0x802DF3F0; +D_802DF428 = 0x802DF428; +D_802DF460 = 0x802DF460; +D_802DF490 = 0x802DF490; +D_802DF4C0 = 0x802DF4C0; +D_802DF4C4 = 0x802DF4C4; D_802DF524 = 0x802DF524; D_802DF530 = 0x802DF530; D_802DF540 = 0x802DF540; @@ -3708,49 +3759,6 @@ D_802E9CF8 = 0x802E9CF8; D_802E9D1C = 0x802E9D1C; D_802E9D40 = 0x802E9D40; D_802E9D64 = 0x802E9D64; -D_802E9E54 = 0x802E9E54; -D_802E9E80 = 0x802E9E80; -D_802EA07C = 0x802EA07C; -D_802EA0A0 = 0x802EA0A0; -D_802EA0C4 = 0x802EA0C4; -D_802EA2BC = 0x802EA2BC; -D_802EA310 = 0x802EA310; -D_802EA618 = 0x802EA618; -D_802EA63C = 0x802EA63C; -D_802EA660 = 0x802EA660; -D_802EA728 = 0x802EA728; -D_802EA744 = 0x802EA744; -D_802EA760 = 0x802EA760; -D_802EA7BC = 0x802EA7BC; -D_802EA862 = 0x802EA862; -D_802EA870 = 0x802EA870; -D_802EA871 = 0x802EA871; -D_802EA934 = 0x802EA934; -D_802EAAE0 = 0x802EAAE0; -D_802EAB30 = 0x802EAB30; -D_802EAC0C = 0x802EAC0C; -D_802EAC40 = 0x802EAC40; -D_802EAC84 = 0x802EAC84; -D_802EACC8 = 0x802EACC8; -D_802EAD7C = 0x802EAD7C; -D_802EAE7C = 0x802EAE7C; -D_802EAFDC = 0x802EAFDC; -D_802EB270 = 0x802EB270; -D_802EB278 = 0x802EB278; -D_802EB290 = 0x802EB290; -D_802EB298 = 0x802EB298; -D_802EB2A0 = 0x802EB2A0; -D_802EB2B0 = 0x802EB2B0; -D_802EB2F0 = 0x802EB2F0; -D_802EB308 = 0x802EB308; -D_802EB320 = 0x802EB320; -D_802EB328 = 0x802EB328; -D_802EB330 = 0x802EB330; -D_802EB350 = 0x802EB350; -D_802EB358 = 0x802EB358; -D_802EB360 = 0x802EB360; -D_802EB368 = 0x802EB368; -D_802EB370 = 0x802EB370; D_802EB380 = 0x802EB380; D_802EB390 = 0x802EB390; D_802EB394 = 0x802EB394; @@ -4463,15 +4471,6 @@ D_FA000028 = 0xFA000028; D_FD100008 = 0xFD100008; jtbl_8009A578 = 0x8009A578; jtbl_8009A590 = 0x8009A590; -D_802DF390 = 0x802DF390; -D_802DF3E0 = 0x802DF3E0; -D_802DF3D0 = 0x802DF3D0; -D_802DF460 = 0x802DF460; -D_802DF490 = 0x802DF490; -D_802DF3F0 = 0x802DF3F0; -D_802DF428 = 0x802DF428; -D_802DF4C0 = 0x802DF4C0; -D_802DF4C4 = 0x802DF4C4; jtbl_E000CD40 = 0xE000CD40; jtbl_E000CD58 = 0xE000CD58; jtbl_E0044F00 = 0xE0044F00;