diff --git a/diff_evt.py b/diff_evt.py index 63c263b2eb..b86990b127 100755 --- a/diff_evt.py +++ b/diff_evt.py @@ -4,10 +4,12 @@ import argparse import queue import time import subprocess +import sys from diff import Display, debounced_fs_watch from colorama import Fore, Back, Style +sys.path.append("tools") from tools.update_evts import parse_symbol_addrs from tools.disasm_script import ScriptDisassembler, get_constants diff --git a/include/script_api/battle.h b/include/script_api/battle.h index 7ee5440b3c..96751a8005 100644 --- a/include/script_api/battle.h +++ b/include/script_api/battle.h @@ -286,8 +286,15 @@ ApiStatus func_80269550(Evt* script, s32 isInitialCall); ApiStatus func_8026919C(Evt* script, s32 isInitialCall); ApiStatus func_80280818(Evt* script, s32 isInitialCall); ///< YieldTurn copy ApiStatus func_8024ECF8(Evt* script, s32 isInitialCall); +ApiStatus func_8024E664(Evt* script, s32 isInitialCall); ApiStatus func_8027D32C(Evt* script, s32 isInitialCall); ApiStatus GetActionCommandResult(Evt* script, s32 isInitialCall); +ApiStatus CreateNpc(Evt* script, s32 isInitialCall); +ApiStatus func_802535B4(Evt* script, s32 isInitialCall); +ApiStatus func_80276EFC(Evt* script, s32 isInitialCall); +ApiStatus func_802D7520(Evt* script, s32 isInitialCall); +ApiStatus func_802D75D8(Evt* script, s32 isInitialCall); +ApiStatus func_80273444(Evt *script, s32 isInitialCall); extern EvtSource PlayerScriptDispatcher; extern EvtSource PeachScriptDispatcher; diff --git a/include/script_api/common.h b/include/script_api/common.h index ae0c5c0339..88b881b5a3 100644 --- a/include/script_api/common.h +++ b/include/script_api/common.h @@ -274,6 +274,8 @@ ApiStatus SetVirtualEntityPosition(Evt* script, s32 isInitialCall); ApiStatus SetVirtualEntityScale(Evt* script, s32 isInitialCall); ApiStatus SetVirtualEntityRotation(Evt* script, s32 isInitialCall); ApiStatus SetVirtualEntityJumpGravity(Evt* script, s32 isInitialCall); +ApiStatus SetVirtualEntityFlags(Evt* script, s32 isInitialCall); +ApiStatus GetVirtualEntityPosition(Evt* script, s32 isInitialCall); ApiStatus VirtualEntityJumpTo(Evt* script, s32 isInitialCall); ApiStatus func_802D2884(Evt* script, s32 isInitialCall); ApiStatus func_802D2C14(Evt* script, s32 isInitialCall); @@ -302,6 +304,8 @@ ApiStatus SetNpcPaletteSwapMode(Evt* script, s32 isInitialCall); ApiStatus SetNpcPaletteSwapping(Evt* script, s32 isInitialCall); ApiStatus MakeTransformGroup(Evt* script, s32 isInitialCall); +ApiStatus Spawn802D9D50(Evt* script, s32 isInitialCall); + extern EvtSource EnemyNpcHit; extern EvtSource EnemyNpcDefeat; diff --git a/include/script_api/macros.h b/include/script_api/macros.h index c3d522ae01..32e1912a19 100644 --- a/include/script_api/macros.h +++ b/include/script_api/macros.h @@ -83,8 +83,7 @@ /// Used for almost all savefile state. #define GSW(INDEX) (((((INDEX)) - 170000000)) -// TODO(docs): figure out what 'U' might stand for in UW and UF -/// **Array** Word. A variable stored within the current thread's array. +/// User Word. A variable stored within the current thread's array. /// You can load an array with EVT_USE_ARRAY or temporarily allocate one with EVT_MALLOC_ARRAY, then get/set values with /// the `UW(index)` macro. /// @@ -92,7 +91,7 @@ /// Star Rod equivalent: `*Array[v]`. #define UW(INDEX) ((((INDEX)) - 190000000)) -/// **Array** Flag. A boolean variable stored within the current thread's flag array. +/// User Flag. A boolean variable stored within the current thread's flag array. /// The flag array is distinct from the word array (unlike EVT_USE_BUF and EVT_USE_FBUF). /// /// Range: `0 <= v` diff --git a/src/battle/item/dried_shroom.h b/src/battle/item/dried_shroom.h index 69b62d605a..293dc5b7e3 100644 --- a/src/battle/item/dried_shroom.h +++ b/src/battle/item/dried_shroom.h @@ -7,8 +7,6 @@ #undef NAMESPACE #define NAMESPACE battle_item_dried_shroom -ApiStatus func_802D7520(Evt* script, s32 isInitialCall); -ApiStatus func_802D75D8(Evt* script, s32 isInitialCall); ApiStatus N(func_802A123C_71CF1C)(Evt* script, s32 isInitialCall); ApiStatus N(func_802A12FC_71CFDC)(Evt* script, s32 isInitialCall); diff --git a/src/battle/item/electro_pop.h b/src/battle/item/electro_pop.h index 7e86f5d20f..8df2d94792 100644 --- a/src/battle/item/electro_pop.h +++ b/src/battle/item/electro_pop.h @@ -7,9 +7,6 @@ #undef NAMESPACE #define NAMESPACE battle_item_electro_pop -ApiStatus func_802D7520(Evt* script, s32 isInitialCall); -ApiStatus func_802D75D8(Evt* script, s32 isInitialCall); - ApiStatus N(func_802A123C_7307DC)(Evt* script, s32 isInitialCall); ApiStatus N(func_802A14F0_730A90)(Evt* script, s32 isInitialCall); ApiStatus N(func_802A133C_7308DC)(Evt* script, s32 isInitialCall); diff --git a/src/battle/item/food.h b/src/battle/item/food.h index 0cce7fe43b..b5828d0da9 100644 --- a/src/battle/item/food.h +++ b/src/battle/item/food.h @@ -7,11 +7,6 @@ #undef NAMESPACE #define NAMESPACE battle_item_food -ApiStatus SetVirtualEntityFlags(Evt* script, s32 isInitialCall); -ApiStatus GetVirtualEntityPosition(Evt* script, s32 isInitialCall); -ApiStatus func_802D7520(Evt* script, s32 isInitialCall); -ApiStatus func_802D75D8(Evt* script, s32 isInitialCall); - ApiStatus N(func_802A123C_73330C)(Evt* script, s32 isInitialCall); ApiStatus N(func_802A12EC_7333BC)(Evt* script, s32 isInitialCall); ApiStatus N(func_802A15A0_733670)(Evt* script, s32 isInitialCall); diff --git a/src/battle/item/hustle_drink.h b/src/battle/item/hustle_drink.h index f45168795e..390db0d416 100644 --- a/src/battle/item/hustle_drink.h +++ b/src/battle/item/hustle_drink.h @@ -7,7 +7,6 @@ #undef NAMESPACE #define NAMESPACE battle_item_hustle_drink -ApiStatus func_802D7520(Evt* script, s32 isInitialCall); ApiStatus N(func_802A12C4_726224)(Evt* script, s32 isInitialCall); ApiStatus N(func_802A123C_72619C)(Evt* script, s32 isInitialCall); diff --git a/src/battle/item/life_shroom.h b/src/battle/item/life_shroom.h index 4b2c953e8e..4ec7f138e8 100644 --- a/src/battle/item/life_shroom.h +++ b/src/battle/item/life_shroom.h @@ -7,11 +7,6 @@ #undef NAMESPACE #define NAMESPACE battle_item_life_shroom -ApiStatus SetVirtualEntityFlags(Evt* script, s32 isInitialCall); -ApiStatus GetVirtualEntityPosition(Evt* script, s32 isInitialCall); -ApiStatus func_802D7520(Evt* script, s32 isInitialCall); -ApiStatus func_802D75D8(Evt* script, s32 isInitialCall); - ApiStatus N(func_802A123C_72E76C)(Evt* script, s32 isInitialCall); ApiStatus N(func_802A12EC_72E81C)(Evt* script, s32 isInitialCall); ApiStatus N(func_802A1484_72E9B4)(Evt* script, s32 isInitialCall); diff --git a/src/battle/item/mushroom.h b/src/battle/item/mushroom.h index d5eedd23ce..95d7afd0a5 100644 --- a/src/battle/item/mushroom.h +++ b/src/battle/item/mushroom.h @@ -7,11 +7,6 @@ #undef NAMESPACE #define NAMESPACE battle_item_mushroom -ApiStatus SetVirtualEntityFlags(Evt* script, s32 isInitialCall); -ApiStatus GetVirtualEntityPosition(Evt* script, s32 isInitialCall); -ApiStatus func_802D7520(Evt* script, s32 isInitialCall); -ApiStatus func_802D75D8(Evt* script, s32 isInitialCall); - ApiStatus N(func_802A123C_715A8C)(Evt* script, s32 isInitialCall); ApiStatus N(func_802A12EC_715B3C)(Evt* script, s32 isInitialCall); ApiStatus N(func_802A15A0_715DF0)(Evt* script, s32 isInitialCall); diff --git a/src/battle/item/please_come_back.h b/src/battle/item/please_come_back.h index b11c6ac4cd..6edbfc31c9 100644 --- a/src/battle/item/please_come_back.h +++ b/src/battle/item/please_come_back.h @@ -7,8 +7,6 @@ #undef NAMESPACE #define NAMESPACE battle_item_please_come_back -ApiStatus func_80273444(Evt* script, s32 isInitialCall); - EvtSource N(UseItemWithEffect); #endif diff --git a/src/battle/item/pow_block.h b/src/battle/item/pow_block.h index 3793200bce..219b15aa80 100644 --- a/src/battle/item/pow_block.h +++ b/src/battle/item/pow_block.h @@ -7,7 +7,6 @@ #undef NAMESPACE #define NAMESPACE battle_item_pow_block -ApiStatus func_80273444(Evt* script, s32 isInitialCall); ApiStatus func_80269EAC(Evt* script, s32 isInitialCall); ApiStatus N(func_802A1318_718B68)(Evt* script, s32 isInitialCall); diff --git a/src/battle/item/sleepy_sheep.h b/src/battle/item/sleepy_sheep.h index 0d283115fb..5d87887e12 100644 --- a/src/battle/item/sleepy_sheep.h +++ b/src/battle/item/sleepy_sheep.h @@ -7,7 +7,6 @@ #undef NAMESPACE #define NAMESPACE battle_item_sleepy_sheep -ApiStatus func_80273444(Evt* script, s32 isInitialCall); ApiStatus SetVirtualEntityMoveSpeed(Evt* script, s32 isInitialCall); ApiStatus VirtualEntityMoveTo(Evt* script, s32 isInitialCall); ApiStatus func_80252B3C(Evt* script, s32 isInitialCall); diff --git a/src/battle/item/strange_cake.h b/src/battle/item/strange_cake.h index af9696e63b..cc7e8dd614 100644 --- a/src/battle/item/strange_cake.h +++ b/src/battle/item/strange_cake.h @@ -7,9 +7,6 @@ #undef NAMESPACE #define NAMESPACE battle_item_strange_cake -ApiStatus func_802D75D8(Evt *script, s32 isInitialCall); -ApiStatus func_802D7520(Evt *script, s32 isInitialCall); - ApiStatus N(func_802A1A8C_731D8C)(Evt *script, s32 isInitialCall); ApiStatus N(func_802A18D8_731BD8)(Evt *script, s32 isInitialCall); ApiStatus N(AddFP)(Evt *script, s32 isInitialCall); diff --git a/src/battle/item/super_soda.h b/src/battle/item/super_soda.h index 05ab0b40ae..c3963fb925 100644 --- a/src/battle/item/super_soda.h +++ b/src/battle/item/super_soda.h @@ -7,11 +7,6 @@ #undef NAMESPACE #define NAMESPACE battle_item_super_soda -ApiStatus SetVirtualEntityFlags(Evt* script, s32 isInitialCall); -ApiStatus GetVirtualEntityPosition(Evt* script, s32 isInitialCall); -ApiStatus func_802D75D8(Evt* script, s32 isInitialCall); -ApiStatus func_802D7520(Evt* script, s32 isInitialCall); - ApiStatus N(func_802A123C_724F1C)(Evt* script, s32 isInitialCall); ApiStatus N(func_802A12EC_724FCC)(Evt* script, s32 isInitialCall); ApiStatus N(func_802A1418_7250F8)(Evt* script, s32 isInitialCall); diff --git a/src/battle/item/tasty_tonic.h b/src/battle/item/tasty_tonic.h index 5cbaf6989b..47a6798339 100644 --- a/src/battle/item/tasty_tonic.h +++ b/src/battle/item/tasty_tonic.h @@ -7,9 +7,6 @@ #undef NAMESPACE #define NAMESPACE battle_item_tasty_tonic -ApiStatus func_802D7520(Evt* script, s32 isInitialCall); -ApiStatus func_802D75D8(Evt* script, s32 isInitialCall); - ApiStatus N(func_802A123C_72223C)(Evt* script, s32 isInitialCall); EvtSource N(UseItemWithEffect); diff --git a/src/battle/item/ultra_shroom.h b/src/battle/item/ultra_shroom.h index 2f38cff110..1e3a65ee34 100644 --- a/src/battle/item/ultra_shroom.h +++ b/src/battle/item/ultra_shroom.h @@ -7,9 +7,6 @@ #undef NAMESPACE #define NAMESPACE battle_item_ultra_shroom -ApiStatus func_802D7520(Evt* script, s32 isInitialCall); -ApiStatus func_802D75D8(Evt* script, s32 isInitialCall); - ApiStatus N(func_802A123C_7239BC)(Evt* script, s32 isInitialCall); ApiStatus N(func_802A12FC_723A7C)(Evt* script, s32 isInitialCall); diff --git a/src/battle/item/unknown_item.h b/src/battle/item/unknown_item.h index 452931e445..90a7eb0761 100644 --- a/src/battle/item/unknown_item.h +++ b/src/battle/item/unknown_item.h @@ -7,9 +7,6 @@ #undef NAMESPACE #define NAMESPACE battle_item_unknown_item -ApiStatus func_802D7520(Evt* script, s32 isInitialCall); -ApiStatus func_802D75D8(Evt* script, s32 isInitialCall); - ApiStatus N(func_802A123C_72447C)(Evt* script, s32 isInitialCall); ApiStatus N(func_802A12FC_72453C)(Evt* script, s32 isInitialCall); diff --git a/src/battle/star/chill_out/7900D0.c b/src/battle/star/chill_out/7900D0.c index 0f81cb4dc3..24361eb96d 100644 --- a/src/battle/star/chill_out/7900D0.c +++ b/src/battle/star/chill_out/7900D0.c @@ -1,4 +1,6 @@ #include "common.h" +#include "script_api/battle.h" +#include "sprite/npc/battle_muskular.h" #define NAMESPACE battle_star_chill_out @@ -49,4 +51,331 @@ ApiStatus func_802A163C_79070C(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } +ApiStatus func_802A16F4_7907C4(Evt* script, s32 isInitialCall); INCLUDE_ASM(s32, "battle/star/chill_out/7900D0", func_802A16F4_7907C4); + +EvtSource N(802A18F0) = { + EVT_CALL(GetOwnerID, LW(10)) + EVT_IF_EQ(LW(10), 0) + EVT_CALL(UseBattleCamPreset, 69) + EVT_WAIT_FRAMES(10) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_GOT_ITEM) + EVT_CALL(GetActorPos, ACTOR_PLAYER, LW(0), LW(1), LW(2)) + EVT_ADD(LW(0), 16) + EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(4.0)) + EVT_CALL(SetGoalPos, ACTOR_PLAYER, LW(0), LW(1), LW(2)) + EVT_CALL(PlayerRunToGoal, 0) + EVT_WAIT_FRAMES(8) + EVT_CALL(PlaySound, 0x241) + EVT_CALL(GetActorPos, ACTOR_PLAYER, LW(0), LW(1), LW(2)) + EVT_ADD(LW(1), 15) + EVT_CALL(N(UnkStarFunc1), LW(0), LW(1), LW(2)) + EVT_CALL(N(FadeBackgroundToBlack)) + EVT_WAIT_FRAMES(20) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_PRAY) + EVT_WAIT_FRAMES(10) + EVT_CALL(PlaySound, 0x2051) + EVT_CALL(GetActorPos, ACTOR_PLAYER, LW(0), LW(1), LW(2)) + EVT_CALL(N(UnkStarFunc2), LW(0), LW(1), LW(2)) + EVT_WAIT_FRAMES(30) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, 0x01002A) + EVT_ELSE + EVT_CALL(UseBattleCamPreset, 69) + EVT_WAIT_FRAMES(10) + EVT_CALL(N(UnkStarFunc), 0) + EVT_CALL(GetActorPos, ACTOR_PARTNER, LW(0), LW(1), LW(2)) + EVT_ADD(LW(0), 16) + EVT_CALL(SetActorSpeed, ACTOR_PARTNER, EVT_FLOAT(4.0)) + EVT_CALL(SetGoalPos, ACTOR_PARTNER, LW(0), LW(1), LW(2)) + EVT_CALL(RunToGoal, ACTOR_PARTNER, 0, FALSE) + EVT_CALL(N(UnkStarFunc), 4) + EVT_WAIT_FRAMES(8) + EVT_CALL(PlaySound, 0x241) + EVT_CALL(N(UnkStarFunc), 1) + EVT_CALL(GetActorPos, ACTOR_PARTNER, LW(0), LW(1), LW(2)) + EVT_ADD(LW(1), 15) + EVT_CALL(N(UnkStarFunc1), LW(0), LW(1), LW(2)) + EVT_CALL(N(FadeBackgroundToBlack)) + EVT_WAIT_FRAMES(20) + EVT_CALL(PlaySound, 0x2051) + EVT_CALL(N(UnkStarFunc), 1) + EVT_WAIT_FRAMES(10) + EVT_CALL(GetActorPos, ACTOR_PARTNER, LW(0), LW(1), LW(2)) + EVT_CALL(N(UnkStarFunc2), LW(0), LW(1), LW(2)) + EVT_WAIT_FRAMES(30) + EVT_CALL(N(UnkStarFunc), 4) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtSource N(802A1C88) = { + EVT_CALL(GetOwnerID, LW(10)) + EVT_IF_EQ(LW(10), 0) + EVT_CALL(UseBattleCamPreset, 69) + EVT_WAIT_FRAMES(10) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_GOT_ITEM) + EVT_CALL(GetActorPos, ACTOR_PLAYER, LW(0), LW(1), LW(2)) + EVT_ADD(LW(0), 16) + EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(4.0)) + EVT_CALL(SetGoalPos, ACTOR_PLAYER, LW(0), LW(1), LW(2)) + EVT_CALL(PlayerRunToGoal, 0) + EVT_WAIT_FRAMES(8) + EVT_CALL(PlaySound, 0x241) + EVT_CALL(GetActorPos, ACTOR_PLAYER, LW(0), LW(1), LW(2)) + EVT_ADD(LW(1), 15) + EVT_CALL(N(UnkStarFunc1), LW(0), LW(1), LW(2)) + EVT_CALL(N(UnkBackgroundFunc2)) + EVT_WAIT_FRAMES(20) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_PRAY) + EVT_WAIT_FRAMES(10) + EVT_CALL(PlaySound, 0x2051) + EVT_CALL(GetActorPos, ACTOR_PLAYER, LW(0), LW(1), LW(2)) + EVT_CALL(N(UnkStarFunc2), LW(0), LW(1), LW(2)) + EVT_WAIT_FRAMES(30) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, 0x01002A) + EVT_ELSE + EVT_CALL(UseBattleCamPreset, 69) + EVT_WAIT_FRAMES(10) + EVT_CALL(N(UnkStarFunc), 0) + EVT_CALL(GetActorPos, ACTOR_PARTNER, LW(0), LW(1), LW(2)) + EVT_ADD(LW(0), 16) + EVT_CALL(SetActorSpeed, ACTOR_PARTNER, EVT_FLOAT(4.0)) + EVT_CALL(SetGoalPos, ACTOR_PARTNER, LW(0), LW(1), LW(2)) + EVT_CALL(RunToGoal, ACTOR_PARTNER, 0, FALSE) + EVT_CALL(N(UnkStarFunc), 4) + EVT_WAIT_FRAMES(8) + EVT_CALL(PlaySound, 0x241) + EVT_CALL(N(UnkStarFunc), 1) + EVT_CALL(GetActorPos, ACTOR_PARTNER, LW(0), LW(1), LW(2)) + EVT_ADD(LW(1), 15) + EVT_CALL(N(UnkStarFunc1), LW(0), LW(1), LW(2)) + EVT_CALL(N(UnkBackgroundFunc2)) + EVT_WAIT_FRAMES(20) + EVT_CALL(PlaySound, 0x2051) + EVT_CALL(N(UnkStarFunc), 1) + EVT_WAIT_FRAMES(10) + EVT_CALL(GetActorPos, ACTOR_PARTNER, LW(0), LW(1), LW(2)) + EVT_CALL(N(UnkStarFunc2), LW(0), LW(1), LW(2)) + EVT_WAIT_FRAMES(30) + EVT_CALL(N(UnkStarFunc), 4) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtSource N(802A2020) = { + EVT_WAIT_FRAMES(8) + EVT_CALL(SetForegroundModelsVisible, 0) + EVT_CALL(func_8024E664, 73) + EVT_CALL(MoveBattleCamOver, 1) + EVT_CALL(PlaySound, 0x2041) + EVT_CALL(CreateNpc, 100, LW(0)) + EVT_CALL(N(SetNpcCollision32)) + EVT_CALL(SetNpcFlagBits, 100, ((NPC_FLAG_40000)), TRUE) + EVT_CALL(SetNpcPos, 100, -75, 150, 0) + EVT_CALL(SetNpcDecoration, 100, 0, 5) + EVT_CALL(N(UnkStarFunc3), -75, 167, 0) + EVT_WAIT_FRAMES(10) + EVT_CALL(EnableNpcBlur, 100, 1) + EVT_SET(LW(0), 0) + EVT_LOOP(8) + EVT_ADD(LW(0), 67) + EVT_CALL(SetNpcRotation, 100, 0, LW(0), 0) + EVT_WAIT_FRAMES(1) + EVT_END_LOOP + EVT_WAIT_FRAMES(10) + EVT_CALL(EnableNpcBlur, 100, 0) + EVT_THREAD + EVT_WAIT_FRAMES(10) + EVT_CALL(UseBattleCamPreset, 69) + EVT_END_THREAD + EVT_CALL(GetActorPos, ACTOR_PLAYER, LW(0), LW(1), LW(2)) + EVT_ADD(LW(1), 50) + EVT_CALL(NpcFlyTo, 100, LW(0), LW(1), LW(2), 30, 0, 10) + EVT_CALL(SetForegroundModelsVisible, 1) + EVT_RETURN + EVT_END +}; + +EvtSource N(802A222C) = { + EVT_CALL(GetOwnerID, LW(10)) + EVT_IF_EQ(LW(10), 0) + EVT_CALL(UseBattleCamPreset, 2) + EVT_CALL(PlaySound, 0x2047) + EVT_THREAD + EVT_LOOP(5) + EVT_WAIT_FRAMES(6) + EVT_CALL(GetNpcPos, 100, LW(0), LW(1), LW(2)) + EVT_CALL(N(UnkStarFunc4), LW(0), LW(1), LW(2)) + EVT_END_LOOP + EVT_END_THREAD + EVT_CALL(EnableNpcBlur, 100, 1) + EVT_THREAD + EVT_SET(LW(2), 0) + EVT_SET(LW(3), 720) + EVT_CALL(MakeLerp, LW(2), LW(3), 30, 2) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(SetNpcRotation, 100, 0, LW(0), 0) + EVT_WAIT_FRAMES(1) + EVT_IF_EQ(LW(1), 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_END_THREAD + EVT_CALL(GetNpcPos, 100, LW(0), LW(1), LW(2)) + EVT_ADD(LW(1), 60) + EVT_CALL(NpcFlyTo, 100, LW(0), LW(1), LW(2), 15, 0, 10) + EVT_ADD(LW(1), 140) + EVT_CALL(NpcFlyTo, 100, LW(0), LW(1), LW(2), 15, 0, 10) + EVT_WAIT_FRAMES(10) + EVT_CALL(EnableNpcBlur, 100, 0) + EVT_CALL(DeleteNpc, 100) + EVT_ELSE + EVT_CALL(UseBattleCamPreset, 2) + EVT_CALL(PlaySound, 0x2045) + EVT_THREAD + EVT_LOOP(5) + EVT_WAIT_FRAMES(6) + EVT_CALL(GetNpcPos, 100, LW(0), LW(1), LW(2)) + EVT_CALL(N(UnkStarFunc4), LW(0), LW(1), LW(2)) + EVT_END_LOOP + EVT_END_THREAD + EVT_CALL(EnableNpcBlur, 100, 1) + EVT_THREAD + EVT_SET(LW(2), 0) + EVT_SET(LW(3), 720) + EVT_CALL(MakeLerp, LW(2), LW(3), 30, 2) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(SetNpcRotation, 100, 0, LW(0), 0) + EVT_WAIT_FRAMES(1) + EVT_IF_EQ(LW(1), 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_END_THREAD + EVT_CALL(GetNpcPos, 100, LW(0), LW(1), LW(2)) + EVT_ADD(LW(1), 60) + EVT_CALL(NpcFlyTo, 100, LW(0), LW(1), LW(2), 15, 0, 10) + EVT_ADD(LW(1), 140) + EVT_CALL(NpcFlyTo, 100, LW(0), LW(1), LW(2), 15, 0, 10) + EVT_WAIT_FRAMES(10) + EVT_CALL(EnableNpcBlur, 100, 0) + EVT_CALL(DeleteNpc, 100) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtSource N(802A267C) = { + EVT_CALL(GetOwnerID, LW(10)) + EVT_IF_EQ(LW(10), 0) + EVT_CALL(N(UnkBackgroundFunc)) + EVT_WAIT_FRAMES(15) + EVT_CALL(SetGoalToHome, ACTOR_PLAYER) + EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(8.0)) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_RUNNING) + EVT_CALL(PlayerRunToGoal, 0) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_10002) + EVT_ELSE + EVT_CALL(N(UnkBackgroundFunc)) + EVT_WAIT_FRAMES(15) + EVT_CALL(SetGoalToHome, ACTOR_PARTNER) + EVT_CALL(SetActorSpeed, ACTOR_PARTNER, EVT_FLOAT(8.0)) + EVT_CALL(N(UnkStarFunc), 3) + EVT_CALL(RunToGoal, ACTOR_PARTNER, 0) + EVT_CALL(N(UnkStarFunc), 4) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtSource N(usePower) = { + EVT_CALL(func_802A1518_7905E8) + EVT_EXEC_WAIT(N(802A18F0)) + EVT_SET_CONST(LW(0), NPC_ANIM_battle_muskular_Palette_00_Anim_1) + EVT_EXEC_WAIT(N(802A2020)) + EVT_CALL(SetNpcAnimation, 100, NPC_ANIM_battle_muskular_Palette_00_Anim_2) + EVT_WAIT_FRAMES(16) + EVT_CALL(UseBattleCamPreset, 3) + EVT_CALL(PlaySound, 0x244) + EVT_CALL(InitTargetIterator) + EVT_LABEL(10) + EVT_CALL(ItemCheckHit, LW(0), 0, 0, 0, 0) + EVT_IF_EQ(LW(0), 6) + EVT_GOTO(11) + EVT_END_IF + EVT_CALL(func_802A163C_79070C) + EVT_IF_EQ(LW(0), 1) + EVT_CALL(GetOwnerTarget, LW(10), LW(11)) + EVT_THREAD + EVT_LOOP(5) + EVT_CALL(SetActorScaleModifier, LW(10), EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0)) + EVT_WAIT_FRAMES(1) + EVT_CALL(SetActorScaleModifier, LW(10), EVT_FLOAT(1.1005859375), EVT_FLOAT(1.0), EVT_FLOAT(1.0)) + EVT_WAIT_FRAMES(1) + EVT_CALL(SetActorScaleModifier, LW(10), EVT_FLOAT(1.2001953125), EVT_FLOAT(0.9501953125), EVT_FLOAT(1.0)) + EVT_WAIT_FRAMES(1) + EVT_CALL(SetActorScaleModifier, LW(10), EVT_FLOAT(1.30078125), EVT_FLOAT(0.900390625), EVT_FLOAT(1.0)) + EVT_WAIT_FRAMES(1) + EVT_CALL(SetActorScaleModifier, LW(10), EVT_FLOAT(1.3505859375), EVT_FLOAT(0.8505859375), EVT_FLOAT(1.0)) + EVT_WAIT_FRAMES(1) + EVT_CALL(SetActorScaleModifier, LW(10), EVT_FLOAT(1.380859375), EVT_FLOAT(0.80078125), EVT_FLOAT(1.0)) + EVT_WAIT_FRAMES(1) + EVT_CALL(SetActorScaleModifier, LW(10), EVT_FLOAT(1.400390625), EVT_FLOAT(0.80078125), EVT_FLOAT(1.0)) + EVT_WAIT_FRAMES(1) + EVT_CALL(SetActorScaleModifier, LW(10), EVT_FLOAT(1.30078125), EVT_FLOAT(0.8505859375), EVT_FLOAT(1.0)) + EVT_WAIT_FRAMES(1) + EVT_CALL(SetActorScaleModifier, LW(10), EVT_FLOAT(1.2001953125), EVT_FLOAT(0.900390625), EVT_FLOAT(1.0)) + EVT_WAIT_FRAMES(1) + EVT_CALL(SetActorScaleModifier, LW(10), EVT_FLOAT(1.1005859375), EVT_FLOAT(0.9501953125), EVT_FLOAT(1.0)) + EVT_WAIT_FRAMES(1) + EVT_END_LOOP + EVT_CALL(SetActorScaleModifier, LW(10), EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0)) + EVT_END_THREAD + EVT_END_IF + EVT_LABEL(11) + EVT_CALL(ChooseNextTarget, 0, LW(0)) + EVT_IF_NE(LW(0), -1) + EVT_GOTO(10) + EVT_END_IF + EVT_LOOP(30) + EVT_CALL(func_802A153C_79060C) + EVT_WAIT_FRAMES(2) + EVT_END_LOOP + EVT_CALL(ChooseNextTarget, -1, 0) + EVT_LABEL(0) + EVT_CALL(SetGoalToTarget, ACTOR_SELF) + EVT_CALL(ItemCheckHit, LW(0), 0, 0, 0, 0) + EVT_IF_EQ(LW(0), 6) + EVT_GOTO(1) + EVT_END_IF + EVT_CALL(func_802A163C_79070C) + EVT_IF_EQ(LW(0), 1) + EVT_CALL(func_802A16F4_7907C4) + EVT_ELSE + EVT_CALL(PlayerDamageEnemy, LW(0), 0, 65535, 0, 0, 2080) + EVT_END_IF + EVT_LABEL(1) + EVT_WAIT_FRAMES(5) + EVT_CALL(ChooseNextTarget, 0, LW(0)) + EVT_IF_NE(LW(0), -1) + EVT_GOTO(0) + EVT_END_IF + EVT_WAIT_FRAMES(5) + EVT_CALL(func_802A1528_7905F8) + EVT_IF_EQ(LW(0), 1) + EVT_CALL(ShowMessageBox, 44, 60) + EVT_END_IF + EVT_CALL(func_80276EFC) + EVT_EXEC_WAIT(N(802A222C)) + EVT_EXEC_WAIT(N(802A267C)) + EVT_CALL(func_802A1528_7905F8) + EVT_IF_EQ(LW(0), 1) + EVT_CALL(WaitForMessageBoxDone) + EVT_END_IF + EVT_RETURN + EVT_END +}; diff --git a/src/battle/star/focus/789E60.c b/src/battle/star/focus/789E60.c index eae957b5b2..fa6c653c64 100644 --- a/src/battle/star/focus/789E60.c +++ b/src/battle/star/focus/789E60.c @@ -1,4 +1,5 @@ #include "common.h" +#include "script_api/battle.h" #define NAMESPACE battle_star_focus @@ -46,3 +47,292 @@ ApiStatus func_802A15B0_78A410(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } + +EvtSource N(802A1630) = { + EVT_CALL(GetOwnerID, LW(10)) + EVT_IF_EQ(LW(10), 0) + EVT_CALL(UseBattleCamPreset, 69) + EVT_WAIT_FRAMES(10) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_GOT_ITEM) + EVT_CALL(GetActorPos, ACTOR_PLAYER, LW(0), LW(1), LW(2)) + EVT_ADD(LW(0), 16) + EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(4.0)) + EVT_CALL(SetGoalPos, ACTOR_PLAYER, LW(0), LW(1), LW(2)) + EVT_CALL(PlayerRunToGoal, 0) + EVT_WAIT_FRAMES(8) + EVT_CALL(PlaySound, 0x241) + EVT_CALL(GetActorPos, ACTOR_PLAYER, LW(0), LW(1), LW(2)) + EVT_ADD(LW(1), 15) + EVT_CALL(N(UnkStarFunc1), LW(0), LW(1), LW(2)) + EVT_CALL(N(FadeBackgroundToBlack)) + EVT_WAIT_FRAMES(20) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_PRAY) + EVT_WAIT_FRAMES(10) + EVT_CALL(PlaySound, 0x2051) + EVT_CALL(GetActorPos, ACTOR_PLAYER, LW(0), LW(1), LW(2)) + EVT_CALL(N(UnkStarFunc2), LW(0), LW(1), LW(2)) + EVT_WAIT_FRAMES(30) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, 0x01002A) + EVT_ELSE + EVT_CALL(UseBattleCamPreset, 69) + EVT_WAIT_FRAMES(10) + EVT_CALL(N(UnkStarFunc), 0) + EVT_CALL(GetActorPos, ACTOR_PARTNER, LW(0), LW(1), LW(2)) + EVT_ADD(LW(0), 16) + EVT_CALL(SetActorSpeed, ACTOR_PARTNER, EVT_FLOAT(4.0)) + EVT_CALL(SetGoalPos, ACTOR_PARTNER, LW(0), LW(1), LW(2)) + EVT_CALL(RunToGoal, ACTOR_PARTNER, 0, FALSE) + EVT_CALL(N(UnkStarFunc), 4) + EVT_WAIT_FRAMES(8) + EVT_CALL(PlaySound, 0x241) + EVT_CALL(N(UnkStarFunc), 1) + EVT_CALL(GetActorPos, ACTOR_PARTNER, LW(0), LW(1), LW(2)) + EVT_ADD(LW(1), 15) + EVT_CALL(N(UnkStarFunc1), LW(0), LW(1), LW(2)) + EVT_CALL(N(FadeBackgroundToBlack)) + EVT_WAIT_FRAMES(20) + EVT_CALL(PlaySound, 0x2051) + EVT_CALL(N(UnkStarFunc), 1) + EVT_WAIT_FRAMES(10) + EVT_CALL(GetActorPos, ACTOR_PARTNER, LW(0), LW(1), LW(2)) + EVT_CALL(N(UnkStarFunc2), LW(0), LW(1), LW(2)) + EVT_WAIT_FRAMES(30) + EVT_CALL(N(UnkStarFunc), 4) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtSource N(802A19C8) = { + EVT_CALL(GetOwnerID, LW(10)) + EVT_IF_EQ(LW(10), 0) + EVT_CALL(UseBattleCamPreset, 69) + EVT_WAIT_FRAMES(10) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_GOT_ITEM) + EVT_CALL(GetActorPos, ACTOR_PLAYER, LW(0), LW(1), LW(2)) + EVT_ADD(LW(0), 16) + EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(4.0)) + EVT_CALL(SetGoalPos, ACTOR_PLAYER, LW(0), LW(1), LW(2)) + EVT_CALL(PlayerRunToGoal, 0) + EVT_WAIT_FRAMES(8) + EVT_CALL(PlaySound, 0x241) + EVT_CALL(GetActorPos, ACTOR_PLAYER, LW(0), LW(1), LW(2)) + EVT_ADD(LW(1), 15) + EVT_CALL(N(UnkStarFunc1), LW(0), LW(1), LW(2)) + EVT_CALL(N(UnkBackgroundFunc2)) + EVT_WAIT_FRAMES(20) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_PRAY) + EVT_WAIT_FRAMES(10) + EVT_CALL(PlaySound, 0x2051) + EVT_CALL(GetActorPos, ACTOR_PLAYER, LW(0), LW(1), LW(2)) + EVT_CALL(N(UnkStarFunc2), LW(0), LW(1), LW(2)) + EVT_WAIT_FRAMES(30) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, 0x01002A) + EVT_ELSE + EVT_CALL(UseBattleCamPreset, 69) + EVT_WAIT_FRAMES(10) + EVT_CALL(N(UnkStarFunc), 0) + EVT_CALL(GetActorPos, ACTOR_PARTNER, LW(0), LW(1), LW(2)) + EVT_ADD(LW(0), 16) + EVT_CALL(SetActorSpeed, ACTOR_PARTNER, EVT_FLOAT(4.0)) + EVT_CALL(SetGoalPos, ACTOR_PARTNER, LW(0), LW(1), LW(2)) + EVT_CALL(RunToGoal, ACTOR_PARTNER, 0, FALSE) + EVT_CALL(N(UnkStarFunc), 4) + EVT_WAIT_FRAMES(8) + EVT_CALL(PlaySound, 0x241) + EVT_CALL(N(UnkStarFunc), 1) + EVT_CALL(GetActorPos, ACTOR_PARTNER, LW(0), LW(1), LW(2)) + EVT_ADD(LW(1), 15) + EVT_CALL(N(UnkStarFunc1), LW(0), LW(1), LW(2)) + EVT_CALL(N(UnkBackgroundFunc2)) + EVT_WAIT_FRAMES(20) + EVT_CALL(PlaySound, 0x2051) + EVT_CALL(N(UnkStarFunc), 1) + EVT_WAIT_FRAMES(10) + EVT_CALL(GetActorPos, ACTOR_PARTNER, LW(0), LW(1), LW(2)) + EVT_CALL(N(UnkStarFunc2), LW(0), LW(1), LW(2)) + EVT_WAIT_FRAMES(30) + EVT_CALL(N(UnkStarFunc), 4) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtSource N(802A1D60) = { + EVT_WAIT_FRAMES(8) + EVT_CALL(SetForegroundModelsVisible, 0) + EVT_CALL(func_8024E664, 73) + EVT_CALL(MoveBattleCamOver, 1) + EVT_CALL(PlaySound, 0x2041) + EVT_CALL(CreateNpc, 100, LW(0)) + EVT_CALL(N(SetNpcCollision32)) + EVT_CALL(SetNpcFlagBits, 100, ((NPC_FLAG_40000)), TRUE) + EVT_CALL(SetNpcPos, 100, -75, 150, 0) + EVT_CALL(SetNpcDecoration, 100, 0, 5) + EVT_CALL(N(UnkStarFunc3), -75, 167, 0) + EVT_WAIT_FRAMES(10) + EVT_CALL(EnableNpcBlur, 100, 1) + EVT_SET(LW(0), 0) + EVT_LOOP(8) + EVT_ADD(LW(0), 67) + EVT_CALL(SetNpcRotation, 100, 0, LW(0), 0) + EVT_WAIT_FRAMES(1) + EVT_END_LOOP + EVT_WAIT_FRAMES(10) + EVT_CALL(EnableNpcBlur, 100, 0) + EVT_THREAD + EVT_WAIT_FRAMES(10) + EVT_CALL(UseBattleCamPreset, 69) + EVT_END_THREAD + EVT_CALL(GetActorPos, ACTOR_PLAYER, LW(0), LW(1), LW(2)) + EVT_ADD(LW(1), 50) + EVT_CALL(NpcFlyTo, 100, LW(0), LW(1), LW(2), 30, 0, 10) + EVT_CALL(SetForegroundModelsVisible, 1) + EVT_RETURN + EVT_END +}; + +EvtSource N(802A1F6C) = { + EVT_CALL(GetOwnerID, LW(10)) + EVT_IF_EQ(LW(10), 0) + EVT_CALL(UseBattleCamPreset, 2) + EVT_CALL(PlaySound, 0x2047) + EVT_THREAD + EVT_LOOP(5) + EVT_WAIT_FRAMES(6) + EVT_CALL(GetNpcPos, 100, LW(0), LW(1), LW(2)) + EVT_CALL(N(UnkStarFunc4), LW(0), LW(1), LW(2)) + EVT_END_LOOP + EVT_END_THREAD + EVT_CALL(EnableNpcBlur, 100, 1) + EVT_THREAD + EVT_SET(LW(2), 0) + EVT_SET(LW(3), 720) + EVT_CALL(MakeLerp, LW(2), LW(3), 30, 2) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(SetNpcRotation, 100, 0, LW(0), 0) + EVT_WAIT_FRAMES(1) + EVT_IF_EQ(LW(1), 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_END_THREAD + EVT_CALL(GetNpcPos, 100, LW(0), LW(1), LW(2)) + EVT_ADD(LW(1), 60) + EVT_CALL(NpcFlyTo, 100, LW(0), LW(1), LW(2), 15, 0, 10) + EVT_ADD(LW(1), 140) + EVT_CALL(NpcFlyTo, 100, LW(0), LW(1), LW(2), 15, 0, 10) + EVT_WAIT_FRAMES(10) + EVT_CALL(EnableNpcBlur, 100, 0) + EVT_CALL(DeleteNpc, 100) + EVT_ELSE + EVT_CALL(UseBattleCamPreset, 2) + EVT_CALL(PlaySound, 0x2045) + EVT_THREAD + EVT_LOOP(5) + EVT_WAIT_FRAMES(6) + EVT_CALL(GetNpcPos, 100, LW(0), LW(1), LW(2)) + EVT_CALL(N(UnkStarFunc4), LW(0), LW(1), LW(2)) + EVT_END_LOOP + EVT_END_THREAD + EVT_CALL(EnableNpcBlur, 100, 1) + EVT_THREAD + EVT_SET(LW(2), 0) + EVT_SET(LW(3), 720) + EVT_CALL(MakeLerp, LW(2), LW(3), 30, 2) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(SetNpcRotation, 100, 0, LW(0), 0) + EVT_WAIT_FRAMES(1) + EVT_IF_EQ(LW(1), 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_END_THREAD + EVT_CALL(GetNpcPos, 100, LW(0), LW(1), LW(2)) + EVT_ADD(LW(1), 60) + EVT_CALL(NpcFlyTo, 100, LW(0), LW(1), LW(2), 15, 0, 10) + EVT_ADD(LW(1), 140) + EVT_CALL(NpcFlyTo, 100, LW(0), LW(1), LW(2), 15, 0, 10) + EVT_WAIT_FRAMES(10) + EVT_CALL(EnableNpcBlur, 100, 0) + EVT_CALL(DeleteNpc, 100) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtSource N(802A23BC) = { + EVT_CALL(GetOwnerID, LW(10)) + EVT_IF_EQ(LW(10), 0) + EVT_CALL(N(UnkBackgroundFunc)) + EVT_WAIT_FRAMES(15) + EVT_CALL(SetGoalToHome, ACTOR_PLAYER) + EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(8.0)) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_RUNNING) + EVT_CALL(PlayerRunToGoal, 0) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_10002) + EVT_ELSE + EVT_CALL(N(UnkBackgroundFunc)) + EVT_WAIT_FRAMES(15) + EVT_CALL(SetGoalToHome, ACTOR_PARTNER) + EVT_CALL(SetActorSpeed, ACTOR_PARTNER, EVT_FLOAT(8.0)) + EVT_CALL(N(UnkStarFunc), 3) + EVT_CALL(RunToGoal, ACTOR_PARTNER, 0) + EVT_CALL(N(UnkStarFunc), 4) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtSource N(usePower) = { + EVT_EXEC_WAIT(N(802A1630)) + EVT_CALL(func_802535B4, 1) + EVT_CALL(GetOwnerID, LW(10)) + EVT_IF_EQ(LW(10), 0) + EVT_CALL(PlaySound, 0x2053) + EVT_CALL(func_802A1518_78A378) + EVT_WAIT_FRAMES(30) + EVT_CALL(N(UnkBackgroundFunc)) + EVT_CALL(UseBattleCamPreset, 2) + EVT_SWITCH(LW(0)) + EVT_CASE_EQ(0) + EVT_CALL(ShowMessageBox, 26, 60) + EVT_CASE_EQ(1) + EVT_CALL(ShowMessageBox, 27, 60) + EVT_CASE_EQ(2) + EVT_CALL(ShowMessageBox, 28, 60) + EVT_END_SWITCH + EVT_CALL(WaitForMessageBoxDone) + EVT_CALL(func_80276EFC) + EVT_CALL(SetGoalToHome, ACTOR_PLAYER) + EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(8.0)) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_RUNNING) + EVT_CALL(PlayerRunToGoal, 0) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_10002) + EVT_ELSE + EVT_CALL(PlaySound, 0x2053) + EVT_CALL(func_802A15B0_78A410) + EVT_WAIT_FRAMES(30) + EVT_CALL(N(UnkBackgroundFunc)) + EVT_CALL(UseBattleCamPreset, 2) + EVT_SWITCH(LW(0)) + EVT_CASE_EQ(0) + EVT_CALL(ShowMessageBox, 26, 60) + EVT_CASE_EQ(1) + EVT_CALL(ShowMessageBox, 27, 60) + EVT_CASE_EQ(2) + EVT_CALL(ShowMessageBox, 28, 60) + EVT_END_SWITCH + EVT_CALL(WaitForMessageBoxDone) + EVT_CALL(func_80280818) + EVT_CALL(SetGoalToHome, ACTOR_PARTNER) + EVT_CALL(SetActorSpeed, ACTOR_PARTNER, EVT_FLOAT(8.0)) + EVT_CALL(N(UnkStarFunc), 3) + EVT_CALL(RunToGoal, ACTOR_PARTNER, 0) + EVT_CALL(N(UnkStarFunc), 4) + EVT_END_IF + EVT_RETURN + EVT_END +}; diff --git a/src/battle/star/lullaby/78D150.c b/src/battle/star/lullaby/78D150.c index f644637789..19b448c295 100644 --- a/src/battle/star/lullaby/78D150.c +++ b/src/battle/star/lullaby/78D150.c @@ -1,4 +1,6 @@ #include "common.h" +#include "script_api/battle.h" +#include "sprite/npc/battle_mamar.h" #define NAMESPACE battle_star_lullaby @@ -31,3 +33,274 @@ ApiStatus func_802A1518_78D668(Evt* script, s32 isInitialCall) { } return ApiStatus_BLOCK; } + +EvtSource N(802A1620) = { + EVT_CALL(GetOwnerID, LW(10)) + EVT_IF_EQ(LW(10), 0) + EVT_CALL(UseBattleCamPreset, 69) + EVT_WAIT_FRAMES(10) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_GOT_ITEM) + EVT_CALL(GetActorPos, ACTOR_PLAYER, LW(0), LW(1), LW(2)) + EVT_ADD(LW(0), 16) + EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(4.0)) + EVT_CALL(SetGoalPos, ACTOR_PLAYER, LW(0), LW(1), LW(2)) + EVT_CALL(PlayerRunToGoal, 0) + EVT_WAIT_FRAMES(8) + EVT_CALL(PlaySound, 0x241) + EVT_CALL(GetActorPos, ACTOR_PLAYER, LW(0), LW(1), LW(2)) + EVT_ADD(LW(1), 15) + EVT_CALL(N(UnkStarFunc1), LW(0), LW(1), LW(2)) + EVT_CALL(N(FadeBackgroundToBlack)) + EVT_WAIT_FRAMES(20) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_PRAY) + EVT_WAIT_FRAMES(10) + EVT_CALL(PlaySound, 0x2051) + EVT_CALL(GetActorPos, ACTOR_PLAYER, LW(0), LW(1), LW(2)) + EVT_CALL(N(UnkStarFunc2), LW(0), LW(1), LW(2)) + EVT_WAIT_FRAMES(30) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, 0x01002A) + EVT_ELSE + EVT_CALL(UseBattleCamPreset, 69) + EVT_WAIT_FRAMES(10) + EVT_CALL(N(UnkStarFunc), 0) + EVT_CALL(GetActorPos, ACTOR_PARTNER, LW(0), LW(1), LW(2)) + EVT_ADD(LW(0), 16) + EVT_CALL(SetActorSpeed, ACTOR_PARTNER, EVT_FLOAT(4.0)) + EVT_CALL(SetGoalPos, ACTOR_PARTNER, LW(0), LW(1), LW(2)) + EVT_CALL(RunToGoal, ACTOR_PARTNER, 0, FALSE) + EVT_CALL(N(UnkStarFunc), 4) + EVT_WAIT_FRAMES(8) + EVT_CALL(PlaySound, 0x241) + EVT_CALL(N(UnkStarFunc), 1) + EVT_CALL(GetActorPos, ACTOR_PARTNER, LW(0), LW(1), LW(2)) + EVT_ADD(LW(1), 15) + EVT_CALL(N(UnkStarFunc1), LW(0), LW(1), LW(2)) + EVT_CALL(N(FadeBackgroundToBlack)) + EVT_WAIT_FRAMES(20) + EVT_CALL(PlaySound, 0x2051) + EVT_CALL(N(UnkStarFunc), 1) + EVT_WAIT_FRAMES(10) + EVT_CALL(GetActorPos, ACTOR_PARTNER, LW(0), LW(1), LW(2)) + EVT_CALL(N(UnkStarFunc2), LW(0), LW(1), LW(2)) + EVT_WAIT_FRAMES(30) + EVT_CALL(N(UnkStarFunc), 4) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtSource N(802A19B8) = { + EVT_CALL(GetOwnerID, LW(10)) + EVT_IF_EQ(LW(10), 0) + EVT_CALL(UseBattleCamPreset, 69) + EVT_WAIT_FRAMES(10) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_GOT_ITEM) + EVT_CALL(GetActorPos, ACTOR_PLAYER, LW(0), LW(1), LW(2)) + EVT_ADD(LW(0), 16) + EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(4.0)) + EVT_CALL(SetGoalPos, ACTOR_PLAYER, LW(0), LW(1), LW(2)) + EVT_CALL(PlayerRunToGoal, 0) + EVT_WAIT_FRAMES(8) + EVT_CALL(PlaySound, 0x241) + EVT_CALL(GetActorPos, ACTOR_PLAYER, LW(0), LW(1), LW(2)) + EVT_ADD(LW(1), 15) + EVT_CALL(N(UnkStarFunc1), LW(0), LW(1), LW(2)) + EVT_CALL(N(UnkBackgroundFunc2)) + EVT_WAIT_FRAMES(20) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_PRAY) + EVT_WAIT_FRAMES(10) + EVT_CALL(PlaySound, 0x2051) + EVT_CALL(GetActorPos, ACTOR_PLAYER, LW(0), LW(1), LW(2)) + EVT_CALL(N(UnkStarFunc2), LW(0), LW(1), LW(2)) + EVT_WAIT_FRAMES(30) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, 0x01002A) + EVT_ELSE + EVT_CALL(UseBattleCamPreset, 69) + EVT_WAIT_FRAMES(10) + EVT_CALL(N(UnkStarFunc), 0) + EVT_CALL(GetActorPos, ACTOR_PARTNER, LW(0), LW(1), LW(2)) + EVT_ADD(LW(0), 16) + EVT_CALL(SetActorSpeed, ACTOR_PARTNER, EVT_FLOAT(4.0)) + EVT_CALL(SetGoalPos, ACTOR_PARTNER, LW(0), LW(1), LW(2)) + EVT_CALL(RunToGoal, ACTOR_PARTNER, 0, FALSE) + EVT_CALL(N(UnkStarFunc), 4) + EVT_WAIT_FRAMES(8) + EVT_CALL(PlaySound, 0x241) + EVT_CALL(N(UnkStarFunc), 1) + EVT_CALL(GetActorPos, ACTOR_PARTNER, LW(0), LW(1), LW(2)) + EVT_ADD(LW(1), 15) + EVT_CALL(N(UnkStarFunc1), LW(0), LW(1), LW(2)) + EVT_CALL(N(UnkBackgroundFunc2)) + EVT_WAIT_FRAMES(20) + EVT_CALL(PlaySound, 0x2051) + EVT_CALL(N(UnkStarFunc), 1) + EVT_WAIT_FRAMES(10) + EVT_CALL(GetActorPos, ACTOR_PARTNER, LW(0), LW(1), LW(2)) + EVT_CALL(N(UnkStarFunc2), LW(0), LW(1), LW(2)) + EVT_WAIT_FRAMES(30) + EVT_CALL(N(UnkStarFunc), 4) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtSource N(802A1D50) = { + EVT_WAIT_FRAMES(8) + EVT_CALL(SetForegroundModelsVisible, 0) + EVT_CALL(func_8024E664, 73) + EVT_CALL(MoveBattleCamOver, 1) + EVT_CALL(PlaySound, 0x2041) + EVT_CALL(CreateNpc, 100, LW(0)) + EVT_CALL(N(SetNpcCollision32)) + EVT_CALL(SetNpcFlagBits, 100, ((NPC_FLAG_40000)), TRUE) + EVT_CALL(SetNpcPos, 100, -75, 150, 0) + EVT_CALL(SetNpcDecoration, 100, 0, 5) + EVT_CALL(N(UnkStarFunc3), -75, 167, 0) + EVT_WAIT_FRAMES(10) + EVT_CALL(EnableNpcBlur, 100, 1) + EVT_SET(LW(0), 0) + EVT_LOOP(8) + EVT_ADD(LW(0), 67) + EVT_CALL(SetNpcRotation, 100, 0, LW(0), 0) + EVT_WAIT_FRAMES(1) + EVT_END_LOOP + EVT_WAIT_FRAMES(10) + EVT_CALL(EnableNpcBlur, 100, 0) + EVT_THREAD + EVT_WAIT_FRAMES(10) + EVT_CALL(UseBattleCamPreset, 69) + EVT_END_THREAD + EVT_CALL(GetActorPos, ACTOR_PLAYER, LW(0), LW(1), LW(2)) + EVT_ADD(LW(1), 50) + EVT_CALL(NpcFlyTo, 100, LW(0), LW(1), LW(2), 30, 0, 10) + EVT_CALL(SetForegroundModelsVisible, 1) + EVT_RETURN + EVT_END +}; + +EvtSource N(802A1F5C) = { + EVT_CALL(GetOwnerID, LW(10)) + EVT_IF_EQ(LW(10), 0) + EVT_CALL(UseBattleCamPreset, 2) + EVT_CALL(PlaySound, 0x2047) + EVT_THREAD + EVT_LOOP(5) + EVT_WAIT_FRAMES(6) + EVT_CALL(GetNpcPos, 100, LW(0), LW(1), LW(2)) + EVT_CALL(N(UnkStarFunc4), LW(0), LW(1), LW(2)) + EVT_END_LOOP + EVT_END_THREAD + EVT_CALL(EnableNpcBlur, 100, 1) + EVT_THREAD + EVT_SET(LW(2), 0) + EVT_SET(LW(3), 720) + EVT_CALL(MakeLerp, LW(2), LW(3), 30, 2) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(SetNpcRotation, 100, 0, LW(0), 0) + EVT_WAIT_FRAMES(1) + EVT_IF_EQ(LW(1), 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_END_THREAD + EVT_CALL(GetNpcPos, 100, LW(0), LW(1), LW(2)) + EVT_ADD(LW(1), 60) + EVT_CALL(NpcFlyTo, 100, LW(0), LW(1), LW(2), 15, 0, 10) + EVT_ADD(LW(1), 140) + EVT_CALL(NpcFlyTo, 100, LW(0), LW(1), LW(2), 15, 0, 10) + EVT_WAIT_FRAMES(10) + EVT_CALL(EnableNpcBlur, 100, 0) + EVT_CALL(DeleteNpc, 100) + EVT_ELSE + EVT_CALL(UseBattleCamPreset, 2) + EVT_CALL(PlaySound, 0x2045) + EVT_THREAD + EVT_LOOP(5) + EVT_WAIT_FRAMES(6) + EVT_CALL(GetNpcPos, 100, LW(0), LW(1), LW(2)) + EVT_CALL(N(UnkStarFunc4), LW(0), LW(1), LW(2)) + EVT_END_LOOP + EVT_END_THREAD + EVT_CALL(EnableNpcBlur, 100, 1) + EVT_THREAD + EVT_SET(LW(2), 0) + EVT_SET(LW(3), 720) + EVT_CALL(MakeLerp, LW(2), LW(3), 30, 2) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(SetNpcRotation, 100, 0, LW(0), 0) + EVT_WAIT_FRAMES(1) + EVT_IF_EQ(LW(1), 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_END_THREAD + EVT_CALL(GetNpcPos, 100, LW(0), LW(1), LW(2)) + EVT_ADD(LW(1), 60) + EVT_CALL(NpcFlyTo, 100, LW(0), LW(1), LW(2), 15, 0, 10) + EVT_ADD(LW(1), 140) + EVT_CALL(NpcFlyTo, 100, LW(0), LW(1), LW(2), 15, 0, 10) + EVT_WAIT_FRAMES(10) + EVT_CALL(EnableNpcBlur, 100, 0) + EVT_CALL(DeleteNpc, 100) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtSource N(802A23AC) = { + EVT_CALL(GetOwnerID, LW(10)) + EVT_IF_EQ(LW(10), 0) + EVT_CALL(N(UnkBackgroundFunc)) + EVT_WAIT_FRAMES(15) + EVT_CALL(SetGoalToHome, ACTOR_PLAYER) + EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(8.0)) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_RUNNING) + EVT_CALL(PlayerRunToGoal, 0) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_10002) + EVT_ELSE + EVT_CALL(N(UnkBackgroundFunc)) + EVT_WAIT_FRAMES(15) + EVT_CALL(SetGoalToHome, ACTOR_PARTNER) + EVT_CALL(SetActorSpeed, ACTOR_PARTNER, EVT_FLOAT(8.0)) + EVT_CALL(N(UnkStarFunc), 3) + EVT_CALL(RunToGoal, ACTOR_PARTNER, 0) + EVT_CALL(N(UnkStarFunc), 4) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtSource N(usePower) = { + EVT_EXEC_WAIT(N(802A1620)) + EVT_SET_CONST(LW(0), NPC_ANIM_battle_mamar_Palette_00_Anim_1) + EVT_EXEC_WAIT(N(802A1D50)) + EVT_CALL(SetNpcAnimation, 100, NPC_ANIM_battle_mamar_Palette_00_Anim_2) + EVT_WAIT_FRAMES(16) + EVT_CALL(UseBattleCamPreset, 3) + EVT_WAIT_FRAMES(15) + EVT_CALL(PlaySound, 0x3F4) + EVT_CALL(func_802A1518_78D668) + EVT_WAIT_FRAMES(30) + EVT_CALL(InitTargetIterator) + EVT_LABEL(0) + EVT_CALL(SetGoalToTarget, ACTOR_SELF) + EVT_CALL(ItemCheckHit, LW(0), 0, 0, 0, 0) + EVT_IF_EQ(LW(0), 6) + EVT_GOTO(1) + EVT_END_IF + EVT_CALL(ItemDamageEnemy, LW(0), 1879048192, 0x80001364, 0, 32) + EVT_LABEL(1) + EVT_WAIT_FRAMES(5) + EVT_CALL(ChooseNextTarget, 0, LW(0)) + EVT_IF_NE(LW(0), -1) + EVT_GOTO(0) + EVT_END_IF + EVT_WAIT_FRAMES(5) + EVT_CALL(func_80276EFC) + EVT_EXEC_WAIT(N(802A1F5C)) + EVT_EXEC_WAIT(N(802A23AC)) + EVT_RETURN + EVT_END +}; diff --git a/src/battle/star/peach_beam/7997B0.c b/src/battle/star/peach_beam/7997B0.c index 158e3cd34f..d187c01599 100644 --- a/src/battle/star/peach_beam/7997B0.c +++ b/src/battle/star/peach_beam/7997B0.c @@ -1,9 +1,11 @@ #include "common.h" +#include "script_api/battle.h" #define NAMESPACE battle_star_peach_beam #include "common/StarPower.inc.c" +ApiStatus func_802A1518_799CC8(Evt* script, s32 isInitialCall); INCLUDE_ASM(s32, "battle/star/peach_beam/7997B0", func_802A1518_799CC8); ApiStatus func_802A2468_79AC18(Evt* script, s32 isInitialCall) { @@ -28,3 +30,312 @@ ApiStatus func_802A247C_79AC2C(Evt* script, s32 isInitialCall) { } // this file is identical in c code to star beam +// TODO: consider .inc.c? + +EvtSource N(802A24F0) = { + EVT_CALL(GetOwnerID, LW(10)) + EVT_IF_EQ(LW(10), 0) + EVT_CALL(UseBattleCamPreset, 69) + EVT_WAIT_FRAMES(10) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_GOT_ITEM) + EVT_CALL(GetActorPos, ACTOR_PLAYER, LW(0), LW(1), LW(2)) + EVT_ADD(LW(0), 16) + EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(4.0)) + EVT_CALL(SetGoalPos, ACTOR_PLAYER, LW(0), LW(1), LW(2)) + EVT_CALL(PlayerRunToGoal, 0) + EVT_WAIT_FRAMES(8) + EVT_CALL(PlaySound, 0x241) + EVT_CALL(GetActorPos, ACTOR_PLAYER, LW(0), LW(1), LW(2)) + EVT_ADD(LW(1), 15) + EVT_CALL(N(UnkStarFunc1), LW(0), LW(1), LW(2)) + EVT_CALL(N(FadeBackgroundToBlack)) + EVT_WAIT_FRAMES(20) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_PRAY) + EVT_WAIT_FRAMES(10) + EVT_CALL(PlaySound, 0x2051) + EVT_CALL(GetActorPos, ACTOR_PLAYER, LW(0), LW(1), LW(2)) + EVT_CALL(N(UnkStarFunc2), LW(0), LW(1), LW(2)) + EVT_WAIT_FRAMES(30) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, 0x01002A) + EVT_ELSE + EVT_CALL(UseBattleCamPreset, 69) + EVT_WAIT_FRAMES(10) + EVT_CALL(N(UnkStarFunc), 0) + EVT_CALL(GetActorPos, ACTOR_PARTNER, LW(0), LW(1), LW(2)) + EVT_ADD(LW(0), 16) + EVT_CALL(SetActorSpeed, ACTOR_PARTNER, EVT_FLOAT(4.0)) + EVT_CALL(SetGoalPos, ACTOR_PARTNER, LW(0), LW(1), LW(2)) + EVT_CALL(RunToGoal, ACTOR_PARTNER, 0, FALSE) + EVT_CALL(N(UnkStarFunc), 4) + EVT_WAIT_FRAMES(8) + EVT_CALL(PlaySound, 0x241) + EVT_CALL(N(UnkStarFunc), 1) + EVT_CALL(GetActorPos, ACTOR_PARTNER, LW(0), LW(1), LW(2)) + EVT_ADD(LW(1), 15) + EVT_CALL(N(UnkStarFunc1), LW(0), LW(1), LW(2)) + EVT_CALL(N(FadeBackgroundToBlack)) + EVT_WAIT_FRAMES(20) + EVT_CALL(PlaySound, 0x2051) + EVT_CALL(N(UnkStarFunc), 1) + EVT_WAIT_FRAMES(10) + EVT_CALL(GetActorPos, ACTOR_PARTNER, LW(0), LW(1), LW(2)) + EVT_CALL(N(UnkStarFunc2), LW(0), LW(1), LW(2)) + EVT_WAIT_FRAMES(30) + EVT_CALL(N(UnkStarFunc), 4) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtSource N(802A2888) = { + EVT_CALL(GetOwnerID, LW(10)) + EVT_IF_EQ(LW(10), 0) + EVT_CALL(UseBattleCamPreset, 69) + EVT_WAIT_FRAMES(10) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_GOT_ITEM) + EVT_CALL(GetActorPos, ACTOR_PLAYER, LW(0), LW(1), LW(2)) + EVT_ADD(LW(0), 16) + EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(4.0)) + EVT_CALL(SetGoalPos, ACTOR_PLAYER, LW(0), LW(1), LW(2)) + EVT_CALL(PlayerRunToGoal, 0) + EVT_WAIT_FRAMES(8) + EVT_CALL(PlaySound, 0x241) + EVT_CALL(GetActorPos, ACTOR_PLAYER, LW(0), LW(1), LW(2)) + EVT_ADD(LW(1), 15) + EVT_CALL(N(UnkStarFunc1), LW(0), LW(1), LW(2)) + EVT_CALL(N(UnkBackgroundFunc2)) + EVT_WAIT_FRAMES(20) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_PRAY) + EVT_WAIT_FRAMES(10) + EVT_CALL(PlaySound, 0x2051) + EVT_CALL(GetActorPos, ACTOR_PLAYER, LW(0), LW(1), LW(2)) + EVT_CALL(N(UnkStarFunc2), LW(0), LW(1), LW(2)) + EVT_WAIT_FRAMES(30) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, 0x01002A) + EVT_ELSE + EVT_CALL(UseBattleCamPreset, 69) + EVT_WAIT_FRAMES(10) + EVT_CALL(N(UnkStarFunc), 0) + EVT_CALL(GetActorPos, ACTOR_PARTNER, LW(0), LW(1), LW(2)) + EVT_ADD(LW(0), 16) + EVT_CALL(SetActorSpeed, ACTOR_PARTNER, EVT_FLOAT(4.0)) + EVT_CALL(SetGoalPos, ACTOR_PARTNER, LW(0), LW(1), LW(2)) + EVT_CALL(RunToGoal, ACTOR_PARTNER, 0, FALSE) + EVT_CALL(N(UnkStarFunc), 4) + EVT_WAIT_FRAMES(8) + EVT_CALL(PlaySound, 0x241) + EVT_CALL(N(UnkStarFunc), 1) + EVT_CALL(GetActorPos, ACTOR_PARTNER, LW(0), LW(1), LW(2)) + EVT_ADD(LW(1), 15) + EVT_CALL(N(UnkStarFunc1), LW(0), LW(1), LW(2)) + EVT_CALL(N(UnkBackgroundFunc2)) + EVT_WAIT_FRAMES(20) + EVT_CALL(PlaySound, 0x2051) + EVT_CALL(N(UnkStarFunc), 1) + EVT_WAIT_FRAMES(10) + EVT_CALL(GetActorPos, ACTOR_PARTNER, LW(0), LW(1), LW(2)) + EVT_CALL(N(UnkStarFunc2), LW(0), LW(1), LW(2)) + EVT_WAIT_FRAMES(30) + EVT_CALL(N(UnkStarFunc), 4) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtSource N(802A2C20) = { + EVT_WAIT_FRAMES(8) + EVT_CALL(SetForegroundModelsVisible, 0) + EVT_CALL(func_8024E664, 73) + EVT_CALL(MoveBattleCamOver, 1) + EVT_CALL(PlaySound, 0x2041) + EVT_CALL(CreateNpc, 100, LW(0)) + EVT_CALL(N(SetNpcCollision32)) + EVT_CALL(SetNpcFlagBits, 100, ((NPC_FLAG_40000)), TRUE) + EVT_CALL(SetNpcPos, 100, -75, 150, 0) + EVT_CALL(SetNpcDecoration, 100, 0, 5) + EVT_CALL(N(UnkStarFunc3), -75, 167, 0) + EVT_WAIT_FRAMES(10) + EVT_CALL(EnableNpcBlur, 100, 1) + EVT_SET(LW(0), 0) + EVT_LOOP(8) + EVT_ADD(LW(0), 67) + EVT_CALL(SetNpcRotation, 100, 0, LW(0), 0) + EVT_WAIT_FRAMES(1) + EVT_END_LOOP + EVT_WAIT_FRAMES(10) + EVT_CALL(EnableNpcBlur, 100, 0) + EVT_THREAD + EVT_WAIT_FRAMES(10) + EVT_CALL(UseBattleCamPreset, 69) + EVT_END_THREAD + EVT_CALL(GetActorPos, ACTOR_PLAYER, LW(0), LW(1), LW(2)) + EVT_ADD(LW(1), 50) + EVT_CALL(NpcFlyTo, 100, LW(0), LW(1), LW(2), 30, 0, 10) + EVT_CALL(SetForegroundModelsVisible, 1) + EVT_RETURN + EVT_END +}; + +EvtSource N(802A2E2C) = { + EVT_CALL(GetOwnerID, LW(10)) + EVT_IF_EQ(LW(10), 0) + EVT_CALL(UseBattleCamPreset, 2) + EVT_CALL(PlaySound, 0x2047) + EVT_THREAD + EVT_LOOP(5) + EVT_WAIT_FRAMES(6) + EVT_CALL(GetNpcPos, 100, LW(0), LW(1), LW(2)) + EVT_CALL(N(UnkStarFunc4), LW(0), LW(1), LW(2)) + EVT_END_LOOP + EVT_END_THREAD + EVT_CALL(EnableNpcBlur, 100, 1) + EVT_THREAD + EVT_SET(LW(2), 0) + EVT_SET(LW(3), 720) + EVT_CALL(MakeLerp, LW(2), LW(3), 30, 2) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(SetNpcRotation, 100, 0, LW(0), 0) + EVT_WAIT_FRAMES(1) + EVT_IF_EQ(LW(1), 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_END_THREAD + EVT_CALL(GetNpcPos, 100, LW(0), LW(1), LW(2)) + EVT_ADD(LW(1), 60) + EVT_CALL(NpcFlyTo, 100, LW(0), LW(1), LW(2), 15, 0, 10) + EVT_ADD(LW(1), 140) + EVT_CALL(NpcFlyTo, 100, LW(0), LW(1), LW(2), 15, 0, 10) + EVT_WAIT_FRAMES(10) + EVT_CALL(EnableNpcBlur, 100, 0) + EVT_CALL(DeleteNpc, 100) + EVT_ELSE + EVT_CALL(UseBattleCamPreset, 2) + EVT_CALL(PlaySound, 0x2045) + EVT_THREAD + EVT_LOOP(5) + EVT_WAIT_FRAMES(6) + EVT_CALL(GetNpcPos, 100, LW(0), LW(1), LW(2)) + EVT_CALL(N(UnkStarFunc4), LW(0), LW(1), LW(2)) + EVT_END_LOOP + EVT_END_THREAD + EVT_CALL(EnableNpcBlur, 100, 1) + EVT_THREAD + EVT_SET(LW(2), 0) + EVT_SET(LW(3), 720) + EVT_CALL(MakeLerp, LW(2), LW(3), 30, 2) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(SetNpcRotation, 100, 0, LW(0), 0) + EVT_WAIT_FRAMES(1) + EVT_IF_EQ(LW(1), 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_END_THREAD + EVT_CALL(GetNpcPos, 100, LW(0), LW(1), LW(2)) + EVT_ADD(LW(1), 60) + EVT_CALL(NpcFlyTo, 100, LW(0), LW(1), LW(2), 15, 0, 10) + EVT_ADD(LW(1), 140) + EVT_CALL(NpcFlyTo, 100, LW(0), LW(1), LW(2), 15, 0, 10) + EVT_WAIT_FRAMES(10) + EVT_CALL(EnableNpcBlur, 100, 0) + EVT_CALL(DeleteNpc, 100) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtSource N(802A327C) = { + EVT_CALL(GetOwnerID, LW(10)) + EVT_IF_EQ(LW(10), 0) + EVT_CALL(N(UnkBackgroundFunc)) + EVT_WAIT_FRAMES(15) + EVT_CALL(SetGoalToHome, ACTOR_PLAYER) + EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(8.0)) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_RUNNING) + EVT_CALL(PlayerRunToGoal, 0) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_10002) + EVT_ELSE + EVT_CALL(N(UnkBackgroundFunc)) + EVT_WAIT_FRAMES(15) + EVT_CALL(SetGoalToHome, ACTOR_PARTNER) + EVT_CALL(SetActorSpeed, ACTOR_PARTNER, EVT_FLOAT(8.0)) + EVT_CALL(N(UnkStarFunc), 3) + EVT_CALL(RunToGoal, ACTOR_PARTNER, 0) + EVT_CALL(N(UnkStarFunc), 4) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtSource N(802A33A8) = { + EVT_THREAD + EVT_CALL(PlayEffect, 0x38, 0, LW(0), LW(1), LW(2), EVT_FLOAT(1.0), 100, 0, 0, 0, 0, 0, 0, 0) + EVT_WAIT_FRAMES(5) + EVT_CALL(PlayEffect, 0x38, 0, LW(0), LW(1), LW(2), EVT_FLOAT(1.0), 100, 0, 0, 0, 0, 0, 0, 0) + EVT_IF_EQ(LW(10), 1) + EVT_WAIT_FRAMES(5) + EVT_CALL(PlayEffect, 0x38, 0, LW(0), LW(1), LW(2), EVT_FLOAT(1.0), 100, 0, 0, 0, 0, 0, 0, 0) + EVT_END_IF + EVT_END_THREAD + EVT_WAIT_FRAMES(20) + EVT_CALL(PlayEffect, 0x52, 4, LW(0), LW(1), LW(2), EVT_FLOAT(1.0), 30, 0, 0, 0, 0, 0, 0, 0) + EVT_RETURN + EVT_END +}; + +s32 N(D_802A3514_7FCCC4)[] = { + 0x00000023, 0x00000000, 0x00000005, 0x0000000A, 0x0000000F, 0x00000014, 0x00000019, 0x0000001E, +}; + +s32 N(D_802A3534_7FCCE4)[] = { + 0x00000023, 0x00000000, 0x00000005, 0x0000000A, 0x0000000F, 0x00000014, 0x00000019, 0x0000001E, +}; + +s32 N(D_802A3554_7FCD04)[] = { + 0x42B20000, 0x43340000, 0x00000000, 0xC2100000, 0x43340000, 0x00000000, 0x434C0000, 0x43340000, + 0x00000000, 0x41F00000, 0x42C20000, 0x43EE8000, 0x43660000, 0x42A20000, 0x00000000, 0x43010000, + 0x43340000, 0x00000000, 0xC2700000, 0x43340000, 0x00000000, 0xC36A0000, 0x421C0000, 0x00000000, +}; + +EvtSource N(usePower) = { + EVT_EXEC_WAIT(N(802A2888)) + EVT_CALL(AddBattleCamZoom, 100) + EVT_CALL(MoveBattleCamOver, 20) + EVT_CALL(InitTargetIterator) + EVT_CALL(SetGoalToTarget, ACTOR_SELF) + EVT_THREAD + EVT_CALL(func_802A1518_799CC8, 1) + EVT_END_THREAD + EVT_WAIT_FRAMES(10) + EVT_LOOP(0) + EVT_WAIT_FRAMES(1) + EVT_CALL(func_802A2468_79AC18) + EVT_IF_EQ(LW(0), 1) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(InitTargetIterator) + EVT_LABEL(0) + EVT_CALL(SetGoalToTarget, ACTOR_SELF) + EVT_CALL(ItemDamageEnemy, LW(0), 1082130432, 0, 0, 32) + EVT_CALL(ChooseNextTarget, 0, LW(0)) + EVT_IF_NE(LW(0), -1) + EVT_GOTO(0) + EVT_END_IF + EVT_LOOP(0) + EVT_WAIT_FRAMES(1) + EVT_CALL(func_802A2468_79AC18) + EVT_IF_EQ(LW(0), 2) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(UseBattleCamPreset, 2) + EVT_CALL(func_802A247C_79AC2C) + EVT_CALL(func_80276EFC) + EVT_EXEC_WAIT(N(802A327C)) + EVT_RETURN + EVT_END +}; diff --git a/src/battle/star/peach_dash/79D8A0.c b/src/battle/star/peach_dash/79D8A0.c index 83d30ddbf5..f1137fb081 100644 --- a/src/battle/star/peach_dash/79D8A0.c +++ b/src/battle/star/peach_dash/79D8A0.c @@ -1,4 +1,5 @@ #include "common.h" +#include "script_api/battle.h" #define NAMESPACE battle_star_peach_dash @@ -23,3 +24,276 @@ ApiStatus func_802A1518_79DDB8(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } + +EvtSource N(802A15B0) = { + EVT_CALL(GetOwnerID, LW(10)) + EVT_IF_EQ(LW(10), 0) + EVT_CALL(UseBattleCamPreset, 69) + EVT_WAIT_FRAMES(10) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_GOT_ITEM) + EVT_CALL(GetActorPos, ACTOR_PLAYER, LW(0), LW(1), LW(2)) + EVT_ADD(LW(0), 16) + EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(4.0)) + EVT_CALL(SetGoalPos, ACTOR_PLAYER, LW(0), LW(1), LW(2)) + EVT_CALL(PlayerRunToGoal, 0) + EVT_WAIT_FRAMES(8) + EVT_CALL(PlaySound, 0x241) + EVT_CALL(GetActorPos, ACTOR_PLAYER, LW(0), LW(1), LW(2)) + EVT_ADD(LW(1), 15) + EVT_CALL(N(UnkStarFunc1), LW(0), LW(1), LW(2)) + EVT_CALL(N(FadeBackgroundToBlack)) + EVT_WAIT_FRAMES(20) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_PRAY) + EVT_WAIT_FRAMES(10) + EVT_CALL(PlaySound, 0x2051) + EVT_CALL(GetActorPos, ACTOR_PLAYER, LW(0), LW(1), LW(2)) + EVT_CALL(N(UnkStarFunc2), LW(0), LW(1), LW(2)) + EVT_WAIT_FRAMES(30) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, 0x01002A) + EVT_ELSE + EVT_CALL(UseBattleCamPreset, 69) + EVT_WAIT_FRAMES(10) + EVT_CALL(N(UnkStarFunc), 0) + EVT_CALL(GetActorPos, ACTOR_PARTNER, LW(0), LW(1), LW(2)) + EVT_ADD(LW(0), 16) + EVT_CALL(SetActorSpeed, ACTOR_PARTNER, EVT_FLOAT(4.0)) + EVT_CALL(SetGoalPos, ACTOR_PARTNER, LW(0), LW(1), LW(2)) + EVT_CALL(RunToGoal, ACTOR_PARTNER, 0, FALSE) + EVT_CALL(N(UnkStarFunc), 4) + EVT_WAIT_FRAMES(8) + EVT_CALL(PlaySound, 0x241) + EVT_CALL(N(UnkStarFunc), 1) + EVT_CALL(GetActorPos, ACTOR_PARTNER, LW(0), LW(1), LW(2)) + EVT_ADD(LW(1), 15) + EVT_CALL(N(UnkStarFunc1), LW(0), LW(1), LW(2)) + EVT_CALL(N(FadeBackgroundToBlack)) + EVT_WAIT_FRAMES(20) + EVT_CALL(PlaySound, 0x2051) + EVT_CALL(N(UnkStarFunc), 1) + EVT_WAIT_FRAMES(10) + EVT_CALL(GetActorPos, ACTOR_PARTNER, LW(0), LW(1), LW(2)) + EVT_CALL(N(UnkStarFunc2), LW(0), LW(1), LW(2)) + EVT_WAIT_FRAMES(30) + EVT_CALL(N(UnkStarFunc), 4) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtSource N(802A1948) = { + EVT_CALL(GetOwnerID, LW(10)) + EVT_IF_EQ(LW(10), 0) + EVT_CALL(UseBattleCamPreset, 69) + EVT_WAIT_FRAMES(10) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_GOT_ITEM) + EVT_CALL(GetActorPos, ACTOR_PLAYER, LW(0), LW(1), LW(2)) + EVT_ADD(LW(0), 16) + EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(4.0)) + EVT_CALL(SetGoalPos, ACTOR_PLAYER, LW(0), LW(1), LW(2)) + EVT_CALL(PlayerRunToGoal, 0) + EVT_WAIT_FRAMES(8) + EVT_CALL(PlaySound, 0x241) + EVT_CALL(GetActorPos, ACTOR_PLAYER, LW(0), LW(1), LW(2)) + EVT_ADD(LW(1), 15) + EVT_CALL(N(UnkStarFunc1), LW(0), LW(1), LW(2)) + EVT_CALL(N(UnkBackgroundFunc2)) + EVT_WAIT_FRAMES(20) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_PRAY) + EVT_WAIT_FRAMES(10) + EVT_CALL(PlaySound, 0x2051) + EVT_CALL(GetActorPos, ACTOR_PLAYER, LW(0), LW(1), LW(2)) + EVT_CALL(N(UnkStarFunc2), LW(0), LW(1), LW(2)) + EVT_WAIT_FRAMES(30) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, 0x01002A) + EVT_ELSE + EVT_CALL(UseBattleCamPreset, 69) + EVT_WAIT_FRAMES(10) + EVT_CALL(N(UnkStarFunc), 0) + EVT_CALL(GetActorPos, ACTOR_PARTNER, LW(0), LW(1), LW(2)) + EVT_ADD(LW(0), 16) + EVT_CALL(SetActorSpeed, ACTOR_PARTNER, EVT_FLOAT(4.0)) + EVT_CALL(SetGoalPos, ACTOR_PARTNER, LW(0), LW(1), LW(2)) + EVT_CALL(RunToGoal, ACTOR_PARTNER, 0, FALSE) + EVT_CALL(N(UnkStarFunc), 4) + EVT_WAIT_FRAMES(8) + EVT_CALL(PlaySound, 0x241) + EVT_CALL(N(UnkStarFunc), 1) + EVT_CALL(GetActorPos, ACTOR_PARTNER, LW(0), LW(1), LW(2)) + EVT_ADD(LW(1), 15) + EVT_CALL(N(UnkStarFunc1), LW(0), LW(1), LW(2)) + EVT_CALL(N(UnkBackgroundFunc2)) + EVT_WAIT_FRAMES(20) + EVT_CALL(PlaySound, 0x2051) + EVT_CALL(N(UnkStarFunc), 1) + EVT_WAIT_FRAMES(10) + EVT_CALL(GetActorPos, ACTOR_PARTNER, LW(0), LW(1), LW(2)) + EVT_CALL(N(UnkStarFunc2), LW(0), LW(1), LW(2)) + EVT_WAIT_FRAMES(30) + EVT_CALL(N(UnkStarFunc), 4) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtSource N(802A1CE0) = { + EVT_WAIT_FRAMES(8) + EVT_CALL(SetForegroundModelsVisible, 0) + EVT_CALL(func_8024E664, 73) + EVT_CALL(MoveBattleCamOver, 1) + EVT_CALL(PlaySound, 0x2041) + EVT_CALL(CreateNpc, 100, LW(0)) + EVT_CALL(N(SetNpcCollision32)) + EVT_CALL(SetNpcFlagBits, 100, ((NPC_FLAG_40000)), TRUE) + EVT_CALL(SetNpcPos, 100, -75, 150, 0) + EVT_CALL(SetNpcDecoration, 100, 0, 5) + EVT_CALL(N(UnkStarFunc3), -75, 167, 0) + EVT_WAIT_FRAMES(10) + EVT_CALL(EnableNpcBlur, 100, 1) + EVT_SET(LW(0), 0) + EVT_LOOP(8) + EVT_ADD(LW(0), 67) + EVT_CALL(SetNpcRotation, 100, 0, LW(0), 0) + EVT_WAIT_FRAMES(1) + EVT_END_LOOP + EVT_WAIT_FRAMES(10) + EVT_CALL(EnableNpcBlur, 100, 0) + EVT_THREAD + EVT_WAIT_FRAMES(10) + EVT_CALL(UseBattleCamPreset, 69) + EVT_END_THREAD + EVT_CALL(GetActorPos, ACTOR_PLAYER, LW(0), LW(1), LW(2)) + EVT_ADD(LW(1), 50) + EVT_CALL(NpcFlyTo, 100, LW(0), LW(1), LW(2), 30, 0, 10) + EVT_CALL(SetForegroundModelsVisible, 1) + EVT_RETURN + EVT_END +}; + +EvtSource N(802A1EEC) = { + EVT_CALL(GetOwnerID, LW(10)) + EVT_IF_EQ(LW(10), 0) + EVT_CALL(UseBattleCamPreset, 2) + EVT_CALL(PlaySound, 0x2047) + EVT_THREAD + EVT_LOOP(5) + EVT_WAIT_FRAMES(6) + EVT_CALL(GetNpcPos, 100, LW(0), LW(1), LW(2)) + EVT_CALL(N(UnkStarFunc4), LW(0), LW(1), LW(2)) + EVT_END_LOOP + EVT_END_THREAD + EVT_CALL(EnableNpcBlur, 100, 1) + EVT_THREAD + EVT_SET(LW(2), 0) + EVT_SET(LW(3), 720) + EVT_CALL(MakeLerp, LW(2), LW(3), 30, 2) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(SetNpcRotation, 100, 0, LW(0), 0) + EVT_WAIT_FRAMES(1) + EVT_IF_EQ(LW(1), 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_END_THREAD + EVT_CALL(GetNpcPos, 100, LW(0), LW(1), LW(2)) + EVT_ADD(LW(1), 60) + EVT_CALL(NpcFlyTo, 100, LW(0), LW(1), LW(2), 15, 0, 10) + EVT_ADD(LW(1), 140) + EVT_CALL(NpcFlyTo, 100, LW(0), LW(1), LW(2), 15, 0, 10) + EVT_WAIT_FRAMES(10) + EVT_CALL(EnableNpcBlur, 100, 0) + EVT_CALL(DeleteNpc, 100) + EVT_ELSE + EVT_CALL(UseBattleCamPreset, 2) + EVT_CALL(PlaySound, 0x2045) + EVT_THREAD + EVT_LOOP(5) + EVT_WAIT_FRAMES(6) + EVT_CALL(GetNpcPos, 100, LW(0), LW(1), LW(2)) + EVT_CALL(N(UnkStarFunc4), LW(0), LW(1), LW(2)) + EVT_END_LOOP + EVT_END_THREAD + EVT_CALL(EnableNpcBlur, 100, 1) + EVT_THREAD + EVT_SET(LW(2), 0) + EVT_SET(LW(3), 720) + EVT_CALL(MakeLerp, LW(2), LW(3), 30, 2) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(SetNpcRotation, 100, 0, LW(0), 0) + EVT_WAIT_FRAMES(1) + EVT_IF_EQ(LW(1), 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_END_THREAD + EVT_CALL(GetNpcPos, 100, LW(0), LW(1), LW(2)) + EVT_ADD(LW(1), 60) + EVT_CALL(NpcFlyTo, 100, LW(0), LW(1), LW(2), 15, 0, 10) + EVT_ADD(LW(1), 140) + EVT_CALL(NpcFlyTo, 100, LW(0), LW(1), LW(2), 15, 0, 10) + EVT_WAIT_FRAMES(10) + EVT_CALL(EnableNpcBlur, 100, 0) + EVT_CALL(DeleteNpc, 100) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtSource N(802A233C) = { + EVT_CALL(GetOwnerID, LW(10)) + EVT_IF_EQ(LW(10), 0) + EVT_CALL(N(UnkBackgroundFunc)) + EVT_WAIT_FRAMES(15) + EVT_CALL(SetGoalToHome, ACTOR_PLAYER) + EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(8.0)) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_RUNNING) + EVT_CALL(PlayerRunToGoal, 0) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_10002) + EVT_ELSE + EVT_CALL(N(UnkBackgroundFunc)) + EVT_WAIT_FRAMES(15) + EVT_CALL(SetGoalToHome, ACTOR_PARTNER) + EVT_CALL(SetActorSpeed, ACTOR_PARTNER, EVT_FLOAT(8.0)) + EVT_CALL(N(UnkStarFunc), 3) + EVT_CALL(RunToGoal, ACTOR_PARTNER, 0) + EVT_CALL(N(UnkStarFunc), 4) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtSource N(usePower) = { + EVT_CALL(UseBattleCamPreset, 69) + EVT_WAIT_FRAMES(10) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, 0x0C0010) + EVT_CALL(GetActorPos, ACTOR_PLAYER, LW(0), LW(1), LW(2)) + EVT_ADD(LW(0), 16) + EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(4.0)) + EVT_CALL(SetGoalPos, ACTOR_PLAYER, LW(0), LW(1), LW(2)) + EVT_CALL(PlayerRunToGoal, 0) + EVT_WAIT_FRAMES(8) + EVT_CALL(GetActorPos, ACTOR_PLAYER, LW(0), LW(1), LW(2)) + EVT_ADD(LW(1), 20) + EVT_CALL(N(UnkStarFunc1), LW(0), LW(1), LW(2)) + EVT_CALL(N(FadeBackgroundToBlack)) + EVT_WAIT_FRAMES(20) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, 0x0D000F) + EVT_WAIT_FRAMES(10) + EVT_CALL(GetActorPos, ACTOR_PLAYER, LW(0), LW(1), LW(2)) + EVT_ADD(LW(1), 20) + EVT_CALL(N(UnkStarFunc2), LW(0), LW(1), LW(2)) + EVT_WAIT_FRAMES(30) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, 0x0C000C) + EVT_CALL(func_802A1518_79DDB8) + EVT_WAIT_FRAMES(10) + EVT_CALL(N(UnkBackgroundFunc)) + EVT_WAIT_FRAMES(15) + EVT_CALL(SetGoalToHome, ACTOR_PLAYER) + EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(8.0)) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, 0x0A0003) + EVT_CALL(PlayerRunToGoal, 0) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, 0x0A0001) + EVT_RETURN + EVT_END +}; diff --git a/src/battle/star/peach_focus/79BFA0.c b/src/battle/star/peach_focus/79BFA0.c index c683e2c635..8ccb4a01be 100644 --- a/src/battle/star/peach_focus/79BFA0.c +++ b/src/battle/star/peach_focus/79BFA0.c @@ -1,10 +1,327 @@ #include "common.h" +#include "script_api/battle.h" #define NAMESPACE battle_star_peach_focus #include "common/StarPower.inc.c" ApiStatus func_802A1518_79C4B8(Evt* script, s32 isInitialCall) { - ((s32*)script->varTable[0])[1]++; // TODO replace with actual struct when we know what this is + // TODO: replace with actual struct when we know what it is + // varTable[0] is Twink's actorVar[0] + ((s32*)script->varTable[0])[1]++; return ApiStatus_DONE2; } + +EvtSource N(802A1530) = { + EVT_CALL(GetOwnerID, LW(10)) + EVT_IF_EQ(LW(10), 0) + EVT_CALL(UseBattleCamPreset, 69) + EVT_WAIT_FRAMES(10) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_GOT_ITEM) + EVT_CALL(GetActorPos, ACTOR_PLAYER, LW(0), LW(1), LW(2)) + EVT_ADD(LW(0), 16) + EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(4.0)) + EVT_CALL(SetGoalPos, ACTOR_PLAYER, LW(0), LW(1), LW(2)) + EVT_CALL(PlayerRunToGoal, 0) + EVT_WAIT_FRAMES(8) + EVT_CALL(PlaySound, 0x241) + EVT_CALL(GetActorPos, ACTOR_PLAYER, LW(0), LW(1), LW(2)) + EVT_ADD(LW(1), 15) + EVT_CALL(N(UnkStarFunc1), LW(0), LW(1), LW(2)) + EVT_CALL(N(FadeBackgroundToBlack)) + EVT_WAIT_FRAMES(20) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_PRAY) + EVT_WAIT_FRAMES(10) + EVT_CALL(PlaySound, 0x2051) + EVT_CALL(GetActorPos, ACTOR_PLAYER, LW(0), LW(1), LW(2)) + EVT_CALL(N(UnkStarFunc2), LW(0), LW(1), LW(2)) + EVT_WAIT_FRAMES(30) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, 0x01002A) + EVT_ELSE + EVT_CALL(UseBattleCamPreset, 69) + EVT_WAIT_FRAMES(10) + EVT_CALL(N(UnkStarFunc), 0) + EVT_CALL(GetActorPos, ACTOR_PARTNER, LW(0), LW(1), LW(2)) + EVT_ADD(LW(0), 16) + EVT_CALL(SetActorSpeed, ACTOR_PARTNER, EVT_FLOAT(4.0)) + EVT_CALL(SetGoalPos, ACTOR_PARTNER, LW(0), LW(1), LW(2)) + EVT_CALL(RunToGoal, ACTOR_PARTNER, 0, FALSE) + EVT_CALL(N(UnkStarFunc), 4) + EVT_WAIT_FRAMES(8) + EVT_CALL(PlaySound, 0x241) + EVT_CALL(N(UnkStarFunc), 1) + EVT_CALL(GetActorPos, ACTOR_PARTNER, LW(0), LW(1), LW(2)) + EVT_ADD(LW(1), 15) + EVT_CALL(N(UnkStarFunc1), LW(0), LW(1), LW(2)) + EVT_CALL(N(FadeBackgroundToBlack)) + EVT_WAIT_FRAMES(20) + EVT_CALL(PlaySound, 0x2051) + EVT_CALL(N(UnkStarFunc), 1) + EVT_WAIT_FRAMES(10) + EVT_CALL(GetActorPos, ACTOR_PARTNER, LW(0), LW(1), LW(2)) + EVT_CALL(N(UnkStarFunc2), LW(0), LW(1), LW(2)) + EVT_WAIT_FRAMES(30) + EVT_CALL(N(UnkStarFunc), 4) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtSource N(802A18C8) = { + EVT_CALL(GetOwnerID, LW(10)) + EVT_IF_EQ(LW(10), 0) + EVT_CALL(UseBattleCamPreset, 69) + EVT_WAIT_FRAMES(10) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_GOT_ITEM) + EVT_CALL(GetActorPos, ACTOR_PLAYER, LW(0), LW(1), LW(2)) + EVT_ADD(LW(0), 16) + EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(4.0)) + EVT_CALL(SetGoalPos, ACTOR_PLAYER, LW(0), LW(1), LW(2)) + EVT_CALL(PlayerRunToGoal, 0) + EVT_WAIT_FRAMES(8) + EVT_CALL(PlaySound, 0x241) + EVT_CALL(GetActorPos, ACTOR_PLAYER, LW(0), LW(1), LW(2)) + EVT_ADD(LW(1), 15) + EVT_CALL(N(UnkStarFunc1), LW(0), LW(1), LW(2)) + EVT_CALL(N(UnkBackgroundFunc2)) + EVT_WAIT_FRAMES(20) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_PRAY) + EVT_WAIT_FRAMES(10) + EVT_CALL(PlaySound, 0x2051) + EVT_CALL(GetActorPos, ACTOR_PLAYER, LW(0), LW(1), LW(2)) + EVT_CALL(N(UnkStarFunc2), LW(0), LW(1), LW(2)) + EVT_WAIT_FRAMES(30) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, 0x01002A) + EVT_ELSE + EVT_CALL(UseBattleCamPreset, 69) + EVT_WAIT_FRAMES(10) + EVT_CALL(N(UnkStarFunc), 0) + EVT_CALL(GetActorPos, ACTOR_PARTNER, LW(0), LW(1), LW(2)) + EVT_ADD(LW(0), 16) + EVT_CALL(SetActorSpeed, ACTOR_PARTNER, EVT_FLOAT(4.0)) + EVT_CALL(SetGoalPos, ACTOR_PARTNER, LW(0), LW(1), LW(2)) + EVT_CALL(RunToGoal, ACTOR_PARTNER, 0, FALSE) + EVT_CALL(N(UnkStarFunc), 4) + EVT_WAIT_FRAMES(8) + EVT_CALL(PlaySound, 0x241) + EVT_CALL(N(UnkStarFunc), 1) + EVT_CALL(GetActorPos, ACTOR_PARTNER, LW(0), LW(1), LW(2)) + EVT_ADD(LW(1), 15) + EVT_CALL(N(UnkStarFunc1), LW(0), LW(1), LW(2)) + EVT_CALL(N(UnkBackgroundFunc2)) + EVT_WAIT_FRAMES(20) + EVT_CALL(PlaySound, 0x2051) + EVT_CALL(N(UnkStarFunc), 1) + EVT_WAIT_FRAMES(10) + EVT_CALL(GetActorPos, ACTOR_PARTNER, LW(0), LW(1), LW(2)) + EVT_CALL(N(UnkStarFunc2), LW(0), LW(1), LW(2)) + EVT_WAIT_FRAMES(30) + EVT_CALL(N(UnkStarFunc), 4) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtSource N(802A1C60) = { + EVT_WAIT_FRAMES(8) + EVT_CALL(SetForegroundModelsVisible, 0) + EVT_CALL(func_8024E664, 73) + EVT_CALL(MoveBattleCamOver, 1) + EVT_CALL(PlaySound, 0x2041) + EVT_CALL(CreateNpc, 100, LW(0)) + EVT_CALL(N(SetNpcCollision32)) + EVT_CALL(SetNpcFlagBits, 100, ((NPC_FLAG_40000)), TRUE) + EVT_CALL(SetNpcPos, 100, -75, 150, 0) + EVT_CALL(SetNpcDecoration, 100, 0, 5) + EVT_CALL(N(UnkStarFunc3), -75, 167, 0) + EVT_WAIT_FRAMES(10) + EVT_CALL(EnableNpcBlur, 100, 1) + EVT_SET(LW(0), 0) + EVT_LOOP(8) + EVT_ADD(LW(0), 67) + EVT_CALL(SetNpcRotation, 100, 0, LW(0), 0) + EVT_WAIT_FRAMES(1) + EVT_END_LOOP + EVT_WAIT_FRAMES(10) + EVT_CALL(EnableNpcBlur, 100, 0) + EVT_THREAD + EVT_WAIT_FRAMES(10) + EVT_CALL(UseBattleCamPreset, 69) + EVT_END_THREAD + EVT_CALL(GetActorPos, ACTOR_PLAYER, LW(0), LW(1), LW(2)) + EVT_ADD(LW(1), 50) + EVT_CALL(NpcFlyTo, 100, LW(0), LW(1), LW(2), 30, 0, 10) + EVT_CALL(SetForegroundModelsVisible, 1) + EVT_RETURN + EVT_END +}; + +EvtSource N(802A1E6C) = { + EVT_CALL(GetOwnerID, LW(10)) + EVT_IF_EQ(LW(10), 0) + EVT_CALL(UseBattleCamPreset, 2) + EVT_CALL(PlaySound, 0x2047) + EVT_THREAD + EVT_LOOP(5) + EVT_WAIT_FRAMES(6) + EVT_CALL(GetNpcPos, 100, LW(0), LW(1), LW(2)) + EVT_CALL(N(UnkStarFunc4), LW(0), LW(1), LW(2)) + EVT_END_LOOP + EVT_END_THREAD + EVT_CALL(EnableNpcBlur, 100, 1) + EVT_THREAD + EVT_SET(LW(2), 0) + EVT_SET(LW(3), 720) + EVT_CALL(MakeLerp, LW(2), LW(3), 30, 2) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(SetNpcRotation, 100, 0, LW(0), 0) + EVT_WAIT_FRAMES(1) + EVT_IF_EQ(LW(1), 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_END_THREAD + EVT_CALL(GetNpcPos, 100, LW(0), LW(1), LW(2)) + EVT_ADD(LW(1), 60) + EVT_CALL(NpcFlyTo, 100, LW(0), LW(1), LW(2), 15, 0, 10) + EVT_ADD(LW(1), 140) + EVT_CALL(NpcFlyTo, 100, LW(0), LW(1), LW(2), 15, 0, 10) + EVT_WAIT_FRAMES(10) + EVT_CALL(EnableNpcBlur, 100, 0) + EVT_CALL(DeleteNpc, 100) + EVT_ELSE + EVT_CALL(UseBattleCamPreset, 2) + EVT_CALL(PlaySound, 0x2045) + EVT_THREAD + EVT_LOOP(5) + EVT_WAIT_FRAMES(6) + EVT_CALL(GetNpcPos, 100, LW(0), LW(1), LW(2)) + EVT_CALL(N(UnkStarFunc4), LW(0), LW(1), LW(2)) + EVT_END_LOOP + EVT_END_THREAD + EVT_CALL(EnableNpcBlur, 100, 1) + EVT_THREAD + EVT_SET(LW(2), 0) + EVT_SET(LW(3), 720) + EVT_CALL(MakeLerp, LW(2), LW(3), 30, 2) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(SetNpcRotation, 100, 0, LW(0), 0) + EVT_WAIT_FRAMES(1) + EVT_IF_EQ(LW(1), 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_END_THREAD + EVT_CALL(GetNpcPos, 100, LW(0), LW(1), LW(2)) + EVT_ADD(LW(1), 60) + EVT_CALL(NpcFlyTo, 100, LW(0), LW(1), LW(2), 15, 0, 10) + EVT_ADD(LW(1), 140) + EVT_CALL(NpcFlyTo, 100, LW(0), LW(1), LW(2), 15, 0, 10) + EVT_WAIT_FRAMES(10) + EVT_CALL(EnableNpcBlur, 100, 0) + EVT_CALL(DeleteNpc, 100) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtSource N(802A22BC) = { + EVT_CALL(GetOwnerID, LW(10)) + EVT_IF_EQ(LW(10), 0) + EVT_CALL(N(UnkBackgroundFunc)) + EVT_WAIT_FRAMES(15) + EVT_CALL(SetGoalToHome, ACTOR_PLAYER) + EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(8.0)) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_RUNNING) + EVT_CALL(PlayerRunToGoal, 0) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_10002) + EVT_ELSE + EVT_CALL(N(UnkBackgroundFunc)) + EVT_WAIT_FRAMES(15) + EVT_CALL(SetGoalToHome, ACTOR_PARTNER) + EVT_CALL(SetActorSpeed, ACTOR_PARTNER, EVT_FLOAT(8.0)) + EVT_CALL(N(UnkStarFunc), 3) + EVT_CALL(RunToGoal, ACTOR_PARTNER, 0) + EVT_CALL(N(UnkStarFunc), 4) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtSource N(usePower) = { + EVT_CALL(UseBattleCamPreset, 69) + EVT_WAIT_FRAMES(10) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, 0x0A0003) + EVT_CALL(GetActorPos, ACTOR_PLAYER, LW(0), LW(1), LW(2)) + EVT_ADD(LW(0), 16) + EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(4.0)) + EVT_CALL(SetGoalPos, ACTOR_PLAYER, LW(0), LW(1), LW(2)) + EVT_CALL(PlayerRunToGoal, 0) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, 0x0C000D) + EVT_CALL(SetActorYaw, ACTOR_PLAYER, 30) + EVT_WAIT_FRAMES(1) + EVT_CALL(SetActorYaw, ACTOR_PLAYER, 60) + EVT_WAIT_FRAMES(1) + EVT_CALL(SetActorYaw, ACTOR_PLAYER, 90) + EVT_WAIT_FRAMES(1) + EVT_CALL(SetActorYaw, ACTOR_PLAYER, 120) + EVT_WAIT_FRAMES(1) + EVT_CALL(SetActorYaw, ACTOR_PLAYER, 150) + EVT_WAIT_FRAMES(1) + EVT_CALL(SetActorYaw, ACTOR_PLAYER, 180) + EVT_CALL(UseBattleCamPreset, 19) + EVT_CALL(SetBattleCamTarget, -105, -7, 0) + EVT_CALL(SetBattleCamZoom, 213) + EVT_CALL(MoveBattleCamOver, 60) + EVT_WAIT_FRAMES(10) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, 0x0D000F) + EVT_CALL(PlaySound, 0x241) + EVT_CALL(GetActorPos, ACTOR_PLAYER, LW(0), LW(1), LW(2)) + EVT_ADD(LW(1), 20) + EVT_CALL(N(UnkStarFunc1), LW(0), LW(1), LW(2)) + EVT_CALL(N(FadeBackgroundToBlack)) + EVT_CALL(GetActorVar, 256, 0, LW(0)) + EVT_IF_EQ(LW(0), 0) + EVT_CALL(ActorSpeak, 1245334, 0, 0, 851983, 851983) + EVT_END_IF + EVT_WAIT_FRAMES(20) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, 0x0A0001) + EVT_WAIT_FRAMES(10) + EVT_CALL(PlaySound, 0x2051) + EVT_CALL(GetActorPos, ACTOR_PARTNER, LW(0), LW(1), LW(2)) + EVT_CALL(N(UnkStarFunc2), LW(0), LW(1), LW(2)) + EVT_WAIT_FRAMES(30) + EVT_CALL(PlaySound, 0x2053) + EVT_CALL(GetActorVar, ACTOR_PARTNER, 0, LW(0)) + EVT_ADD(LW(0), 1) + EVT_CALL(SetActorVar, ACTOR_PARTNER, 0, LW(0)) + EVT_CALL(ModifyActorDecoration, 256, 1, 0, LW(0), 0, 0, 0) + EVT_CALL(GetActorVar, ACTOR_PARTNER, 1, LW(0)) + EVT_CALL(func_802A1518_79C4B8) + EVT_WAIT_FRAMES(10) + EVT_CALL(UseBattleCamPreset, 2) + EVT_CALL(SetActorYaw, ACTOR_SELF, 150) + EVT_WAIT_FRAMES(1) + EVT_CALL(SetActorYaw, ACTOR_SELF, 120) + EVT_WAIT_FRAMES(1) + EVT_CALL(SetActorYaw, ACTOR_SELF, 90) + EVT_WAIT_FRAMES(1) + EVT_CALL(SetActorYaw, ACTOR_SELF, 60) + EVT_WAIT_FRAMES(1) + EVT_CALL(SetActorYaw, ACTOR_SELF, 30) + EVT_WAIT_FRAMES(1) + EVT_CALL(SetActorYaw, ACTOR_SELF, 0) + EVT_WAIT_FRAMES(1) + EVT_CALL(func_80276EFC) + EVT_CALL(N(UnkBackgroundFunc)) + EVT_WAIT_FRAMES(15) + EVT_CALL(SetGoalToHome, ACTOR_PLAYER) + EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(8.0)) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, 0x0A0003) + EVT_CALL(PlayerRunToGoal, 0) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, 0x0A0002) + EVT_RETURN + EVT_END +}; diff --git a/src/battle/star/refresh/78B600.c b/src/battle/star/refresh/78B600.c index 549a3826eb..425ff41b54 100644 --- a/src/battle/star/refresh/78B600.c +++ b/src/battle/star/refresh/78B600.c @@ -1,10 +1,13 @@ #include "common.h" #include "hud_element.h" +#include "script_api/battle.h" +#include "sprite/npc/battle_eldstar.h" #define NAMESPACE battle_star_refresh #include "common/StarPower.inc.c" +ApiStatus func_802A1518_78BB18(Evt* script, s32 isInitialCall); INCLUDE_ASM(s32, "battle/star/refresh/78B600", func_802A1518_78BB18); ApiStatus func_802A17D4_78BDD4(Evt* script, s32 isInitialCall) { @@ -53,3 +56,277 @@ ApiStatus func_802A19A8_78BFA8(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } + +EvtSource N(802A1A70) = { + EVT_CALL(GetOwnerID, LW(10)) + EVT_IF_EQ(LW(10), 0) + EVT_CALL(UseBattleCamPreset, 69) + EVT_WAIT_FRAMES(10) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_GOT_ITEM) + EVT_CALL(GetActorPos, ACTOR_PLAYER, LW(0), LW(1), LW(2)) + EVT_ADD(LW(0), 16) + EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(4.0)) + EVT_CALL(SetGoalPos, ACTOR_PLAYER, LW(0), LW(1), LW(2)) + EVT_CALL(PlayerRunToGoal, 0) + EVT_WAIT_FRAMES(8) + EVT_CALL(PlaySound, 0x241) + EVT_CALL(GetActorPos, ACTOR_PLAYER, LW(0), LW(1), LW(2)) + EVT_ADD(LW(1), 15) + EVT_CALL(N(UnkStarFunc1), LW(0), LW(1), LW(2)) + EVT_CALL(N(FadeBackgroundToBlack)) + EVT_WAIT_FRAMES(20) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_PRAY) + EVT_WAIT_FRAMES(10) + EVT_CALL(PlaySound, 0x2051) + EVT_CALL(GetActorPos, ACTOR_PLAYER, LW(0), LW(1), LW(2)) + EVT_CALL(N(UnkStarFunc2), LW(0), LW(1), LW(2)) + EVT_WAIT_FRAMES(30) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, 0x01002A) + EVT_ELSE + EVT_CALL(UseBattleCamPreset, 69) + EVT_WAIT_FRAMES(10) + EVT_CALL(N(UnkStarFunc), 0) + EVT_CALL(GetActorPos, ACTOR_PARTNER, LW(0), LW(1), LW(2)) + EVT_ADD(LW(0), 16) + EVT_CALL(SetActorSpeed, ACTOR_PARTNER, EVT_FLOAT(4.0)) + EVT_CALL(SetGoalPos, ACTOR_PARTNER, LW(0), LW(1), LW(2)) + EVT_CALL(RunToGoal, ACTOR_PARTNER, 0, FALSE) + EVT_CALL(N(UnkStarFunc), 4) + EVT_WAIT_FRAMES(8) + EVT_CALL(PlaySound, 0x241) + EVT_CALL(N(UnkStarFunc), 1) + EVT_CALL(GetActorPos, ACTOR_PARTNER, LW(0), LW(1), LW(2)) + EVT_ADD(LW(1), 15) + EVT_CALL(N(UnkStarFunc1), LW(0), LW(1), LW(2)) + EVT_CALL(N(FadeBackgroundToBlack)) + EVT_WAIT_FRAMES(20) + EVT_CALL(PlaySound, 0x2051) + EVT_CALL(N(UnkStarFunc), 1) + EVT_WAIT_FRAMES(10) + EVT_CALL(GetActorPos, ACTOR_PARTNER, LW(0), LW(1), LW(2)) + EVT_CALL(N(UnkStarFunc2), LW(0), LW(1), LW(2)) + EVT_WAIT_FRAMES(30) + EVT_CALL(N(UnkStarFunc), 4) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtSource N(802A1E08) = { + EVT_CALL(GetOwnerID, LW(10)) + EVT_IF_EQ(LW(10), 0) + EVT_CALL(UseBattleCamPreset, 69) + EVT_WAIT_FRAMES(10) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_GOT_ITEM) + EVT_CALL(GetActorPos, ACTOR_PLAYER, LW(0), LW(1), LW(2)) + EVT_ADD(LW(0), 16) + EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(4.0)) + EVT_CALL(SetGoalPos, ACTOR_PLAYER, LW(0), LW(1), LW(2)) + EVT_CALL(PlayerRunToGoal, 0) + EVT_WAIT_FRAMES(8) + EVT_CALL(PlaySound, 0x241) + EVT_CALL(GetActorPos, ACTOR_PLAYER, LW(0), LW(1), LW(2)) + EVT_ADD(LW(1), 15) + EVT_CALL(N(UnkStarFunc1), LW(0), LW(1), LW(2)) + EVT_CALL(N(UnkBackgroundFunc2)) + EVT_WAIT_FRAMES(20) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_PRAY) + EVT_WAIT_FRAMES(10) + EVT_CALL(PlaySound, 0x2051) + EVT_CALL(GetActorPos, ACTOR_PLAYER, LW(0), LW(1), LW(2)) + EVT_CALL(N(UnkStarFunc2), LW(0), LW(1), LW(2)) + EVT_WAIT_FRAMES(30) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, 0x01002A) + EVT_ELSE + EVT_CALL(UseBattleCamPreset, 69) + EVT_WAIT_FRAMES(10) + EVT_CALL(N(UnkStarFunc), 0) + EVT_CALL(GetActorPos, ACTOR_PARTNER, LW(0), LW(1), LW(2)) + EVT_ADD(LW(0), 16) + EVT_CALL(SetActorSpeed, ACTOR_PARTNER, EVT_FLOAT(4.0)) + EVT_CALL(SetGoalPos, ACTOR_PARTNER, LW(0), LW(1), LW(2)) + EVT_CALL(RunToGoal, ACTOR_PARTNER, 0, FALSE) + EVT_CALL(N(UnkStarFunc), 4) + EVT_WAIT_FRAMES(8) + EVT_CALL(PlaySound, 0x241) + EVT_CALL(N(UnkStarFunc), 1) + EVT_CALL(GetActorPos, ACTOR_PARTNER, LW(0), LW(1), LW(2)) + EVT_ADD(LW(1), 15) + EVT_CALL(N(UnkStarFunc1), LW(0), LW(1), LW(2)) + EVT_CALL(N(UnkBackgroundFunc2)) + EVT_WAIT_FRAMES(20) + EVT_CALL(PlaySound, 0x2051) + EVT_CALL(N(UnkStarFunc), 1) + EVT_WAIT_FRAMES(10) + EVT_CALL(GetActorPos, ACTOR_PARTNER, LW(0), LW(1), LW(2)) + EVT_CALL(N(UnkStarFunc2), LW(0), LW(1), LW(2)) + EVT_WAIT_FRAMES(30) + EVT_CALL(N(UnkStarFunc), 4) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtSource N(802A21A0) = { + EVT_WAIT_FRAMES(8) + EVT_CALL(SetForegroundModelsVisible, 0) + EVT_CALL(func_8024E664, 73) + EVT_CALL(MoveBattleCamOver, 1) + EVT_CALL(PlaySound, 0x2041) + EVT_CALL(CreateNpc, 100, LW(0)) + EVT_CALL(N(SetNpcCollision32)) + EVT_CALL(SetNpcFlagBits, 100, ((NPC_FLAG_40000)), TRUE) + EVT_CALL(SetNpcPos, 100, -75, 150, 0) + EVT_CALL(SetNpcDecoration, 100, 0, 5) + EVT_CALL(N(UnkStarFunc3), -75, 167, 0) + EVT_WAIT_FRAMES(10) + EVT_CALL(EnableNpcBlur, 100, 1) + EVT_SET(LW(0), 0) + EVT_LOOP(8) + EVT_ADD(LW(0), 67) + EVT_CALL(SetNpcRotation, 100, 0, LW(0), 0) + EVT_WAIT_FRAMES(1) + EVT_END_LOOP + EVT_WAIT_FRAMES(10) + EVT_CALL(EnableNpcBlur, 100, 0) + EVT_THREAD + EVT_WAIT_FRAMES(10) + EVT_CALL(UseBattleCamPreset, 69) + EVT_END_THREAD + EVT_CALL(GetActorPos, ACTOR_PLAYER, LW(0), LW(1), LW(2)) + EVT_ADD(LW(1), 50) + EVT_CALL(NpcFlyTo, 100, LW(0), LW(1), LW(2), 30, 0, 10) + EVT_CALL(SetForegroundModelsVisible, 1) + EVT_RETURN + EVT_END +}; + +EvtSource N(802A23AC) = { + EVT_CALL(GetOwnerID, LW(10)) + EVT_IF_EQ(LW(10), 0) + EVT_CALL(UseBattleCamPreset, 2) + EVT_CALL(PlaySound, 0x2047) + EVT_THREAD + EVT_LOOP(5) + EVT_WAIT_FRAMES(6) + EVT_CALL(GetNpcPos, 100, LW(0), LW(1), LW(2)) + EVT_CALL(N(UnkStarFunc4), LW(0), LW(1), LW(2)) + EVT_END_LOOP + EVT_END_THREAD + EVT_CALL(EnableNpcBlur, 100, 1) + EVT_THREAD + EVT_SET(LW(2), 0) + EVT_SET(LW(3), 720) + EVT_CALL(MakeLerp, LW(2), LW(3), 30, 2) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(SetNpcRotation, 100, 0, LW(0), 0) + EVT_WAIT_FRAMES(1) + EVT_IF_EQ(LW(1), 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_END_THREAD + EVT_CALL(GetNpcPos, 100, LW(0), LW(1), LW(2)) + EVT_ADD(LW(1), 60) + EVT_CALL(NpcFlyTo, 100, LW(0), LW(1), LW(2), 15, 0, 10) + EVT_ADD(LW(1), 140) + EVT_CALL(NpcFlyTo, 100, LW(0), LW(1), LW(2), 15, 0, 10) + EVT_WAIT_FRAMES(10) + EVT_CALL(EnableNpcBlur, 100, 0) + EVT_CALL(DeleteNpc, 100) + EVT_ELSE + EVT_CALL(UseBattleCamPreset, 2) + EVT_CALL(PlaySound, 0x2045) + EVT_THREAD + EVT_LOOP(5) + EVT_WAIT_FRAMES(6) + EVT_CALL(GetNpcPos, 100, LW(0), LW(1), LW(2)) + EVT_CALL(N(UnkStarFunc4), LW(0), LW(1), LW(2)) + EVT_END_LOOP + EVT_END_THREAD + EVT_CALL(EnableNpcBlur, 100, 1) + EVT_THREAD + EVT_SET(LW(2), 0) + EVT_SET(LW(3), 720) + EVT_CALL(MakeLerp, LW(2), LW(3), 30, 2) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(SetNpcRotation, 100, 0, LW(0), 0) + EVT_WAIT_FRAMES(1) + EVT_IF_EQ(LW(1), 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_END_THREAD + EVT_CALL(GetNpcPos, 100, LW(0), LW(1), LW(2)) + EVT_ADD(LW(1), 60) + EVT_CALL(NpcFlyTo, 100, LW(0), LW(1), LW(2), 15, 0, 10) + EVT_ADD(LW(1), 140) + EVT_CALL(NpcFlyTo, 100, LW(0), LW(1), LW(2), 15, 0, 10) + EVT_WAIT_FRAMES(10) + EVT_CALL(EnableNpcBlur, 100, 0) + EVT_CALL(DeleteNpc, 100) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtSource N(802A27FC) = { + EVT_CALL(GetOwnerID, LW(10)) + EVT_IF_EQ(LW(10), 0) + EVT_CALL(N(UnkBackgroundFunc)) + EVT_WAIT_FRAMES(15) + EVT_CALL(SetGoalToHome, ACTOR_PLAYER) + EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(8.0)) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_RUNNING) + EVT_CALL(PlayerRunToGoal, 0) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_10002) + EVT_ELSE + EVT_CALL(N(UnkBackgroundFunc)) + EVT_WAIT_FRAMES(15) + EVT_CALL(SetGoalToHome, ACTOR_PARTNER) + EVT_CALL(SetActorSpeed, ACTOR_PARTNER, EVT_FLOAT(8.0)) + EVT_CALL(N(UnkStarFunc), 3) + EVT_CALL(RunToGoal, ACTOR_PARTNER, 0) + EVT_CALL(N(UnkStarFunc), 4) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtSource N(usePower) = { + EVT_EXEC_WAIT(N(802A1A70)) + EVT_SET_CONST(LW(0), NPC_ANIM_battle_eldstar_Palette_00_Anim_1) + EVT_EXEC_WAIT(N(802A21A0)) + EVT_CALL(SetNpcAnimation, 100, NPC_ANIM_battle_eldstar_Palette_00_Anim_2) + EVT_WAIT_FRAMES(16) + EVT_THREAD + EVT_WAIT_FRAMES(10) + EVT_CALL(UseBattleCamPreset, 2) + EVT_END_THREAD + EVT_CALL(PlaySound, 0x242) + EVT_CALL(EnableNpcBlur, 100, 1) + EVT_CALL(func_802A1518_78BB18, 100) + EVT_CALL(EnableNpcBlur, 100, 0) + EVT_CALL(DeleteNpc, 100) + EVT_CALL(GetActorPos, ACTOR_PLAYER, LW(0), LW(1), LW(2)) + EVT_ADD(LW(0), 0) + EVT_ADD(LW(1), 35) + EVT_CALL(func_802A18E8_78BEE8, LW(0), LW(1), LW(2), 5) + EVT_CALL(GetActorPos, ACTOR_PLAYER, LW(0), LW(1), LW(2)) + EVT_ADD(LW(0), 20) + EVT_ADD(LW(1), 25) + EVT_CALL(func_802A19A8_78BFA8, LW(0), LW(1), LW(2), 5) + EVT_CALL(GetActorPos, ACTOR_PLAYER, LW(0), LW(1), LW(2)) + EVT_ADD(LW(1), 25) + EVT_CALL(func_802D7520, LW(0), LW(1), LW(2), 5) + EVT_CALL(N(AddHP), 5) + EVT_CALL(N(AddFP), 5) + EVT_CALL(func_802A17D4_78BDD4) + EVT_WAIT_FRAMES(30) + EVT_CALL(func_80276EFC) + EVT_EXEC_WAIT(N(802A27FC)) + EVT_RETURN + EVT_END +}; diff --git a/src/battle/star/smooch/791D90.c b/src/battle/star/smooch/791D90.c index f9f2429ae5..6325c049d9 100644 --- a/src/battle/star/smooch/791D90.c +++ b/src/battle/star/smooch/791D90.c @@ -1,4 +1,6 @@ #include "common.h" +#include "script_api/battle.h" +#include "sprite/npc/battle_misstar.h" #define NAMESPACE battle_star_smooch @@ -17,3 +19,390 @@ ApiStatus func_802A156C_7922FC(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } + +EvtSource N(802A1630) = { + EVT_CALL(GetOwnerID, LW(10)) + EVT_IF_EQ(LW(10), 0) + EVT_CALL(UseBattleCamPreset, 69) + EVT_WAIT_FRAMES(10) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_GOT_ITEM) + EVT_CALL(GetActorPos, ACTOR_PLAYER, LW(0), LW(1), LW(2)) + EVT_ADD(LW(0), 16) + EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(4.0)) + EVT_CALL(SetGoalPos, ACTOR_PLAYER, LW(0), LW(1), LW(2)) + EVT_CALL(PlayerRunToGoal, 0) + EVT_WAIT_FRAMES(8) + EVT_CALL(PlaySound, 0x241) + EVT_CALL(GetActorPos, ACTOR_PLAYER, LW(0), LW(1), LW(2)) + EVT_ADD(LW(1), 15) + EVT_CALL(N(UnkStarFunc1), LW(0), LW(1), LW(2)) + EVT_CALL(N(FadeBackgroundToBlack)) + EVT_WAIT_FRAMES(20) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_PRAY) + EVT_WAIT_FRAMES(10) + EVT_CALL(PlaySound, 0x2051) + EVT_CALL(GetActorPos, ACTOR_PLAYER, LW(0), LW(1), LW(2)) + EVT_CALL(N(UnkStarFunc2), LW(0), LW(1), LW(2)) + EVT_WAIT_FRAMES(30) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, 0x01002A) + EVT_ELSE + EVT_CALL(UseBattleCamPreset, 69) + EVT_WAIT_FRAMES(10) + EVT_CALL(N(UnkStarFunc), 0) + EVT_CALL(GetActorPos, ACTOR_PARTNER, LW(0), LW(1), LW(2)) + EVT_ADD(LW(0), 16) + EVT_CALL(SetActorSpeed, ACTOR_PARTNER, EVT_FLOAT(4.0)) + EVT_CALL(SetGoalPos, ACTOR_PARTNER, LW(0), LW(1), LW(2)) + EVT_CALL(RunToGoal, ACTOR_PARTNER, 0, FALSE) + EVT_CALL(N(UnkStarFunc), 4) + EVT_WAIT_FRAMES(8) + EVT_CALL(PlaySound, 0x241) + EVT_CALL(N(UnkStarFunc), 1) + EVT_CALL(GetActorPos, ACTOR_PARTNER, LW(0), LW(1), LW(2)) + EVT_ADD(LW(1), 15) + EVT_CALL(N(UnkStarFunc1), LW(0), LW(1), LW(2)) + EVT_CALL(N(FadeBackgroundToBlack)) + EVT_WAIT_FRAMES(20) + EVT_CALL(PlaySound, 0x2051) + EVT_CALL(N(UnkStarFunc), 1) + EVT_WAIT_FRAMES(10) + EVT_CALL(GetActorPos, ACTOR_PARTNER, LW(0), LW(1), LW(2)) + EVT_CALL(N(UnkStarFunc2), LW(0), LW(1), LW(2)) + EVT_WAIT_FRAMES(30) + EVT_CALL(N(UnkStarFunc), 4) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtSource N(802A19C8) = { + EVT_CALL(GetOwnerID, LW(10)) + EVT_IF_EQ(LW(10), 0) + EVT_CALL(UseBattleCamPreset, 69) + EVT_WAIT_FRAMES(10) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_GOT_ITEM) + EVT_CALL(GetActorPos, ACTOR_PLAYER, LW(0), LW(1), LW(2)) + EVT_ADD(LW(0), 16) + EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(4.0)) + EVT_CALL(SetGoalPos, ACTOR_PLAYER, LW(0), LW(1), LW(2)) + EVT_CALL(PlayerRunToGoal, 0) + EVT_WAIT_FRAMES(8) + EVT_CALL(PlaySound, 0x241) + EVT_CALL(GetActorPos, ACTOR_PLAYER, LW(0), LW(1), LW(2)) + EVT_ADD(LW(1), 15) + EVT_CALL(N(UnkStarFunc1), LW(0), LW(1), LW(2)) + EVT_CALL(N(UnkBackgroundFunc2)) + EVT_WAIT_FRAMES(20) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_PRAY) + EVT_WAIT_FRAMES(10) + EVT_CALL(PlaySound, 0x2051) + EVT_CALL(GetActorPos, ACTOR_PLAYER, LW(0), LW(1), LW(2)) + EVT_CALL(N(UnkStarFunc2), LW(0), LW(1), LW(2)) + EVT_WAIT_FRAMES(30) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, 0x01002A) + EVT_ELSE + EVT_CALL(UseBattleCamPreset, 69) + EVT_WAIT_FRAMES(10) + EVT_CALL(N(UnkStarFunc), 0) + EVT_CALL(GetActorPos, ACTOR_PARTNER, LW(0), LW(1), LW(2)) + EVT_ADD(LW(0), 16) + EVT_CALL(SetActorSpeed, ACTOR_PARTNER, EVT_FLOAT(4.0)) + EVT_CALL(SetGoalPos, ACTOR_PARTNER, LW(0), LW(1), LW(2)) + EVT_CALL(RunToGoal, ACTOR_PARTNER, 0, FALSE) + EVT_CALL(N(UnkStarFunc), 4) + EVT_WAIT_FRAMES(8) + EVT_CALL(PlaySound, 0x241) + EVT_CALL(N(UnkStarFunc), 1) + EVT_CALL(GetActorPos, ACTOR_PARTNER, LW(0), LW(1), LW(2)) + EVT_ADD(LW(1), 15) + EVT_CALL(N(UnkStarFunc1), LW(0), LW(1), LW(2)) + EVT_CALL(N(UnkBackgroundFunc2)) + EVT_WAIT_FRAMES(20) + EVT_CALL(PlaySound, 0x2051) + EVT_CALL(N(UnkStarFunc), 1) + EVT_WAIT_FRAMES(10) + EVT_CALL(GetActorPos, ACTOR_PARTNER, LW(0), LW(1), LW(2)) + EVT_CALL(N(UnkStarFunc2), LW(0), LW(1), LW(2)) + EVT_WAIT_FRAMES(30) + EVT_CALL(N(UnkStarFunc), 4) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtSource N(802A1D60) = { + EVT_WAIT_FRAMES(8) + EVT_CALL(SetForegroundModelsVisible, 0) + EVT_CALL(func_8024E664, 73) + EVT_CALL(MoveBattleCamOver, 1) + EVT_CALL(PlaySound, 0x2041) + EVT_CALL(CreateNpc, 100, LW(0)) + EVT_CALL(N(SetNpcCollision32)) + EVT_CALL(SetNpcFlagBits, 100, ((NPC_FLAG_40000)), TRUE) + EVT_CALL(SetNpcPos, 100, -75, 150, 0) + EVT_CALL(SetNpcDecoration, 100, 0, 5) + EVT_CALL(N(UnkStarFunc3), -75, 167, 0) + EVT_WAIT_FRAMES(10) + EVT_CALL(EnableNpcBlur, 100, 1) + EVT_SET(LW(0), 0) + EVT_LOOP(8) + EVT_ADD(LW(0), 67) + EVT_CALL(SetNpcRotation, 100, 0, LW(0), 0) + EVT_WAIT_FRAMES(1) + EVT_END_LOOP + EVT_WAIT_FRAMES(10) + EVT_CALL(EnableNpcBlur, 100, 0) + EVT_THREAD + EVT_WAIT_FRAMES(10) + EVT_CALL(UseBattleCamPreset, 69) + EVT_END_THREAD + EVT_CALL(GetActorPos, ACTOR_PLAYER, LW(0), LW(1), LW(2)) + EVT_ADD(LW(1), 50) + EVT_CALL(NpcFlyTo, 100, LW(0), LW(1), LW(2), 30, 0, 10) + EVT_CALL(SetForegroundModelsVisible, 1) + EVT_RETURN + EVT_END +}; + +EvtSource N(802A1F6C) = { + EVT_CALL(GetOwnerID, LW(10)) + EVT_IF_EQ(LW(10), 0) + EVT_CALL(UseBattleCamPreset, 2) + EVT_CALL(PlaySound, 0x2047) + EVT_THREAD + EVT_LOOP(5) + EVT_WAIT_FRAMES(6) + EVT_CALL(GetNpcPos, 100, LW(0), LW(1), LW(2)) + EVT_CALL(N(UnkStarFunc4), LW(0), LW(1), LW(2)) + EVT_END_LOOP + EVT_END_THREAD + EVT_CALL(EnableNpcBlur, 100, 1) + EVT_THREAD + EVT_SET(LW(2), 0) + EVT_SET(LW(3), 720) + EVT_CALL(MakeLerp, LW(2), LW(3), 30, 2) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(SetNpcRotation, 100, 0, LW(0), 0) + EVT_WAIT_FRAMES(1) + EVT_IF_EQ(LW(1), 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_END_THREAD + EVT_CALL(GetNpcPos, 100, LW(0), LW(1), LW(2)) + EVT_ADD(LW(1), 60) + EVT_CALL(NpcFlyTo, 100, LW(0), LW(1), LW(2), 15, 0, 10) + EVT_ADD(LW(1), 140) + EVT_CALL(NpcFlyTo, 100, LW(0), LW(1), LW(2), 15, 0, 10) + EVT_WAIT_FRAMES(10) + EVT_CALL(EnableNpcBlur, 100, 0) + EVT_CALL(DeleteNpc, 100) + EVT_ELSE + EVT_CALL(UseBattleCamPreset, 2) + EVT_CALL(PlaySound, 0x2045) + EVT_THREAD + EVT_LOOP(5) + EVT_WAIT_FRAMES(6) + EVT_CALL(GetNpcPos, 100, LW(0), LW(1), LW(2)) + EVT_CALL(N(UnkStarFunc4), LW(0), LW(1), LW(2)) + EVT_END_LOOP + EVT_END_THREAD + EVT_CALL(EnableNpcBlur, 100, 1) + EVT_THREAD + EVT_SET(LW(2), 0) + EVT_SET(LW(3), 720) + EVT_CALL(MakeLerp, LW(2), LW(3), 30, 2) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(SetNpcRotation, 100, 0, LW(0), 0) + EVT_WAIT_FRAMES(1) + EVT_IF_EQ(LW(1), 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_END_THREAD + EVT_CALL(GetNpcPos, 100, LW(0), LW(1), LW(2)) + EVT_ADD(LW(1), 60) + EVT_CALL(NpcFlyTo, 100, LW(0), LW(1), LW(2), 15, 0, 10) + EVT_ADD(LW(1), 140) + EVT_CALL(NpcFlyTo, 100, LW(0), LW(1), LW(2), 15, 0, 10) + EVT_WAIT_FRAMES(10) + EVT_CALL(EnableNpcBlur, 100, 0) + EVT_CALL(DeleteNpc, 100) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtSource N(802A23BC) = { + EVT_CALL(GetOwnerID, LW(10)) + EVT_IF_EQ(LW(10), 0) + EVT_CALL(N(UnkBackgroundFunc)) + EVT_WAIT_FRAMES(15) + EVT_CALL(SetGoalToHome, ACTOR_PLAYER) + EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(8.0)) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_RUNNING) + EVT_CALL(PlayerRunToGoal, 0) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_10002) + EVT_ELSE + EVT_CALL(N(UnkBackgroundFunc)) + EVT_WAIT_FRAMES(15) + EVT_CALL(SetGoalToHome, ACTOR_PARTNER) + EVT_CALL(SetActorSpeed, ACTOR_PARTNER, EVT_FLOAT(8.0)) + EVT_CALL(N(UnkStarFunc), 3) + EVT_CALL(RunToGoal, ACTOR_PARTNER, 0) + EVT_CALL(N(UnkStarFunc), 4) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +s32 N(intTable_802A24E8)[] = { + 0x0000000F, 0x0000000F, 0xFFFFFFDF, 0x0000001B, 0xFFFFFFEA, 0xFFFFFFE6, 0x0000000A, 0xFFFFFFDD, + 0x00000023, 0x00000000, +}; + +EvtSource N(usePower) = { + EVT_EXEC_WAIT(N(802A1630)) + EVT_SET_CONST(LW(0), NPC_ANIM_battle_misstar_Palette_00_Anim_0) + EVT_EXEC_WAIT(N(802A1D60)) + EVT_WAIT_FRAMES(16) + EVT_THREAD + EVT_WAIT_FRAMES(10) + EVT_CALL(SetNpcRotation, 100, 0, 180, 0) + EVT_WAIT_FRAMES(1) + EVT_CALL(SetNpcRotation, 100, 0, 150, 0) + EVT_WAIT_FRAMES(1) + EVT_CALL(SetNpcRotation, 100, 0, 120, 0) + EVT_WAIT_FRAMES(1) + EVT_CALL(SetNpcRotation, 100, 0, 90, 0) + EVT_WAIT_FRAMES(1) + EVT_CALL(SetNpcRotation, 100, 0, 60, 0) + EVT_WAIT_FRAMES(1) + EVT_CALL(SetNpcRotation, 100, 0, 30, 0) + EVT_WAIT_FRAMES(1) + EVT_CALL(SetNpcRotation, 100, 0, 0, 0) + EVT_END_THREAD + EVT_CALL(GetActorPos, ACTOR_PLAYER, LW(0), LW(1), LW(2)) + EVT_ADD(LW(1), 25) + EVT_ADD(LW(0), 30) + EVT_CALL(NpcFlyTo, 100, LW(0), LW(1), LW(2), 20, 0, 10) + EVT_WAIT_FRAMES(15) + EVT_CALL(SetNpcAnimation, 100, NPC_ANIM_battle_misstar_Palette_00_Anim_1) + EVT_CALL(GetActorPos, ACTOR_PLAYER, LW(0), LW(1), LW(2)) + EVT_ADD(LW(0), 15) + EVT_ADD(LW(1), 15) + EVT_ADD(LW(2), -5) + EVT_CALL(NpcFlyTo, 100, LW(0), LW(1), LW(2), 10, 0, 10) + EVT_CALL(PlaySound, 0x245) + EVT_THREAD + EVT_CALL(PlayEffect, 0x40, 2, LW(0), LW(1), LW(2), 1, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_WAIT_FRAMES(2) + EVT_USE_BUF(EVT_ADDR(N(intTable_802A24E8))) + EVT_LOOP(5) + EVT_BUF_READ2(LW(5), LW(6)) + EVT_SET(LW(3), LW(0)) + EVT_SET(LW(4), LW(1)) + EVT_ADD(LW(3), LW(5)) + EVT_ADD(LW(4), LW(6)) + EVT_CALL(PlayEffect, 0x40, 2, LW(3), LW(4), LW(2), 1, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_WAIT_FRAMES(2) + EVT_END_LOOP + EVT_END_THREAD + EVT_THREAD + EVT_CALL(GetActorPos, ACTOR_PLAYER, LW(0), LW(1), LW(2)) + EVT_ADD(LW(1), 15) + EVT_ADD(LW(0), 5) + EVT_CALL(N(UnkStarFunc1), LW(0), LW(1), LW(2)) + EVT_CALL(GetActorPos, ACTOR_PLAYER, LW(0), LW(1), LW(2)) + EVT_ADD(LW(1), 20) + EVT_ADD(LW(0), 25) + EVT_CALL(NpcFlyTo, 100, LW(0), LW(1), LW(2), 10, 0, 10) + EVT_END_THREAD + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, 0x01002E) + EVT_WAIT_FRAMES(12) + EVT_THREAD + EVT_EXEC_WAIT(N(802A1F6C)) + EVT_END_THREAD + EVT_THREAD + EVT_LOOP(2) + EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0)) + EVT_WAIT_FRAMES(1) + EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(1.1005859375), EVT_FLOAT(1.0), EVT_FLOAT(1.0)) + EVT_WAIT_FRAMES(1) + EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(1.2001953125), EVT_FLOAT(0.9501953125), EVT_FLOAT(1.0)) + EVT_WAIT_FRAMES(1) + EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(1.30078125), EVT_FLOAT(0.900390625), EVT_FLOAT(1.0)) + EVT_WAIT_FRAMES(1) + EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(1.3505859375), EVT_FLOAT(0.8505859375), EVT_FLOAT(1.0)) + EVT_WAIT_FRAMES(1) + EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(1.380859375), EVT_FLOAT(0.80078125), EVT_FLOAT(1.0)) + EVT_WAIT_FRAMES(1) + EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(1.400390625), EVT_FLOAT(0.80078125), EVT_FLOAT(1.0)) + EVT_WAIT_FRAMES(1) + EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(1.30078125), EVT_FLOAT(0.8505859375), EVT_FLOAT(1.0)) + EVT_WAIT_FRAMES(1) + EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(1.2001953125), EVT_FLOAT(0.900390625), EVT_FLOAT(1.0)) + EVT_WAIT_FRAMES(1) + EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(1.1005859375), EVT_FLOAT(0.9501953125), EVT_FLOAT(1.0)) + EVT_WAIT_FRAMES(1) + EVT_END_LOOP + EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0)) + EVT_WAIT_FRAMES(1) + EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(1.1005859375), EVT_FLOAT(1.0), EVT_FLOAT(1.0)) + EVT_WAIT_FRAMES(1) + EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(1.2001953125), EVT_FLOAT(0.9501953125), EVT_FLOAT(1.0)) + EVT_WAIT_FRAMES(1) + EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(1.30078125), EVT_FLOAT(0.900390625), EVT_FLOAT(1.0)) + EVT_WAIT_FRAMES(1) + EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(1.3505859375), EVT_FLOAT(0.8505859375), EVT_FLOAT(1.0)) + EVT_WAIT_FRAMES(1) + EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(1.380859375), EVT_FLOAT(0.80078125), EVT_FLOAT(1.0)) + EVT_WAIT_FRAMES(1) + EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(1.400390625), EVT_FLOAT(0.80078125), EVT_FLOAT(1.0)) + EVT_WAIT_FRAMES(1) + EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(0.900390625), EVT_FLOAT(1.30078125), EVT_FLOAT(1.0)) + EVT_WAIT_FRAMES(1) + EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(0.900390625), EVT_FLOAT(1.2001953125), EVT_FLOAT(1.0)) + EVT_WAIT_FRAMES(1) + EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(0.9501953125), EVT_FLOAT(1.1005859375), EVT_FLOAT(1.0)) + EVT_WAIT_FRAMES(1) + EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0)) + EVT_WAIT_FRAMES(1) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_10002) + EVT_END_THREAD + EVT_LOOP(10) + EVT_WAIT_FRAMES(3) + EVT_END_LOOP + EVT_CALL(UseBattleCamPreset, 2) + EVT_CALL(GetActorPos, ACTOR_PLAYER, LW(0), LW(1), LW(2)) + EVT_ADD(LW(0), 0) + EVT_ADD(LW(1), 35) + EVT_CALL(func_802A156C_7922FC, LW(0), LW(1), LW(2), 20) + EVT_CALL(GetActorPos, ACTOR_PLAYER, LW(0), LW(1), LW(2)) + EVT_ADD(LW(1), 25) + EVT_CALL(func_802D7520, LW(0), LW(1), LW(2), 20) + EVT_CALL(N(AddHP), 20) + EVT_THREAD + EVT_CALL(N(UnkBackgroundFunc)) + EVT_END_THREAD + EVT_CALL(func_80276EFC) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, 0x160) + EVT_CALL(SetActorJumpGravity, ACTOR_PLAYER, EVT_FLOAT(1.0)) + EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(1.0)) + EVT_CALL(GetActorPos, ACTOR_PLAYER, LW(0), LW(1), LW(2)) + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_MIDAIR_STILL, ANIM_MIDAIR, ANIM_10009) + EVT_CALL(SetGoalPos, ACTOR_PLAYER, LW(0), LW(1), LW(2)) + EVT_CALL(func_80273444, 20, 0, 0) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_10009) + EVT_WAIT_FRAMES(4) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_10002) + EVT_CALL(SetGoalToHome, ACTOR_PLAYER) + EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(8.0)) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_RUNNING) + EVT_CALL(PlayerRunToGoal, 0) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_10002) + EVT_RETURN + EVT_END +}; diff --git a/src/battle/star/star_beam/796FC0.c b/src/battle/star/star_beam/796FC0.c index 16c6cb4b6f..1ec0f172c7 100644 --- a/src/battle/star/star_beam/796FC0.c +++ b/src/battle/star/star_beam/796FC0.c @@ -1,9 +1,11 @@ #include "common.h" +#include "script_api/battle.h" #define NAMESPACE battle_star_star_beam #include "common/StarPower.inc.c" +ApiStatus func_802A1518_7974D8(Evt* script, s32 isInitialCall); INCLUDE_ASM(s32, "battle/star/star_beam/796FC0", func_802A1518_7974D8); ApiStatus func_802A2468_798428(Evt* script, s32 isInitialCall) { @@ -26,3 +28,312 @@ ApiStatus func_802A247C_79843C(Evt* script, s32 isInitialCall) { return ApiStatus_BLOCK; } + +EvtSource N(802A24F0) = { + EVT_CALL(GetOwnerID, LW(10)) + EVT_IF_EQ(LW(10), 0) + EVT_CALL(UseBattleCamPreset, 69) + EVT_WAIT_FRAMES(10) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_GOT_ITEM) + EVT_CALL(GetActorPos, ACTOR_PLAYER, LW(0), LW(1), LW(2)) + EVT_ADD(LW(0), 16) + EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(4.0)) + EVT_CALL(SetGoalPos, ACTOR_PLAYER, LW(0), LW(1), LW(2)) + EVT_CALL(PlayerRunToGoal, 0) + EVT_WAIT_FRAMES(8) + EVT_CALL(PlaySound, 0x241) + EVT_CALL(GetActorPos, ACTOR_PLAYER, LW(0), LW(1), LW(2)) + EVT_ADD(LW(1), 15) + EVT_CALL(N(UnkStarFunc1), LW(0), LW(1), LW(2)) + EVT_CALL(N(FadeBackgroundToBlack)) + EVT_WAIT_FRAMES(20) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_PRAY) + EVT_WAIT_FRAMES(10) + EVT_CALL(PlaySound, 0x2051) + EVT_CALL(GetActorPos, ACTOR_PLAYER, LW(0), LW(1), LW(2)) + EVT_CALL(N(UnkStarFunc2), LW(0), LW(1), LW(2)) + EVT_WAIT_FRAMES(30) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, 0x01002A) + EVT_ELSE + EVT_CALL(UseBattleCamPreset, 69) + EVT_WAIT_FRAMES(10) + EVT_CALL(N(UnkStarFunc), 0) + EVT_CALL(GetActorPos, ACTOR_PARTNER, LW(0), LW(1), LW(2)) + EVT_ADD(LW(0), 16) + EVT_CALL(SetActorSpeed, ACTOR_PARTNER, EVT_FLOAT(4.0)) + EVT_CALL(SetGoalPos, ACTOR_PARTNER, LW(0), LW(1), LW(2)) + EVT_CALL(RunToGoal, ACTOR_PARTNER, 0, FALSE) + EVT_CALL(N(UnkStarFunc), 4) + EVT_WAIT_FRAMES(8) + EVT_CALL(PlaySound, 0x241) + EVT_CALL(N(UnkStarFunc), 1) + EVT_CALL(GetActorPos, ACTOR_PARTNER, LW(0), LW(1), LW(2)) + EVT_ADD(LW(1), 15) + EVT_CALL(N(UnkStarFunc1), LW(0), LW(1), LW(2)) + EVT_CALL(N(FadeBackgroundToBlack)) + EVT_WAIT_FRAMES(20) + EVT_CALL(PlaySound, 0x2051) + EVT_CALL(N(UnkStarFunc), 1) + EVT_WAIT_FRAMES(10) + EVT_CALL(GetActorPos, ACTOR_PARTNER, LW(0), LW(1), LW(2)) + EVT_CALL(N(UnkStarFunc2), LW(0), LW(1), LW(2)) + EVT_WAIT_FRAMES(30) + EVT_CALL(N(UnkStarFunc), 4) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtSource N(802A2888) = { + EVT_CALL(GetOwnerID, LW(10)) + EVT_IF_EQ(LW(10), 0) + EVT_CALL(UseBattleCamPreset, 69) + EVT_WAIT_FRAMES(10) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_GOT_ITEM) + EVT_CALL(GetActorPos, ACTOR_PLAYER, LW(0), LW(1), LW(2)) + EVT_ADD(LW(0), 16) + EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(4.0)) + EVT_CALL(SetGoalPos, ACTOR_PLAYER, LW(0), LW(1), LW(2)) + EVT_CALL(PlayerRunToGoal, 0) + EVT_WAIT_FRAMES(8) + EVT_CALL(PlaySound, 0x241) + EVT_CALL(GetActorPos, ACTOR_PLAYER, LW(0), LW(1), LW(2)) + EVT_ADD(LW(1), 15) + EVT_CALL(N(UnkStarFunc1), LW(0), LW(1), LW(2)) + EVT_CALL(N(UnkBackgroundFunc2)) + EVT_WAIT_FRAMES(20) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_PRAY) + EVT_WAIT_FRAMES(10) + EVT_CALL(PlaySound, 0x2051) + EVT_CALL(GetActorPos, ACTOR_PLAYER, LW(0), LW(1), LW(2)) + EVT_CALL(N(UnkStarFunc2), LW(0), LW(1), LW(2)) + EVT_WAIT_FRAMES(30) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, 0x01002A) + EVT_ELSE + EVT_CALL(UseBattleCamPreset, 69) + EVT_WAIT_FRAMES(10) + EVT_CALL(N(UnkStarFunc), 0) + EVT_CALL(GetActorPos, ACTOR_PARTNER, LW(0), LW(1), LW(2)) + EVT_ADD(LW(0), 16) + EVT_CALL(SetActorSpeed, ACTOR_PARTNER, EVT_FLOAT(4.0)) + EVT_CALL(SetGoalPos, ACTOR_PARTNER, LW(0), LW(1), LW(2)) + EVT_CALL(RunToGoal, ACTOR_PARTNER, 0, FALSE) + EVT_CALL(N(UnkStarFunc), 4) + EVT_WAIT_FRAMES(8) + EVT_CALL(PlaySound, 0x241) + EVT_CALL(N(UnkStarFunc), 1) + EVT_CALL(GetActorPos, ACTOR_PARTNER, LW(0), LW(1), LW(2)) + EVT_ADD(LW(1), 15) + EVT_CALL(N(UnkStarFunc1), LW(0), LW(1), LW(2)) + EVT_CALL(N(UnkBackgroundFunc2)) + EVT_WAIT_FRAMES(20) + EVT_CALL(PlaySound, 0x2051) + EVT_CALL(N(UnkStarFunc), 1) + EVT_WAIT_FRAMES(10) + EVT_CALL(GetActorPos, ACTOR_PARTNER, LW(0), LW(1), LW(2)) + EVT_CALL(N(UnkStarFunc2), LW(0), LW(1), LW(2)) + EVT_WAIT_FRAMES(30) + EVT_CALL(N(UnkStarFunc), 4) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtSource N(802A2C20) = { + EVT_WAIT_FRAMES(8) + EVT_CALL(SetForegroundModelsVisible, 0) + EVT_CALL(func_8024E664, 73) + EVT_CALL(MoveBattleCamOver, 1) + EVT_CALL(PlaySound, 0x2041) + EVT_CALL(CreateNpc, 100, LW(0)) + EVT_CALL(N(SetNpcCollision32)) + EVT_CALL(SetNpcFlagBits, 100, ((NPC_FLAG_40000)), TRUE) + EVT_CALL(SetNpcPos, 100, -75, 150, 0) + EVT_CALL(SetNpcDecoration, 100, 0, 5) + EVT_CALL(N(UnkStarFunc3), -75, 167, 0) + EVT_WAIT_FRAMES(10) + EVT_CALL(EnableNpcBlur, 100, 1) + EVT_SET(LW(0), 0) + EVT_LOOP(8) + EVT_ADD(LW(0), 67) + EVT_CALL(SetNpcRotation, 100, 0, LW(0), 0) + EVT_WAIT_FRAMES(1) + EVT_END_LOOP + EVT_WAIT_FRAMES(10) + EVT_CALL(EnableNpcBlur, 100, 0) + EVT_THREAD + EVT_WAIT_FRAMES(10) + EVT_CALL(UseBattleCamPreset, 69) + EVT_END_THREAD + EVT_CALL(GetActorPos, ACTOR_PLAYER, LW(0), LW(1), LW(2)) + EVT_ADD(LW(1), 50) + EVT_CALL(NpcFlyTo, 100, LW(0), LW(1), LW(2), 30, 0, 10) + EVT_CALL(SetForegroundModelsVisible, 1) + EVT_RETURN + EVT_END +}; + +EvtSource N(802A2E2C) = { + EVT_CALL(GetOwnerID, LW(10)) + EVT_IF_EQ(LW(10), 0) + EVT_CALL(UseBattleCamPreset, 2) + EVT_CALL(PlaySound, 0x2047) + EVT_THREAD + EVT_LOOP(5) + EVT_WAIT_FRAMES(6) + EVT_CALL(GetNpcPos, 100, LW(0), LW(1), LW(2)) + EVT_CALL(N(UnkStarFunc4), LW(0), LW(1), LW(2)) + EVT_END_LOOP + EVT_END_THREAD + EVT_CALL(EnableNpcBlur, 100, 1) + EVT_THREAD + EVT_SET(LW(2), 0) + EVT_SET(LW(3), 720) + EVT_CALL(MakeLerp, LW(2), LW(3), 30, 2) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(SetNpcRotation, 100, 0, LW(0), 0) + EVT_WAIT_FRAMES(1) + EVT_IF_EQ(LW(1), 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_END_THREAD + EVT_CALL(GetNpcPos, 100, LW(0), LW(1), LW(2)) + EVT_ADD(LW(1), 60) + EVT_CALL(NpcFlyTo, 100, LW(0), LW(1), LW(2), 15, 0, 10) + EVT_ADD(LW(1), 140) + EVT_CALL(NpcFlyTo, 100, LW(0), LW(1), LW(2), 15, 0, 10) + EVT_WAIT_FRAMES(10) + EVT_CALL(EnableNpcBlur, 100, 0) + EVT_CALL(DeleteNpc, 100) + EVT_ELSE + EVT_CALL(UseBattleCamPreset, 2) + EVT_CALL(PlaySound, 0x2045) + EVT_THREAD + EVT_LOOP(5) + EVT_WAIT_FRAMES(6) + EVT_CALL(GetNpcPos, 100, LW(0), LW(1), LW(2)) + EVT_CALL(N(UnkStarFunc4), LW(0), LW(1), LW(2)) + EVT_END_LOOP + EVT_END_THREAD + EVT_CALL(EnableNpcBlur, 100, 1) + EVT_THREAD + EVT_SET(LW(2), 0) + EVT_SET(LW(3), 720) + EVT_CALL(MakeLerp, LW(2), LW(3), 30, 2) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(SetNpcRotation, 100, 0, LW(0), 0) + EVT_WAIT_FRAMES(1) + EVT_IF_EQ(LW(1), 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_END_THREAD + EVT_CALL(GetNpcPos, 100, LW(0), LW(1), LW(2)) + EVT_ADD(LW(1), 60) + EVT_CALL(NpcFlyTo, 100, LW(0), LW(1), LW(2), 15, 0, 10) + EVT_ADD(LW(1), 140) + EVT_CALL(NpcFlyTo, 100, LW(0), LW(1), LW(2), 15, 0, 10) + EVT_WAIT_FRAMES(10) + EVT_CALL(EnableNpcBlur, 100, 0) + EVT_CALL(DeleteNpc, 100) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtSource N(802A327C) = { + EVT_CALL(GetOwnerID, LW(10)) + EVT_IF_EQ(LW(10), 0) + EVT_CALL(N(UnkBackgroundFunc)) + EVT_WAIT_FRAMES(15) + EVT_CALL(SetGoalToHome, ACTOR_PLAYER) + EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(8.0)) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_RUNNING) + EVT_CALL(PlayerRunToGoal, 0) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_10002) + EVT_ELSE + EVT_CALL(N(UnkBackgroundFunc)) + EVT_WAIT_FRAMES(15) + EVT_CALL(SetGoalToHome, ACTOR_PARTNER) + EVT_CALL(SetActorSpeed, ACTOR_PARTNER, EVT_FLOAT(8.0)) + EVT_CALL(N(UnkStarFunc), 3) + EVT_CALL(RunToGoal, ACTOR_PARTNER, 0) + EVT_CALL(N(UnkStarFunc), 4) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtSource N(802A33A8) = { + EVT_THREAD + EVT_CALL(PlayEffect, 0x38, 0, LW(0), LW(1), LW(2), EVT_FLOAT(1.0), 100, 0, 0, 0, 0, 0, 0, 0) + EVT_WAIT_FRAMES(5) + EVT_CALL(PlayEffect, 0x38, 0, LW(0), LW(1), LW(2), EVT_FLOAT(1.0), 100, 0, 0, 0, 0, 0, 0, 0) + EVT_IF_EQ(LW(10), 1) + EVT_WAIT_FRAMES(5) + EVT_CALL(PlayEffect, 0x38, 0, LW(0), LW(1), LW(2), EVT_FLOAT(1.0), 100, 0, 0, 0, 0, 0, 0, 0) + EVT_END_IF + EVT_END_THREAD + EVT_WAIT_FRAMES(20) + EVT_CALL(PlayEffect, 0x52, 4, LW(0), LW(1), LW(2), EVT_FLOAT(1.0), 30, 0, 0, 0, 0, 0, 0, 0) + EVT_RETURN + EVT_END +}; + +// TODO: type this data used by func_802A1518_7974D8 +s32 D_802A3514_7994D4[] = { + 0x00000023, 0x00000000, 0x00000005, 0x0000000A, 0x0000000F, 0x00000014, 0x00000019, 0x0000001E, +}; + +s32 D_802A3534_7994F4[] = { + 0x00000023, 0x00000000, 0x00000005, 0x0000000A, 0x0000000F, 0x00000014, 0x00000019, 0x0000001E, +}; + +s32 D_802A3554_799514[] = { + 0x42B20000, 0x43340000, 0x00000000, 0xC2100000, 0x43340000, 0x00000000, 0x434C0000, 0x43340000, + 0x00000000, 0x41F00000, 0x42C20000, 0x43EE8000, 0x43660000, 0x42A20000, 0x00000000, 0x43010000, + 0x43340000, 0x00000000, 0xC2700000, 0x43340000, 0x00000000, 0xC36A0000, 0x421C0000, 0x00000000, +}; + +EvtSource N(usePower) = { + EVT_EXEC_WAIT(N(802A2888)) + EVT_CALL(AddBattleCamZoom, 100) + EVT_CALL(MoveBattleCamOver, 20) + EVT_CALL(InitTargetIterator) + EVT_CALL(SetGoalToTarget, ACTOR_SELF) + EVT_THREAD + EVT_CALL(func_802A1518_7974D8, 0) + EVT_END_THREAD + EVT_WAIT_FRAMES(10) + EVT_LOOP(0) + EVT_WAIT_FRAMES(1) + EVT_CALL(func_802A2468_798428) + EVT_IF_EQ(LW(0), 1) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(InitTargetIterator) + EVT_LABEL(0) + EVT_CALL(SetGoalToTarget, ACTOR_SELF) + EVT_CALL(ItemDamageEnemy, LW(0), 1077936128, 0, 0, 32) + EVT_CALL(ChooseNextTarget, 0, LW(0)) + EVT_IF_NE(LW(0), -1) + EVT_GOTO(0) + EVT_END_IF + EVT_LOOP(0) + EVT_WAIT_FRAMES(1) + EVT_CALL(func_802A2468_798428) + EVT_IF_EQ(LW(0), 2) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(UseBattleCamPreset, 2) + EVT_CALL(func_802A247C_79843C) + EVT_CALL(func_80276EFC) + EVT_EXEC_WAIT(N(802A327C)) + EVT_RETURN + EVT_END +}; diff --git a/src/battle/star/star_storm/78E7D0.c b/src/battle/star/star_storm/78E7D0.c index 8c4a13acbc..b118f1b686 100644 --- a/src/battle/star/star_storm/78E7D0.c +++ b/src/battle/star/star_storm/78E7D0.c @@ -1,4 +1,6 @@ #include "common.h" +#include "script_api/battle.h" +#include "sprite/npc/battle_skolar.h" #define NAMESPACE battle_star_star_storm @@ -31,3 +33,305 @@ ApiStatus func_802A1628_78EDF8(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } + +EvtSource N(802A16F0) = { + EVT_CALL(GetOwnerID, LW(10)) + EVT_IF_EQ(LW(10), 0) + EVT_CALL(UseBattleCamPreset, 69) + EVT_WAIT_FRAMES(10) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_GOT_ITEM) + EVT_CALL(GetActorPos, ACTOR_PLAYER, LW(0), LW(1), LW(2)) + EVT_ADD(LW(0), 16) + EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(4.0)) + EVT_CALL(SetGoalPos, ACTOR_PLAYER, LW(0), LW(1), LW(2)) + EVT_CALL(PlayerRunToGoal, 0) + EVT_WAIT_FRAMES(8) + EVT_CALL(PlaySound, 0x241) + EVT_CALL(GetActorPos, ACTOR_PLAYER, LW(0), LW(1), LW(2)) + EVT_ADD(LW(1), 15) + EVT_CALL(N(UnkStarFunc1), LW(0), LW(1), LW(2)) + EVT_CALL(N(FadeBackgroundToBlack)) + EVT_WAIT_FRAMES(20) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_PRAY) + EVT_WAIT_FRAMES(10) + EVT_CALL(PlaySound, 0x2051) + EVT_CALL(GetActorPos, ACTOR_PLAYER, LW(0), LW(1), LW(2)) + EVT_CALL(N(UnkStarFunc2), LW(0), LW(1), LW(2)) + EVT_WAIT_FRAMES(30) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, 0x01002A) + EVT_ELSE + EVT_CALL(UseBattleCamPreset, 69) + EVT_WAIT_FRAMES(10) + EVT_CALL(N(UnkStarFunc), 0) + EVT_CALL(GetActorPos, ACTOR_PARTNER, LW(0), LW(1), LW(2)) + EVT_ADD(LW(0), 16) + EVT_CALL(SetActorSpeed, ACTOR_PARTNER, EVT_FLOAT(4.0)) + EVT_CALL(SetGoalPos, ACTOR_PARTNER, LW(0), LW(1), LW(2)) + EVT_CALL(RunToGoal, ACTOR_PARTNER, 0, FALSE) + EVT_CALL(N(UnkStarFunc), 4) + EVT_WAIT_FRAMES(8) + EVT_CALL(PlaySound, 0x241) + EVT_CALL(N(UnkStarFunc), 1) + EVT_CALL(GetActorPos, ACTOR_PARTNER, LW(0), LW(1), LW(2)) + EVT_ADD(LW(1), 15) + EVT_CALL(N(UnkStarFunc1), LW(0), LW(1), LW(2)) + EVT_CALL(N(FadeBackgroundToBlack)) + EVT_WAIT_FRAMES(20) + EVT_CALL(PlaySound, 0x2051) + EVT_CALL(N(UnkStarFunc), 1) + EVT_WAIT_FRAMES(10) + EVT_CALL(GetActorPos, ACTOR_PARTNER, LW(0), LW(1), LW(2)) + EVT_CALL(N(UnkStarFunc2), LW(0), LW(1), LW(2)) + EVT_WAIT_FRAMES(30) + EVT_CALL(N(UnkStarFunc), 4) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtSource N(802A1A88) = { + EVT_CALL(GetOwnerID, LW(10)) + EVT_IF_EQ(LW(10), 0) + EVT_CALL(UseBattleCamPreset, 69) + EVT_WAIT_FRAMES(10) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_GOT_ITEM) + EVT_CALL(GetActorPos, ACTOR_PLAYER, LW(0), LW(1), LW(2)) + EVT_ADD(LW(0), 16) + EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(4.0)) + EVT_CALL(SetGoalPos, ACTOR_PLAYER, LW(0), LW(1), LW(2)) + EVT_CALL(PlayerRunToGoal, 0) + EVT_WAIT_FRAMES(8) + EVT_CALL(PlaySound, 0x241) + EVT_CALL(GetActorPos, ACTOR_PLAYER, LW(0), LW(1), LW(2)) + EVT_ADD(LW(1), 15) + EVT_CALL(N(UnkStarFunc1), LW(0), LW(1), LW(2)) + EVT_CALL(N(UnkBackgroundFunc2)) + EVT_WAIT_FRAMES(20) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_PRAY) + EVT_WAIT_FRAMES(10) + EVT_CALL(PlaySound, 0x2051) + EVT_CALL(GetActorPos, ACTOR_PLAYER, LW(0), LW(1), LW(2)) + EVT_CALL(N(UnkStarFunc2), LW(0), LW(1), LW(2)) + EVT_WAIT_FRAMES(30) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, 0x01002A) + EVT_ELSE + EVT_CALL(UseBattleCamPreset, 69) + EVT_WAIT_FRAMES(10) + EVT_CALL(N(UnkStarFunc), 0) + EVT_CALL(GetActorPos, ACTOR_PARTNER, LW(0), LW(1), LW(2)) + EVT_ADD(LW(0), 16) + EVT_CALL(SetActorSpeed, ACTOR_PARTNER, EVT_FLOAT(4.0)) + EVT_CALL(SetGoalPos, ACTOR_PARTNER, LW(0), LW(1), LW(2)) + EVT_CALL(RunToGoal, ACTOR_PARTNER, 0, FALSE) + EVT_CALL(N(UnkStarFunc), 4) + EVT_WAIT_FRAMES(8) + EVT_CALL(PlaySound, 0x241) + EVT_CALL(N(UnkStarFunc), 1) + EVT_CALL(GetActorPos, ACTOR_PARTNER, LW(0), LW(1), LW(2)) + EVT_ADD(LW(1), 15) + EVT_CALL(N(UnkStarFunc1), LW(0), LW(1), LW(2)) + EVT_CALL(N(UnkBackgroundFunc2)) + EVT_WAIT_FRAMES(20) + EVT_CALL(PlaySound, 0x2051) + EVT_CALL(N(UnkStarFunc), 1) + EVT_WAIT_FRAMES(10) + EVT_CALL(GetActorPos, ACTOR_PARTNER, LW(0), LW(1), LW(2)) + EVT_CALL(N(UnkStarFunc2), LW(0), LW(1), LW(2)) + EVT_WAIT_FRAMES(30) + EVT_CALL(N(UnkStarFunc), 4) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtSource N(802A1E20) = { + EVT_WAIT_FRAMES(8) + EVT_CALL(SetForegroundModelsVisible, 0) + EVT_CALL(func_8024E664, 73) + EVT_CALL(MoveBattleCamOver, 1) + EVT_CALL(PlaySound, 0x2041) + EVT_CALL(CreateNpc, 100, LW(0)) + EVT_CALL(N(SetNpcCollision32)) + EVT_CALL(SetNpcFlagBits, 100, ((NPC_FLAG_40000)), TRUE) + EVT_CALL(SetNpcPos, 100, -75, 150, 0) + EVT_CALL(SetNpcDecoration, 100, 0, 5) + EVT_CALL(N(UnkStarFunc3), -75, 167, 0) + EVT_WAIT_FRAMES(10) + EVT_CALL(EnableNpcBlur, 100, 1) + EVT_SET(LW(0), 0) + EVT_LOOP(8) + EVT_ADD(LW(0), 67) + EVT_CALL(SetNpcRotation, 100, 0, LW(0), 0) + EVT_WAIT_FRAMES(1) + EVT_END_LOOP + EVT_WAIT_FRAMES(10) + EVT_CALL(EnableNpcBlur, 100, 0) + EVT_THREAD + EVT_WAIT_FRAMES(10) + EVT_CALL(UseBattleCamPreset, 69) + EVT_END_THREAD + EVT_CALL(GetActorPos, ACTOR_PLAYER, LW(0), LW(1), LW(2)) + EVT_ADD(LW(1), 50) + EVT_CALL(NpcFlyTo, 100, LW(0), LW(1), LW(2), 30, 0, 10) + EVT_CALL(SetForegroundModelsVisible, 1) + EVT_RETURN + EVT_END +}; + +EvtSource N(802A202C) = { + EVT_CALL(GetOwnerID, LW(10)) + EVT_IF_EQ(LW(10), 0) + EVT_CALL(UseBattleCamPreset, 2) + EVT_CALL(PlaySound, 0x2047) + EVT_THREAD + EVT_LOOP(5) + EVT_WAIT_FRAMES(6) + EVT_CALL(GetNpcPos, 100, LW(0), LW(1), LW(2)) + EVT_CALL(N(UnkStarFunc4), LW(0), LW(1), LW(2)) + EVT_END_LOOP + EVT_END_THREAD + EVT_CALL(EnableNpcBlur, 100, 1) + EVT_THREAD + EVT_SET(LW(2), 0) + EVT_SET(LW(3), 720) + EVT_CALL(MakeLerp, LW(2), LW(3), 30, 2) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(SetNpcRotation, 100, 0, LW(0), 0) + EVT_WAIT_FRAMES(1) + EVT_IF_EQ(LW(1), 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_END_THREAD + EVT_CALL(GetNpcPos, 100, LW(0), LW(1), LW(2)) + EVT_ADD(LW(1), 60) + EVT_CALL(NpcFlyTo, 100, LW(0), LW(1), LW(2), 15, 0, 10) + EVT_ADD(LW(1), 140) + EVT_CALL(NpcFlyTo, 100, LW(0), LW(1), LW(2), 15, 0, 10) + EVT_WAIT_FRAMES(10) + EVT_CALL(EnableNpcBlur, 100, 0) + EVT_CALL(DeleteNpc, 100) + EVT_ELSE + EVT_CALL(UseBattleCamPreset, 2) + EVT_CALL(PlaySound, 0x2045) + EVT_THREAD + EVT_LOOP(5) + EVT_WAIT_FRAMES(6) + EVT_CALL(GetNpcPos, 100, LW(0), LW(1), LW(2)) + EVT_CALL(N(UnkStarFunc4), LW(0), LW(1), LW(2)) + EVT_END_LOOP + EVT_END_THREAD + EVT_CALL(EnableNpcBlur, 100, 1) + EVT_THREAD + EVT_SET(LW(2), 0) + EVT_SET(LW(3), 720) + EVT_CALL(MakeLerp, LW(2), LW(3), 30, 2) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(SetNpcRotation, 100, 0, LW(0), 0) + EVT_WAIT_FRAMES(1) + EVT_IF_EQ(LW(1), 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_END_THREAD + EVT_CALL(GetNpcPos, 100, LW(0), LW(1), LW(2)) + EVT_ADD(LW(1), 60) + EVT_CALL(NpcFlyTo, 100, LW(0), LW(1), LW(2), 15, 0, 10) + EVT_ADD(LW(1), 140) + EVT_CALL(NpcFlyTo, 100, LW(0), LW(1), LW(2), 15, 0, 10) + EVT_WAIT_FRAMES(10) + EVT_CALL(EnableNpcBlur, 100, 0) + EVT_CALL(DeleteNpc, 100) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtSource N(802A247C) = { + EVT_CALL(GetOwnerID, LW(10)) + EVT_IF_EQ(LW(10), 0) + EVT_CALL(N(UnkBackgroundFunc)) + EVT_WAIT_FRAMES(15) + EVT_CALL(SetGoalToHome, ACTOR_PLAYER) + EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(8.0)) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_RUNNING) + EVT_CALL(PlayerRunToGoal, 0) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_10002) + EVT_ELSE + EVT_CALL(N(UnkBackgroundFunc)) + EVT_WAIT_FRAMES(15) + EVT_CALL(SetGoalToHome, ACTOR_PARTNER) + EVT_CALL(SetActorSpeed, ACTOR_PARTNER, EVT_FLOAT(8.0)) + EVT_CALL(N(UnkStarFunc), 3) + EVT_CALL(RunToGoal, ACTOR_PARTNER, 0) + EVT_CALL(N(UnkStarFunc), 4) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtSource N(usePower) = { + EVT_EXEC_WAIT(N(802A16F0)) + EVT_SET_CONST(LW(0), NPC_ANIM_battle_skolar_Palette_00_Anim_1) + EVT_EXEC_WAIT(N(802A1E20)) + EVT_CALL(SetNpcAnimation, 100, NPC_ANIM_battle_skolar_Palette_00_Anim_2) + EVT_WAIT_FRAMES(16) + EVT_CALL(UseBattleCamPreset, 3) + EVT_THREAD + EVT_SET(LW(0), 0) + EVT_LOOP(10) + EVT_CALL(PlaySound, SOUND_259) + EVT_CALL(func_802A1518_78ECE8) + EVT_WAIT_FRAMES(5) + EVT_ADD(LW(0), 1) + EVT_CALL(PlaySound, SOUND_25A) + EVT_CALL(func_802A1518_78ECE8) + EVT_WAIT_FRAMES(5) + EVT_ADD(LW(0), 1) + EVT_END_LOOP + EVT_END_THREAD + EVT_THREAD + EVT_SET(LW(0), 0) + EVT_WAIT_FRAMES(50) + EVT_LOOP(10) + EVT_CALL(PlaySound, SOUND_25C) + EVT_ADD(LW(0), 1) + EVT_WAIT_FRAMES(5) + EVT_CALL(PlaySound, SOUND_25D) + EVT_ADD(LW(0), 1) + EVT_WAIT_FRAMES(5) + EVT_END_LOOP + EVT_END_THREAD + EVT_THREAD + EVT_LOOP(10) + EVT_WAIT_FRAMES(7) + EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(1.0)) + EVT_CALL(StartRumble, 8) + EVT_END_LOOP + EVT_END_THREAD + EVT_WAIT_FRAMES(90) + EVT_CALL(InitTargetIterator) + EVT_LABEL(0) + EVT_CALL(SetGoalToTarget, ACTOR_SELF) + EVT_CALL(ItemCheckHit, LW(0), 0, 0, 0, 0) + EVT_IF_EQ(LW(0), 6) + EVT_GOTO(1) + EVT_END_IF + EVT_CALL(GetGoalPos, ACTOR_SELF, LW(0), LW(1), LW(2)) + EVT_CALL(func_802A1628_78EDF8, LW(0), LW(1), LW(2)) + EVT_CALL(ItemDamageEnemy, LW(0), 939524352, 0, 7, 32) + EVT_LABEL(1) + EVT_WAIT_FRAMES(10) + EVT_CALL(ChooseNextTarget, 0, LW(0)) + EVT_IF_NE(LW(0), -1) + EVT_GOTO(0) + EVT_END_IF + EVT_WAIT_FRAMES(20) + EVT_EXEC_WAIT(N(802A202C)) + EVT_CALL(func_80276EFC) + EVT_EXEC_WAIT(N(802A247C)) + EVT_RETURN + EVT_END +}; diff --git a/src/battle/star/time_out/793D20.c b/src/battle/star/time_out/793D20.c index 2db0fd38ea..a09e144364 100644 --- a/src/battle/star/time_out/793D20.c +++ b/src/battle/star/time_out/793D20.c @@ -1,5 +1,278 @@ #include "common.h" +#include "script_api/battle.h" +#include "sprite/npc/battle_klevar.h" #define NAMESPACE battle_star_time_out #include "common/StarPower.inc.c" + +EvtSource N(802A1520) = { + EVT_CALL(GetOwnerID, LW(10)) + EVT_IF_EQ(LW(10), 0) + EVT_CALL(UseBattleCamPreset, 69) + EVT_WAIT_FRAMES(10) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_GOT_ITEM) + EVT_CALL(GetActorPos, ACTOR_PLAYER, LW(0), LW(1), LW(2)) + EVT_ADD(LW(0), 16) + EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(4.0)) + EVT_CALL(SetGoalPos, ACTOR_PLAYER, LW(0), LW(1), LW(2)) + EVT_CALL(PlayerRunToGoal, 0) + EVT_WAIT_FRAMES(8) + EVT_CALL(PlaySound, 0x241) + EVT_CALL(GetActorPos, ACTOR_PLAYER, LW(0), LW(1), LW(2)) + EVT_ADD(LW(1), 15) + EVT_CALL(N(UnkStarFunc1), LW(0), LW(1), LW(2)) + EVT_CALL(N(FadeBackgroundToBlack)) + EVT_WAIT_FRAMES(20) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_PRAY) + EVT_WAIT_FRAMES(10) + EVT_CALL(PlaySound, 0x2051) + EVT_CALL(GetActorPos, ACTOR_PLAYER, LW(0), LW(1), LW(2)) + EVT_CALL(N(UnkStarFunc2), LW(0), LW(1), LW(2)) + EVT_WAIT_FRAMES(30) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, 0x01002A) + EVT_ELSE + EVT_CALL(UseBattleCamPreset, 69) + EVT_WAIT_FRAMES(10) + EVT_CALL(N(UnkStarFunc), 0) + EVT_CALL(GetActorPos, ACTOR_PARTNER, LW(0), LW(1), LW(2)) + EVT_ADD(LW(0), 16) + EVT_CALL(SetActorSpeed, ACTOR_PARTNER, EVT_FLOAT(4.0)) + EVT_CALL(SetGoalPos, ACTOR_PARTNER, LW(0), LW(1), LW(2)) + EVT_CALL(RunToGoal, ACTOR_PARTNER, 0, FALSE) + EVT_CALL(N(UnkStarFunc), 4) + EVT_WAIT_FRAMES(8) + EVT_CALL(PlaySound, 0x241) + EVT_CALL(N(UnkStarFunc), 1) + EVT_CALL(GetActorPos, ACTOR_PARTNER, LW(0), LW(1), LW(2)) + EVT_ADD(LW(1), 15) + EVT_CALL(N(UnkStarFunc1), LW(0), LW(1), LW(2)) + EVT_CALL(N(FadeBackgroundToBlack)) + EVT_WAIT_FRAMES(20) + EVT_CALL(PlaySound, 0x2051) + EVT_CALL(N(UnkStarFunc), 1) + EVT_WAIT_FRAMES(10) + EVT_CALL(GetActorPos, ACTOR_PARTNER, LW(0), LW(1), LW(2)) + EVT_CALL(N(UnkStarFunc2), LW(0), LW(1), LW(2)) + EVT_WAIT_FRAMES(30) + EVT_CALL(N(UnkStarFunc), 4) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtSource N(802A18B8) = { + EVT_CALL(GetOwnerID, LW(10)) + EVT_IF_EQ(LW(10), 0) + EVT_CALL(UseBattleCamPreset, 69) + EVT_WAIT_FRAMES(10) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_GOT_ITEM) + EVT_CALL(GetActorPos, ACTOR_PLAYER, LW(0), LW(1), LW(2)) + EVT_ADD(LW(0), 16) + EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(4.0)) + EVT_CALL(SetGoalPos, ACTOR_PLAYER, LW(0), LW(1), LW(2)) + EVT_CALL(PlayerRunToGoal, 0) + EVT_WAIT_FRAMES(8) + EVT_CALL(PlaySound, 0x241) + EVT_CALL(GetActorPos, ACTOR_PLAYER, LW(0), LW(1), LW(2)) + EVT_ADD(LW(1), 15) + EVT_CALL(N(UnkStarFunc1), LW(0), LW(1), LW(2)) + EVT_CALL(N(UnkBackgroundFunc2)) + EVT_WAIT_FRAMES(20) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_PRAY) + EVT_WAIT_FRAMES(10) + EVT_CALL(PlaySound, 0x2051) + EVT_CALL(GetActorPos, ACTOR_PLAYER, LW(0), LW(1), LW(2)) + EVT_CALL(N(UnkStarFunc2), LW(0), LW(1), LW(2)) + EVT_WAIT_FRAMES(30) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, 0x01002A) + EVT_ELSE + EVT_CALL(UseBattleCamPreset, 69) + EVT_WAIT_FRAMES(10) + EVT_CALL(N(UnkStarFunc), 0) + EVT_CALL(GetActorPos, ACTOR_PARTNER, LW(0), LW(1), LW(2)) + EVT_ADD(LW(0), 16) + EVT_CALL(SetActorSpeed, ACTOR_PARTNER, EVT_FLOAT(4.0)) + EVT_CALL(SetGoalPos, ACTOR_PARTNER, LW(0), LW(1), LW(2)) + EVT_CALL(RunToGoal, ACTOR_PARTNER, 0, FALSE) + EVT_CALL(N(UnkStarFunc), 4) + EVT_WAIT_FRAMES(8) + EVT_CALL(PlaySound, 0x241) + EVT_CALL(N(UnkStarFunc), 1) + EVT_CALL(GetActorPos, ACTOR_PARTNER, LW(0), LW(1), LW(2)) + EVT_ADD(LW(1), 15) + EVT_CALL(N(UnkStarFunc1), LW(0), LW(1), LW(2)) + EVT_CALL(N(UnkBackgroundFunc2)) + EVT_WAIT_FRAMES(20) + EVT_CALL(PlaySound, 0x2051) + EVT_CALL(N(UnkStarFunc), 1) + EVT_WAIT_FRAMES(10) + EVT_CALL(GetActorPos, ACTOR_PARTNER, LW(0), LW(1), LW(2)) + EVT_CALL(N(UnkStarFunc2), LW(0), LW(1), LW(2)) + EVT_WAIT_FRAMES(30) + EVT_CALL(N(UnkStarFunc), 4) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtSource N(802A1C50) = { + EVT_WAIT_FRAMES(8) + EVT_CALL(SetForegroundModelsVisible, 0) + EVT_CALL(func_8024E664, 73) + EVT_CALL(MoveBattleCamOver, 1) + EVT_CALL(PlaySound, 0x2041) + EVT_CALL(CreateNpc, 100, LW(0)) + EVT_CALL(N(SetNpcCollision32)) + EVT_CALL(SetNpcFlagBits, 100, ((NPC_FLAG_40000)), TRUE) + EVT_CALL(SetNpcPos, 100, -75, 150, 0) + EVT_CALL(SetNpcDecoration, 100, 0, 5) + EVT_CALL(N(UnkStarFunc3), -75, 167, 0) + EVT_WAIT_FRAMES(10) + EVT_CALL(EnableNpcBlur, 100, 1) + EVT_SET(LW(0), 0) + EVT_LOOP(8) + EVT_ADD(LW(0), 67) + EVT_CALL(SetNpcRotation, 100, 0, LW(0), 0) + EVT_WAIT_FRAMES(1) + EVT_END_LOOP + EVT_WAIT_FRAMES(10) + EVT_CALL(EnableNpcBlur, 100, 0) + EVT_THREAD + EVT_WAIT_FRAMES(10) + EVT_CALL(UseBattleCamPreset, 69) + EVT_END_THREAD + EVT_CALL(GetActorPos, ACTOR_PLAYER, LW(0), LW(1), LW(2)) + EVT_ADD(LW(1), 50) + EVT_CALL(NpcFlyTo, 100, LW(0), LW(1), LW(2), 30, 0, 10) + EVT_CALL(SetForegroundModelsVisible, 1) + EVT_RETURN + EVT_END +}; + +EvtSource N(802A1E5C) = { + EVT_CALL(GetOwnerID, LW(10)) + EVT_IF_EQ(LW(10), 0) + EVT_CALL(UseBattleCamPreset, 2) + EVT_CALL(PlaySound, 0x2047) + EVT_THREAD + EVT_LOOP(5) + EVT_WAIT_FRAMES(6) + EVT_CALL(GetNpcPos, 100, LW(0), LW(1), LW(2)) + EVT_CALL(N(UnkStarFunc4), LW(0), LW(1), LW(2)) + EVT_END_LOOP + EVT_END_THREAD + EVT_CALL(EnableNpcBlur, 100, 1) + EVT_THREAD + EVT_SET(LW(2), 0) + EVT_SET(LW(3), 720) + EVT_CALL(MakeLerp, LW(2), LW(3), 30, 2) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(SetNpcRotation, 100, 0, LW(0), 0) + EVT_WAIT_FRAMES(1) + EVT_IF_EQ(LW(1), 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_END_THREAD + EVT_CALL(GetNpcPos, 100, LW(0), LW(1), LW(2)) + EVT_ADD(LW(1), 60) + EVT_CALL(NpcFlyTo, 100, LW(0), LW(1), LW(2), 15, 0, 10) + EVT_ADD(LW(1), 140) + EVT_CALL(NpcFlyTo, 100, LW(0), LW(1), LW(2), 15, 0, 10) + EVT_WAIT_FRAMES(10) + EVT_CALL(EnableNpcBlur, 100, 0) + EVT_CALL(DeleteNpc, 100) + EVT_ELSE + EVT_CALL(UseBattleCamPreset, 2) + EVT_CALL(PlaySound, 0x2045) + EVT_THREAD + EVT_LOOP(5) + EVT_WAIT_FRAMES(6) + EVT_CALL(GetNpcPos, 100, LW(0), LW(1), LW(2)) + EVT_CALL(N(UnkStarFunc4), LW(0), LW(1), LW(2)) + EVT_END_LOOP + EVT_END_THREAD + EVT_CALL(EnableNpcBlur, 100, 1) + EVT_THREAD + EVT_SET(LW(2), 0) + EVT_SET(LW(3), 720) + EVT_CALL(MakeLerp, LW(2), LW(3), 30, 2) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(SetNpcRotation, 100, 0, LW(0), 0) + EVT_WAIT_FRAMES(1) + EVT_IF_EQ(LW(1), 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_END_THREAD + EVT_CALL(GetNpcPos, 100, LW(0), LW(1), LW(2)) + EVT_ADD(LW(1), 60) + EVT_CALL(NpcFlyTo, 100, LW(0), LW(1), LW(2), 15, 0, 10) + EVT_ADD(LW(1), 140) + EVT_CALL(NpcFlyTo, 100, LW(0), LW(1), LW(2), 15, 0, 10) + EVT_WAIT_FRAMES(10) + EVT_CALL(EnableNpcBlur, 100, 0) + EVT_CALL(DeleteNpc, 100) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtSource N(802A22AC) = { + EVT_CALL(GetOwnerID, LW(10)) + EVT_IF_EQ(LW(10), 0) + EVT_CALL(N(UnkBackgroundFunc)) + EVT_WAIT_FRAMES(15) + EVT_CALL(SetGoalToHome, ACTOR_PLAYER) + EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(8.0)) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_RUNNING) + EVT_CALL(PlayerRunToGoal, 0) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_10002) + EVT_ELSE + EVT_CALL(N(UnkBackgroundFunc)) + EVT_WAIT_FRAMES(15) + EVT_CALL(SetGoalToHome, ACTOR_PARTNER) + EVT_CALL(SetActorSpeed, ACTOR_PARTNER, EVT_FLOAT(8.0)) + EVT_CALL(N(UnkStarFunc), 3) + EVT_CALL(RunToGoal, ACTOR_PARTNER, 0) + EVT_CALL(N(UnkStarFunc), 4) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtSource N(usePower) = { + EVT_EXEC_WAIT(N(802A1520)) + EVT_SET_CONST(LW(0), NPC_ANIM_battle_klevar_Palette_00_Anim_1) + EVT_EXEC_WAIT(N(802A1C50)) + EVT_CALL(SetNpcAnimation, 100, NPC_ANIM_battle_klevar_Palette_00_Anim_2) + EVT_WAIT_FRAMES(16) + EVT_CALL(UseBattleCamPreset, 3) + EVT_CALL(PlaySound, SOUND_246) + EVT_CALL(PlayEffect, 0x62, 0, 0, 0, 0, EVT_FLOAT(1.0), 200, 0, 0, 0, 0, 0, 0, 0) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_246) + EVT_WAIT_FRAMES(200) + EVT_CALL(InitTargetIterator) + EVT_LABEL(0) + EVT_CALL(SetGoalToTarget, ACTOR_SELF) + EVT_CALL(ItemCheckHit, LW(0), 0, 0, 0, 0) + EVT_IF_EQ(LW(0), 6) + EVT_GOTO(1) + EVT_END_IF + EVT_CALL(ItemDamageEnemy, LW(0), 1879048192, 0x80200564, 0, 32) + EVT_WAIT_FRAMES(5) + EVT_LABEL(1) + EVT_CALL(ChooseNextTarget, 0, LW(0)) + EVT_IF_NE(LW(0), -1) + EVT_GOTO(0) + EVT_END_IF + EVT_WAIT_FRAMES(5) + EVT_CALL(func_80276EFC) + EVT_EXEC_WAIT(N(802A1E5C)) + EVT_EXEC_WAIT(N(802A22AC)) + EVT_RETURN + EVT_END +}; diff --git a/src/battle/star/up_and_away/7952E0.c b/src/battle/star/up_and_away/7952E0.c index 730984afca..e234c8caeb 100644 --- a/src/battle/star/up_and_away/7952E0.c +++ b/src/battle/star/up_and_away/7952E0.c @@ -1,5 +1,7 @@ #include "common.h" #include "battle/battle.h" +#include "script_api/battle.h" +#include "sprite/npc/battle_kalmar.h" #define NAMESPACE battle_star_up_and_away @@ -55,5 +57,351 @@ ApiStatus func_802A1628_795908(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } #else +ApiStatus func_802A1628_795908(Evt* script, s32 isInitialCall); INCLUDE_ASM(s32, "battle/star/up_and_away/7952E0", func_802A1628_795908); #endif + +EvtSource N(802A16D0) = { + EVT_CALL(GetOwnerID, LW(10)) + EVT_IF_EQ(LW(10), 0) + EVT_CALL(UseBattleCamPreset, 69) + EVT_WAIT_FRAMES(10) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_GOT_ITEM) + EVT_CALL(GetActorPos, ACTOR_PLAYER, LW(0), LW(1), LW(2)) + EVT_ADD(LW(0), 16) + EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(4.0)) + EVT_CALL(SetGoalPos, ACTOR_PLAYER, LW(0), LW(1), LW(2)) + EVT_CALL(PlayerRunToGoal, 0) + EVT_WAIT_FRAMES(8) + EVT_CALL(PlaySound, 0x241) + EVT_CALL(GetActorPos, ACTOR_PLAYER, LW(0), LW(1), LW(2)) + EVT_ADD(LW(1), 15) + EVT_CALL(N(UnkStarFunc1), LW(0), LW(1), LW(2)) + EVT_CALL(N(FadeBackgroundToBlack)) + EVT_WAIT_FRAMES(20) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_PRAY) + EVT_WAIT_FRAMES(10) + EVT_CALL(PlaySound, 0x2051) + EVT_CALL(GetActorPos, ACTOR_PLAYER, LW(0), LW(1), LW(2)) + EVT_CALL(N(UnkStarFunc2), LW(0), LW(1), LW(2)) + EVT_WAIT_FRAMES(30) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, 0x01002A) + EVT_ELSE + EVT_CALL(UseBattleCamPreset, 69) + EVT_WAIT_FRAMES(10) + EVT_CALL(N(UnkStarFunc), 0) + EVT_CALL(GetActorPos, ACTOR_PARTNER, LW(0), LW(1), LW(2)) + EVT_ADD(LW(0), 16) + EVT_CALL(SetActorSpeed, ACTOR_PARTNER, EVT_FLOAT(4.0)) + EVT_CALL(SetGoalPos, ACTOR_PARTNER, LW(0), LW(1), LW(2)) + EVT_CALL(RunToGoal, ACTOR_PARTNER, 0, FALSE) + EVT_CALL(N(UnkStarFunc), 4) + EVT_WAIT_FRAMES(8) + EVT_CALL(PlaySound, 0x241) + EVT_CALL(N(UnkStarFunc), 1) + EVT_CALL(GetActorPos, ACTOR_PARTNER, LW(0), LW(1), LW(2)) + EVT_ADD(LW(1), 15) + EVT_CALL(N(UnkStarFunc1), LW(0), LW(1), LW(2)) + EVT_CALL(N(FadeBackgroundToBlack)) + EVT_WAIT_FRAMES(20) + EVT_CALL(PlaySound, 0x2051) + EVT_CALL(N(UnkStarFunc), 1) + EVT_WAIT_FRAMES(10) + EVT_CALL(GetActorPos, ACTOR_PARTNER, LW(0), LW(1), LW(2)) + EVT_CALL(N(UnkStarFunc2), LW(0), LW(1), LW(2)) + EVT_WAIT_FRAMES(30) + EVT_CALL(N(UnkStarFunc), 4) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtSource N(802A1A68) = { + EVT_CALL(GetOwnerID, LW(10)) + EVT_IF_EQ(LW(10), 0) + EVT_CALL(UseBattleCamPreset, 69) + EVT_WAIT_FRAMES(10) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_GOT_ITEM) + EVT_CALL(GetActorPos, ACTOR_PLAYER, LW(0), LW(1), LW(2)) + EVT_ADD(LW(0), 16) + EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(4.0)) + EVT_CALL(SetGoalPos, ACTOR_PLAYER, LW(0), LW(1), LW(2)) + EVT_CALL(PlayerRunToGoal, 0) + EVT_WAIT_FRAMES(8) + EVT_CALL(PlaySound, 0x241) + EVT_CALL(GetActorPos, ACTOR_PLAYER, LW(0), LW(1), LW(2)) + EVT_ADD(LW(1), 15) + EVT_CALL(N(UnkStarFunc1), LW(0), LW(1), LW(2)) + EVT_CALL(N(UnkBackgroundFunc2)) + EVT_WAIT_FRAMES(20) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_PRAY) + EVT_WAIT_FRAMES(10) + EVT_CALL(PlaySound, 0x2051) + EVT_CALL(GetActorPos, ACTOR_PLAYER, LW(0), LW(1), LW(2)) + EVT_CALL(N(UnkStarFunc2), LW(0), LW(1), LW(2)) + EVT_WAIT_FRAMES(30) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, 0x01002A) + EVT_ELSE + EVT_CALL(UseBattleCamPreset, 69) + EVT_WAIT_FRAMES(10) + EVT_CALL(N(UnkStarFunc), 0) + EVT_CALL(GetActorPos, ACTOR_PARTNER, LW(0), LW(1), LW(2)) + EVT_ADD(LW(0), 16) + EVT_CALL(SetActorSpeed, ACTOR_PARTNER, EVT_FLOAT(4.0)) + EVT_CALL(SetGoalPos, ACTOR_PARTNER, LW(0), LW(1), LW(2)) + EVT_CALL(RunToGoal, ACTOR_PARTNER, 0, FALSE) + EVT_CALL(N(UnkStarFunc), 4) + EVT_WAIT_FRAMES(8) + EVT_CALL(PlaySound, 0x241) + EVT_CALL(N(UnkStarFunc), 1) + EVT_CALL(GetActorPos, ACTOR_PARTNER, LW(0), LW(1), LW(2)) + EVT_ADD(LW(1), 15) + EVT_CALL(N(UnkStarFunc1), LW(0), LW(1), LW(2)) + EVT_CALL(N(UnkBackgroundFunc2)) + EVT_WAIT_FRAMES(20) + EVT_CALL(PlaySound, 0x2051) + EVT_CALL(N(UnkStarFunc), 1) + EVT_WAIT_FRAMES(10) + EVT_CALL(GetActorPos, ACTOR_PARTNER, LW(0), LW(1), LW(2)) + EVT_CALL(N(UnkStarFunc2), LW(0), LW(1), LW(2)) + EVT_WAIT_FRAMES(30) + EVT_CALL(N(UnkStarFunc), 4) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtSource N(802A1E00) = { + EVT_WAIT_FRAMES(8) + EVT_CALL(SetForegroundModelsVisible, 0) + EVT_CALL(func_8024E664, 73) + EVT_CALL(MoveBattleCamOver, 1) + EVT_CALL(PlaySound, 0x2041) + EVT_CALL(CreateNpc, 100, LW(0)) + EVT_CALL(N(SetNpcCollision32)) + EVT_CALL(SetNpcFlagBits, 100, ((NPC_FLAG_40000)), TRUE) + EVT_CALL(SetNpcPos, 100, -75, 150, 0) + EVT_CALL(SetNpcDecoration, 100, 0, 5) + EVT_CALL(N(UnkStarFunc3), -75, 167, 0) + EVT_WAIT_FRAMES(10) + EVT_CALL(EnableNpcBlur, 100, 1) + EVT_SET(LW(0), 0) + EVT_LOOP(8) + EVT_ADD(LW(0), 67) + EVT_CALL(SetNpcRotation, 100, 0, LW(0), 0) + EVT_WAIT_FRAMES(1) + EVT_END_LOOP + EVT_WAIT_FRAMES(10) + EVT_CALL(EnableNpcBlur, 100, 0) + EVT_THREAD + EVT_WAIT_FRAMES(10) + EVT_CALL(UseBattleCamPreset, 69) + EVT_END_THREAD + EVT_CALL(GetActorPos, ACTOR_PLAYER, LW(0), LW(1), LW(2)) + EVT_ADD(LW(1), 50) + EVT_CALL(NpcFlyTo, 100, LW(0), LW(1), LW(2), 30, 0, 10) + EVT_CALL(SetForegroundModelsVisible, 1) + EVT_RETURN + EVT_END +}; + +EvtSource N(802A200C) = { + EVT_CALL(GetOwnerID, LW(10)) + EVT_IF_EQ(LW(10), 0) + EVT_CALL(UseBattleCamPreset, 2) + EVT_CALL(PlaySound, 0x2047) + EVT_THREAD + EVT_LOOP(5) + EVT_WAIT_FRAMES(6) + EVT_CALL(GetNpcPos, 100, LW(0), LW(1), LW(2)) + EVT_CALL(N(UnkStarFunc4), LW(0), LW(1), LW(2)) + EVT_END_LOOP + EVT_END_THREAD + EVT_CALL(EnableNpcBlur, 100, 1) + EVT_THREAD + EVT_SET(LW(2), 0) + EVT_SET(LW(3), 720) + EVT_CALL(MakeLerp, LW(2), LW(3), 30, 2) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(SetNpcRotation, 100, 0, LW(0), 0) + EVT_WAIT_FRAMES(1) + EVT_IF_EQ(LW(1), 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_END_THREAD + EVT_CALL(GetNpcPos, 100, LW(0), LW(1), LW(2)) + EVT_ADD(LW(1), 60) + EVT_CALL(NpcFlyTo, 100, LW(0), LW(1), LW(2), 15, 0, 10) + EVT_ADD(LW(1), 140) + EVT_CALL(NpcFlyTo, 100, LW(0), LW(1), LW(2), 15, 0, 10) + EVT_WAIT_FRAMES(10) + EVT_CALL(EnableNpcBlur, 100, 0) + EVT_CALL(DeleteNpc, 100) + EVT_ELSE + EVT_CALL(UseBattleCamPreset, 2) + EVT_CALL(PlaySound, 0x2045) + EVT_THREAD + EVT_LOOP(5) + EVT_WAIT_FRAMES(6) + EVT_CALL(GetNpcPos, 100, LW(0), LW(1), LW(2)) + EVT_CALL(N(UnkStarFunc4), LW(0), LW(1), LW(2)) + EVT_END_LOOP + EVT_END_THREAD + EVT_CALL(EnableNpcBlur, 100, 1) + EVT_THREAD + EVT_SET(LW(2), 0) + EVT_SET(LW(3), 720) + EVT_CALL(MakeLerp, LW(2), LW(3), 30, 2) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(SetNpcRotation, 100, 0, LW(0), 0) + EVT_WAIT_FRAMES(1) + EVT_IF_EQ(LW(1), 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_END_THREAD + EVT_CALL(GetNpcPos, 100, LW(0), LW(1), LW(2)) + EVT_ADD(LW(1), 60) + EVT_CALL(NpcFlyTo, 100, LW(0), LW(1), LW(2), 15, 0, 10) + EVT_ADD(LW(1), 140) + EVT_CALL(NpcFlyTo, 100, LW(0), LW(1), LW(2), 15, 0, 10) + EVT_WAIT_FRAMES(10) + EVT_CALL(EnableNpcBlur, 100, 0) + EVT_CALL(DeleteNpc, 100) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtSource N(802A245C) = { + EVT_CALL(GetOwnerID, LW(10)) + EVT_IF_EQ(LW(10), 0) + EVT_CALL(N(UnkBackgroundFunc)) + EVT_WAIT_FRAMES(15) + EVT_CALL(SetGoalToHome, ACTOR_PLAYER) + EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(8.0)) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_RUNNING) + EVT_CALL(PlayerRunToGoal, 0) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_10002) + EVT_ELSE + EVT_CALL(N(UnkBackgroundFunc)) + EVT_WAIT_FRAMES(15) + EVT_CALL(SetGoalToHome, ACTOR_PARTNER) + EVT_CALL(SetActorSpeed, ACTOR_PARTNER, EVT_FLOAT(8.0)) + EVT_CALL(N(UnkStarFunc), 3) + EVT_CALL(RunToGoal, ACTOR_PARTNER, 0) + EVT_CALL(N(UnkStarFunc), 4) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtSource N(usePower) = { + EVT_EXEC_WAIT(N(802A16D0)) + EVT_SET_CONST(LW(0), NPC_ANIM_battle_kalmar_Palette_00_Anim_1) + EVT_EXEC_WAIT(N(802A1E00)) + EVT_CALL(SetNpcAnimation, 100, NPC_ANIM_battle_kalmar_Palette_00_Anim_2) + EVT_CALL(UseBattleCamPreset, 2) + EVT_WAIT_FRAMES(20) + EVT_CALL(Spawn802D9D50, 0, 0, 0, 320, 240, 128, 10) + EVT_CALL(func_802A1518_7957F8) + EVT_CALL(PlaySound, 0x247) + EVT_CALL(PlayEffect, 0x39, 0, 0, 20, 0, EVT_FLOAT(1.0), 90, 0, 0, 0, 0, 0, 0, 0) + EVT_WAIT_FRAMES(30) + EVT_THREAD + EVT_CALL(PlayEffect, 0x3A, 0, 0, 50, 0, 300, 100, 10, 40, 0, 0, 0, 0, 0) + EVT_END_THREAD + EVT_CALL(PlayEffect, 0x39, 0, 0, 20, 0, EVT_FLOAT(1.0), 90, 0, 0, 0, 0, 0, 0, 0) + EVT_WAIT_FRAMES(75) + EVT_CALL(Spawn802D9D50, 0, 0, 0, 320, 240, 0, 10) + EVT_CALL(InitTargetIterator) + EVT_LABEL(0) + EVT_CALL(SetGoalToTarget, ACTOR_SELF) + EVT_CALL(func_802A1628_795908) + EVT_SET(LF(0), 0) + EVT_CALL(ItemCheckHit, LW(1), 0, 0, 0, 0) + EVT_IF_EQ(LW(1), 6) + EVT_SET(LW(0), 0) + EVT_SET(LF(0), 1) + EVT_END_IF + EVT_SWITCH(LW(0)) + EVT_CASE_GT(0) + EVT_CALL(GetOwnerTarget, LW(0), LW(1)) + EVT_CALL(DispatchEvent, LW(0), 61) + EVT_CALL(SetActorRotationOffset, LW(0), 0, 10, 0) + EVT_THREAD + EVT_CALL(GetOwnerTarget, LW(11), LW(1)) + EVT_WAIT_FRAMES(10) + EVT_CALL(CreateVirtualEntity, LW(10), 0x80283EE8) + EVT_CALL(GetActorPos, LW(11), LW(0), LW(1), LW(2)) + EVT_SET(LW(13), LW(0)) + EVT_SET(LW(14), LW(1)) + EVT_SET(LW(15), LW(2)) + EVT_CALL(SetVirtualEntityPosition, LW(10), LW(0), LW(1), LW(2)) + EVT_SETF(LW(0), EVT_FLOAT(0.2001953125)) + EVT_CALL(SetVirtualEntityScale, LW(10), LW(0), LW(0), LW(0)) + EVT_LOOP(4) + EVT_ADDF(LW(0), EVT_FLOAT(0.2001953125)) + EVT_CALL(SetVirtualEntityScale, LW(10), LW(0), LW(0), LW(0)) + EVT_WAIT_FRAMES(1) + EVT_END_LOOP + EVT_SET(LW(0), 0) + EVT_LOOP(5) + EVT_ADD(LW(0), 72) + EVT_CALL(SetVirtualEntityRotation, LW(10), 0, LW(0), 0) + EVT_WAIT_FRAMES(1) + EVT_END_LOOP + EVT_CALL(PlaySound, 0x2052) + EVT_SET(LW(0), LW(13)) + EVT_SET(LW(1), LW(14)) + EVT_SET(LW(2), LW(15)) + EVT_SET(LW(3), 0) + EVT_LOOP(50) + EVT_CALL(SetVirtualEntityPosition, LW(10), LW(0), LW(1), LW(2)) + EVT_CALL(SetVirtualEntityRotation, LW(10), 0, LW(3), 0) + EVT_ADD(LW(1), 6) + EVT_ADD(LW(3), 45) + EVT_WAIT_FRAMES(1) + EVT_END_LOOP + EVT_END_THREAD + EVT_THREAD + EVT_CALL(PlaySound, 0x2071) + EVT_CALL(GetOwnerTarget, LW(10), LW(1)) + EVT_CALL(SetActorFlagBits, LW(10), 4, 1) + EVT_SETF(LW(0), EVT_FLOAT(1.0)) + EVT_LOOP(18) + EVT_SUBF(LW(0), EVT_FLOAT(0.05078125)) + EVT_CALL(SetActorScale, LW(10), LW(0), LW(0), LW(0)) + EVT_WAIT_FRAMES(1) + EVT_END_LOOP + EVT_CALL(SetActorPos, LW(10), 0, -1000, 0) + EVT_CALL(GetActorPos, LW(10), LW(0), LW(1), LW(2)) + EVT_LOOP(10) + EVT_CALL(PlayEffect, 0x11, 1, LW(0), LW(1), LW(2), 20, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_ADD(LW(1), 30) + EVT_WAIT_FRAMES(5) + EVT_END_LOOP + EVT_CALL(SetBattleFlagBits, 16777216, 1) + EVT_CALL(RemoveActor, LW(10)) + EVT_END_THREAD + EVT_CASE_DEFAULT + EVT_IF_EQ(LF(0), 0) + EVT_CALL(PlayerDamageEnemy, LW(0), 0, 65535, 0, 0, 2080) + EVT_END_IF + EVT_END_SWITCH + EVT_WAIT_FRAMES(5) + EVT_CALL(ChooseNextTarget, 0, LW(0)) + EVT_IF_NE(LW(0), -1) + EVT_GOTO(0) + EVT_END_IF + EVT_WAIT_FRAMES(70) + EVT_CALL(func_802A15B4_795894) + EVT_EXEC_WAIT(N(802A200C)) + EVT_CALL(func_80276EFC) + EVT_EXEC_WAIT(N(802A245C)) + EVT_RETURN + EVT_END +}; diff --git a/src/common/StarPower.inc.c b/src/common/StarPower.inc.c index 5b18541e4a..1d77beb01a 100644 --- a/src/common/StarPower.inc.c +++ b/src/common/StarPower.inc.c @@ -49,3 +49,5 @@ ApiStatus N(UnkStarFunc4)(Evt* script, s32 isInitialCall) { #include "common/UnkStarFunc.inc.c" #include "common/SetNpcCollision32.inc.c" + +// possibly 2 scripts here diff --git a/tools/disasm_script.py b/tools/disasm_script.py index e06b5721d1..ce04112fca 100755 --- a/tools/disasm_script.py +++ b/tools/disasm_script.py @@ -55,6 +55,7 @@ def script_lib(offset): _script_lib[vaddr] = [] _script_lib[vaddr].append([int(raddr, 16), name]) + """ # Sort the symbols for each vram address by the difference # between their rom address and the offset passed in. # If offset - rom address goes below 0, it's part of the @@ -66,17 +67,48 @@ def script_lib(offset): entry[0] = 0xFFFFFFFF if diff < 0 else diff _script_lib[k][i][0] = entry[0] _script_lib[k] = sorted(_script_lib[k], key=lambda x: x[0]) + """ return _script_lib +def extend_symbol_map(a, b): + for k in b: + if k not in a: + a[k] = b[k] + else: + a[k] += b[k] + + return a + def round_fixed(f: float) -> float: + """ g = f * 100.0 whole = round(g) if abs(g - whole) <= 100.0/1024.0: f = whole / 100.0 + """ return f +def find_symbol_in_overlay(symbol_map, overlay_rom_addr, symbol_ram_addr): + if not symbol_ram_addr in symbol_map: + return None + + lowest_delta = None + lowest_symbol_name = None + + for rom_addr, symbol_name in symbol_map[symbol_ram_addr]: + delta = rom_addr - overlay_rom_addr + + if delta >= 0 and (lowest_delta is None or delta <= lowest_delta): + lowest_delta = delta + lowest_symbol_name = symbol_name + + if lowest_symbol_name: + return lowest_symbol_name + + return symbol_map[symbol_ram_addr][0][1] + # Grab CONSTANTS from the include/ folder to save manual work CONSTANTS = {} SAVE_VARS = set() @@ -210,7 +242,11 @@ def fix_args(self, func, args, info): if "_" in arg: new_args.append(f"{arg}") continue - argNum = int(arg, 0) + try: + argNum = int(arg, 0) + except ValueError: + new_args.append(f"{arg}") + continue if info[i] == "Bool": new_args.append(f"{'TRUE' if argNum == True else 'FALSE'}") @@ -225,20 +261,23 @@ def fix_args(self, func, args, info): # new_args.append(f"0x{argNum:X}") # continue - if func == "SetAnimation" and int(new_args[1], 10) == 0: - call = f"{CONSTANTS['PlayerAnims'][argNum]}" - elif "EVT_" not in args[0] and int(args[0]) >= 0 and CONSTANTS["MAP_NPCS"].get(int(args[0])) == "NPC_PLAYER": - if sprite == 0: - print(f"Func {func} arg {i} ({CONSTANTS['MAP_NPCS'][int(args[0])]}) -- sprite was 0, is this really valid? Arg 0x{argNum:X} -- sprite: {sprite}, palette: {palette}, anim: {anim}") - call = f"0x{argNum:X}" - else: + try: + if func == "SetAnimation" and int(new_args[1], 10) == 0: call = f"{CONSTANTS['PlayerAnims'][argNum]}" - else: - if sprite == 0: - print(f"Func {func} arg {i} -- sprite was 0, is this really valid? Arg 0x{argNum:X} -- sprite: {sprite}, palette: {palette}, anim: {anim}") - call = f"0x{argNum:X}" + elif "EVT_" not in args[0] and int(args[0]) >= 0 and CONSTANTS["MAP_NPCS"].get(int(args[0])) == "NPC_PLAYER": + if sprite == 0: + print(f"Func {func} arg {i} ({CONSTANTS['MAP_NPCS'][int(args[0])]}) -- sprite was 0, is this really valid? Arg 0x{argNum:X} -- sprite: {sprite}, palette: {palette}, anim: {anim}") + call = f"0x{argNum:X}" + else: + call = f"{CONSTANTS['PlayerAnims'][argNum]}" else: - call = make_anim_macro(self, sprite, palette, anim) + if sprite == 0: + print(f"Func {func} arg {i} -- sprite was 0, is this really valid? Arg 0x{argNum:X} -- sprite: {sprite}, palette: {palette}, anim: {anim}") + call = f"0x{argNum:X}" + else: + call = make_anim_macro(self, sprite, palette, anim) + except KeyError: + call = f"0x{argNum:06X}" new_args.append(call) elif info[i] == "CustomMsg": type_ = (argNum & 0xFF0000) >> 16 @@ -437,13 +476,14 @@ def replace_constants(self, func, args): class ScriptDisassembler: - def __init__(self, bytes, script_name = "script", symbol_map = {}, romstart = 0, INCLUDES_NEEDED = {"forward": [], "sprites": set(), "npcs": []}, INCLUDED = {"functions": set(), "includes": set()}, prelude = True): + def __init__(self, bytes, script_name = "script", symbol_map = {}, romstart = 0, INCLUDES_NEEDED = {"forward": [], "sprites": set(), "npcs": []}, INCLUDED = {"functions": set(), "includes": set()}, prelude = True, transform_symbol_name=None): self.bytes = bytes self.script_name = script_name self.prelude = prelude - self.symbol_map = { **script_lib(self.bytes.tell()), **symbol_map } + self.symbol_map = extend_symbol_map(symbol_map, script_lib(self.bytes.tell())) self.romstart = romstart + self.transform_symbol_name = transform_symbol_name self.INCLUDES_NEEDED = INCLUDES_NEEDED self.INCLUDED = INCLUDED @@ -467,7 +507,7 @@ class ScriptDisassembler: #print(f"Op {opcode:X}, argc {argc}") if opcode > 0xFF or argc > 0xFF: - raise Exception(f"script '{self.script_name}' is malformed") + raise Exception(f"script '{self.script_name}' is malformed (opcode {opcode:X}, argc {argc:X})") argv = [] for i in range(0, argc): @@ -501,21 +541,21 @@ class ScriptDisassembler: def var(self, arg, prefer_hex = False, use_evt_ptr = True): if arg in self.symbol_map: s = self.symbol_map[arg][0][1] - return f"EVT_PTR({s})" if use_evt_ptr else s + return f"EVT_ADDR({s})" if use_evt_ptr else s v = arg - 2**32 # convert to s32 if v > -250000000: - if v <= -220000000: return f"EVT_FIXED({round_fixed((v + 230000000) / 1024)})" - elif v <= -200000000: return f"EVT_ARRAY_FLAG({v + 210000000})" - elif v <= -180000000: return f"EVT_ARRAY({v + 190000000})" - elif v <= -160000000: return f"EVT_SAVE_VAR({v + 170000000})" - elif v <= -140000000: return f"EVT_AREA_VAR({v + 150000000})" - elif v <= -120000000: return f"EVT_SAVE_FLAG({v + 130000000})" - elif v <= -100000000: return f"EVT_AREA_FLAG({v + 110000000})" - elif v <= -80000000: return f"EVT_MAP_FLAG({v + 90000000})" - elif v <= -60000000: return f"EVT_FLAG({v + 70000000})" - elif v <= -40000000: return f"EVT_MAP_VAR({v + 50000000})" - elif v <= -20000000: return f"EVT_VAR({v + 30000000})" + if v <= -220000000: return f"EVT_FLOAT({round_fixed((v + 230000000) / 1024)})" + elif v <= -200000000: return f"UF({v + 210000000})" + elif v <= -180000000: return f"UW({v + 190000000})" + elif v <= -160000000: return f"GSW({v + 170000000})" + elif v <= -140000000: return f"LSW({v + 150000000})" + elif v <= -120000000: return f"GSWF({v + 130000000})" + elif v <= -100000000: return f"LSWF({v + 110000000})" + elif v <= -80000000: return f"GF({v + 90000000})" + elif v <= -60000000: return f"LF({v + 70000000})" + elif v <= -40000000: return f"GW({v + 50000000})" + elif v <= -20000000: return f"LW({v + 30000000})" if arg == 0xFFFFFFFF: return "-1" @@ -537,7 +577,9 @@ class ScriptDisassembler: if type(addr) is str: return addr if addr > 0x80000000 and addr in self.symbol_map: - name = self.symbol_map[addr][0][1] + name = find_symbol_in_overlay(self.symbol_map, self.romstart, addr) + if self.transform_symbol_name: + name = self.transform_symbol_name(name) toReplace = True suffix = "" if False and name.startswith("N(func_"): diff --git a/tools/sort_symbol_addrs.py b/tools/sort_symbol_addrs.py index 8c6b5aae69..670181e04a 100755 --- a/tools/sort_symbol_addrs.py +++ b/tools/sort_symbol_addrs.py @@ -9,7 +9,7 @@ script_dir = os.path.dirname(os.path.realpath(__file__)) syms = {} for version in ["us", "jp"]: - file_path = os.path.join(script_dir, f"ver/{version}/symbol_addrs.txt") + file_path = os.path.join(script_dir, f"../ver/{version}/symbol_addrs.txt") with open(file_path) as f: symbol_lines = f.readlines() diff --git a/tools/star_rod_idx_to_c.py b/tools/star_rod_idx_to_c.py index 5b1ee9957a..f8cff9229c 100755 --- a/tools/star_rod_idx_to_c.py +++ b/tools/star_rod_idx_to_c.py @@ -117,7 +117,7 @@ def read_ptr(addr: int, symbol_map: dict, needs_ampersand: bool = False) -> str: else: return f"(void*) 0x{addr:08X}" -def disassemble(bytes, midx, symbol_map={}, comments=True, romstart=0): +def disassemble(bytes, midx, symbol_map={}, comments=True, romstart=0, namespace=None): global INCLUDES_NEEDED, INCLUDED out = "" @@ -128,6 +128,11 @@ def disassemble(bytes, midx, symbol_map={}, comments=True, romstart=0): afterHeader = False treePrint = False + def transform_symbol_name(symbol): + if namespace and symbol.startswith(namespace + "_"): + return "N(" + symbol[len(namespace)+1:] + ")" + return symbol + while len(midx) > 0: struct = midx.pop(0) @@ -143,7 +148,7 @@ def disassemble(bytes, midx, symbol_map={}, comments=True, romstart=0): out += f"// rodata: {struct['name']}\n" # format struct - if struct["type"].startswith("EvtSource"): + if struct["type"].startswith("Script"): if struct["type"] == "Script_Main": name = "N(main)" INCLUDES_NEEDED["forward"].append(f"EvtSource " + name + ";") @@ -154,16 +159,10 @@ def disassemble(bytes, midx, symbol_map={}, comments=True, romstart=0): # INCLUDES_NEEDED["forward"].append(f"EvtSource " + name + ";") # afterHeader = False - pos = bytes.tell() - try_replace = False - try: - script_text = disasm_script.ScriptDSLDisassembler(bytes, name, symbol_map, romstart, INCLUDES_NEEDED, INCLUDED).disassemble() - try_replace = True - except disasm_script.UnsupportedScript as e: - script_text = f"// Unable to use DSL: {e}\n" - - bytes.seek(pos) - script_text += disasm_script.ScriptDisassembler(bytes, name, symbol_map, romstart, INCLUDES_NEEDED, INCLUDED).disassemble() + script_text = disasm_script.ScriptDisassembler( + bytes, name, symbol_map, romstart, INCLUDES_NEEDED, INCLUDED, + transform_symbol_name=transform_symbol_name, + ).disassemble() if "shakeTree" in name or "searchBush" in name: symbol_map[struct["vaddr"]][0][1] = name.split("_",1)[0] + ")" @@ -174,7 +173,7 @@ def disassemble(bytes, midx, symbol_map={}, comments=True, romstart=0): treePrint = True continue - if try_replace and "exitWalk" in name: + if "exitWalk" in name: script_text = script_text.splitlines() walkDistance = exitIdx = map_ = entryIdx = "" if "UseExitHeading" in script_text[2]: @@ -955,7 +954,7 @@ def parse_midx(file, prefix="", vram=0x80240000): for line in file.readlines(): s = line.split("#") - if len(s) == 5: + if len(s) == 5 or len(s) == 6: if s[0] == "$Start": continue if s[0] == "$End": continue @@ -991,6 +990,8 @@ def parse_midx(file, prefix="", vram=0x80240000): "length": end - start, "end": end, }) + else: + raise Exception(str(s)) structs.sort(key=lambda s: s["start"]) return structs @@ -1026,6 +1027,7 @@ def name_struct(s): if __name__ == "__main__": parser = argparse.ArgumentParser(description="Converts split data to C using a Star Rod idx file") parser.add_argument("idxfile", help="Input .*idx file from Star Rod dump") + parser.add_argument("namespace", nargs='?', help="Value of NAMESPACE macro") parser.add_argument("--comments", action="store_true", help="Write offset/vaddr comments") args = parser.parse_args() @@ -1041,12 +1043,29 @@ if __name__ == "__main__": if "partner" in base: segment_name = f"battle/partners/{battle_area}" + elif "/starpower/src/" in args.idxfile: + segment_name = ( + f"battle/star/{battle_area}" + .replace("starstorm", "star_storm") + .replace("chillout", "chill_out") + .replace("timeout", "time_out") + .replace("upandaway", "up_and_away") + .replace("starbeam", "star_beam") + .replace("peachbeam", "peach_beam") + .replace("peachfocus", "peach_focus") + .replace("peachdash", "peach_dash") + ) else: segment_name = f"battle_partner_{battle_area}" is_battle = True symbol_map = {} + def add_to_symbol_map(addr, pair): + if addr in symbol_map: + symbol_map[addr].append(pair) + else: + symbol_map[addr] = [pair] disasm_script.get_constants() @@ -1116,16 +1135,16 @@ if __name__ == "__main__": string_data = string_data[:-1] string_literal = json.dumps(string_data) - symbol_map[struct["vaddr"]] = [[struct["vaddr"], string_literal]] + add_to_symbol_map(struct["vaddr"], [struct["vaddr"], string_literal]) elif struct["type"] == "SJIS": string_data = sjis.decode(romfile.read(struct["length"])) string_literal = '"' + string_data + '"' - symbol_map[struct["vaddr"]] = [[struct["vaddr"], string_literal]] + add_to_symbol_map(struct["vaddr"], [struct["vaddr"], string_literal]) elif struct["type"] == "ConstDouble": double = unpack_from(">d", romfile.read(struct["length"]), 0)[0] double_literal = f"{double}" - symbol_map[struct["vaddr"]] = [[struct["vaddr"], double_literal]] + add_to_symbol_map(struct["vaddr"], [struct["vaddr"], double_literal]) elif struct["type"] == "NpcGroup": for z in range(struct["length"]//0x1F0): npc = romfile.read(0x1F0) @@ -1137,9 +1156,9 @@ if __name__ == "__main__": sprite = disasm_script.CONSTANTS["NPC_SPRITE"][sprite_id]["name"].upper() if npc_id not in total_npc_counts: total_npc_counts[npc_id] = sprite - symbol_map[struct["vaddr"]] = [[struct["vaddr"], struct["name"]]] + add_to_symbol_map(struct["vaddr"], [struct["vaddr"], struct["name"]]) else: - symbol_map[struct["vaddr"]] = [[struct["vaddr"], struct["name"]]] + add_to_symbol_map(struct["vaddr"], [struct["vaddr"], struct["name"]]) # fix NPC names curr_counts = {} @@ -1159,7 +1178,7 @@ if __name__ == "__main__": romfile.seek(rom_offset, 0) - disasm = disassemble(romfile, midx, symbol_map, args.comments, rom_offset) + disasm = disassemble(romfile, midx, symbol_map, args.comments, rom_offset, namespace=args.namespace) print("========== Includes needed: ===========\n") if is_battle: @@ -1169,7 +1188,7 @@ if __name__ == "__main__": print(f"#include \"message_ids.h\"") if INCLUDES_NEEDED["sprites"]: for npc in sorted(INCLUDES_NEEDED["sprites"]): - print(f"#include \"sprite/npc/{npc}.h\"") + print(f"#include \"sprite/npc/{npc}\"") print() if INCLUDES_NEEDED["forward"]: diff --git a/tools/update_symbol_addrs.py b/tools/update_symbol_addrs.py index e60c8cabb4..3cd327f297 100755 --- a/tools/update_symbol_addrs.py +++ b/tools/update_symbol_addrs.py @@ -113,7 +113,7 @@ def read_symbol_addrs(): def read_elf(): try: - result = subprocess.run(['objdump', '-x', elf_path], stdout=subprocess.PIPE) + result = subprocess.run(['mips-linux-gnu-objdump', '-x', elf_path], stdout=subprocess.PIPE) objdump_lines = result.stdout.decode().split("\n") except: print(f"Error: Could not run objdump on {elf_path} - make sure that the project is built") @@ -131,6 +131,7 @@ def read_elf(): name in ignores or \ name.startswith("_") or \ name.startswith("jtbl_") or \ + name.endswith(".o") or \ re.match(r"L[0-9A-F]{8}", name): continue 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 deleted file mode 100644 index e632b5e3d4..0000000000 --- a/ver/us/asm/data/battle/star/chill_out/7909C0.data.s +++ /dev/null @@ -1,15 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802A18F0_7909C0 -.word 0x00000043, 0x00000002, GetOwnerID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 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, UseBattleCamPreset, 0x00000045, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, battle_star_chill_out_UnkStarFunc, 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, battle_star_chill_out_UnkStarFunc, 0x00000004, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, PlaySound, 0x00000241, 0x00000043, 0x00000002, battle_star_chill_out_UnkStarFunc, 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, battle_star_chill_out_UnkStarFunc, 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, battle_star_chill_out_UnkStarFunc, 0x00000004, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetOwnerID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 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, UseBattleCamPreset, 0x00000045, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, battle_star_chill_out_UnkStarFunc, 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, battle_star_chill_out_UnkStarFunc, 0x00000004, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, PlaySound, 0x00000241, 0x00000043, 0x00000002, battle_star_chill_out_UnkStarFunc, 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, battle_star_chill_out_UnkStarFunc, 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, battle_star_chill_out_UnkStarFunc, 0x00000004, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A2020_7910F0 -.word 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, SetNpcDecoration, 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, UseBattleCamPreset, 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 - -dlabel D_802A222C_7912FC -.word 0x00000043, 0x00000002, GetOwnerID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 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, UseBattleCamPreset, 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 - -dlabel D_802A267C_79174C -.word 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, battle_star_chill_out_UnkStarFunc, 0x00000003, 0x00000043, 0x00000003, RunToGoal, 0x00000100, 0x00000000, 0x00000043, 0x00000002, battle_star_chill_out_UnkStarFunc, 0x00000004, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_802A1518_7905E8, 0x00000046, 0x00000001, D_802A18F0_7909C0, 0x00000025, 0x00000002, 0xFE363C80, 0x001C0001, 0x00000046, 0x00000001, D_802A2020_7910F0, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000064, 0x001C0002, 0x00000008, 0x00000001, 0x00000010, 0x00000043, 0x00000002, UseBattleCamPreset, 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, D_802A222C_7912FC, 0x00000046, 0x00000001, D_802A267C_79174C, 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/78A490.data.s b/ver/us/asm/data/battle/star/focus/78A490.data.s deleted file mode 100644 index 2a13fc9cc6..0000000000 --- a/ver/us/asm/data/battle/star/focus/78A490.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802A1630_78A490 -.word 0x00000043, 0x00000002, GetOwnerID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 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, UseBattleCamPreset, 0x00000045, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, battle_star_focus_UnkStarFunc, 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, battle_star_focus_UnkStarFunc, 0x00000004, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, PlaySound, 0x00000241, 0x00000043, 0x00000002, battle_star_focus_UnkStarFunc, 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, battle_star_focus_UnkStarFunc, 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, battle_star_focus_UnkStarFunc, 0x00000004, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetOwnerID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 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, UseBattleCamPreset, 0x00000045, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, battle_star_focus_UnkStarFunc, 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, battle_star_focus_UnkStarFunc, 0x00000004, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, PlaySound, 0x00000241, 0x00000043, 0x00000002, battle_star_focus_UnkStarFunc, 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, battle_star_focus_UnkStarFunc, 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, battle_star_focus_UnkStarFunc, 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, SetNpcDecoration, 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, UseBattleCamPreset, 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, UseBattleCamPreset, 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, UseBattleCamPreset, 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, battle_star_focus_UnkStarFunc, 0x00000003, 0x00000043, 0x00000003, RunToGoal, 0x00000100, 0x00000000, 0x00000043, 0x00000002, battle_star_focus_UnkStarFunc, 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, UseBattleCamPreset, 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, UseBattleCamPreset, 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, battle_star_focus_UnkStarFunc, 0x00000003, 0x00000043, 0x00000003, RunToGoal, 0x00000100, 0x00000000, 0x00000043, 0x00000002, battle_star_focus_UnkStarFunc, 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 deleted file mode 100644 index 23565f8477..0000000000 --- a/ver/us/asm/data/battle/star/lullaby/78D770.data.s +++ /dev/null @@ -1,15 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802A1620_78D770 -.word 0x00000043, 0x00000002, GetOwnerID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 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, UseBattleCamPreset, 0x00000045, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, battle_star_lullaby_UnkStarFunc, 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, battle_star_lullaby_UnkStarFunc, 0x00000004, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, PlaySound, 0x00000241, 0x00000043, 0x00000002, battle_star_lullaby_UnkStarFunc, 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, battle_star_lullaby_UnkStarFunc, 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, battle_star_lullaby_UnkStarFunc, 0x00000004, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetOwnerID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 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, UseBattleCamPreset, 0x00000045, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, battle_star_lullaby_UnkStarFunc, 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, battle_star_lullaby_UnkStarFunc, 0x00000004, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, PlaySound, 0x00000241, 0x00000043, 0x00000002, battle_star_lullaby_UnkStarFunc, 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, battle_star_lullaby_UnkStarFunc, 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, battle_star_lullaby_UnkStarFunc, 0x00000004, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A1D50_78DEA0 -.word 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, SetNpcDecoration, 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, UseBattleCamPreset, 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 - -dlabel D_802A1F5C_78E0AC -.word 0x00000043, 0x00000002, GetOwnerID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 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, UseBattleCamPreset, 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 - -dlabel D_802A23AC_78E4FC -.word 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, battle_star_lullaby_UnkStarFunc, 0x00000003, 0x00000043, 0x00000003, RunToGoal, 0x00000100, 0x00000000, 0x00000043, 0x00000002, battle_star_lullaby_UnkStarFunc, 0x00000004, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000046, 0x00000001, D_802A1620_78D770, 0x00000025, 0x00000002, 0xFE363C80, 0x001A0001, 0x00000046, 0x00000001, D_802A1D50_78DEA0, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000064, 0x001A0002, 0x00000008, 0x00000001, 0x00000010, 0x00000043, 0x00000002, UseBattleCamPreset, 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, D_802A1F5C_78E0AC, 0x00000046, 0x00000001, D_802A23AC_78E4FC, 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 deleted file mode 100644 index a03a455b81..0000000000 --- a/ver/us/asm/data/battle/star/peach_beam/79ACA0.data.s +++ /dev/null @@ -1,27 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802A24F0_79ACA0 -.word 0x00000043, 0x00000002, GetOwnerID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 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, UseBattleCamPreset, 0x00000045, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, battle_star_peach_beam_UnkStarFunc, 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, battle_star_peach_beam_UnkStarFunc, 0x00000004, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, PlaySound, 0x00000241, 0x00000043, 0x00000002, battle_star_peach_beam_UnkStarFunc, 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, battle_star_peach_beam_UnkStarFunc, 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, battle_star_peach_beam_UnkStarFunc, 0x00000004, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A2888_79B038 -.word 0x00000043, 0x00000002, GetOwnerID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 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, UseBattleCamPreset, 0x00000045, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, battle_star_peach_beam_UnkStarFunc, 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, battle_star_peach_beam_UnkStarFunc, 0x00000004, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, PlaySound, 0x00000241, 0x00000043, 0x00000002, battle_star_peach_beam_UnkStarFunc, 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, battle_star_peach_beam_UnkStarFunc, 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, battle_star_peach_beam_UnkStarFunc, 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, SetNpcDecoration, 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, UseBattleCamPreset, 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, UseBattleCamPreset, 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, UseBattleCamPreset, 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 - -dlabel D_802A327C_79BA2C -.word 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, battle_star_peach_beam_UnkStarFunc, 0x00000003, 0x00000043, 0x00000003, RunToGoal, 0x00000100, 0x00000000, 0x00000043, 0x00000002, battle_star_peach_beam_UnkStarFunc, 0x00000004, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel 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 - -dlabel D_802A3514_79BCC4 -.word 0x00000023, 0x00000000, 0x00000005, 0x0000000A, 0x0000000F, 0x00000014, 0x00000019, 0x0000001E - -dlabel D_802A3534_79BCE4 -.word 0x00000023, 0x00000000, 0x00000005, 0x0000000A, 0x0000000F, 0x00000014, 0x00000019, 0x0000001E - -dlabel D_802A3554_79BD04 -.word 0x42B20000, 0x43340000, 0x00000000, 0xC2100000, 0x43340000, 0x00000000, 0x434C0000, 0x43340000, 0x00000000, 0x41F00000, 0x42C20000, 0x43EE8000, 0x43660000, 0x42A20000, 0x00000000, 0x43010000, 0x43340000, 0x00000000, 0xC2700000, 0x43340000, 0x00000000, 0xC36A0000, 0x421C0000, 0x00000000, 0x00000046, 0x00000001, D_802A2888_79B038, 0x00000043, 0x00000002, AddBattleCamZoom, 0x00000064, 0x00000043, 0x00000002, MoveBattleCamOver, 0x00000014, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000002, SetGoalToTarget, 0xFFFFFF81, 0x00000056, 0x00000000, 0x00000043, 0x00000002, func_802A1518_799CC8, 0x00000001, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000001, func_802A2468_79AC18, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000001, InitTargetIterator, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetGoalToTarget, 0xFFFFFF81, 0x00000043, 0x00000006, ItemDamageEnemy, 0xFE363C80, 0x40800000, 0x00000000, 0x00000000, 0x00000020, 0x00000043, 0x00000003, ChooseNextTarget, 0x00000000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000001, func_802A2468_79AC18, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000002, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000002, 0x00000043, 0x00000001, func_802A247C_79AC2C, 0x00000043, 0x00000001, func_80276EFC, 0x00000046, 0x00000001, D_802A327C_79BA2C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel jtbl_802A3790_79BF40 -.word L802A18B0_79A060, L802A1A00_79A1B0, L802A1A88_79A238, L802A1AB8_79A268, L802A1B54_79A304, L802A1E34_79A5E4, L802A1F0C_79A6BC, L802A1FC8_79A778, L802A1FE8_79A798, L802A2040_79A7F0, L802A2080_79A830, L802A241C_79ABCC, L802A241C_79ABCC, L802A241C_79ABCC, L802A241C_79ABCC, L802A241C_79ABCC, L802A241C_79ABCC, L802A241C_79ABCC, L802A241C_79ABCC, L802A241C_79ABCC, L802A219C_79A94C, L802A21F8_79A9A8, 0, 0 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 deleted file mode 100644 index b076f91db9..0000000000 --- a/ver/us/asm/data/battle/star/peach_dash/79DE50.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802A15B0_79DE50 -.word 0x00000043, 0x00000002, GetOwnerID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 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, UseBattleCamPreset, 0x00000045, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, battle_star_peach_dash_UnkStarFunc, 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, battle_star_peach_dash_UnkStarFunc, 0x00000004, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, PlaySound, 0x00000241, 0x00000043, 0x00000002, battle_star_peach_dash_UnkStarFunc, 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, battle_star_peach_dash_UnkStarFunc, 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, battle_star_peach_dash_UnkStarFunc, 0x00000004, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetOwnerID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 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, UseBattleCamPreset, 0x00000045, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, battle_star_peach_dash_UnkStarFunc, 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, battle_star_peach_dash_UnkStarFunc, 0x00000004, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, PlaySound, 0x00000241, 0x00000043, 0x00000002, battle_star_peach_dash_UnkStarFunc, 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, battle_star_peach_dash_UnkStarFunc, 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, battle_star_peach_dash_UnkStarFunc, 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, SetNpcDecoration, 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, UseBattleCamPreset, 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, UseBattleCamPreset, 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, UseBattleCamPreset, 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, battle_star_peach_dash_UnkStarFunc, 0x00000003, 0x00000043, 0x00000003, RunToGoal, 0x00000100, 0x00000000, 0x00000043, 0x00000002, battle_star_peach_dash_UnkStarFunc, 0x00000004, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 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 deleted file mode 100644 index b8d4043ee1..0000000000 --- a/ver/us/asm/data/battle/star/peach_focus/79C4D0.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802A1530_79C4D0 -.word 0x00000043, 0x00000002, GetOwnerID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 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, UseBattleCamPreset, 0x00000045, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, battle_star_peach_focus_UnkStarFunc, 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, battle_star_peach_focus_UnkStarFunc, 0x00000004, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, PlaySound, 0x00000241, 0x00000043, 0x00000002, battle_star_peach_focus_UnkStarFunc, 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, battle_star_peach_focus_UnkStarFunc, 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, battle_star_peach_focus_UnkStarFunc, 0x00000004, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetOwnerID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 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, UseBattleCamPreset, 0x00000045, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, battle_star_peach_focus_UnkStarFunc, 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, battle_star_peach_focus_UnkStarFunc, 0x00000004, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, PlaySound, 0x00000241, 0x00000043, 0x00000002, battle_star_peach_focus_UnkStarFunc, 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, battle_star_peach_focus_UnkStarFunc, 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, battle_star_peach_focus_UnkStarFunc, 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, SetNpcDecoration, 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, UseBattleCamPreset, 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, UseBattleCamPreset, 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, UseBattleCamPreset, 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, battle_star_peach_focus_UnkStarFunc, 0x00000003, 0x00000043, 0x00000003, RunToGoal, 0x00000100, 0x00000000, 0x00000043, 0x00000002, battle_star_peach_focus_UnkStarFunc, 0x00000004, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 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, UseBattleCamPreset, 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, UseBattleCamPreset, 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 deleted file mode 100644 index 8c873e4cde..0000000000 --- a/ver/us/asm/data/battle/star/refresh/78C070.data.s +++ /dev/null @@ -1,12 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802A1A70_78C070 -.word 0x00000043, 0x00000002, GetOwnerID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 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, UseBattleCamPreset, 0x00000045, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, battle_star_refresh_UnkStarFunc, 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, battle_star_refresh_UnkStarFunc, 0x00000004, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, PlaySound, 0x00000241, 0x00000043, 0x00000002, battle_star_refresh_UnkStarFunc, 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, battle_star_refresh_UnkStarFunc, 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, battle_star_refresh_UnkStarFunc, 0x00000004, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetOwnerID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 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, UseBattleCamPreset, 0x00000045, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, battle_star_refresh_UnkStarFunc, 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, battle_star_refresh_UnkStarFunc, 0x00000004, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, PlaySound, 0x00000241, 0x00000043, 0x00000002, battle_star_refresh_UnkStarFunc, 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, battle_star_refresh_UnkStarFunc, 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, battle_star_refresh_UnkStarFunc, 0x00000004, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A21A0_78C7A0 -.word 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, SetNpcDecoration, 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, UseBattleCamPreset, 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, UseBattleCamPreset, 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, UseBattleCamPreset, 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 - -dlabel D_802A27FC_78CDFC -.word 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, battle_star_refresh_UnkStarFunc, 0x00000003, 0x00000043, 0x00000003, RunToGoal, 0x00000100, 0x00000000, 0x00000043, 0x00000002, battle_star_refresh_UnkStarFunc, 0x00000004, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000046, 0x00000001, D_802A1A70_78C070, 0x00000025, 0x00000002, 0xFE363C80, 0x00190001, 0x00000046, 0x00000001, D_802A21A0_78C7A0, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000064, 0x00190002, 0x00000008, 0x00000001, 0x00000010, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, UseBattleCamPreset, 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, D_802A27FC_78CDFC, 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 deleted file mode 100644 index f1cd04b50c..0000000000 --- a/ver/us/asm/data/battle/star/smooch/7923C0.data.s +++ /dev/null @@ -1,15 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802A1630_7923C0 -.word 0x00000043, 0x00000002, GetOwnerID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 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, UseBattleCamPreset, 0x00000045, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, battle_star_smooch_UnkStarFunc, 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, battle_star_smooch_UnkStarFunc, 0x00000004, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, PlaySound, 0x00000241, 0x00000043, 0x00000002, battle_star_smooch_UnkStarFunc, 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, battle_star_smooch_UnkStarFunc, 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, battle_star_smooch_UnkStarFunc, 0x00000004, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetOwnerID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 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, UseBattleCamPreset, 0x00000045, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, battle_star_smooch_UnkStarFunc, 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, battle_star_smooch_UnkStarFunc, 0x00000004, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, PlaySound, 0x00000241, 0x00000043, 0x00000002, battle_star_smooch_UnkStarFunc, 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, battle_star_smooch_UnkStarFunc, 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, battle_star_smooch_UnkStarFunc, 0x00000004, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A1D60_792AF0 -.word 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, SetNpcDecoration, 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, UseBattleCamPreset, 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 - -dlabel D_802A1F6C_792CFC -.word 0x00000043, 0x00000002, GetOwnerID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 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, UseBattleCamPreset, 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, battle_star_smooch_UnkStarFunc, 0x00000003, 0x00000043, 0x00000003, RunToGoal, 0x00000100, 0x00000000, 0x00000043, 0x00000002, battle_star_smooch_UnkStarFunc, 0x00000004, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A24E8_793278 -.word 0x0000000F, 0x0000000F, 0xFFFFFFDF, 0x0000001B, 0xFFFFFFEA, 0xFFFFFFE6, 0x0000000A, 0xFFFFFFDD, 0x00000023, 0x00000000, 0x00000046, 0x00000001, D_802A1630_7923C0, 0x00000025, 0x00000002, 0xFE363C80, 0x001D0000, 0x00000046, 0x00000001, D_802A1D60_792AF0, 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, D_802A24E8_793278, 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, D_802A1F6C_792CFC, 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, UseBattleCamPreset, 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 deleted file mode 100644 index 83036cfafe..0000000000 --- a/ver/us/asm/data/battle/star/star_beam/7984B0.data.s +++ /dev/null @@ -1,27 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802A24F0_7984B0 -.word 0x00000043, 0x00000002, GetOwnerID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 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, UseBattleCamPreset, 0x00000045, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, battle_star_star_beam_UnkStarFunc, 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, battle_star_star_beam_UnkStarFunc, 0x00000004, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, PlaySound, 0x00000241, 0x00000043, 0x00000002, battle_star_star_beam_UnkStarFunc, 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, battle_star_star_beam_UnkStarFunc, 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, battle_star_star_beam_UnkStarFunc, 0x00000004, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A2888_798848 -.word 0x00000043, 0x00000002, GetOwnerID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 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, UseBattleCamPreset, 0x00000045, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, battle_star_star_beam_UnkStarFunc, 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, battle_star_star_beam_UnkStarFunc, 0x00000004, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, PlaySound, 0x00000241, 0x00000043, 0x00000002, battle_star_star_beam_UnkStarFunc, 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, battle_star_star_beam_UnkStarFunc, 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, battle_star_star_beam_UnkStarFunc, 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, SetNpcDecoration, 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, UseBattleCamPreset, 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, UseBattleCamPreset, 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, UseBattleCamPreset, 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 - -dlabel D_802A327C_79923C -.word 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, battle_star_star_beam_UnkStarFunc, 0x00000003, 0x00000043, 0x00000003, RunToGoal, 0x00000100, 0x00000000, 0x00000043, 0x00000002, battle_star_star_beam_UnkStarFunc, 0x00000004, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel 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 - -dlabel D_802A3514_7994D4 -.word 0x00000023, 0x00000000, 0x00000005, 0x0000000A, 0x0000000F, 0x00000014, 0x00000019, 0x0000001E - -dlabel D_802A3534_7994F4 -.word 0x00000023, 0x00000000, 0x00000005, 0x0000000A, 0x0000000F, 0x00000014, 0x00000019, 0x0000001E - -dlabel D_802A3554_799514 -.word 0x42B20000, 0x43340000, 0x00000000, 0xC2100000, 0x43340000, 0x00000000, 0x434C0000, 0x43340000, 0x00000000, 0x41F00000, 0x42C20000, 0x43EE8000, 0x43660000, 0x42A20000, 0x00000000, 0x43010000, 0x43340000, 0x00000000, 0xC2700000, 0x43340000, 0x00000000, 0xC36A0000, 0x421C0000, 0x00000000, 0x00000046, 0x00000001, D_802A2888_798848, 0x00000043, 0x00000002, AddBattleCamZoom, 0x00000064, 0x00000043, 0x00000002, MoveBattleCamOver, 0x00000014, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000002, SetGoalToTarget, 0xFFFFFF81, 0x00000056, 0x00000000, 0x00000043, 0x00000002, func_802A1518_7974D8, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000001, func_802A2468_798428, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000001, InitTargetIterator, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetGoalToTarget, 0xFFFFFF81, 0x00000043, 0x00000006, ItemDamageEnemy, 0xFE363C80, 0x40400000, 0x00000000, 0x00000000, 0x00000020, 0x00000043, 0x00000003, ChooseNextTarget, 0x00000000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000001, func_802A2468_798428, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000002, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000002, 0x00000043, 0x00000001, func_802A247C_79843C, 0x00000043, 0x00000001, func_80276EFC, 0x00000046, 0x00000001, D_802A327C_79923C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel jtbl_802A3790_799750 -.word L802A18B0_797870, L802A1A00_7979C0, L802A1A88_797A48, L802A1AB8_797A78, L802A1B54_797B14, L802A1E34_797DF4, L802A1F0C_797ECC, L802A1FC8_797F88, L802A1FE8_797FA8, L802A2040_798000, L802A2080_798040, L802A241C_7983DC, L802A241C_7983DC, L802A241C_7983DC, L802A241C_7983DC, L802A241C_7983DC, L802A241C_7983DC, L802A241C_7983DC, L802A241C_7983DC, L802A241C_7983DC, L802A219C_79815C, L802A21F8_7981B8, 0, 0 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 deleted file mode 100644 index be958c8b0b..0000000000 --- a/ver/us/asm/data/battle/star/star_storm/78EEC0.data.s +++ /dev/null @@ -1,15 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802A16F0_78EEC0 -.word 0x00000043, 0x00000002, GetOwnerID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 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, UseBattleCamPreset, 0x00000045, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, battle_star_star_storm_UnkStarFunc, 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, battle_star_star_storm_UnkStarFunc, 0x00000004, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, PlaySound, 0x00000241, 0x00000043, 0x00000002, battle_star_star_storm_UnkStarFunc, 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, battle_star_star_storm_UnkStarFunc, 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, battle_star_star_storm_UnkStarFunc, 0x00000004, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetOwnerID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 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, UseBattleCamPreset, 0x00000045, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, battle_star_star_storm_UnkStarFunc, 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, battle_star_star_storm_UnkStarFunc, 0x00000004, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, PlaySound, 0x00000241, 0x00000043, 0x00000002, battle_star_star_storm_UnkStarFunc, 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, battle_star_star_storm_UnkStarFunc, 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, battle_star_star_storm_UnkStarFunc, 0x00000004, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A1E20_78F5F0 -.word 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, SetNpcDecoration, 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, UseBattleCamPreset, 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 - -dlabel D_802A202C_78F7FC -.word 0x00000043, 0x00000002, GetOwnerID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 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, UseBattleCamPreset, 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 - -dlabel D_802A247C_78FC4C -.word 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, battle_star_star_storm_UnkStarFunc, 0x00000003, 0x00000043, 0x00000003, RunToGoal, 0x00000100, 0x00000000, 0x00000043, 0x00000002, battle_star_star_storm_UnkStarFunc, 0x00000004, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000046, 0x00000001, D_802A16F0_78EEC0, 0x00000025, 0x00000002, 0xFE363C80, 0x001B0001, 0x00000046, 0x00000001, D_802A1E20_78F5F0, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000064, 0x001B0002, 0x00000008, 0x00000001, 0x00000010, 0x00000043, 0x00000002, UseBattleCamPreset, 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, D_802A202C_78F7FC, 0x00000043, 0x00000001, func_80276EFC, 0x00000046, 0x00000001, D_802A247C_78FC4C, 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 deleted file mode 100644 index e18bcb5c80..0000000000 --- a/ver/us/asm/data/battle/star/time_out/794240.data.s +++ /dev/null @@ -1,15 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802A1520_794240 -.word 0x00000043, 0x00000002, GetOwnerID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 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, UseBattleCamPreset, 0x00000045, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, battle_star_time_out_UnkStarFunc, 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, battle_star_time_out_UnkStarFunc, 0x00000004, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, PlaySound, 0x00000241, 0x00000043, 0x00000002, battle_star_time_out_UnkStarFunc, 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, battle_star_time_out_UnkStarFunc, 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, battle_star_time_out_UnkStarFunc, 0x00000004, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetOwnerID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 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, UseBattleCamPreset, 0x00000045, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, battle_star_time_out_UnkStarFunc, 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, battle_star_time_out_UnkStarFunc, 0x00000004, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, PlaySound, 0x00000241, 0x00000043, 0x00000002, battle_star_time_out_UnkStarFunc, 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, battle_star_time_out_UnkStarFunc, 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, battle_star_time_out_UnkStarFunc, 0x00000004, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A1C50_794970 -.word 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, SetNpcDecoration, 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, UseBattleCamPreset, 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 - -dlabel D_802A1E5C_794B7C -.word 0x00000043, 0x00000002, GetOwnerID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 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, UseBattleCamPreset, 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 - -dlabel D_802A22AC_794FCC -.word 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, battle_star_time_out_UnkStarFunc, 0x00000003, 0x00000043, 0x00000003, RunToGoal, 0x00000100, 0x00000000, 0x00000043, 0x00000002, battle_star_time_out_UnkStarFunc, 0x00000004, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000046, 0x00000001, D_802A1520_794240, 0x00000025, 0x00000002, 0xFE363C80, 0x001E0001, 0x00000046, 0x00000001, D_802A1C50_794970, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000064, 0x001E0002, 0x00000008, 0x00000001, 0x00000010, 0x00000043, 0x00000002, UseBattleCamPreset, 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, D_802A1E5C_794B7C, 0x00000046, 0x00000001, D_802A22AC_794FCC, 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 deleted file mode 100644 index 4a62cb47a0..0000000000 --- a/ver/us/asm/data/battle/star/up_and_away/7959B0.data.s +++ /dev/null @@ -1,15 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802A16D0_7959B0 -.word 0x00000043, 0x00000002, GetOwnerID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 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, UseBattleCamPreset, 0x00000045, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, battle_star_up_and_away_UnkStarFunc, 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, battle_star_up_and_away_UnkStarFunc, 0x00000004, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, PlaySound, 0x00000241, 0x00000043, 0x00000002, battle_star_up_and_away_UnkStarFunc, 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, battle_star_up_and_away_UnkStarFunc, 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, battle_star_up_and_away_UnkStarFunc, 0x00000004, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetOwnerID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 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, UseBattleCamPreset, 0x00000045, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, battle_star_up_and_away_UnkStarFunc, 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, battle_star_up_and_away_UnkStarFunc, 0x00000004, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, PlaySound, 0x00000241, 0x00000043, 0x00000002, battle_star_up_and_away_UnkStarFunc, 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, battle_star_up_and_away_UnkStarFunc, 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, battle_star_up_and_away_UnkStarFunc, 0x00000004, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A1E00_7960E0 -.word 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, SetNpcDecoration, 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, UseBattleCamPreset, 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 - -dlabel D_802A200C_7962EC -.word 0x00000043, 0x00000002, GetOwnerID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 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, UseBattleCamPreset, 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 - -dlabel D_802A245C_79673C -.word 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, battle_star_up_and_away_UnkStarFunc, 0x00000003, 0x00000043, 0x00000003, RunToGoal, 0x00000100, 0x00000000, 0x00000043, 0x00000002, battle_star_up_and_away_UnkStarFunc, 0x00000004, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000046, 0x00000001, D_802A16D0_7959B0, 0x00000025, 0x00000002, 0xFE363C80, 0x001F0001, 0x00000046, 0x00000001, D_802A1E00_7960E0, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000064, 0x001F0002, 0x00000043, 0x00000002, UseBattleCamPreset, 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, CreateVirtualEntity, 0xFE363C8A, 0x80283EE8, 0x00000043, 0x00000005, GetActorPos, 0xFE363C8B, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C8D, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C8F, 0xFE363C82, 0x00000043, 0x00000005, SetVirtualEntityPosition, 0xFE363C8A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000026, 0x00000002, 0xFE363C80, 0xF24A7B4D, 0x00000043, 0x00000005, SetVirtualEntityScale, 0xFE363C8A, 0xFE363C80, 0xFE363C80, 0xFE363C80, 0x00000005, 0x00000001, 0x00000004, 0x0000002C, 0x00000002, 0xFE363C80, 0xF24A7B4D, 0x00000043, 0x00000005, SetVirtualEntityScale, 0xFE363C8A, 0xFE363C80, 0xFE363C80, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000027, 0x00000002, 0xFE363C80, 0x00000048, 0x00000043, 0x00000005, SetVirtualEntityRotation, 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, SetVirtualEntityPosition, 0xFE363C8A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetVirtualEntityRotation, 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, D_802A200C_7962EC, 0x00000043, 0x00000001, func_80276EFC, 0x00000046, 0x00000001, D_802A245C_79673C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/nonmatchings/battle/star/peach_beam/7997B0/func_802A1518_799CC8.s b/ver/us/asm/nonmatchings/battle/star/peach_beam/7997B0/func_802A1518_799CC8.s index fc2274c6e3..8d04a3bec0 100644 --- a/ver/us/asm/nonmatchings/battle/star/peach_beam/7997B0/func_802A1518_799CC8.s +++ b/ver/us/asm/nonmatchings/battle/star/peach_beam/7997B0/func_802A1518_799CC8.s @@ -1,1067 +1,1072 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches +.section .rodata +dlabel jtbl_802A3790_79BF40 +.word .L802A18B0_797870, .L802A1A00_7979C0, .L802A1A88_797A48, .L802A1AB8_797A78, .L802A1B54_797B14, .L802A1E34_797DF4, .L802A1F0C_797ECC, .L802A1FC8_797F88, .L802A1FE8_797FA8, .L802A2040_798000, .L802A2080_798040, .L802A241C_7983DC, .L802A241C_7983DC, .L802A241C_7983DC, .L802A241C_7983DC, .L802A241C_7983DC, .L802A241C_7983DC, .L802A241C_7983DC, .L802A241C_7983DC, .L802A241C_7983DC, .L802A219C_79815C, .L802A21F8_7981B8, 0, 0 + +.section .text 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 evt_get_variable -/* 799D30 802A1580 8C450000 */ lw $a1, ($v0) -/* 799D34 802A1584 AFC20078 */ sw $v0, 0x78($fp) -/* 799D38 802A1588 AFC00070 */ sw $zero, 0x70($fp) +/* 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 evt_get_variable +/* 797540 802A1580 8C450000 */ lw $a1, ($v0) +/* 797544 802A1584 AFC20078 */ sw $v0, 0x78($fp) +/* 797548 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 +/* 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: -/* 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 +/* 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: -/* 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 +/* 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: -/* 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 +/* 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: -/* 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 +/* 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: -/* 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 +/* 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: -/* 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) +/* 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: -/* 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 +/* 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: -/* 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) +/* 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: -/* 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) +/* 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: -/* 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) +/* 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: -/* 799F40 802A1790 0C01C8D4 */ jal playFX_72 -/* 799F44 802A1794 24040004 */ addiu $a0, $zero, 4 +/* 797750 802A1790 0C01C8D4 */ jal playFX_72 +/* 797754 802A1794 24040004 */ addiu $a0, $zero, 4 .L802A1798: -/* 799F48 802A1798 26730004 */ addiu $s3, $s3, 4 +/* 797758 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 +/* 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: -/* 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) +/* 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: -/* 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 +/* 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: -/* 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) +/* 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: -/* 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) +/* 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: -/* 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) +/* 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: -/* 79A020 802A1870 0C01C8D4 */ jal playFX_72 -/* 79A024 802A1874 24040004 */ addiu $a0, $zero, 4 +/* 797830 802A1870 0C01C8D4 */ jal playFX_72 +/* 797834 802A1874 24040004 */ addiu $a0, $zero, 4 .L802A1878: -/* 79A028 802A1878 26730004 */ addiu $s3, $s3, 4 +/* 797838 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 +/* 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: -/* 79A03C 802A188C 8FC30070 */ lw $v1, 0x70($fp) +/* 79784C 802A188C 8FC30070 */ lw $v1, 0x70($fp) .L802A1890: -/* 79A040 802A1890 2C620016 */ sltiu $v0, $v1, 0x16 +/* 797850 802A1890 2C620016 */ sltiu $v0, $v1, 0x16 .L802A1894: -/* 79A044 802A1894 104002E1 */ beqz $v0, L802A241C_79ABCC -/* 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 -dlabel 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 +/* 797854 802A1894 104002E1 */ beqz $v0, .L802A241C_7983DC +/* 797858 802A1898 00031080 */ sll $v0, $v1, 2 +/* 79785C 802A189C 3C01802A */ lui $at, %hi(jtbl_802A3790_79BF40) +/* 797860 802A18A0 00220821 */ addu $at, $at, $v0 +/* 797864 802A18A4 8C223790 */ lw $v0, %lo(jtbl_802A3790_79BF40)($at) +/* 797868 802A18A8 00400008 */ jr $v0 +/* 79786C 802A18AC 00000000 */ nop +.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: -/* 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 +/* 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: -/* 79A0EC 802A193C AFA00014 */ sw $zero, 0x14($sp) -/* 79A0F0 802A1940 0C01C964 */ jal playFX_78 -/* 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) +/* 7978FC 802A193C AFA00014 */ sw $zero, 0x14($sp) +/* 797900 802A1940 0C01C964 */ jal playFX_78 +/* 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: -/* 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 +/* 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: -/* 79A194 802A19E4 3C048000 */ lui $a0, 0x8000 -/* 79A198 802A19E8 34840069 */ ori $a0, $a0, 0x69 +/* 7979A4 802A19E4 3C048000 */ lui $a0, 0x8000 +/* 7979A8 802A19E8 34840069 */ ori $a0, $a0, 0x69 .L802A19EC: -/* 79A19C 802A19EC 0C05272D */ jal sfx_play_sound -/* 79A1A0 802A19F0 00000000 */ nop -/* 79A1A4 802A19F4 24020001 */ addiu $v0, $zero, 1 -/* 79A1A8 802A19F8 080A8907 */ j L802A241C_79ABCC -/* 79A1AC 802A19FC AFC20070 */ sw $v0, 0x70($fp) -dlabel 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_79ABCC -/* 79A234 802A1A84 AFC20070 */ sw $v0, 0x70($fp) -dlabel 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 btl_cam_move -/* 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_79ABCC -/* 79A264 802A1AB4 AFC20070 */ sw $v0, 0x70($fp) -dlabel 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) +/* 7979AC 802A19EC 0C05272D */ jal sfx_play_sound +/* 7979B0 802A19F0 00000000 */ nop +/* 7979B4 802A19F4 24020001 */ addiu $v0, $zero, 1 +/* 7979B8 802A19F8 080A8907 */ j .L802A241C_7983DC +/* 7979BC 802A19FC AFC20070 */ sw $v0, 0x70($fp) +.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_7983DC +/* 797A44 802A1A84 AFC20070 */ sw $v0, 0x70($fp) +.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 btl_cam_move +/* 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_7983DC +/* 797A74 802A1AB4 AFC20070 */ sw $v0, 0x70($fp) +.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: -/* 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 +/* 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: -/* 79A2F0 802A1B40 0C05272D */ jal sfx_play_sound -/* 79A2F4 802A1B44 00000000 */ nop -/* 79A2F8 802A1B48 24020004 */ addiu $v0, $zero, 4 -/* 79A2FC 802A1B4C 080A8907 */ j L802A241C_79ABCC -/* 79A300 802A1B50 AFC20070 */ sw $v0, 0x70($fp) -dlabel 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) +/* 797B00 802A1B40 0C05272D */ jal sfx_play_sound +/* 797B04 802A1B44 00000000 */ nop +/* 797B08 802A1B48 24020004 */ addiu $v0, $zero, 4 +/* 797B0C 802A1B4C 080A8907 */ j .L802A241C_7983DC +/* 797B10 802A1B50 AFC20070 */ sw $v0, 0x70($fp) +.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: -/* 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) +/* 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: -/* 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) +/* 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: -/* 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) +/* 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: -/* 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) +/* 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: -/* 79A494 802A1CE4 8E620000 */ lw $v0, ($s3) -/* 79A498 802A1CE8 2442FFFF */ addiu $v0, $v0, -1 -/* 79A49C 802A1CEC AE620000 */ sw $v0, ($s3) +/* 797CA4 802A1CE4 8E620000 */ lw $v0, ($s3) +/* 797CA8 802A1CE8 2442FFFF */ addiu $v0, $v0, -1 +/* 797CAC 802A1CEC AE620000 */ sw $v0, ($s3) .L802A1CF0: -/* 79A4A0 802A1CF0 26730004 */ addiu $s3, $s3, 4 +/* 797CB0 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_79ABCC -/* 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) +/* 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_7983DC +/* 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: -/* 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 +/* 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: -/* 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 +/* 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: -/* 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 btl_cam_move -/* 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_79ABCC -/* 79A5E0 802A1E30 AFC20070 */ sw $v0, 0x70($fp) -dlabel 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) +/* 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 btl_cam_move +/* 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_7983DC +/* 797DF0 802A1E30 AFC20070 */ sw $v0, 0x70($fp) +.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: -/* 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 sfx_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_79ABCC -/* 79A6B8 802A1F08 AFC20070 */ sw $v0, 0x70($fp) -dlabel 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) +/* 797E60 802A1EA0 3C04802A */ lui $a0, %hi(battle_star_star_beam_802A33A8) +/* 797E64 802A1EA4 248433A8 */ addiu $a0, $a0, %lo(battle_star_star_beam_802A33A8) +/* 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 sfx_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_7983DC +/* 797EC8 802A1F08 AFC20070 */ sw $v0, 0x70($fp) +.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: -/* 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_79ABCC -/* 79A760 802A1FB0 AFC20070 */ sw $v0, 0x70($fp) +/* 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_7983DC +/* 797F70 802A1FB0 AFC20070 */ sw $v0, 0x70($fp) .L802A1FB4: -/* 79A764 802A1FB4 2402000F */ addiu $v0, $zero, 0xf +/* 797F74 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_79ABCC -/* 79A774 802A1FC4 AFC20070 */ sw $v0, 0x70($fp) -dlabel 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_79ABCC -/* 79A794 802A1FE4 AFC20070 */ sw $v0, 0x70($fp) -dlabel 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) +/* 797F78 802A1FB8 AFC20074 */ sw $v0, 0x74($fp) +/* 797F7C 802A1FBC 24020007 */ addiu $v0, $zero, 7 +/* 797F80 802A1FC0 080A8907 */ j .L802A241C_7983DC +/* 797F84 802A1FC4 AFC20070 */ sw $v0, 0x70($fp) +.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_7983DC +/* 797FA4 802A1FE4 AFC20070 */ sw $v0, 0x70($fp) +.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: -/* 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_79ABCC -/* 79A7EC 802A203C AFC20070 */ sw $v0, 0x70($fp) -dlabel L802A2040_79A7F0 -/* 79A7F0 802A2040 8FC20074 */ lw $v0, 0x74($fp) -/* 79A7F4 802A2044 10400003 */ beqz $v0, .L802A2054 -/* 79A7F8 802A2048 2442FFFF */ addiu $v0, $v0, -1 +/* 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_7983DC +/* 797FFC 802A203C AFC20070 */ sw $v0, 0x70($fp) +.L802A2040_798000: +/* 798000 802A2040 8FC20074 */ lw $v0, 0x74($fp) +/* 798004 802A2044 10400003 */ beqz $v0, .L802A2054 +/* 798008 802A2048 2442FFFF */ addiu $v0, $v0, -1 .L802A204C: -/* 79A7FC 802A204C 080A8907 */ j L802A241C_79ABCC -/* 79A800 802A2050 AFC20074 */ sw $v0, 0x74($fp) +/* 79800C 802A204C 080A8907 */ j .L802A241C_7983DC +/* 798010 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_79ABCC -/* 79A82C 802A207C AFC20070 */ sw $v0, 0x70($fp) -dlabel 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 +/* 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_7983DC +/* 79803C 802A207C AFC20070 */ sw $v0, 0x70($fp) +.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: -/* 79A864 802A20B4 0C05269B */ jal func_80149A6C -/* 79A868 802A20B8 24050001 */ addiu $a1, $zero, 1 -/* 79A86C 802A20BC 24040649 */ addiu $a0, $zero, 0x649 +/* 798074 802A20B4 0C05269B */ jal func_80149A6C +/* 798078 802A20B8 24050001 */ addiu $a1, $zero, 1 +/* 79807C 802A20BC 24040649 */ addiu $a0, $zero, 0x649 .L802A20C0: -/* 79A870 802A20C0 0C05272D */ jal sfx_play_sound -/* 79A874 802A20C4 00000000 */ nop +/* 798080 802A20C0 0C05272D */ jal sfx_play_sound +/* 798084 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) +/* 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: -/* 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 +/* 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: -/* 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) +/* 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: -/* 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) +/* 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: -/* 79A930 802A2180 24630004 */ addiu $v1, $v1, 4 +/* 798140 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 -dlabel 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) +/* 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 +.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: -/* 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 +/* 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: -/* 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_79ABCC -/* 79A9A4 802A21F4 AFC20070 */ sw $v0, 0x70($fp) -dlabel 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) +/* 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_7983DC +/* 7981B4 802A21F4 AFC20070 */ sw $v0, 0x70($fp) +.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: -/* 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 +/* 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: -/* 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) +/* 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: -/* 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) +/* 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: -/* 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) +/* 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: -/* 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) +/* 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: -/* 79AB68 802A23B8 8E620000 */ lw $v0, ($s3) -/* 79AB6C 802A23BC 2442FFFF */ addiu $v0, $v0, -1 -/* 79AB70 802A23C0 AE620000 */ sw $v0, ($s3) +/* 798378 802A23B8 8E620000 */ lw $v0, ($s3) +/* 79837C 802A23BC 2442FFFF */ addiu $v0, $v0, -1 +/* 798380 802A23C0 AE620000 */ sw $v0, ($s3) .L802A23C4: -/* 79AB74 802A23C4 26730004 */ addiu $s3, $s3, 4 +/* 798384 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 +/* 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: -/* 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) -dlabel L802A241C_79ABCC -/* 79ABCC 802A241C 0000102D */ daddu $v0, $zero, $zero +/* 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_7983DC: +/* 7983DC 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 +/* 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/battle/star/star_beam/796FC0/func_802A1518_7974D8.s b/ver/us/asm/nonmatchings/battle/star/star_beam/796FC0/func_802A1518_7974D8.s index a126d863f0..1604faa90a 100644 --- a/ver/us/asm/nonmatchings/battle/star/star_beam/796FC0/func_802A1518_7974D8.s +++ b/ver/us/asm/nonmatchings/battle/star/star_beam/796FC0/func_802A1518_7974D8.s @@ -1,6 +1,11 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches +.section .rodata +dlabel jtbl_802A3790_799750 +.word .L802A18B0_797870, .L802A1A00_7979C0, .L802A1A88_797A48, .L802A1AB8_797A78, .L802A1B54_797B14, .L802A1E34_797DF4, .L802A1F0C_797ECC, .L802A1FC8_797F88, .L802A1FE8_797FA8, .L802A2040_798000, .L802A2080_798040, .L802A241C_7983DC, .L802A241C_7983DC, .L802A241C_7983DC, .L802A241C_7983DC, .L802A241C_7983DC, .L802A241C_7983DC, .L802A241C_7983DC, .L802A241C_7983DC, .L802A241C_7983DC, .L802A219C_79815C, .L802A21F8_7981B8, 0, 0 + +.section .text glabel func_802A1518_7974D8 /* 7974D8 802A1518 27BDFF68 */ addiu $sp, $sp, -0x98 /* 7974DC 802A151C AFB50054 */ sw $s5, 0x54($sp) @@ -250,14 +255,14 @@ glabel func_802A1518_7974D8 .L802A1890: /* 797850 802A1890 2C620016 */ sltiu $v0, $v1, 0x16 .L802A1894: -/* 797854 802A1894 104002E1 */ beqz $v0, L802A241C_7983DC +/* 797854 802A1894 104002E1 */ beqz $v0, .L802A241C_7983DC /* 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 -dlabel L802A18B0_797870 +.L802A18B0_797870: /* 797870 802A18B0 C6B40144 */ lwc1 $f20, 0x144($s5) /* 797874 802A18B4 C6BE014C */ lwc1 $f30, 0x14c($s5) /* 797878 802A18B8 92A20191 */ lbu $v0, 0x191($s5) @@ -345,9 +350,9 @@ dlabel L802A18B0_797870 /* 7979AC 802A19EC 0C05272D */ jal sfx_play_sound /* 7979B0 802A19F0 00000000 */ nop /* 7979B4 802A19F4 24020001 */ addiu $v0, $zero, 1 -/* 7979B8 802A19F8 080A8907 */ j L802A241C_7983DC +/* 7979B8 802A19F8 080A8907 */ j .L802A241C_7983DC /* 7979BC 802A19FC AFC20070 */ sw $v0, 0x70($fp) -dlabel L802A1A00_7979C0 +.L802A1A00_7979C0: /* 7979C0 802A1A00 C6200010 */ lwc1 $f0, 0x10($s1) /* 7979C4 802A1A04 C6240004 */ lwc1 $f4, 4($s1) /* 7979C8 802A1A08 46040001 */ sub.s $f0, $f0, $f4 @@ -380,9 +385,9 @@ dlabel L802A1A00_7979C0 /* 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_7983DC +/* 797A40 802A1A80 080A8907 */ j .L802A241C_7983DC /* 797A44 802A1A84 AFC20070 */ sw $v0, 0x70($fp) -dlabel L802A1A88_797A48 +.L802A1A88_797A48: /* 797A48 802A1A88 8FC20074 */ lw $v0, 0x74($fp) /* 797A4C 802A1A8C 1440016F */ bnez $v0, .L802A204C /* 797A50 802A1A90 2442FFFF */ addiu $v0, $v0, -1 @@ -393,9 +398,9 @@ dlabel L802A1A88_797A48 /* 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_7983DC +/* 797A70 802A1AB0 080A8907 */ j .L802A241C_7983DC /* 797A74 802A1AB4 AFC20070 */ sw $v0, 0x70($fp) -dlabel L802A1AB8_797A78 +.L802A1AB8_797A78: /* 797A78 802A1AB8 C624004C */ lwc1 $f4, 0x4c($s1) /* 797A7C 802A1ABC 3C0141C0 */ lui $at, 0x41c0 /* 797A80 802A1AC0 44810000 */ mtc1 $at, $f0 @@ -435,9 +440,9 @@ dlabel L802A1AB8_797A78 /* 797B00 802A1B40 0C05272D */ jal sfx_play_sound /* 797B04 802A1B44 00000000 */ nop /* 797B08 802A1B48 24020004 */ addiu $v0, $zero, 4 -/* 797B0C 802A1B4C 080A8907 */ j L802A241C_7983DC +/* 797B0C 802A1B4C 080A8907 */ j .L802A241C_7983DC /* 797B10 802A1B50 AFC20070 */ sw $v0, 0x70($fp) -dlabel L802A1B54_797B14 +.L802A1B54_797B14: /* 797B14 802A1B54 C624004C */ lwc1 $f4, 0x4c($s1) /* 797B18 802A1B58 3C014240 */ lui $at, 0x4240 /* 797B1C 802A1B5C 44811000 */ mtc1 $at, $f2 @@ -572,7 +577,7 @@ dlabel L802A1B54_797B14 /* 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_7983DC +/* 797D10 802A1D50 16E001B2 */ bnez $s7, .L802A241C_7983DC /* 797D14 802A1D54 E440000C */ swc1 $f0, 0xc($v0) /* 797D18 802A1D58 C620000C */ lwc1 $f0, 0xc($s1) /* 797D1C 802A1D5C C6220010 */ lwc1 $f2, 0x10($s1) @@ -630,9 +635,9 @@ dlabel L802A1B54_797B14 /* 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_7983DC +/* 797DEC 802A1E2C 080A8907 */ j .L802A241C_7983DC /* 797DF0 802A1E30 AFC20070 */ sw $v0, 0x70($fp) -dlabel L802A1E34_797DF4 +.L802A1E34_797DF4: /* 797DF4 802A1E34 8FC20074 */ lw $v0, 0x74($fp) /* 797DF8 802A1E38 14400084 */ bnez $v0, .L802A204C /* 797DFC 802A1E3C 2442FFFF */ addiu $v0, $v0, -1 @@ -661,8 +666,8 @@ dlabel L802A1E34_797DF4 /* 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) +/* 797E60 802A1EA0 3C04802A */ lui $a0, %hi(battle_star_star_beam_802A33A8) +/* 797E64 802A1EA4 248433A8 */ addiu $a0, $a0, %lo(battle_star_star_beam_802A33A8) /* 797E68 802A1EA8 2405000A */ addiu $a1, $zero, 0xa /* 797E6C 802A1EAC 0C0B0CF8 */ jal start_script /* 797E70 802A1EB0 0000302D */ daddu $a2, $zero, $zero @@ -686,9 +691,9 @@ dlabel L802A1E34_797DF4 /* 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_7983DC +/* 797EC4 802A1F04 080A8907 */ j .L802A241C_7983DC /* 797EC8 802A1F08 AFC20070 */ sw $v0, 0x70($fp) -dlabel L802A1F0C_797ECC +.L802A1F0C_797ECC: /* 797ECC 802A1F0C 96220064 */ lhu $v0, 0x64($s1) /* 797ED0 802A1F10 2442001E */ addiu $v0, $v0, 0x1e /* 797ED4 802A1F14 A6220064 */ sh $v0, 0x64($s1) @@ -730,25 +735,25 @@ dlabel L802A1F0C_797ECC /* 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_7983DC +/* 797F6C 802A1FAC 080A8907 */ j .L802A241C_7983DC /* 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_7983DC +/* 797F80 802A1FC0 080A8907 */ j .L802A241C_7983DC /* 797F84 802A1FC4 AFC20070 */ sw $v0, 0x70($fp) -dlabel L802A1FC8_797F88 +.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_7983DC +/* 797FA0 802A1FE0 080A8907 */ j .L802A241C_7983DC /* 797FA4 802A1FE4 AFC20070 */ sw $v0, 0x70($fp) -dlabel L802A1FE8_797FA8 +.L802A1FE8_797FA8: /* 797FA8 802A1FE8 96220064 */ lhu $v0, 0x64($s1) /* 797FAC 802A1FEC 2442FFE2 */ addiu $v0, $v0, -0x1e /* 797FB0 802A1FF0 A6220064 */ sh $v0, 0x64($s1) @@ -770,14 +775,14 @@ dlabel L802A1FE8_797FA8 /* 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_7983DC +/* 797FF8 802A2038 080A8907 */ j .L802A241C_7983DC /* 797FFC 802A203C AFC20070 */ sw $v0, 0x70($fp) -dlabel L802A2040_798000 +.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_7983DC +/* 79800C 802A204C 080A8907 */ j .L802A241C_7983DC /* 798010 802A2050 AFC20074 */ sw $v0, 0x74($fp) .L802A2054: /* 798014 802A2054 3C01432A */ lui $at, 0x432a @@ -789,9 +794,9 @@ dlabel L802A2040_798000 /* 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_7983DC +/* 798038 802A2078 080A8907 */ j .L802A241C_7983DC /* 79803C 802A207C AFC20070 */ sw $v0, 0x70($fp) -dlabel L802A2080_798040 +.L802A2080_798040: /* 798040 802A2080 8FC20074 */ lw $v0, 0x74($fp) /* 798044 802A2084 10400010 */ beqz $v0, .L802A20C8 /* 798048 802A2088 2442FFFF */ addiu $v0, $v0, -1 @@ -871,7 +876,7 @@ dlabel L802A2080_798040 /* 798150 802A2190 2484001C */ addiu $a0, $a0, 0x1c /* 798154 802A2194 080A88FB */ j .L802A23EC /* 798158 802A2198 00000000 */ nop -dlabel L802A219C_79815C +.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 @@ -895,9 +900,9 @@ dlabel L802A219C_79815C /* 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_7983DC +/* 7981B0 802A21F0 080A8907 */ j .L802A241C_7983DC /* 7981B4 802A21F4 AFC20070 */ sw $v0, 0x70($fp) -dlabel L802A21F8_7981B8 +.L802A21F8_7981B8: /* 7981B8 802A21F8 0000B82D */ daddu $s7, $zero, $zero /* 7981BC 802A21FC 02E0902D */ daddu $s2, $s7, $zero /* 7981C0 802A2200 3C13802A */ lui $s3, %hi(D_802A3818) @@ -1044,7 +1049,7 @@ dlabel L802A21F8_7981B8 /* 7983D0 802A2410 34840010 */ ori $a0, $a0, 0x10 /* 7983D4 802A2414 080A8908 */ j .L802A2420 /* 7983D8 802A2418 AC640000 */ sw $a0, ($v1) -dlabel L802A241C_7983DC +.L802A241C_7983DC: /* 7983DC 802A241C 0000102D */ daddu $v0, $zero, $zero .L802A2420: /* 7983E0 802A2420 8FBF0064 */ lw $ra, 0x64($sp) diff --git a/ver/us/splat.yaml b/ver/us/splat.yaml index a4bd45ab6f..52ad26ba96 100644 --- a/ver/us/splat.yaml +++ b/ver/us/splat.yaml @@ -4913,7 +4913,7 @@ segments: overlay: True subsegments: - [0x789E60, c] - - [0x78A490, data] + - [0x78A490] - dir: battle/star/refresh type: code start: 0x78B600 @@ -4921,7 +4921,7 @@ segments: overlay: True subsegments: - [0x78B600, c] - - [0x78C070, data] + - [0x78C070] - dir: battle/star/lullaby type: code start: 0x78D150 @@ -4929,7 +4929,7 @@ segments: overlay: True subsegments: - [0x78D150, c] - - [0x78D770, data] + - [0x78D770] - dir: battle/star/star_storm type: code start: 0x78E7D0 @@ -4937,7 +4937,7 @@ segments: overlay: True subsegments: - [0x78E7D0, c] - - [0x78EEC0, data] + - [0x78EEC0] - dir: battle/star/chill_out type: code start: 0x7900D0 @@ -4945,7 +4945,7 @@ segments: overlay: True subsegments: - [0x7900D0, c] - - [0x7909C0, data] + - [0x7909C0] - dir: battle/star/smooch type: code start: 0x791D90 @@ -4953,7 +4953,7 @@ segments: overlay: True subsegments: - [0x791D90, c] - - [0x7923C0, data] + - [0x7923C0] - dir: battle/star/time_out type: code start: 0x793D20 @@ -4961,7 +4961,7 @@ segments: overlay: True subsegments: - [0x793D20, c] - - [0x794240, data] + - [0x794240] - dir: battle/star/up_and_away type: code start: 0x7952E0 @@ -4969,7 +4969,7 @@ segments: overlay: True subsegments: - [0x7952E0, c] - - [0x7959B0, data] + - [0x7959B0] - dir: battle/star/star_beam type: code start: 0x796FC0 @@ -4977,7 +4977,7 @@ segments: overlay: True subsegments: - [0x796FC0, c] - - [0x7984B0, data] + - [0x7984B0] - dir: battle/star/peach_beam type: code start: 0x7997B0 @@ -4985,7 +4985,7 @@ segments: overlay: True subsegments: - [0x7997B0, c] - - [0x79ACA0, data] + - [0x79ACA0] - dir: battle/star/peach_focus type: code start: 0x79BFA0 @@ -4993,7 +4993,7 @@ segments: overlay: True subsegments: - [0x79BFA0, c] - - [0x79C4D0, data] + - [0x79C4D0] - dir: battle/star/peach_dash type: code start: 0x79D8A0 @@ -5001,7 +5001,7 @@ segments: overlay: True subsegments: - [0x79D8A0, c] - - [0x79DE50, data] + - [0x79DE50] - [0x79EF40, bin] # todo identify - dir: world/script_api type: code diff --git a/ver/us/symbol_addrs.txt b/ver/us/symbol_addrs.txt index 904eabdec0..883c72cd36 100644 --- a/ver/us/symbol_addrs.txt +++ b/ver/us/symbol_addrs.txt @@ -1061,8 +1061,8 @@ osContRamWrite = 0x8006A3C0; // type:func rom:0x457C0 osAfterPreNMI = 0x8006A630; // type:func rom:0x45A30 func_8006A650 = 0x8006A650; // type:func rom:0x45A50 __osInitialize_common = 0x8006A708; // type:func rom:0x45B08 -func_8006A9F0 = 0x8006A9F0; // type:func rom:0x45B74 func_8006A9E0 = 0x8006A9E0; // type:func rom:0x45DE0 +func_8006A9F0 = 0x8006A9F0; // type:func rom:0x45DF0 osExceptionPreamble = 0x8006AA00; // type:label rom:0x45E00 func_8006AA34 = 0x8006AA34; // type:func rom:0x45E34 send_mesg = 0x8006AF7C; // rom:0x4637C ! @@ -1602,8 +1602,68 @@ D_80099E40 = 0x80099E40; // type:data rom:0x75240 D_80099F40 = 0x80099F40; // type:data rom:0x75340 D_8009A040 = 0x8009A040; // type:data rom:0x75440 D_8009A140 = 0x8009A140; // type:data rom:0x75540 -nuIdleFunc = 0x8009A5A8; // type:data rom:0x759A8 npc_raycast_down = 0x800DC500; // type:func rom:0x759B0 +D_8009A5B4 = 0x8009A5B4; // type:data rom:0x759B4 +D_8009A5B8 = 0x8009A5B8; // type:data rom:0x759B8 +D_8009A5BC = 0x8009A5BC; // type:data rom:0x759BC +D_8009A5C0 = 0x8009A5C0; // type:data rom:0x759C0 +D_8009A5C4 = 0x8009A5C4; // type:data rom:0x759C4 +D_8009A5C8 = 0x8009A5C8; // type:data rom:0x759C8 +D_8009A5CC = 0x8009A5CC; // type:data rom:0x759CC +D_8009A5D0 = 0x8009A5D0; // type:data rom:0x759D0 +D_8009A5D4 = 0x8009A5D4; // type:data rom:0x759D4 +timeFreezeMode = 0x8009A5D8; // type:data rom:0x759D8 +nuGfxZBuffer = 0x8009A5DC; // rom:0x759DC +nuContDataLockKey = 0x8009A5E0; // type:data rom:0x759E0 +D_8009A5E4 = 0x8009A5E4; // type:data rom:0x759E4 +D_8009A5E8 = 0x8009A5E8; // type:data rom:0x759E8 +D_8009A5EC = 0x8009A5EC; // type:data rom:0x759EC +nuGfxCfbCounter = 0x8009A5F0; // type:data rom:0x759F0 +mdl_currentModelTreeNodeInfo = 0x8009A5F4; // type:data rom:0x759F4 +nuGfxDisplay = 0x8009A5F8; // rom:0x759F8 +D_8009A5FC = 0x8009A5FC; // type:data rom:0x759FC +gGameState = 0x8009A600; // rom:0x75A00 +gNpcCount = 0x8009A604; // type:data rom:0x75A04 +D_8009A606 = 0x8009A606; // type:data rom:0x75A06 +D_8009A608 = 0x8009A608; // type:data rom:0x75A08 +D_8009A60C = 0x8009A60C; // type:data rom:0x75A0C +nuGfxUcode = 0x8009A610; // type:data rom:0x75A10 +nuContNum = 0x8009A614; // type:data rom:0x75A14 +nuGfxTaskSpool = 0x8009A618; // rom:0x75A18 +D_8009A61C = 0x8009A61C; // type:data rom:0x75A1C +D_8009A620 = 0x8009A620; // type:data rom:0x75A20 +D_8009A624 = 0x8009A624; // type:data rom:0x75A24 +D_8009A628 = 0x8009A628; // type:data rom:0x75A28 +D_8009A62C = 0x8009A62C; // type:data rom:0x75A2C +D_8009A630 = 0x8009A630; // type:data rom:0x75A30 +gCurrentCamID = 0x8009A634; // type:data rom:0x75A34 +nuPiCartHandle = 0x8009A638; // rom:0x75A38 +D_8009A63C = 0x8009A63C; // type:data rom:0x75A3C +D_8009A640 = 0x8009A640; // type:data rom:0x75A40 +D_8009A644 = 0x8009A644; // type:data rom:0x75A44 +nuGfxCfb_ptr = 0x8009A64C; // type:data rom:0x75A4C +gOverrideFlags = 0x8009A650; // type:data rom:0x75A50 +D_8009A654 = 0x8009A654; // type:data rom:0x75A54 +nuGfxCfb = 0x8009A658; // type:data rom:0x75A58 +D_8009A65C = 0x8009A65C; // type:data rom:0x75A5C +D_8009A660 = 0x8009A660; // type:data rom:0x75A60 +D_8009A664 = 0x8009A664; // type:data rom:0x75A64 +D_8009A668 = 0x8009A668; // type:data rom:0x75A68 +gMasterGfxPos = 0x8009A66C; // rom:0x75A6C +D_8009A670 = 0x8009A670; // type:data rom:0x75A70 +gDisplayContext = 0x8009A674; // rom:0x75A74 +D_8009A678 = 0x8009A678; // type:data rom:0x75A78 +D_8009A67C = 0x8009A67C; // type:data rom:0x75A7C +D_8009A680 = 0x8009A680; // type:data rom:0x75A80 +D_8009A684 = 0x8009A684; // type:data rom:0x75A84 +D_8009A690 = 0x8009A690; // type:data rom:0x75A90 +D_8009A694 = 0x8009A694; // type:data rom:0x75A94 +D_8009A6A0 = 0x8009A6A0; // type:data rom:0x75AA0 +D_8009A6A2 = 0x8009A6A2; // type:data rom:0x75AA2 +D_8009A6A4 = 0x8009A6A4; // type:data rom:0x75AA4 +D_8009A6A6 = 0x8009A6A6; // type:data rom:0x75AA6 +D_8009A6A8 = 0x8009A6A8; // type:data rom:0x75AA8 +D_8009A6B0 = 0x8009A6B0; // type:data rom:0x75AB0 npc_raycast_down_ahead = 0x800DC778; // type:func rom:0x75C28 npc_raycast_down_sides = 0x800DCB7C; // type:func rom:0x7602C npc_raycast_up = 0x800DCE70; // type:func rom:0x76320 @@ -1613,11 +1673,28 @@ npc_raycast_general = 0x800DD44C; // type:func rom:0x768FC npc_get_slip_vector = 0x800DD5B4; // type:func rom:0x76A64 npc_test_move_with_slipping = 0x800DD618; // type:func rom:0x76AC8 npc_test_move_without_slipping = 0x800DD8FC; // type:func rom:0x76DAC +logicalSaveInfo = 0x8009BA30; // type:data rom:0x76E30 +physicalSaveInfo = 0x8009BA50; // type:data rom:0x76E50 +nextAvailableSavePage = 0x8009BA80; // type:data rom:0x76E80 +D_8009BA84 = 0x8009BA84; // type:data rom:0x76E84 +gCurtainScale = 0x8009BA90; // rom:0x76E90 +gCurtainScaleGoal = 0x8009BA94; // rom:0x76E94 +gCurtainFade = 0x8009BA98; // rom:0x76E98 +gCurtainFadeGoal = 0x8009BA9C; // rom:0x76E9C +gCurtainDrawCallback = 0x8009BAA0; // rom:0x76EA0 +D_8009BAA4 = 0x8009BAA4; // type:data rom:0x76EA4 +D_8009BAA8 = 0x8009BAA8; // type:data rom:0x76EA8 +D_8009BA28 = 0x8009BB28; // type:data rom:0x76F28 +gCrashScreen = 0x8009BB30; // type:data rom:0x76F30 npc_test_move_taller_with_slipping = 0x800DDAE4; // type:func rom:0x76F94 npc_test_move_simple_with_slipping = 0x800DDC44; // type:func rom:0x770F4 npc_test_move_simple_without_slipping = 0x800DDCEC; // type:func rom:0x7719C npc_test_move_complex_with_slipping = 0x800DDD94; // type:func rom:0x77244 player_raycast_below = 0x800DDFD0; // type:func rom:0x77480 +nuGfxTask_ptr = 0x8009C510; // type:data rom:0x77910 +taskDoneMsg = 0x8009C514; // type:data rom:0x77914 +swapBufMsg = 0x8009C516; // type:data rom:0x77916 +GfxTaskMgrThread = 0x8009C518; // type:data rom:0x77918 player_raycast_below_cam_relative = 0x800DE46C; // type:func rom:0x7791C player_raycast_down = 0x800DE54C; // type:func rom:0x779FC player_raycast_up_corners = 0x800DE7E4; // type:func rom:0x77C94 @@ -1657,7 +1734,11 @@ func_800E04D0 = 0x800E04D0; // type:func rom:0x79980 func_800E0514 = 0x800E0514; // type:func rom:0x799C4 has_valid_conversation_npc = 0x800E0538; // type:func rom:0x799E8 check_for_conversation_prompt = 0x800E0580; // type:func rom:0x79A30 +D_8009E6C8 = 0x8009E6C8; // type:data rom:0x79AC8 +D_8009E6D0 = 0x8009E6D0; // type:data rom:0x79AD0 +nuSiMesgBuf = 0x8009E6F0; // type:data rom:0x79AF0 func_800E0658 = 0x800E0658; // type:func rom:0x79B08 +siMgrThread = 0x8009E710; // type:data rom:0x79B10 func_800E069C = 0x800E069C; // type:func rom:0x79B4C func_800E06C0 = 0x800E06C0; // type:func rom:0x79B70 func_800E06D8 = 0x800E06D8; // type:func rom:0x79B88 @@ -1682,9 +1763,82 @@ record_jump_apex = 0x800E26B0; // type:func rom:0x7BB60 can_trigger_loading_zone = 0x800E26C4; // type:func rom:0x7BB74 move_player = 0x800E2778; // type:func rom:0x7BC28 collision_main_above = 0x800E27E0; // type:func rom:0x7BC90 +blendedCamSettings = 0x800A08C0; // type:data rom:0x7BCC0 +D_800A08DC = 0x800A08DC; // type:data rom:0x7BCDC +D_800A08E0 = 0x800A08E0; // type:data rom:0x7BCE0 +D_800A08E4 = 0x800A08E4; // type:data rom:0x7BCE4 +D_800A08E8 = 0x800A08E8; // type:data rom:0x7BCE8 +D_800A08EC = 0x800A08EC; // type:data rom:0x7BCEC +gameMode = 0x800A08F0; // type:data rom:0x7BCF0 +D_800A08F4 = 0x800A08F4; // type:data rom:0x7BCF4 +D_800A0900 = 0x800A0900; // type:data rom:0x7BD00 +D_800A0904 = 0x800A0904; // type:data rom:0x7BD04 +D_800A0908 = 0x800A0908; // type:data rom:0x7BD08 +D_800A090C = 0x800A090C; // type:data rom:0x7BD0C +D_800A0910 = 0x800A0910; // type:data rom:0x7BD10 +D_800A0914 = 0x800A0914; // type:data rom:0x7BD14 +D_800A0918 = 0x800A0918; // type:data rom:0x7BD18 +D_800A091C = 0x800A091C; // type:data rom:0x7BD1C +D_800A0920 = 0x800A0920; // type:data rom:0x7BD20 +D_800A0921 = 0x800A0921; // type:data rom:0x7BD21 +D_800A0922 = 0x800A0922; // type:data rom:0x7BD22 +D_800A0924 = 0x800A0924; // type:data rom:0x7BD24 +D_800A0928 = 0x800A0928; // type:data rom:0x7BD28 +D_800A0930 = 0x800A0930; // type:data rom:0x7BD30 +D_800A0931 = 0x800A0931; // type:data rom:0x7BD31 +D_800A0932 = 0x800A0932; // type:data rom:0x7BD32 +D_800A0934 = 0x800A0934; // type:data rom:0x7BD34 +gMapTransitionAlpha = 0x800A0940; // rom:0x7BD40 +D_800A0942 = 0x800A0942; // type:data rom:0x7BD42 +D_800A0944 = 0x800A0944; // type:data rom:0x7BD44 +D_800A0946 = 0x800A0946; // type:data rom:0x7BD46 +D_800A0948 = 0x800A0948; // type:data rom:0x7BD48 +D_800A094C = 0x800A094C; // type:data rom:0x7BD4C +D_800A0950 = 0x800A0950; // type:data rom:0x7BD50 +D_800A0954 = 0x800A0954; // type:data rom:0x7BD54 +D_800A0956 = 0x800A0956; // type:data rom:0x7BD56 +D_800A0958 = 0x800A0958; // type:data rom:0x7BD58 +D_800A095A = 0x800A095A; // type:data rom:0x7BD5A +D_800A095B = 0x800A095B; // type:data rom:0x7BD5B +D_800A095C = 0x800A095C; // type:data rom:0x7BD5C +D_800A095D = 0x800A095D; // type:data rom:0x7BD5D +D_800A095E = 0x800A095E; // type:data rom:0x7BD5E +D_800A095F = 0x800A095F; // type:data rom:0x7BD5F +D_800A0960 = 0x800A0960; // type:data rom:0x7BD60 +D_800A0963 = 0x800A0963; // type:data rom:0x7BD63 +D_800A0964 = 0x800A0964; // type:data rom:0x7BD64 +D_800A0968 = 0x800A0968; // type:data rom:0x7BD68 +D_800A0970 = 0x800A0970; // type:data rom:0x7BD70 +D_800A0974 = 0x800A0974; // type:data rom:0x7BD74 +D_800A0978 = 0x800A0978; // type:data rom:0x7BD78 +D_800A097C = 0x800A097C; // type:data rom:0x7BD7C +D_800A0980 = 0x800A0980; // type:data rom:0x7BD80 +D_800A0984 = 0x800A0984; // type:data rom:0x7BD84 +D_800A0988 = 0x800A0988; // type:data rom:0x7BD88 +D_800A098C = 0x800A098C; // type:data rom:0x7BD8C +gWorldNpcList = 0x800A0990; // rom:0x7BD90 func_800E29C8 = 0x800E29C8; // type:func rom:0x7BE78 +gBattleNpcList = 0x800A0A90; // rom:0x7BE90 +gCurrentNpcListPtr = 0x800A0B90; // rom:0x7BF90 +D_800A0B94 = 0x800A0B94; // type:data rom:0x7BF94 +D_800A0B98 = 0x800A0B98; // type:data rom:0x7BF98 +D_800A0BA0 = 0x800A0BA0; // type:data rom:0x7BFA0 +D_800A0BA4 = 0x800A0BA4; // type:data rom:0x7BFA4 +D_800A0BA8 = 0x800A0BA8; // type:data rom:0x7BFA8 +D_800A0BAC = 0x800A0BAC; // type:data rom:0x7BFAC +D_800A0BB0 = 0x800A0BB0; // type:data rom:0x7BFB0 +D_800A0BB4 = 0x800A0BB4; // type:data rom:0x7BFB4 +D_800A0BB8 = 0x800A0BB8; // type:data rom:0x7BFB8 +D_800A0BBC = 0x800A0BBC; // type:data rom:0x7BFBC +D_800A0BC0 = 0x800A0BC0; // type:data rom:0x7BFC0 func_800E2BB0 = 0x800E2BB0; // type:func rom:0x7C060 phys_update_jump = 0x800E2D18; // type:func rom:0x7C1C8 +D_800A0F40 = 0x800A0F40; // type:data rom:0x7C340 +D_800A0F44 = 0x800A0F44; // type:data rom:0x7C344 +D_800A0F48 = 0x800A0F48; // type:data rom:0x7C348 +D_800A0F50 = 0x800A0F50; // type:data rom:0x7C350 +D_800A0F54 = 0x800A0F54; // type:data rom:0x7C354 +D_800A0F58 = 0x800A0F58; // type:data rom:0x7C358 phys_init_integrator_for_current_state = 0x800E2F60; // type:func rom:0x7C410 gravity_use_fall_parms = 0x800E306C; // type:func rom:0x7C51C phys_update_falling = 0x800E3100; // type:func rom:0x7C5B0 @@ -1711,24 +1865,77 @@ phys_update_interact_collider = 0x800E5150; // type:func rom:0x7E600 phys_check_interactable_collision = 0x800E5174; // type:func rom:0x7E624 phys_can_player_interact = 0x800E52F8; // type:func rom:0x7E7A8 func_800E5348 = 0x800E5348; // type:func rom:0x7E7F8 +D_800A3510 = 0x800A3510; // type:data rom:0x7E910 +D_800A3514 = 0x800A3514; // type:data rom:0x7E914 player_get_camera_facing_angle = 0x800E546C; // type:func rom:0x7E91C +D_800A3520 = 0x800A3520; // type:data rom:0x7E920 +D_800A3524 = 0x800A3524; // type:data rom:0x7E924 phys_save_ground_pos = 0x800E54E0; // type:func rom:0x7E990 func_800E5520 = 0x800E5520; // type:func rom:0x7E9D0 phys_adjust_cam_on_landing = 0x800E5530; // type:func rom:0x7E9E0 +D_800A3628 = 0x800A3628; // type:data rom:0x7EA28 +nuAuFrameSampleSize = 0x800A3634; // type:data rom:0x7EA34 +D_800A3638 = 0x800A3638; // type:data rom:0x7EA38 +D_800A363C = 0x800A363C; // type:data rom:0x7EA3C +D_800A3640 = 0x800A3640; // type:data rom:0x7EA40 +D_800A3644 = 0x800A3644; // type:data rom:0x7EA44 +D_800A3658 = 0x800A3658; // type:data rom:0x7EA58 +D_800A3720 = 0x800A3720; // type:data rom:0x7EB20 phys_clear_spin_history = 0x800E58F0; // type:func rom:0x7EDA0 phys_get_spin_history = 0x800E5938; // type:func rom:0x7EDE8 phys_reset_spin_history = 0x800E59A0; // type:func rom:0x7EE50 phys_update_action_state = 0x800E5A2C; // type:func rom:0x7EEDC +nuAuDmaState = 0x800A3BD0; // rom:0x7EFD0 +D_800A3BD4 = 0x800A3BD4; // type:data rom:0x7EFD4 +D_800A3BD8 = 0x800A3BD8; // type:data rom:0x7EFD8 +nuAuDmaBuf = 0x800A3BE0; // rom:0x7EFE0 +D_800A3BE4 = 0x800A3BE4; // type:data rom:0x7EFE4 +D_800A3BF0 = 0x800A3BF0; // type:data rom:0x7EFF0 phys_peach_update = 0x800E5C78; // type:func rom:0x7F128 set_action_state = 0x800E5DA4; // type:func rom:0x7F254 +D_800A3FD0 = 0x800A3FD0; // type:data rom:0x7F3D0 +D_800A3FD4 = 0x800A3FD4; // type:data rom:0x7F3D4 +D_800A3FE0 = 0x800A3FE0; // type:data rom:0x7F3E0 +D_800A3FE4 = 0x800A3FE4; // type:data rom:0x7F3E4 +D_800A3FE8 = 0x800A3FE8; // type:data rom:0x7F3E8 +D_800A3FEC = 0x800A3FEC; // type:data rom:0x7F3EC +D_800A3FEE = 0x800A3FEE; // type:data rom:0x7F3EE +D_800A3FF0 = 0x800A3FF0; // type:data rom:0x7F3F0 +D_800A3FF4 = 0x800A3FF4; // type:data rom:0x7F3F4 +gEffectGraphicsData = 0x800A4000; // type:data rom:0x7F400 update_locomotion_state = 0x800E5F68; // type:func rom:0x7F418 start_falling = 0x800E5FD0; // type:func rom:0x7F480 start_bounce_a = 0x800E6034; // type:func rom:0x7F4E4 start_bounce_b = 0x800E608C; // type:func rom:0x7F53C check_input_hammer = 0x800E60E0; // type:func rom:0x7F590 +D_800A41B4 = 0x800A41B4; // type:data rom:0x7F5B4 +D_800A41C0 = 0x800A41C0; // type:data rom:0x7F5C0 +D_800A41C4 = 0x800A41C4; // type:data rom:0x7F5C4 +gMap = 0x800A41E0; // type:data rom:0x7F5E0 +D_800A41E4 = 0x800A41E4; // type:data rom:0x7F5E4 +gMapConfig = 0x800A41E8; // type:data rom:0x7F5E8 +D_800A41EC = 0x800A41EC; // type:data rom:0x7F5EC check_input_jump = 0x800E6160; // type:func rom:0x7F610 +D_800A4230 = 0x800A4230; // type:data rom:0x7F630 +D_800A4234 = 0x800A4234; // type:data rom:0x7F634 +D_800A4238 = 0x800A4238; // type:data rom:0x7F638 +D_800A423C = 0x800A423C; // type:data rom:0x7F63C +D_800A4240 = 0x800A4240; // type:data rom:0x7F640 +D_800A4244 = 0x800A4244; // type:data rom:0x7F644 +D_800A4248 = 0x800A4248; // type:data rom:0x7F648 +D_800A424C = 0x800A424C; // type:data rom:0x7F64C +D_800A4250 = 0x800A4250; // type:data rom:0x7F650 +D_800A4254 = 0x800A4254; // type:data rom:0x7F654 +D_800A4258 = 0x800A4258; // type:data rom:0x7F658 +D_800A425C = 0x800A425C; // type:data rom:0x7F65C +D_800A4260 = 0x800A4260; // type:data rom:0x7F660 +D_800A4264 = 0x800A4264; // type:data rom:0x7F664 +D_800A4268 = 0x800A4268; // type:data rom:0x7F668 +D_800A426C = 0x800A426C; // type:data rom:0x7F66C +D_800A4270 = 0x800A4270; // type:data rom:0x7F670 check_input_spin = 0x800E6268; // type:func rom:0x7F718 peach_set_disguise_anim = 0x800E636C; // type:func rom:0x7F81C +D_800A4420 = 0x800A4420; // type:data rom:0x7F820 func_800E63A4 = 0x800E63A4; // type:func rom:0x7F854 peach_check_for_parasol_input = 0x800E6428; // type:func rom:0x7F8D8 peach_sync_disguise_npc = 0x800E6500; // type:func rom:0x7F9B0 @@ -1758,6 +1965,7 @@ initialize_status_menu = 0x800E7934; // type:func rom:0x80DE4 status_menu_draw_number = 0x800E7CA4; // type:func rom:0x81154 status_menu_draw_stat = 0x800E7E34; // type:func rom:0x812E4 update_status_menu = 0x800E80B4; // type:func rom:0x81564 +nuScStack = 0x800A65D0; // rom:0x819D0 coin_counter_draw_content = 0x800E92D8; // type:func rom:0x82788 update_coin_counter = 0x800E93DC; // type:func rom:0x8288C show_coin_counter = 0x800E9518; // type:func rom:0x829C8 @@ -1815,6 +2023,7 @@ use_consumable = 0x800EA400; // type:func rom:0x838B0 remove_consumable = 0x800EA47C; // type:func rom:0x8392C func_800EA4B0 = 0x800EA4B0; // type:func rom:0x83960 partner_is_idle = 0x800EA514; // type:func rom:0x839C4 +nuScAudioStack = 0x800A85D0; // rom:0x839D0 world_partner_can_player_pause_default = 0x800EA524; // type:func rom:0x839D4 func_800EA52C = 0x800EA52C; // type:func rom:0x839DC partner_is_flying = 0x800EA5A4; // type:func rom:0x83A54 @@ -1840,10 +2049,15 @@ partner_walking_enable = 0x800EB8A8; // type:func rom:0x84D58 partner_walking_update_player_tracking = 0x800EBA3C; // type:func rom:0x84EEC partner_walking_update_motion = 0x800EBB40; // type:func rom:0x84FF0 partner_walking_follow_player = 0x800EBC74; // type:func rom:0x85124 +nuScGraphicsStack = 0x800AA5D0; // rom:0x859D0 partner_flying_enable = 0x800ED310; // type:func rom:0x867C0 partner_flying_update_player_tracking = 0x800ED4B8; // type:func rom:0x86968 partner_flying_update_motion = 0x800ED5D0; // type:func rom:0x86A80 partner_flying_follow_player = 0x800ED9F8; // type:func rom:0x86EA8 +D_800AC5D0 = 0x800AC5D0; // type:data rom:0x879D0 +D_800AC5D4 = 0x800AC5D4; // type:data rom:0x879D4 +D_800AC5E8 = 0x800AC5E8; // type:data rom:0x879E8 +nuGfxMesgBuf = 0x800AC6B0; // type:data rom:0x87AB0 partner_init_put_away = 0x800EE994; // type:func rom:0x87E44 partner_put_away = 0x800EE9B8; // type:func rom:0x87E68 partner_init_get_out = 0x800EECC4; // type:func rom:0x88174 @@ -1869,6 +2083,10 @@ func_800EFD08 = 0x800EFD08; // type:func rom:0x891B8 func_800EFE2C = 0x800EFE2C; // type:func rom:0x892DC func_800F0248 = 0x800F0248; // type:func rom:0x896F8 func_800F0490 = 0x800F0490; // type:func rom:0x89940 +nuContWaitMesgBuf = 0x800AE6D0; // type:data rom:0x89AD0 +nuContDataMutexBuf = 0x800AE6D4; // type:data rom:0x89AD4 +D_800AC6D8 = 0x800AE6D8; // type:data rom:0x89AD8 +piMgrThread = 0x800AE6E0; // type:data rom:0x89AE0 func_800F0864 = 0x800F0864; // type:func rom:0x89D14 func_800F09EC = 0x800F09EC; // type:func rom:0x89E9C func_800F0B3C = 0x800F0B3C; // type:func rom:0x89FEC @@ -1880,8 +2098,78 @@ func_800F102C = 0x800F102C; // type:func rom:0x8A4DC hide_popup_menu = 0x800F13B0; // type:func rom:0x8A860 destroy_popup_menu = 0x800F1538; // type:func rom:0x8A9E8 func_800F16CC = 0x800F16CC; // type:func rom:0x8AB7C +D_800AF890 = 0x800AF894; // type:data rom:0x8AC94 +piMgrMesgBuff = 0x800AF8A8; // type:data rom:0x8ACA8 +D_800AF8AC = 0x800AF8AC; // type:data rom:0x8ACAC +D_800AF8B0 = 0x800AF8B0; // type:data rom:0x8ACB0 +D_800AF8B4 = 0x800AF8B4; // type:data rom:0x8ACB4 +D_800AF8C0 = 0x800AF8C0; // type:data rom:0x8ACC0 +D_800AF8C4 = 0x800AF8C4; // type:data rom:0x8ACC4 +D_800AF8C8 = 0x800AF8C8; // type:data rom:0x8ACC8 +D_800AF8D0 = 0x800AF8D0; // type:data rom:0x8ACD0 +D_800AF8D4 = 0x800AF8D4; // type:data rom:0x8ACD4 +D_800AF8D8 = 0x800AF8D8; // type:data rom:0x8ACD8 +D_800AF8DC = 0x800AF8DC; // type:data rom:0x8ACDC +D_800AF8E0 = 0x800AF8E0; // type:data rom:0x8ACE0 +D_800AF8E4 = 0x800AF8E4; // type:data rom:0x8ACE4 +D_800AF8E8 = 0x800AF8E8; // type:data rom:0x8ACE8 +D_800AF8EC = 0x800AF8EC; // type:data rom:0x8ACEC +D_800AF8F0 = 0x800AF8F0; // type:data rom:0x8ACF0 +D_800AF8F4 = 0x800AF8F4; // type:data rom:0x8ACF4 +D_800AF8F8 = 0x800AF8F8; // type:data rom:0x8ACF8 +D_800AF8FC = 0x800AF8FC; // type:data rom:0x8ACFC +D_800AF900 = 0x800AF900; // type:data rom:0x8AD00 +D_800AF904 = 0x800AF904; // type:data rom:0x8AD04 +D_800AF910 = 0x800AF910; // type:data rom:0x8AD10 +D_800AF914 = 0x800AF914; // type:data rom:0x8AD14 +D_800AF918 = 0x800AF918; // type:data rom:0x8AD18 +D_800AF91C = 0x800AF91C; // type:data rom:0x8AD1C popup_menu_update = 0x800F1A10; // type:func rom:0x8AEC0 +D_800B0AD0 = 0x800B0AD0; // type:data rom:0x8BED0 +D_800B0AD4 = 0x800B0AD4; // type:data rom:0x8BED4 +D_800B0AE8 = 0x800B0AE8; // type:data rom:0x8BEE8 +D_800B0AEC = 0x800B0AEC; // type:data rom:0x8BEEC +D_800B0B00 = 0x800B0B00; // type:data rom:0x8BF00 +D_800B0B02 = 0x800B0B02; // type:data rom:0x8BF02 +D_800B0B04 = 0x800B0B04; // type:data rom:0x8BF04 +D_800B0B08 = 0x800B0B08; // type:data rom:0x8BF08 +D_800B0B18 = 0x800B0B18; // type:data rom:0x8BF18 +D_800B0B1A = 0x800B0B1A; // type:data rom:0x8BF1A +D_800B0B1C = 0x800B0B1C; // type:data rom:0x8BF1C +D_800B0B20 = 0x800B0B20; // type:data rom:0x8BF20 +D_800B0B30 = 0x800B0B30; // type:data rom:0x8BF30 +D_800B0B34 = 0x800B0B34; // type:data rom:0x8BF34 +D_800B0B6C = 0x800B0B6C; // type:data rom:0x8BF6C +D_800B0B70 = 0x800B0B70; // type:data rom:0x8BF70 +D_800B0C34 = 0x800B0C34; // type:data rom:0x8C034 +D_800B0C44 = 0x800B0C44; // type:data rom:0x8C044 +D_800B0C5C = 0x800B0C5C; // type:data rom:0x8C05C +D_800B0C74 = 0x800B0C74; // type:data rom:0x8C074 +D_800B0CEC = 0x800B0CEC; // type:data rom:0x8C0EC +wMapTexName = 0x800B0CF0; // type:data rom:0x8C0F0 +D_800B0CF4 = 0x800B0CF4; // type:data rom:0x8C0F4 +D_800B0D08 = 0x800B0D08; // type:data rom:0x8C108 +D_800B0D0C = 0x800B0D0C; // type:data rom:0x8C10C +nuContWaitMesgQ = 0x800B0EB8; // type:data rom:0x8C2B8 +D_800B0EBC = 0x800B0EBC; // type:data rom:0x8C2BC +D_800B0ED0 = 0x800B0ED0; // type:data rom:0x8C2D0 +D_800B0ED4 = 0x800B0ED4; // type:data rom:0x8C2D4 +D_800B0F08 = 0x800B0F08; // type:data rom:0x8C308 +D_800B0F0C = 0x800B0F0C; // type:data rom:0x8C30C +gCurrentEncounter = 0x800B0F10; // rom:0x8C310 size:0xB0 popup_menu_draw_menu_contents = 0x800F3680; // type:func rom:0x8CB30 +LeoDiskHandle = 0x800B1B08; // type:data rom:0x8CF08 +D_800B1B0C = 0x800B1B0C; // type:data rom:0x8CF0C +D_800B1B0D = 0x800B1B0D; // type:data rom:0x8CF0D +D_800B1B0E = 0x800B1B0E; // type:data rom:0x8CF0E +D_800B1B0F = 0x800B1B0F; // type:data rom:0x8CF0F +D_800B1B10 = 0x800B1B10; // type:data rom:0x8CF10 +D_800B1B14 = 0x800B1B14; // type:data rom:0x8CF14 +nuContStatus = 0x800B1B7C; // type:data rom:0x8CF7C +D_800B1B90 = 0x800B1B90; // type:data rom:0x8CF90 +nuContRmbCtl = 0x800B1D40; // rom:0x8D140 +nuContData = 0x800B1D68; // rom:0x8D168 +gCameras = 0x800B1D80; // type:data rom:0x8D180 size:0x1560 popup_menu_draw_title_contents = 0x800F4648; // type:func rom:0x8DAF8 func_800F48F4 = 0x800F48F4; // type:func rom:0x8DDA4 func_800F4944 = 0x800F4944; // type:func rom:0x8DDF4 @@ -1894,6 +2182,29 @@ func_800F4FC4 = 0x800F4FC4; // type:func rom:0x8E474 func_800F513C = 0x800F513C; // type:func rom:0x8E5EC func_800F52BC = 0x800F52BC; // type:func rom:0x8E76C draw_box = 0x800F52E0; // type:func rom:0x8E790 +gCollisionData = 0x800B42E0; // type:data rom:0x8F6E0 size:0x10 +D_800B42E4 = 0x800B42E4; // type:data rom:0x8F6E4 +nuGfxMesgQ = 0x800B42F0; // type:data rom:0x8F6F0 +D_800B42F4 = 0x800B42F4; // type:data rom:0x8F6F4 +D_800B4308 = 0x800B4308; // type:data rom:0x8F708 +D_800B430C = 0x800B430C; // type:data rom:0x8F70C +D_800B430D = 0x800B430D; // type:data rom:0x8F70D +D_800B430E = 0x800B430E; // type:data rom:0x8F70E +D_800B430F = 0x800B430F; // type:data rom:0x8F70F +D_800B4310 = 0x800B4310; // type:data rom:0x8F710 +D_800B4311 = 0x800B4311; // type:data rom:0x8F711 +D_800B4314 = 0x800B4314; // type:data rom:0x8F714 +D_800B4318 = 0x800B4318; // type:data rom:0x8F718 +D_800B431C = 0x800B431C; // type:data rom:0x8F71C +gOsPiMessageQueue = 0x800B4380; // type:data rom:0x8F780 +D_800B4384 = 0x800B4384; // type:data rom:0x8F784 +gEffectInstances = 0x800B4398; // type:data rom:0x8F798 +CartRomHandle = 0x800B4518; // type:data rom:0x8F918 +D_800B451C = 0x800B451C; // type:data rom:0x8F91C +D_800B451D = 0x800B451D; // type:data rom:0x8F91D +D_800B451E = 0x800B451E; // type:data rom:0x8F91E +D_800B451F = 0x800B451F; // type:data rom:0x8F91F +D_800B4520 = 0x800B4520; // type:data rom:0x8F920 gPlayerStatusPtr = 0x800F7B30; // rom:0x90FE0 D_800F7B40 = 0x800F7B40; // type:data rom:0x90FF0 D_800F7B44 = 0x800F7B44; // type:data rom:0x90FF4 @@ -1938,12 +2249,20 @@ D_800F833C = 0x800F833C; // type:data rom:0x917EC D_800F8340 = 0x800F8340; // type:data rom:0x917F0 D_800F8344 = 0x800F8344; // type:data rom:0x917F4 gPartnerAnimations = 0x800F8348; // rom:0x917F8 size:0x1B0 +D_800B6590 = 0x800B6590; // type:data rom:0x91990 D_800F84F8 = 0x800F84F8; // type:data rom:0x919A8 +nuYieldBuf = 0x800B8590; // type:data rom:0x93990 +D_800B91A0 = 0x800B91A0; // type:data rom:0x945A0 +D_800B91D0 = 0x800B91D0; // type:data rom:0x945D0 D_801041A0 = 0x801041A0; // type:data rom:0x9D650 ui_stat_heart_png = 0x801041A8; // type:data rom:0x9D658 D_801045A8 = 0x801045A8; // type:data rom:0x9DA58 ui_stat_flower_png = 0x801045B0; // type:data rom:0x9DA60 D_80108A64 = 0x80108A64; // type:data rom:0xA1F14 +D_80109890 = 0x80109890; // type:data rom:0xA2D40 +D_80109898 = 0x80109898; // type:data rom:0xA2D48 +D_801098A0 = 0x801098A0; // type:data rom:0xA2D50 +D_801098BC = 0x801098BC; // type:data rom:0xA2D6C D_8010BC50 = 0x8010BC50; // type:data rom:0xA5100 D_8010BD30 = 0x8010BD30; // type:data rom:0xA51E0 D_8010BD80 = 0x8010BD80; // type:data rom:0xA5230 @@ -2105,6 +2424,15 @@ clear_render_tasks_alt = 0x8011D8D0; // type:func rom:0xB3FD0 queue_render_task = 0x8011D910; // type:func rom:0xB4010 execute_render_tasks = 0x8011D9B8; // type:func rom:0xB40B8 animator_copy_vertices_to_buffer = 0x8011DE80; // type:func rom:0xB4580 +D_800D91D0 = 0x800D91D0; // type:data rom:0xB45D0 +D_800D91D4 = 0x800D91D4; // type:data rom:0xB45D4 +D_800D91D8 = 0x800D91D8; // type:data rom:0xB45D8 +D_800D91DC = 0x800D91DC; // type:data rom:0xB45DC +wMapHitName = 0x800D91E0; // type:data rom:0xB45E0 +nuSiMgrMesgQ = 0x800D91F8; // type:data rom:0xB45F8 +wMapShapeName = 0x800D9230; // type:data rom:0xB4630 +D_800D9248 = 0x800D9248; // type:data rom:0xB4648 struct:ALHeap +nuGfxTask = 0x800D9278; // type:data rom:0xB4678 animator_make_mirrorZ = 0x8011DFD0; // type:func rom:0xB46D0 animator_make_mirrorY = 0x8011E014; // type:func rom:0xB4714 animator_make_mirrorX = 0x8011E058; // type:func rom:0xB4758 @@ -2113,21 +2441,45 @@ get_animator_child_with_id = 0x8011E0DC; // type:func rom:0xB47DC get_animator_child_for_model = 0x8011E150; // type:func rom:0xB4850 free_animator_nodes = 0x8011E1C4; // type:func rom:0xB48C4 clear_animator_list = 0x8011E224; // type:func rom:0xB4924 +D_800D95E8 = 0x800D95E8; // type:data rom:0xB49E8 reset_animator_list = 0x8011E310; // type:func rom:0xB4A10 +D_800D9620 = 0x800D9620; // type:data rom:0xB4A20 +D_800D9668 = 0x800D9668; // type:data rom:0xB4A68 +D_800D9680 = 0x800D9680; // type:data rom:0xB4A80 delete_model_animator_node = 0x8011E398; // type:func rom:0xB4A98 delete_model_animator_nodes = 0x8011E400; // type:func rom:0xB4B00 delete_model_animator = 0x8011E438; // type:func rom:0xB4B38 +rspbootUcodeBuffer = 0x800D9780; // type:data rom:0xB4B80 create_model_animator = 0x8011E4B8; // type:func rom:0xB4BB8 +D_800D9880 = 0x800D9880; // type:data rom:0xB4C80 create_mesh_animator = 0x8011E5E0; // type:func rom:0xB4CE0 add_anim_node = 0x8011E718; // type:func rom:0xB4E18 update_model_animator = 0x8011E8BC; // type:func rom:0xB4FBC update_model_animator_with_transform = 0x8011EA54; // type:func rom:0xB5154 step_model_animator = 0x8011EBF0; // type:func rom:0xB52F0 +D_800D9F80 = 0x800D9F80; // type:data rom:0xB5380 +D_800DA000 = 0x800DA000; // type:data rom:0xB5400 +D_800DA03C = 0x800DA03C; // type:data rom:0xB543C +D_800DA040 = 0x800DA040; // type:data rom:0xB5440 animator_update_model_transforms = 0x8011F058; // type:func rom:0xB5758 animator_node_update_model_transform = 0x8011F118; // type:func rom:0xB5818 +nusched = 0x800DA440; // rom:0xB5840 +D_800DA444 = 0x800DA444; // type:data rom:0xB5844 +D_800DA47C = 0x800DA47C; // type:data rom:0xB587C +D_800DA4B4 = 0x800DA4B4; // type:data rom:0xB58B4 +D_800DA55C = 0x800DA55C; // type:data rom:0xB595C render_animated_model = 0x8011F304; // type:func rom:0xB5A04 render_animated_model_with_vertices = 0x8011F3E8; // type:func rom:0xB5AE8 appendGfx_animator = 0x8011F4D4; // type:func rom:0xB5BD4 +D_800DAAA8 = 0x800DAAA8; // type:data rom:0xB5EA8 +D_800DAAB8 = 0x800DAAB8; // type:data rom:0xB5EB8 +D_800DAABD = 0x800DAABD; // type:data rom:0xB5EBD +D_800DAAC0 = 0x800DAAC0; // type:data rom:0xB5EC0 +nuContPfs = 0x800DAAD8; // rom:0xB5ED8 +nuSiMesgQ = 0x800DAC78; // rom:0xB6078 +D_800DAC90 = 0x800DAC90; // type:data rom:0xB6090 +D_800DACA8 = 0x800DACA8; // type:data rom:0xB60A8 +gCurrentSaveFile = 0x800DACC0; // rom:0xB60C0 appendGfx_animator_node = 0x8011FA54; // type:func rom:0xB6154 get_animator_node_for_tree_index = 0x8011FF74; // type:func rom:0xB6674 get_animator_node_with_id = 0x8011FF98; // type:func rom:0xB6698 @@ -2155,11 +2507,32 @@ step_mesh_animator = 0x801206F8; // type:func rom:0xB6DF8 clear_entity_models = 0x80120BB0; // type:func rom:0xB72B0 init_entity_models = 0x80120C58; // type:func rom:0xB7358 load_entity_model = 0x80120CE0; // type:func rom:0xB73E0 +nuContDataMutexQ = 0x800DC040; // type:data rom:0xB7440 +D_800DC060 = 0x800DC060; // type:data rom:0xB7460 +D_800DC064 = 0x800DC064; // type:data rom:0xB7464 +gBattleState = 0x800DC068; // rom:0xB7468 +D_800DC06C = 0x800DC06C; // type:data rom:0xB746C +gBattleStatus = 0x800DC070; // rom:0xB7470 size:0x460 ALT_load_entity_model = 0x80120DE4; // type:func rom:0xB74E4 exec_entity_model_commandlist = 0x80120F04; // type:func rom:0xB7604 step_entity_model_commandlist = 0x80120FB8; // type:func rom:0xB76B8 make_entity_model_mtx_flipZ = 0x80121140; // type:func rom:0xB7840 appendGfx_entity_model = 0x80121184; // type:func rom:0xB7884 +D_800DC4D0 = 0x800DC4D0; // type:data rom:0xB78D0 +D_800DC4D4 = 0x800DC4D4; // type:data rom:0xB78D4 +D_800DC4D8 = 0x800DC4D8; // type:data rom:0xB78D8 +gBattleState2 = 0x800DC4DC; // type:data rom:0xB78DC +D_800DC4E0 = 0x800DC4E0; // type:data rom:0xB78E0 +D_800DC4E4 = 0x800DC4E4; // type:data rom:0xB78E4 +D_800DC4E8 = 0x800DC4E8; // type:data rom:0xB78E8 +gCurrentBattleSection = 0x800DC4EA; // type:data rom:0xB78EA +D_800DC4EB = 0x800DC4EB; // type:data rom:0xB78EB +D_800DC4EC = 0x800DC4EC; // type:data rom:0xB78EC +D_800DC4F0 = 0x800DC4F0; // type:data rom:0xB78F0 +D_800DC4F4 = 0x800DC4F4; // type:data rom:0xB78F4 +D_800DC4F8 = 0x800DC4F8; // type:data rom:0xB78F8 +D_800DC4FC = 0x800DC4FC; // type:data rom:0xB78FC +nuIdleFunc = 0x8009A5A8; // type:data rom:0xB7900 draw_entity_model_A = 0x80121CE8; // type:func rom:0xB83E8 draw_entity_model_B = 0x80121EB8; // type:func rom:0xB85B8 draw_entity_model_C = 0x80122088; // type:func rom:0xB8788 @@ -2313,7 +2686,7 @@ func_8013A704 = 0x8013A704; // type:func rom:0xD0E04 func_8013A854 = 0x8013A854; // type:func rom:0xD0F54 func_8013A888 = 0x8013A888; // type:func rom:0xD0F88 func_8013A8E0 = 0x8013A8E0; // type:func rom:0xD0FE0 -fold_get_sprite_effect = 0x8013A920; // type:func rom:0xD1020 +fold_get_state = 0x8013A920; // type:func rom:0xD1020 fold_clear_state_gfx = 0x8013A93C; // type:func rom:0xD103C fold_clear_state_data = 0x8013A9C8; // type:func rom:0xD10C8 fold_init_state = 0x8013A9E8; // type:func rom:0xD10E8 @@ -2593,6 +2966,22 @@ D_8014C4C0 = 0x8014C4C0; // type:data rom:0xE2BC0 D_8014C500 = 0x8014C500; // type:data rom:0xE2C00 D_8014C580 = 0x8014C580; // type:data rom:0xE2C80 D_8014C588 = 0x8014C588; // type:data rom:0xE2C88 +D_8014C6F0 = 0x8014C6F0; // type:data rom:0xE2DF0 +D_8014C6F4 = 0x8014C6F4; // type:data rom:0xE2DF4 +ui_star_silhouette_png = 0x8014C700; // type:data rom:0xE2E00 +ui_mario_head_silhouette_png = 0x8014CB00; // type:data rom:0xE3200 +ui_quarter_circle_silhouette_png = 0x8014D300; // type:data rom:0xE3A00 +ui_flame_thing_silhouette_png = 0x8014D500; // type:data rom:0xE3C00 +D_8014E500 = 0x8014E500; // type:data rom:0xE4C00 +D_8014E5A0 = 0x8014E5A0; // type:data rom:0xE4CA0 +D_8014E618 = 0x8014E618; // type:data rom:0xE4D18 +D_8014E670 = 0x8014E670; // type:data rom:0xE4D70 +D_8014E6C0 = 0x8014E6C0; // type:data rom:0xE4DC0 +D_8014E718 = 0x8014E718; // type:data rom:0xE4E18 +D_8014E770 = 0x8014E770; // type:data rom:0xE4E70 +D_8014E8F0 = 0x8014E8F0; // type:data rom:0xE4FF0 +D_8014E9A8 = 0x8014E9A8; // type:data rom:0xE50A8 +D_8014EA48 = 0x8014EA48; // type:data rom:0xE5148 fold_currentImage = 0x8014EE10; // type:data rom:0xE5510 fold_vtxCount = 0x8014EE14; // type:data rom:0xE5514 D_8014EE18 = 0x8014EE18; // type:data rom:0xE5518 @@ -4767,6 +5156,13 @@ 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 +D_802BDF34 = 0x802BDF34; // type:data rom:0x317E54 +D_802BDF38 = 0x802BDF38; // type:data rom:0x317E58 +D_802BDF3C = 0x802BDF3C; // type:data rom:0x317E5C +D_802BDF40 = 0x802BDF40; // type:data rom:0x317E60 +D_802BDF5C = 0x802BDF5C; // type:data rom:0x317E7C +D_802BDF60 = 0x802BDF60; // type:data rom:0x317E80 +D_802BDF64 = 0x802BDF64; // type:data rom:0x317E84 world_bombette_init = 0x802BD2D8; // type:func rom:0x318028 func_802BD300_318050 = 0x802BD300; // type:func rom:0x318050 func_802BD338_318088 = 0x802BD338; // type:func rom:0x318088 @@ -4777,7 +5173,21 @@ func_802BD758_3184A8 = 0x802BD758; // type:func rom:0x3184A8 func_802BE4E8_319238 = 0x802BE4E8; // type:func rom:0x319238 world_bombette_test_first_strike = 0x802BE520; // type:func rom:0x319270 world_bombette_pre_battle = 0x802BE6E8; // type:func rom:0x319438 +world_bombette_take_out = 0x802BE880; // type:data rom:0x3195D0 +D_802BE89C_3195EC = 0x802BE89C; // type:data rom:0x3195EC +world_bombette_update = 0x802BE8A0; // type:data rom:0x3195F0 +world_bombette_use_ability = 0x802BE8BC; // type:data rom:0x31960C +world_bombette_put_away = 0x802BE8D8; // type:data rom:0x319628 +D_802BE908_319658 = 0x802BE908; // type:data rom:0x319658 world_parakarry_init = 0x802BD100; // type:func rom:0x319670 +D_802BE924 = 0x802BE924; // type:data rom:0x319674 +D_802BE928 = 0x802BE928; // type:data rom:0x319678 +D_802BE92C = 0x802BE92C; // type:data rom:0x31967C +D_802BE930 = 0x802BE930; // type:data rom:0x319680 +D_802BE934 = 0x802BE934; // type:data rom:0x319684 +D_802BE938 = 0x802BE938; // type:data rom:0x319688 +D_802BE93C = 0x802BE93C; // type:data rom:0x31968C +D_802BE940 = 0x802BE940; // type:data rom:0x319690 func_802BD148_3196B8 = 0x802BD148; // type:func rom:0x3196B8 func_802BD180_3196F0 = 0x802BD180; // type:func rom:0x3196F0 func_802BD514_319A84 = 0x802BD514; // type:func rom:0x319A84 @@ -4786,11 +5196,22 @@ func_802BD660_319BD0 = 0x802BD660; // type:func rom:0x319BD0 func_802BE8D4_31AE44 = 0x802BE8D4; // type:func rom:0x31AE44 world_parakarry_pre_battle = 0x802BE90C; // type:func rom:0x31AE7C world_parakarry_post_battle = 0x802BE9D0; // type:func rom:0x31AF40 +world_parakarry_take_out = 0x802BEA90; // type:data rom:0x31B000 +D_802BEAAC_31B01C = 0x802BEAAC; // type:data rom:0x31B01C +world_parakarry_update = 0x802BEAB0; // type:data rom:0x31B020 +world_parakarry_use_ability = 0x802BEACC; // type:data rom:0x31B03C +world_parakarry_put_away = 0x802BEAE8; // type:data rom:0x31B058 D_802BEB10_31B080 = 0x802BEB10; // type:data rom:0x31B080 D_802BEB98_31B108 = 0x802BEB98; // type:data rom:0x31B108 D_802BEBA0_31B110 = 0x802BEBA0; // type:data rom:0x31B110 D_802BEBA8_31B118 = 0x802BEBA8; // type:data rom:0x31B118 func_802BD100_31B120 = 0x802BD100; // type:func rom:0x31B120 +D_802BEBB4 = 0x802BEBB4; // type:data rom:0x31B124 +D_802BEBB8 = 0x802BEBB8; // type:data rom:0x31B128 +D_802BEBBC = 0x802BEBBC; // type:data rom:0x31B12C +D_802BEBC0_31CBE0 = 0x802BEBC0; // type:data rom:0x31B130 +D_802BEBC4 = 0x802BEBC4; // type:data rom:0x31B134 +D_802BEBC8 = 0x802BEBC8; // type:data rom:0x31B138 func_802BD144_31B164 = 0x802BD144; // type:func rom:0x31B164 func_802BD17C_31B19C = 0x802BD17C; // type:func rom:0x31B19C world_kooper_init = 0x802BD200; // type:func rom:0x31B220 @@ -4802,7 +5223,12 @@ func_802BE7E0_31C800 = 0x802BE7E0; // type:func rom:0x31C800 world_kooper_test_first_strike = 0x802BE818; // type:func rom:0x31C838 world_kooper_pre_battle = 0x802BEA24; // type:func rom:0x31CA44 world_kooper_post_battle = 0x802BEB10; // type:func rom:0x31CB30 -D_802BEBC0_31CBE0 = 0x802BEBC0; // type:data rom:0x31CBE0 +D_802BEB40_31CB60 = 0x802BEB40; // type:data rom:0x31CB60 +world_kooper_take_out = 0x802BEB44; // type:data rom:0x31CB64 +D_802BEB60_31CB80 = 0x802BEB60; // type:data rom:0x31CB80 +world_kooper_update = 0x802BEB64; // type:data rom:0x31CB84 +world_kooper_use_ability = 0x802BEB80; // type:data rom:0x31CBA0 +world_kooper_put_away = 0x802BEB9C; // type:data rom:0x31CBBC D_802BEC18_31CC38 = 0x802BEC18; // type:data rom:0x31CC38 D_802BEC20_31CC40 = 0x802BEC20; // type:data rom:0x31CC40 D_802BEC28_31CC48 = 0x802BEC28; // type:data rom:0x31CC48 @@ -4810,6 +5236,18 @@ D_802BEC30_31CC50 = 0x802BEC30; // type:data rom:0x31CC50 D_802BEC38_31CC58 = 0x802BEC38; // type:data rom:0x31CC58 D_802BEC40_31CC60 = 0x802BEC40; // type:data rom:0x31CC60 func_802BD100_31CC70 = 0x802BD100; // type:func rom:0x31CC70 +D_802BEC54 = 0x802BEC54; // type:data rom:0x31CC74 +D_802BEC58 = 0x802BEC58; // type:data rom:0x31CC78 +D_802BEC5C = 0x802BEC5C; // type:data rom:0x31CC7C +D_802BEC60 = 0x802BEC60; // type:data rom:0x31CC80 +D_802BEC64 = 0x802BEC64; // type:data rom:0x31CC84 +D_802BEC68 = 0x802BEC68; // type:data rom:0x31CC88 +D_802BEC6C = 0x802BEC6C; // type:data rom:0x31CC8C +D_802BEC70 = 0x802BEC70; // type:data rom:0x31CC90 +D_802BEC74 = 0x802BEC74; // type:data rom:0x31CC94 +D_802BEC78 = 0x802BEC78; // type:data rom:0x31CC98 +D_802BEC7C = 0x802BEC7C; // type:data rom:0x31CC9C +D_802BEC80 = 0x802BEC80; // type:data rom:0x31CCA0 func_802BD180_31CCF0 = 0x802BD180; // type:func rom:0x31CCF0 func_802BD1AC_31CD1C = 0x802BD1AC; // type:func rom:0x31CD1C world_watt_init = 0x802BD23C; // type:func rom:0x31CDAC @@ -4823,7 +5261,22 @@ world_watt_post_battle = 0x802BDE10; // type:func rom:0x31D980 func_802BDE88_31D9F8 = 0x802BDE88; // type:func rom:0x31D9F8 func_802BE014_31DB84 = 0x802BE014; // type:func rom:0x31DB84 func_802BE070_31DBE0 = 0x802BE070; // type:func rom:0x31DBE0 +D_802BE250_31DDC0 = 0x802BE250; // type:data rom:0x31DDC0 +D_802BE254_31DDC4 = 0x802BE254; // type:data rom:0x31DDC4 +world_watt_take_out = 0x802BE258; // type:data rom:0x31DDC8 +D_802BE274_31DDE4 = 0x802BE274; // type:data rom:0x31DDE4 +D_802BE278_31DDE8 = 0x802BE278; // type:data rom:0x31DDE8 +world_watt_update = 0x802BE27C; // type:data rom:0x31DDEC +world_watt_use_ability = 0x802BE298; // type:data rom:0x31DE08 +world_watt_put_away = 0x802BE2B4; // type:data rom:0x31DE24 +world_watt_while_riding = 0x802BE2D0; // type:data rom:0x31DE40 func_802BD100_31DE70 = 0x802BD100; // type:func rom:0x31DE70 +D_802BE304 = 0x802BE304; // type:data rom:0x31DE74 +D_802BE308 = 0x802BE308; // type:data rom:0x31DE78 +D_802BE30C = 0x802BE30C; // type:data rom:0x31DE7C +D_802BE310 = 0x802BE310; // type:data rom:0x31DE80 +D_802BE314 = 0x802BE314; // type:data rom:0x31DE84 +D_802BE318 = 0x802BE318; // type:data rom:0x31DE88 func_802BD20C_31DF7C = 0x802BD20C; // type:func rom:0x31DF7C func_802BD368_31E0D8 = 0x802BD368; // type:func rom:0x31E0D8 func_802BD414_31E184 = 0x802BD414; // type:func rom:0x31E184 @@ -4837,12 +5290,34 @@ func_802BF964_3206D4 = 0x802BF964; // type:func rom:0x3206D4 world_sushie_pre_battle = 0x802BF9B8; // type:func rom:0x320728 world_sushie_post_battle = 0x802BFA58; // type:func rom:0x3207C8 func_802BFAB8_320828 = 0x802BFAB8; // type:func rom:0x320828 +D_802BFDB0_320B20 = 0x802BFDB0; // type:data rom:0x320B20 +D_802BFDB4_320B24 = 0x802BFDB4; // type:data rom:0x320B24 +D_802BFDB8_320B28 = 0x802BFDB8; // type:data rom:0x320B28 +D_802BFDBC_320B2C = 0x802BFDBC; // type:data rom:0x320B2C +world_sushie_use_ability = 0x802BFDC0; // type:data rom:0x320B30 +world_sushie_take_out = 0x802BFDDC; // type:data rom:0x320B4C +D_802BFDF8_320B68 = 0x802BFDF8; // type:data rom:0x320B68 +world_sushie_update = 0x802BFDFC; // type:data rom:0x320B6C +world_sushie_put_away = 0x802BFE18; // type:data rom:0x320B88 +world_sushie_while_riding = 0x802BFE34; // type:data rom:0x320BA4 D_802BFE50_320BC0 = 0x802BFE50; // type:data rom:0x320BC0 D_802BFE58_320BC8 = 0x802BFE58; // type:data rom:0x320BC8 D_802BFE60_320BD0 = 0x802BFE60; // type:data rom:0x320BD0 D_802BFED0_320C40 = 0x802BFED0; // type:data rom:0x320C40 D_802BFED8_320C48 = 0x802BFED8; // type:data rom:0x320C48 func_802BD100_320C50 = 0x802BD100; // type:func rom:0x320C50 +bss_802BFEE4 = 0x802BFEE4; // type:data rom:0x320C54 +bss_802BFEE8 = 0x802BFEE8; // type:data rom:0x320C58 +D_802BFEEC = 0x802BFEEC; // type:data rom:0x320C5C +bss_802BFEF0 = 0x802BFEF0; // type:data rom:0x320C60 +bss_802BFEF4 = 0x802BFEF4; // type:data rom:0x320C64 +D_802BFEF8 = 0x802BFEF8; // type:data rom:0x320C68 +bss_802BFEFC = 0x802BFEFC; // type:data rom:0x320C6C +bss_802BFF00 = 0x802BFF00; // type:data rom:0x320C70 +bss_802BFF04 = 0x802BFF04; // type:data rom:0x320C74 +bss_802BFF08 = 0x802BFF08; // type:data rom:0x320C78 +bss_802BFF0C = 0x802BFF0C; // type:data rom:0x320C7C +D_802BFF10_320C80 = 0x802BFF10; // type:data rom:0x320C80 world_lakilester_init = 0x802BD21C; // type:func rom:0x320D6C func_802BD29C_320DEC = 0x802BD29C; // type:func rom:0x320DEC func_802BD2D4_320E24 = 0x802BD2D4; // type:func rom:0x320E24 @@ -4859,7 +5334,25 @@ world_lakilester_pre_battle = 0x802BFA00; // type:func rom:0x323550 world_lakilester_post_battle = 0x802BFAA8; // type:func rom:0x3235F8 func_802BFB44_323694 = 0x802BFB44; // type:func rom:0x323694 func_802BFBA0_3236F0 = 0x802BFBA0; // type:func rom:0x3236F0 -world_bow_init = 0x802BD100; // type:func rom:0x323A50 +world_lakilester_take_out = 0x802BFE60; // type:data rom:0x3239B0 +D_802BFE7C_3239CC = 0x802BFE7C; // type:data rom:0x3239CC +world_lakilester_update = 0x802BFE80; // type:data rom:0x3239D0 +world_lakilester_use_ability = 0x802BFE9C; // type:data rom:0x3239EC +world_lakilester_put_away = 0x802BFEB8; // type:data rom:0x323A08 +world_lakilester_while_riding = 0x802BFED4; // type:data rom:0x323A24 +D_802BFEF8_323A48 = 0x802BFEF8; // type:data rom:0x323A48 +world_bow_init = 0x802BFF00; // type:data rom:0x323A50 +D_802BFF04 = 0x802BFF04; // type:data rom:0x323A54 +D_802BFF08 = 0x802BFF08; // type:data rom:0x323A58 +D_802BFF0C = 0x802BFF0C; // type:data rom:0x323A5C +D_802BFF10 = 0x802BFF10; // type:data rom:0x323A60 +D_802BFF14 = 0x802BFF14; // type:data rom:0x323A64 +D_802BFF18 = 0x802BFF18; // type:data rom:0x323A68 +D_802BFF1C = 0x802BFF1C; // type:data rom:0x323A6C +D_802BFF20 = 0x802BFF20; // type:data rom:0x323A70 +D_802BFF24 = 0x802BFF24; // type:data rom:0x323A74 +D_802BFF28 = 0x802BFF28; // type:data rom:0x323A78 +D_802BFF2C = 0x802BFF2C; // type:data rom:0x323A7C func_802BD130_323A80 = 0x802BD130; // type:func rom:0x323A80 func_802BD168_323AB8 = 0x802BD168; // type:func rom:0x323AB8 func_802BD4FC_323E4C = 0x802BD4FC; // type:func rom:0x323E4C @@ -4868,9 +5361,19 @@ func_802BD694_323FE4 = 0x802BD694; // type:func rom:0x323FE4 func_802BDDF0_324740 = 0x802BDDF0; // type:func rom:0x324740 func_802BDF08_324858 = 0x802BDF08; // type:func rom:0x324858 world_bow_pre_battle = 0x802BDF64; // type:func rom:0x3248B4 +world_bow_take_out = 0x802BDFE0; // type:data rom:0x324930 +D_802BDFFC_32494C = 0x802BDFFC; // type:data rom:0x32494C +world_bow_update = 0x802BE000; // type:data rom:0x324950 +world_bow_use_ability = 0x802BE01C; // type:data rom:0x32496C +world_bow_put_away = 0x802BE038; // type:data rom:0x324988 D_802BE060_3249B0 = 0x802BE060; // type:data rom:0x3249B0 world_goompa_init = 0x802BD100; // type:func rom:0x324A10 +D_802BE0C4 = 0x802BE0C4; // type:data rom:0x324A14 +D_802BE0C8 = 0x802BE0C8; // type:data rom:0x324A18 GoompaTakeOut = 0x802BD114; // type:func rom:0x324A24 +D_802BE0E4 = 0x802BE0E4; // type:data rom:0x324A34 +D_802BE0E8 = 0x802BE0E8; // type:data rom:0x324A38 +D_802BE0EC = 0x802BE0EC; // type:data rom:0x324A3C func_802BD14C_324A5C = 0x802BD14C; // type:func rom:0x324A5C func_802BD4E0_324DF0 = 0x802BD4E0; // type:func rom:0x324DF0 GoompaUseAbility = 0x802BD524; // type:func rom:0x324E34 @@ -5114,6 +5617,10 @@ fx_32_init = 0xE0040148; // type:func rom:0x353448 fx_32_update = 0xE0040150; // type:func rom:0x353450 fx_32_render = 0xE0040210; // type:func rom:0x353510 fx_32_appendGfx = 0xE0040348; // type:func rom:0x353648 +D_E0040840 = 0xE0040840; // type:data rom:0x353B40 +D_E0040848 = 0xE0040848; // type:data rom:0x353B48 +D_E0040880 = 0xE0040880; // type:data rom:0x353B80 +D_E0040890 = 0xE0040890; // type:data rom:0x353B90 fx_33_main = 0xE0042000; // type:func rom:0x3547A0 fx_33_init = 0xE004222C; // type:func rom:0x3549CC fx_33_update = 0xE0042234; // type:func rom:0x3549D4 @@ -5367,6 +5874,18 @@ fx_79_init = 0xE009E1DC; // type:func rom:0x3A00FC fx_79_update = 0xE009E1E4; // type:func rom:0x3A0104 fx_79_render = 0xE009E3DC; // type:func rom:0x3A02FC fx_79_appendGfx = 0xE009E424; // type:func rom:0x3A0344 +D_E009EDF0 = 0xE009EDF0; // type:data rom:0x3A0D10 +D_E009EDF4 = 0xE009EDF4; // type:data rom:0x3A0D14 +D_E009EDF8 = 0xE009EDF8; // type:data rom:0x3A0D18 +D_E009EDFC = 0xE009EDFC; // type:data rom:0x3A0D1C +D_E009EE00 = 0xE009EE00; // type:data rom:0x3A0D20 +D_E009EE08 = 0xE009EE08; // type:data rom:0x3A0D28 +D_E009EE10 = 0xE009EE10; // type:data rom:0x3A0D30 +D_E009EE18 = 0xE009EE18; // type:data rom:0x3A0D38 +D_E009EE20 = 0xE009EE20; // type:data rom:0x3A0D40 +D_E009EE28 = 0xE009EE28; // type:data rom:0x3A0D48 +D_E009EE30 = 0xE009EE30; // type:data rom:0x3A0D50 +D_E009EE38 = 0xE009EE38; // type:data rom:0x3A0D58 fx_80_main = 0xE00A0000; // type:func rom:0x3A2290 fx_81_main = 0xE00A2000; // type:func rom:0x3A2990 fx_81_init = 0xE00A2118; // type:func rom:0x3A2AA8 @@ -5374,12 +5893,20 @@ fx_81_update = 0xE00A2120; // type:func rom:0x3A2AB0 fx_81_render = 0xE00A21EC; // type:func rom:0x3A2B7C func_E00A2234 = 0xE00A2234; // type:func rom:0x3A2BC4 fx_81_appendGfx = 0xE00A223C; // type:func rom:0x3A2BCC +D_E00A29D0 = 0xE00A29D0; // type:data rom:0x3A3360 +D_E00A29DC = 0xE00A29DC; // type:data rom:0x3A336C +D_E00A2A24 = 0xE00A2A24; // type:data rom:0x3A33B4 fx_82_main = 0xE00A4000; // type:func rom:0x3A37E0 fx_82_init = 0xE00A41A4; // type:func rom:0x3A3984 fx_82_update = 0xE00A41AC; // type:func rom:0x3A398C fx_82_render = 0xE00A45DC; // type:func rom:0x3A3DBC func_E00A4648 = 0xE00A4648; // type:func rom:0x3A3E28 fx_82_appendGfx = 0xE00A4650; // type:func rom:0x3A3E30 +D_E00A4AF0 = 0xE00A4AF0; // type:data rom:0x3A42D0 +D_E00A4B20 = 0xE00A4B20; // type:data rom:0x3A4300 +D_E00A4B28 = 0xE00A4B28; // type:data rom:0x3A4308 +D_E00A4B30 = 0xE00A4B30; // type:data rom:0x3A4310 +D_E00A4B38 = 0xE00A4B38; // type:data rom:0x3A4318 fx_83_main = 0xE00A6000; // type:func rom:0x3A5550 fx_83_init = 0xE00A611C; // type:func rom:0x3A566C fx_83_update = 0xE00A6124; // type:func rom:0x3A5674 @@ -5392,17 +5919,32 @@ fx_84_update = 0xE00A8104; // type:func rom:0x3A71F4 fx_84_render = 0xE00A82D4; // type:func rom:0x3A73C4 func_E00A8318 = 0xE00A8318; // type:func rom:0x3A7408 fx_84_appendGfx = 0xE00A8320; // type:func rom:0x3A7410 +D_E00A8620 = 0xE00A8620; // type:data rom:0x3A7710 +D_E00A8648 = 0xE00A8648; // type:data rom:0x3A7738 +D_E00A8678 = 0xE00A8678; // type:data rom:0x3A7768 +D_E00A8690 = 0xE00A8690; // type:data rom:0x3A7780 +D_E00A86A0 = 0xE00A86A0; // type:data rom:0x3A7790 fx_85_main = 0xE00AA000; // type:func rom:0x3AA920 fx_85_init = 0xE00AA104; // type:func rom:0x3AAA24 fx_85_update = 0xE00AA10C; // type:func rom:0x3AAA2C fx_85_render = 0xE00AA3C0; // type:func rom:0x3AACE0 fx_85_appendGfx = 0xE00AA404; // type:func rom:0x3AAD24 +D_E00AA6C0 = 0xE00AA6C0; // type:data rom:0x3AAFE0 +D_E00AA6EC = 0xE00AA6EC; // type:data rom:0x3AB00C fx_86_main = 0xE00AC000; // type:func rom:0x3AEE20 fx_86_init = 0xE00AC11C; // type:func rom:0x3AEF3C fx_86_update = 0xE00AC124; // type:func rom:0x3AEF44 fx_86_render = 0xE00AC280; // type:func rom:0x3AF0A0 func_E00AC288 = 0xE00AC288; // type:func rom:0x3AF0A8 func_E00AC2A4 = 0xE00AC2A4; // type:func rom:0x3AF0C4 +D_E00AC7B0 = 0xE00AC7B0; // type:data rom:0x3AF5D0 +D_E00AC7BC = 0xE00AC7BC; // type:data rom:0x3AF5DC +D_E00AC7C8 = 0xE00AC7C8; // type:data rom:0x3AF5E8 +D_E00AC7F8 = 0xE00AC7F8; // type:data rom:0x3AF618 +D_E00AC83C = 0xE00AC83C; // type:data rom:0x3AF65C +D_E00AC880 = 0xE00AC880; // type:data rom:0x3AF6A0 +D_E00AC8D0 = 0xE00AC8D0; // type:data rom:0x3AF6F0 +D_E00AC8D8 = 0xE00AC8D8; // type:data rom:0x3AF6F8 fx_87_main = 0xE00AE000; // type:func rom:0x3B2350 fx_87_init = 0xE00AE1AC; // type:func rom:0x3B24FC fx_87_update = 0xE00AE1B4; // type:func rom:0x3B2504 @@ -5414,36 +5956,58 @@ fx_88_init = 0xE00B011C; // type:func rom:0x3B3FCC fx_88_update = 0xE00B0124; // type:func rom:0x3B3FD4 fx_88_render = 0xE00B01F8; // type:func rom:0x3B40A8 fx_88_appendGfx = 0xE00B0234; // type:func rom:0x3B40E4 +D_E00B07E0 = 0xE00B07E0; // type:data rom:0x3B4690 +D_E00B07E8 = 0xE00B07E8; // type:data rom:0x3B4698 fx_89_main = 0xE00B2000; // type:func rom:0x3B4790 fx_89_init = 0xE00B21DC; // type:func rom:0x3B496C fx_89_update = 0xE00B21E4; // type:func rom:0x3B4974 fx_89_render = 0xE00B2460; // type:func rom:0x3B4BF0 func_E00B24A8 = 0xE00B24A8; // type:func rom:0x3B4C38 fx_89_appendGfx = 0xE00B24B0; // type:func rom:0x3B4C40 +D_E00B2BA0 = 0xE00B2BA0; // type:data rom:0x3B5330 fx_90_main = 0xE00B4000; // type:func rom:0x3B5CF0 fx_90_init = 0xE00B4134; // type:func rom:0x3B5E24 fx_90_update = 0xE00B413C; // type:func rom:0x3B5E2C fx_90_render = 0xE00B452C; // type:func rom:0x3B621C func_E00B4574 = 0xE00B4574; // type:func rom:0x3B6264 fx_90_appendGfx = 0xE00B457C; // type:func rom:0x3B626C +D_E00B4CF0 = 0xE00B4CF0; // type:data rom:0x3B69E0 +D_E00B4ED0 = 0xE00B4ED0; // type:data rom:0x3B6BC0 +D_E00B4ED8 = 0xE00B4ED8; // type:data rom:0x3B6BC8 +D_E00B4EE0 = 0xE00B4EE0; // type:data rom:0x3B6BD0 +D_E00B4EE8 = 0xE00B4EE8; // type:data rom:0x3B6BD8 +D_E00B4EF0 = 0xE00B4EF0; // type:data rom:0x3B6BE0 +D_E00B4EF8 = 0xE00B4EF8; // type:data rom:0x3B6BE8 fx_91_main = 0xE00B6000; // type:func rom:0x3B7160 fx_91_init = 0xE00B6178; // type:func rom:0x3B72D8 fx_91_update = 0xE00B6180; // type:func rom:0x3B72E0 fx_91_render = 0xE00B629C; // type:func rom:0x3B73FC func_E00B62D8 = 0xE00B62D8; // type:func rom:0x3B7438 fx_91_appendGfx = 0xE00B62E0; // type:func rom:0x3B7440 +D_E00B6750 = 0xE00B6750; // type:data rom:0x3B78B0 +D_E00B6758 = 0xE00B6758; // type:data rom:0x3B78B8 +D_E00B6760 = 0xE00B6760; // type:data rom:0x3B78C0 +D_E00B6768 = 0xE00B6768; // type:data rom:0x3B78C8 fx_92_main = 0xE00B8000; // type:func rom:0x3B7B80 fx_92_init = 0xE00B812C; // type:func rom:0x3B7CAC fx_92_update = 0xE00B8134; // type:func rom:0x3B7CB4 fx_92_render = 0xE00B81B8; // type:func rom:0x3B7D38 func_E00B8200 = 0xE00B8200; // type:func rom:0x3B7D80 fx_92_appendGfx = 0xE00B8208; // type:func rom:0x3B7D88 +D_E00B88F0 = 0xE00B88F0; // type:data rom:0x3B8470 +D_E00B8900 = 0xE00B8900; // type:data rom:0x3B8480 +D_E00B8B58 = 0xE00B8B58; // type:data rom:0x3B86D8 +D_E00B8CA4 = 0xE00B8CA4; // type:data rom:0x3B8824 +D_E00B8CD0 = 0xE00B8CD0; // type:data rom:0x3B8850 fx_93_main = 0xE00BA000; // type:func rom:0x3B8BD0 fx_93_init = 0xE00BA16C; // type:func rom:0x3B8D3C fx_93_update = 0xE00BA174; // type:func rom:0x3B8D44 fx_93_render = 0xE00BA5DC; // type:func rom:0x3B91AC func_E00BA618 = 0xE00BA618; // type:func rom:0x3B91E8 fx_93_appendGfx = 0xE00BA620; // type:func rom:0x3B91F0 +D_E00BAE80 = 0xE00BAE80; // type:data rom:0x3B9A50 +D_E00BAE88 = 0xE00BAE88; // type:data rom:0x3B9A58 +D_E00BAE90 = 0xE00BAE90; // type:data rom:0x3B9A60 fx_94_main = 0xE00BC000; // type:func rom:0x3BA030 fx_94_init = 0xE00BC1D0; // type:func rom:0x3BA200 func_E00BC1D8 = 0xE00BC1D8; // type:func rom:0x3BA208 @@ -5451,6 +6015,13 @@ fx_94_update = 0xE00BC238; // type:func rom:0x3BA268 fx_94_render = 0xE00BC2E8; // type:func rom:0x3BA318 func_E00BC36C = 0xE00BC36C; // type:func rom:0x3BA39C fx_94_appendGfx = 0xE00BC374; // type:func rom:0x3BA3A4 +D_E00BCC30 = 0xE00BCC30; // type:data rom:0x3BAC60 +D_E00BCD38 = 0xE00BCD38; // type:data rom:0x3BAD68 +D_E00BCE40 = 0xE00BCE40; // type:data rom:0x3BAE70 +D_E00BCE50 = 0xE00BCE50; // type:data rom:0x3BAE80 +D_E00BCE58 = 0xE00BCE58; // type:data rom:0x3BAE88 +D_E00BCE60 = 0xE00BCE60; // type:data rom:0x3BAE90 +D_E00BCE68 = 0xE00BCE68; // type:data rom:0x3BAE98 fx_95_main = 0xE00BE000; // type:func rom:0x3BBF60 fx_95_init = 0xE00BE39C; // type:func rom:0x3BC2FC fx_95_update = 0xE00BE3A4; // type:func rom:0x3BC304 @@ -5581,6 +6152,9 @@ fx_117_update = 0xE00EA198; // type:func rom:0x3E2078 fx_117_render = 0xE00EA520; // type:func rom:0x3E2400 func_E00EA664 = 0xE00EA664; // type:func rom:0x3E2544 fx_117_appendGfx = 0xE00EA66C; // type:func rom:0x3E254C +D_E00EAA50 = 0xE00EAA50; // type:data rom:0x3E2930 +D_E00EAA58 = 0xE00EAA58; // type:data rom:0x3E2938 +D_E00EAA60 = 0xE00EAA60; // type:data rom:0x3E2940 fx_119_main = 0xE010A000; // type:func rom:0x3E43A0 fx_119_init = 0xE010A184; // type:func rom:0x3E4524 fx_119_update = 0xE010A18C; // type:func rom:0x3E452C @@ -6857,6 +7431,13 @@ D_80228430_6CBFC0 = 0x80228430; // type:data rom:0x6CBFC0 D_80228438_6CBFC8 = 0x80228438; // type:data rom:0x6CBFC8 D_80228440_6CBFD0 = 0x80228440; // type:data rom:0x6CBFD0 D_80228448_6CBFD8 = 0x80228448; // type:data rom:0x6CBFD8 +D_80228480_6CC010 = 0x80228480; // type:data rom:0x6CC010 +D_80228490_6CC020 = 0x80228490; // type:data rom:0x6CC020 +D_802284A0_6CC030 = 0x802284A0; // type:data rom:0x6CC030 +D_802284A8_6CC038 = 0x802284A8; // type:data rom:0x6CC038 +D_802284B4_6CC044 = 0x802284B4; // type:data rom:0x6CC044 +D_802284C0_6CC050 = 0x802284C0; // type:data rom:0x6CC050 +D_802284D4_6CC064 = 0x802284D4; // type:data rom:0x6CC064 func_80218000_6CC070 = 0x80218000; // type:func rom:0x6CC070 dup_b_area_kpa4_UnkBattleFunc1 = 0x80218020; // type:func rom:0x6CC090 dup_p_area_kpa4_StartRumbleWithParams = 0x802180EC; // type:func rom:0x6CC15C @@ -7503,6 +8084,12 @@ battle_star_focus_UnkStarFunc = 0x802A1494; // type:func rom:0x78A2F4 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 +battle_star_focus_802A1630 = 0x802A1630; // type:data rom:0x78A490 +battle_star_focus_802A19C8 = 0x802A19C8; // type:data rom:0x78A828 +battle_star_focus_802A1D60 = 0x802A1D60; // type:data rom:0x78ABC0 +battle_star_focus_802A1F6C = 0x802A1F6C; // type:data rom:0x78ADCC +battle_star_focus_802A23BC = 0x802A23BC; // type:data rom:0x78B21C +battle_star_focus_usePower = 0x802A24E8; // type:data rom:0x78B348 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 @@ -7518,6 +8105,12 @@ 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 +battle_star_refresh_802A1A70 = 0x802A1A70; // type:data rom:0x78C070 +battle_star_refresh_802A1E08 = 0x802A1E08; // type:data rom:0x78C408 +battle_star_refresh_802A21A0 = 0x802A21A0; // type:data rom:0x78C7A0 +battle_star_refresh_802A23AC = 0x802A23AC; // type:data rom:0x78C9AC +battle_star_refresh_802A27FC = 0x802A27FC; // type:data rom:0x78CDFC +battle_star_refresh_usePower = 0x802A2928; // type:data rom:0x78CF28 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 @@ -7528,6 +8121,12 @@ battle_star_lullaby_UnkBackgroundFunc = 0x802A1414; // type:func rom:0x78D564 battle_star_lullaby_UnkStarFunc = 0x802A1494; // type:func rom:0x78D5E4 battle_star_lullaby_SetNpcCollision32 = 0x802A14E8; // type:func rom:0x78D638 func_802A1518_78D668 = 0x802A1518; // type:func rom:0x78D668 +battle_star_lullaby_802A1620 = 0x802A1620; // type:data rom:0x78D770 +battle_star_lullaby_802A19B8 = 0x802A19B8; // type:data rom:0x78DB08 +battle_star_lullaby_802A1D50 = 0x802A1D50; // type:data rom:0x78DEA0 +battle_star_lullaby_802A1F5C = 0x802A1F5C; // type:data rom:0x78E0AC +battle_star_lullaby_802A23AC = 0x802A23AC; // type:data rom:0x78E4FC +battle_star_lullaby_usePower = 0x802A24D8; // type:data rom:0x78E628 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 @@ -7539,6 +8138,12 @@ battle_star_star_storm_UnkStarFunc = 0x802A1494; // type:func rom:0x78EC64 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 +battle_star_star_storm_802A16F0 = 0x802A16F0; // type:data rom:0x78EEC0 +battle_star_star_storm_802A1A88 = 0x802A1A88; // type:data rom:0x78F258 +battle_star_star_storm_802A1E20 = 0x802A1E20; // type:data rom:0x78F5F0 +battle_star_star_storm_802A202C = 0x802A202C; // type:data rom:0x78F7FC +battle_star_star_storm_802A247C = 0x802A247C; // type:data rom:0x78FC4C +battle_star_star_storm_usePower = 0x802A25A8; // type:data rom:0x78FD78 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 @@ -7553,6 +8158,12 @@ 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 +battle_star_chill_out_802A18F0 = 0x802A18F0; // type:data rom:0x7909C0 +battle_star_chill_out_802A1C88 = 0x802A1C88; // type:data rom:0x790D58 +battle_star_chill_out_802A2020 = 0x802A2020; // type:data rom:0x7910F0 +battle_star_chill_out_802A222C = 0x802A222C; // type:data rom:0x7912FC +battle_star_chill_out_802A267C = 0x802A267C; // type:data rom:0x79174C +battle_star_chill_out_usePower = 0x802A27A8; // type:data rom:0x791878 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 @@ -7564,6 +8175,13 @@ battle_star_smooch_UnkStarFunc = 0x802A1494; // type:func rom:0x792224 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 +battle_star_smooch_802A1630 = 0x802A1630; // type:data rom:0x7923C0 +battle_star_smooch_802A19C8 = 0x802A19C8; // type:data rom:0x792758 +battle_star_smooch_802A1D60 = 0x802A1D60; // type:data rom:0x792AF0 +battle_star_smooch_802A1F6C = 0x802A1F6C; // type:data rom:0x792CFC +battle_star_smooch_802A23BC = 0x802A23BC; // type:data rom:0x79314C +battle_star_smooch_intTable_802A24E8 = 0x802A24E8; // type:data rom:0x793278 +battle_star_smooch_usePower = 0x802A2510; // type:data rom:0x7932A0 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 @@ -7573,6 +8191,12 @@ battle_star_time_out_UnkBackgroundFunc2 = 0x802A137C; // type:func rom:0x79409C battle_star_time_out_UnkBackgroundFunc = 0x802A1414; // type:func rom:0x794134 battle_star_time_out_UnkStarFunc = 0x802A1494; // type:func rom:0x7941B4 battle_star_time_out_SetNpcCollision32 = 0x802A14E8; // type:func rom:0x794208 +battle_star_time_out_802A1520 = 0x802A1520; // type:data rom:0x794240 +battle_star_time_out_802A18B8 = 0x802A18B8; // type:data rom:0x7945D8 +battle_star_time_out_802A1C50 = 0x802A1C50; // type:data rom:0x794970 +battle_star_time_out_802A1E5C = 0x802A1E5C; // type:data rom:0x794B7C +battle_star_time_out_802A22AC = 0x802A22AC; // type:data rom:0x794FCC +battle_star_time_out_usePower = 0x802A23D8; // type:data rom:0x7950F8 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 @@ -7585,6 +8209,12 @@ battle_star_up_and_away_SetNpcCollision32 = 0x802A14E8; // type:func rom:0x7957C func_802A1518_7957F8 = 0x802A1518; // type:func rom:0x7957F8 func_802A15B4_795894 = 0x802A15B4; // type:func rom:0x795894 func_802A1628_795908 = 0x802A1628; // type:func rom:0x795908 +battle_star_up_and_away_802A16D0 = 0x802A16D0; // type:data rom:0x7959B0 +battle_star_up_and_away_802A1A68 = 0x802A1A68; // type:data rom:0x795D48 +battle_star_up_and_away_802A1E00 = 0x802A1E00; // type:data rom:0x7960E0 +battle_star_up_and_away_802A200C = 0x802A200C; // type:data rom:0x7962EC +battle_star_up_and_away_802A245C = 0x802A245C; // type:data rom:0x79673C +battle_star_up_and_away_usePower = 0x802A2588; // type:data rom:0x796868 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 @@ -7597,6 +8227,16 @@ 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 +battle_star_star_beam_802A24F0 = 0x802A24F0; // type:data rom:0x7984B0 +battle_star_star_beam_802A2888 = 0x802A2888; // type:data rom:0x798848 +battle_star_star_beam_802A2C20 = 0x802A2C20; // type:data rom:0x798BE0 +battle_star_star_beam_802A2E2C = 0x802A2E2C; // type:data rom:0x798DEC +battle_star_star_beam_802A327C = 0x802A327C; // type:data rom:0x79923C +battle_star_star_beam_802A33A8 = 0x802A33A8; // type:data rom:0x799368 +D_802A3514_7994D4 = 0x802A3514; // type:data rom:0x7994D4 +D_802A3534_7994F4 = 0x802A3534; // type:data rom:0x7994F4 +D_802A3554_799514 = 0x802A3554; // type:data rom:0x799514 +battle_star_star_beam_usePower = 0x802A35B4; // type:data rom:0x799574 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 @@ -7609,6 +8249,16 @@ 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 +battle_star_peach_beam_802A24F0 = 0x802A24F0; // type:data rom:0x79ACA0 +battle_star_peach_beam_802A2888 = 0x802A2888; // type:data rom:0x79B038 +battle_star_peach_beam_802A2C20 = 0x802A2C20; // type:data rom:0x79B3D0 +battle_star_peach_beam_802A2E2C = 0x802A2E2C; // type:data rom:0x79B5DC +battle_star_peach_beam_802A327C = 0x802A327C; // type:data rom:0x79BA2C +battle_star_peach_beam_802A33A8 = 0x802A33A8; // type:data rom:0x79BB58 +battle_star_peach_beam_D_802A3514_7FCCC4 = 0x802A3514; // type:data rom:0x79BCC4 +battle_star_peach_beam_D_802A3534_7FCCE4 = 0x802A3534; // type:data rom:0x79BCE4 +battle_star_peach_beam_D_802A3554_7FCD04 = 0x802A3554; // type:data rom:0x79BD04 +battle_star_peach_beam_usePower = 0x802A35B4; // type:data rom:0x79BD64 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 @@ -7619,6 +8269,12 @@ battle_star_peach_focus_UnkBackgroundFunc = 0x802A1414; // type:func rom:0x79C3B battle_star_peach_focus_UnkStarFunc = 0x802A1494; // type:func rom:0x79C434 battle_star_peach_focus_SetNpcCollision32 = 0x802A14E8; // type:func rom:0x79C488 func_802A1518_79C4B8 = 0x802A1518; // type:func rom:0x79C4B8 +battle_star_peach_focus_802A1530 = 0x802A1530; // type:data rom:0x79C4D0 +battle_star_peach_focus_802A18C8 = 0x802A18C8; // type:data rom:0x79C868 +battle_star_peach_focus_802A1C60 = 0x802A1C60; // type:data rom:0x79CC00 +battle_star_peach_focus_802A1E6C = 0x802A1E6C; // type:data rom:0x79CE0C +battle_star_peach_focus_802A22BC = 0x802A22BC; // type:data rom:0x79D25C +battle_star_peach_focus_usePower = 0x802A23E8; // type:data rom:0x79D388 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 @@ -7629,6 +8285,12 @@ battle_star_peach_dash_UnkBackgroundFunc = 0x802A1414; // type:func rom:0x79DCB4 battle_star_peach_dash_UnkStarFunc = 0x802A1494; // type:func rom:0x79DD34 battle_star_peach_dash_SetNpcCollision32 = 0x802A14E8; // type:func rom:0x79DD88 func_802A1518_79DDB8 = 0x802A1518; // type:func rom:0x79DDB8 +battle_star_peach_dash_802A15B0 = 0x802A15B0; // type:data rom:0x79DE50 +battle_star_peach_dash_802A1948 = 0x802A1948; // type:data rom:0x79E1E8 +battle_star_peach_dash_802A1CE0 = 0x802A1CE0; // type:data rom:0x79E580 +battle_star_peach_dash_802A1EEC = 0x802A1EEC; // type:data rom:0x79E78C +battle_star_peach_dash_802A233C = 0x802A233C; // type:data rom:0x79EBDC +battle_star_peach_dash_usePower = 0x802A2468; // type:data rom:0x79ED08 shop_owner_begin_speech = 0x80280000; // type:func rom:0x7E0E80 shop_owner_buy_dialog = 0x80280088; // type:func rom:0x7E0F08 shop_owner_continue_speech = 0x8028017C; // type:func rom:0x7E0FFC @@ -7917,16 +8579,16 @@ func_802454B4_805D34 = 0x802454B4; // type:func rom:0x805D34 func_80245504_805D84 = 0x80245504; // type:func rom:0x805D84 func_8024552C_805DAC = 0x8024552C; // type:func rom:0x805DAC mac_01_UnkNpcAIFunc24 = 0x80245550; // type:func rom:0x805DD0 -mac_01_UnkFunc13_copy = 0x802456A8; // type:func rom:0x805F28 +dup_mac_01_UnkFunc13 = 0x802456A8; // type:func rom:0x805F28 mac_01_UnkNpcAIFunc1 = 0x80245950; // type:func rom:0x8061D0 -mac_01_UnkFunc14_copy = 0x80245A10; // type:func rom:0x806290 +dup_mac_01_UnkFunc14 = 0x80245A10; // type:func rom:0x806290 mac_01_UnkNpcAIFunc25 = 0x80245BCC; // type:func rom:0x80644C mac_01_NpcJumpFunc2 = 0x80245C80; // type:func rom:0x806500 mac_01_NpcJumpFunc = 0x80245CF4; // type:func rom:0x806574 mac_01_UnkNpcAIFunc13 = 0x80245D6C; // type:func rom:0x8065EC -mac_01_UnkFunc15_copy = 0x80245E9C; // type:func rom:0x80671C +dup_mac_01_UnkFunc15 = 0x80245E9C; // type:func rom:0x80671C mac_01_UnkNpcDurationFlagFunc = 0x80245FBC; // type:func rom:0x80683C -mac_01_UnkFunc16_copy = 0x80246024; // type:func rom:0x8068A4 +dup_mac_01_UnkFunc16 = 0x80246024; // type:func rom:0x8068A4 func_802460E4_806964 = 0x802460E4; // type:func rom:0x806964 func_802463E0_806C60 = 0x802463E0; // type:func rom:0x806C60 mac_01_foliage_setup_shear_mtx = 0x80246490; // type:func rom:0x806D10 @@ -9164,6 +9826,7 @@ D_802463C0_915A70 = 0x802463C0; // type:data rom:0x915A70 D_802463C8_915A78 = 0x802463C8; // type:data rom:0x915A78 D_802463D0_915A80 = 0x802463D0; // type:data rom:0x915A80 D_802465C0_915C70 = 0x802465C0; // type:data rom:0x915C70 +D_802465C8_915C78 = 0x802465C8; // type:data rom:0x915C78 D_802465D0_915C80 = 0x802465D0; // type:data rom:0x915C80 D_802465D8_915C88 = 0x802465D8; // type:data rom:0x915C88 D_802465E0_915C90 = 0x802465E0; // type:data rom:0x915C90 @@ -10703,7 +11366,7 @@ hos_02_UnkFunc6 = 0x80241E48; // type:func rom:0xA18068 hos_02_UnkFunc5 = 0x802421D8; // type:func rom:0xA183F8 func_802422FC_A1851C = 0x802422FC; // type:func rom:0xA1851C hos_02_UnkNpcAIFunc13 = 0x802424E8; // type:func rom:0xA18708 -hos_02_UnkNpcAIFunc34 = 0x80242618; // type:func rom:0xA18838 +func_80242618_A18838 = 0x80242618; // type:func rom:0xA18838 hos_02_UnkFunc45 = 0x80242898; // type:func rom:0xA18AB8 func_802428F4_A18B14 = 0x802428F4; // type:func rom:0xA18B14 D_802433AC_A195CC = 0x802433AC; // type:data rom:0xA195CC @@ -13686,6 +14349,296 @@ dgb_01_dgb_00_name_hack = 0x80263508; // type:data rom:0xC20D88 D_80263510_C20D90 = 0x80263510; // type:data rom:0xC20D90 D_80263518_C20D98 = 0x80263518; // type:data rom:0xC20D98 dgb_01_dgb_08_name_hack = 0x802636B0; // type:data rom:0xC20F30 +vtx_C20F40 = 0x80200000; // type:data rom:0xC20F40 +vtx_C21100 = 0x802001C0; // type:data rom:0xC21100 +vtx_C21130 = 0x802001F0; // type:data rom:0xC21130 +vtx_C211E0 = 0x802002A0; // type:data rom:0xC211E0 +vtx_C211F0 = 0x802002B0; // type:data rom:0xC211F0 +vtx_C21240 = 0x80200300; // type:data rom:0xC21240 +vtx_C21360 = 0x80200420; // type:data rom:0xC21360 +vtx_C213C0 = 0x80200480; // type:data rom:0xC213C0 +vtx_C215A0 = 0x80200660; // type:data rom:0xC215A0 +vtx_C21700 = 0x802007C0; // type:data rom:0xC21700 +vtx_C21770 = 0x80200830; // type:data rom:0xC21770 +vtx_C21810 = 0x802008D0; // type:data rom:0xC21810 +vtx_C21930 = 0x802009F0; // type:data rom:0xC21930 +vtx_C21AE0 = 0x80200BA0; // type:data rom:0xC21AE0 +vtx_C21B20 = 0x80200BE0; // type:data rom:0xC21B20 +vtx_C21BD0 = 0x80200C90; // type:data rom:0xC21BD0 +vtx_C21C90 = 0x80200D50; // type:data rom:0xC21C90 +vtx_C21D30 = 0x80200DF0; // type:data rom:0xC21D30 +vtx_C21DD0 = 0x80200E90; // type:data rom:0xC21DD0 +vtx_C21E00 = 0x80200EC0; // type:data rom:0xC21E00 +vtx_C21F30 = 0x80200FF0; // type:data rom:0xC21F30 +vtx_C22050 = 0x80201110; // type:data rom:0xC22050 +vtx_C22190 = 0x80201250; // type:data rom:0xC22190 +vtx_C222D0 = 0x80201390; // type:data rom:0xC222D0 +vtx_C22330 = 0x802013F0; // type:data rom:0xC22330 +vtx_C224A0 = 0x80201560; // type:data rom:0xC224A0 +vtx_C224E0 = 0x802015A0; // type:data rom:0xC224E0 +vtx_C22510 = 0x802015D0; // type:data rom:0xC22510 +vtx_C22620 = 0x802016E0; // type:data rom:0xC22620 +vtx_C22780 = 0x80201840; // type:data rom:0xC22780 +vtx_C22810 = 0x802018D0; // type:data rom:0xC22810 +vtx_C22870 = 0x80201930; // type:data rom:0xC22870 +vtx_C228F0 = 0x802019B0; // type:data rom:0xC228F0 +vtx_C22950 = 0x80201A10; // type:data rom:0xC22950 +vtx_C229F0 = 0x80201AB0; // type:data rom:0xC229F0 +vtx_C22B00 = 0x80201BC0; // type:data rom:0xC22B00 +vtx_C22C00 = 0x80201CC0; // type:data rom:0xC22C00 +vtx_C22E00 = 0x80201EC0; // type:data rom:0xC22E00 +vtx_C22EC0 = 0x80201F80; // type:data rom:0xC22EC0 +vtx_C230A0 = 0x80202160; // type:data rom:0xC230A0 +vtx_C23240 = 0x80202300; // type:data rom:0xC23240 +vtx_C23260 = 0x80202320; // type:data rom:0xC23260 +vtx_C232A0 = 0x80202360; // type:data rom:0xC232A0 +vtx_C23330 = 0x802023F0; // type:data rom:0xC23330 +vtx_C233D0 = 0x80202490; // type:data rom:0xC233D0 +vtx_C23480 = 0x80202540; // type:data rom:0xC23480 +vtx_C234B0 = 0x80202570; // type:data rom:0xC234B0 +vtx_C235C0 = 0x80202680; // type:data rom:0xC235C0 +vtx_C236E0 = 0x802027A0; // type:data rom:0xC236E0 +vtx_C23810 = 0x802028D0; // type:data rom:0xC23810 +vtx_C238B0 = 0x80202970; // type:data rom:0xC238B0 +vtx_C239D0 = 0x80202A90; // type:data rom:0xC239D0 +vtx_C23A70 = 0x80202B30; // type:data rom:0xC23A70 +vtx_C23B70 = 0x80202C30; // type:data rom:0xC23B70 +vtx_C23BA0 = 0x80202C60; // type:data rom:0xC23BA0 +vtx_C23C70 = 0x80202D30; // type:data rom:0xC23C70 +vtx_C23C90 = 0x80202D50; // type:data rom:0xC23C90 +vtx_C23CE0 = 0x80202DA0; // type:data rom:0xC23CE0 +vtx_C23D20 = 0x80202DE0; // type:data rom:0xC23D20 +vtx_C23D60 = 0x80202E20; // type:data rom:0xC23D60 +vtx_C23DD0 = 0x80202E90; // type:data rom:0xC23DD0 +vtx_C23E00 = 0x80202EC0; // type:data rom:0xC23E00 +vtx_C23E20 = 0x80202EE0; // type:data rom:0xC23E20 +vtx_C23E50 = 0x80202F10; // type:data rom:0xC23E50 +vtx_C23F10 = 0x80202FD0; // type:data rom:0xC23F10 +vtx_C23FD0 = 0x80203090; // type:data rom:0xC23FD0 +vtx_C240D0 = 0x80203190; // type:data rom:0xC240D0 +vtx_C241D0 = 0x80203290; // type:data rom:0xC241D0 +vtx_C24350 = 0x80203410; // type:data rom:0xC24350 +vtx_C24510 = 0x802035D0; // type:data rom:0xC24510 +vtx_C24540 = 0x80203600; // type:data rom:0xC24540 +vtx_C24600 = 0x802036C0; // type:data rom:0xC24600 +vtx_C24690 = 0x80203750; // type:data rom:0xC24690 +vtx_C24720 = 0x802037E0; // type:data rom:0xC24720 +vtx_C24730 = 0x802037F0; // type:data rom:0xC24730 +vtx_C24840 = 0x80203900; // type:data rom:0xC24840 +vtx_C24960 = 0x80203A20; // type:data rom:0xC24960 +vtx_C24980 = 0x80203A40; // type:data rom:0xC24980 +vtx_C24AD0 = 0x80203B90; // type:data rom:0xC24AD0 +vtx_C24AF0 = 0x80203BB0; // type:data rom:0xC24AF0 +vtx_C24CD0 = 0x80203D90; // type:data rom:0xC24CD0 +vtx_C24EB0 = 0x80203F70; // type:data rom:0xC24EB0 +vtx_C24F30 = 0x80203FF0; // type:data rom:0xC24F30 +vtx_C24FB0 = 0x80204070; // type:data rom:0xC24FB0 +vtx_C25050 = 0x80204110; // type:data rom:0xC25050 +vtx_C25250 = 0x80204310; // type:data rom:0xC25250 +vtx_C25310 = 0x802043D0; // type:data rom:0xC25310 +vtx_C25350 = 0x80204410; // type:data rom:0xC25350 +vtx_C25500 = 0x802045C0; // type:data rom:0xC25500 +vtx_C25600 = 0x802046C0; // type:data rom:0xC25600 +vtx_C256D0 = 0x80204790; // type:data rom:0xC256D0 +vtx_C25710 = 0x802047D0; // type:data rom:0xC25710 +vtx_C257D0 = 0x80204890; // type:data rom:0xC257D0 +vtx_C257F0 = 0x802048B0; // type:data rom:0xC257F0 +vtx_C25900 = 0x802049C0; // type:data rom:0xC25900 +vtx_C25950 = 0x80204A10; // type:data rom:0xC25950 +vtx_C25A30 = 0x80204AF0; // type:data rom:0xC25A30 +vtx_C25AB0 = 0x80204B70; // type:data rom:0xC25AB0 +vtx_C25B30 = 0x80204BF0; // type:data rom:0xC25B30 +vtx_C25BD0 = 0x80204C90; // type:data rom:0xC25BD0 +vtx_C25C00 = 0x80204CC0; // type:data rom:0xC25C00 +vtx_C25C20 = 0x80204CE0; // type:data rom:0xC25C20 +vtx_C25C80 = 0x80204D40; // type:data rom:0xC25C80 +vtx_C25CF0 = 0x80204DB0; // type:data rom:0xC25CF0 +vtx_C25D30 = 0x80204DF0; // type:data rom:0xC25D30 +vtx_C25DA0 = 0x80204E60; // type:data rom:0xC25DA0 +vtx_C25DD0 = 0x80204E90; // type:data rom:0xC25DD0 +vtx_C25EA0 = 0x80204F60; // type:data rom:0xC25EA0 +vtx_C25F00 = 0x80204FC0; // type:data rom:0xC25F00 +vtx_C25F90 = 0x80205050; // type:data rom:0xC25F90 +vtx_C26040 = 0x80205100; // type:data rom:0xC26040 +vtx_C26090 = 0x80205150; // type:data rom:0xC26090 +vtx_C26130 = 0x802051F0; // type:data rom:0xC26130 +vtx_C26250 = 0x80205310; // type:data rom:0xC26250 +vtx_C26290 = 0x80205350; // type:data rom:0xC26290 +vtx_C262D0 = 0x80205390; // type:data rom:0xC262D0 +vtx_C26310 = 0x802053D0; // type:data rom:0xC26310 +vtx_C26350 = 0x80205410; // type:data rom:0xC26350 +vtx_C26390 = 0x80205450; // type:data rom:0xC26390 +vtx_C263D0 = 0x80205490; // type:data rom:0xC263D0 +vtx_C26410 = 0x802054D0; // type:data rom:0xC26410 +vtx_C26450 = 0x80205510; // type:data rom:0xC26450 +vtx_C26490 = 0x80205550; // type:data rom:0xC26490 +vtx_C264D0 = 0x80205590; // type:data rom:0xC264D0 +vtx_C26510 = 0x802055D0; // type:data rom:0xC26510 +vtx_C26550 = 0x80205610; // type:data rom:0xC26550 +vtx_C26590 = 0x80205650; // type:data rom:0xC26590 +vtx_C265D0 = 0x80205690; // type:data rom:0xC265D0 +vtx_C26610 = 0x802056D0; // type:data rom:0xC26610 +vtx_C26650 = 0x80205710; // type:data rom:0xC26650 +vtx_C26690 = 0x80205750; // type:data rom:0xC26690 +vtx_C266D0 = 0x80205790; // type:data rom:0xC266D0 +vtx_C26710 = 0x802057D0; // type:data rom:0xC26710 +vtx_C26750 = 0x80205810; // type:data rom:0xC26750 +vtx_C26890 = 0x80205950; // type:data rom:0xC26890 +vtx_C26A60 = 0x80205B20; // type:data rom:0xC26A60 +vtx_C26AE0 = 0x80205BA0; // type:data rom:0xC26AE0 +vtx_C26CC0 = 0x80205D80; // type:data rom:0xC26CC0 +vtx_C26EB0 = 0x80205F70; // type:data rom:0xC26EB0 +vtx_C26F40 = 0x80206000; // type:data rom:0xC26F40 +vtx_C26FB0 = 0x80206070; // type:data rom:0xC26FB0 +vtx_C27110 = 0x802061D0; // type:data rom:0xC27110 +vtx_C27180 = 0x80206240; // type:data rom:0xC27180 +vtx_C27220 = 0x802062E0; // type:data rom:0xC27220 +vtx_C27300 = 0x802063C0; // type:data rom:0xC27300 +vtx_C273A0 = 0x80206460; // type:data rom:0xC273A0 +vtx_C27460 = 0x80206520; // type:data rom:0xC27460 +vtx_C27580 = 0x80206640; // type:data rom:0xC27580 +vtx_C27740 = 0x80206800; // type:data rom:0xC27740 +vtx_C27770 = 0x80206830; // type:data rom:0xC27770 +vtx_C27880 = 0x80206940; // type:data rom:0xC27880 +vtx_C27A40 = 0x80206B00; // type:data rom:0xC27A40 +vtx_C27A70 = 0x80206B30; // type:data rom:0xC27A70 +vtx_C27B80 = 0x80206C40; // type:data rom:0xC27B80 +vtx_C27D60 = 0x80206E20; // type:data rom:0xC27D60 +vtx_C27F20 = 0x80206FE0; // type:data rom:0xC27F20 +vtx_C27FC0 = 0x80207080; // type:data rom:0xC27FC0 +vtx_C27FE0 = 0x802070A0; // type:data rom:0xC27FE0 +vtx_C28080 = 0x80207140; // type:data rom:0xC28080 +vtx_C28110 = 0x802071D0; // type:data rom:0xC28110 +vtx_C28190 = 0x80207250; // type:data rom:0xC28190 +vtx_C281B0 = 0x80207270; // type:data rom:0xC281B0 +vtx_C281E0 = 0x802072A0; // type:data rom:0xC281E0 +vtx_C282D0 = 0x80207390; // type:data rom:0xC282D0 +vtx_C282F0 = 0x802073B0; // type:data rom:0xC282F0 +vtx_C28310 = 0x802073D0; // type:data rom:0xC28310 +vtx_C28420 = 0x802074E0; // type:data rom:0xC28420 +vtx_C284F0 = 0x802075B0; // type:data rom:0xC284F0 +vtx_C28550 = 0x80207610; // type:data rom:0xC28550 +vtx_C28690 = 0x80207750; // type:data rom:0xC28690 +vtx_C28720 = 0x802077E0; // type:data rom:0xC28720 +vtx_C287A0 = 0x80207860; // type:data rom:0xC287A0 +vtx_C28890 = 0x80207950; // type:data rom:0xC28890 +vtx_C28970 = 0x80207A30; // type:data rom:0xC28970 +vtx_C28A70 = 0x80207B30; // type:data rom:0xC28A70 +vtx_C28BB0 = 0x80207C70; // type:data rom:0xC28BB0 +vtx_C28D90 = 0x80207E50; // type:data rom:0xC28D90 +vtx_C28F70 = 0x80208030; // type:data rom:0xC28F70 +vtx_C29150 = 0x80208210; // type:data rom:0xC29150 +vtx_C29330 = 0x802083F0; // type:data rom:0xC29330 +vtx_C29470 = 0x80208530; // type:data rom:0xC29470 +vtx_C294A0 = 0x80208560; // type:data rom:0xC294A0 +vtx_C294F0 = 0x802085B0; // type:data rom:0xC294F0 +vtx_C29540 = 0x80208600; // type:data rom:0xC29540 +vtx_C29570 = 0x80208630; // type:data rom:0xC29570 +vtx_C295B0 = 0x80208670; // type:data rom:0xC295B0 +vtx_C29630 = 0x802086F0; // type:data rom:0xC29630 +vtx_C29650 = 0x80208710; // type:data rom:0xC29650 +vtx_C296C0 = 0x80208780; // type:data rom:0xC296C0 +vtx_C29750 = 0x80208810; // type:data rom:0xC29750 +vtx_C297F0 = 0x802088B0; // type:data rom:0xC297F0 +vtx_C298E0 = 0x802089A0; // type:data rom:0xC298E0 +vtx_C29A40 = 0x80208B00; // type:data rom:0xC29A40 +vtx_C29AB0 = 0x80208B70; // type:data rom:0xC29AB0 +vtx_C29BB0 = 0x80208C70; // type:data rom:0xC29BB0 +vtx_C29CD0 = 0x80208D90; // type:data rom:0xC29CD0 +vtx_C29E00 = 0x80208EC0; // type:data rom:0xC29E00 +vtx_C29F50 = 0x80209010; // type:data rom:0xC29F50 +vtx_C2A080 = 0x80209140; // type:data rom:0xC2A080 +vtx_C2A180 = 0x80209240; // type:data rom:0xC2A180 +vtx_C2A2C0 = 0x80209380; // type:data rom:0xC2A2C0 +vtx_C2A3C0 = 0x80209480; // type:data rom:0xC2A3C0 +vtx_C2A540 = 0x80209600; // type:data rom:0xC2A540 +vtx_C2A700 = 0x802097C0; // type:data rom:0xC2A700 +vtx_C2A740 = 0x80209800; // type:data rom:0xC2A740 +vtx_C2A790 = 0x80209850; // type:data rom:0xC2A790 +vtx_C2A8D0 = 0x80209990; // type:data rom:0xC2A8D0 +vtx_C2AAB0 = 0x80209B70; // type:data rom:0xC2AAB0 +vtx_C2AC90 = 0x80209D50; // type:data rom:0xC2AC90 +vtx_C2AD20 = 0x80209DE0; // type:data rom:0xC2AD20 +vtx_C2AD70 = 0x80209E30; // type:data rom:0xC2AD70 +vtx_C2AE50 = 0x80209F10; // type:data rom:0xC2AE50 +vtx_C2AE70 = 0x80209F30; // type:data rom:0xC2AE70 +vtx_C2AEB0 = 0x80209F70; // type:data rom:0xC2AEB0 +vtx_C2AF60 = 0x8020A020; // type:data rom:0xC2AF60 +vtx_C2AF80 = 0x8020A040; // type:data rom:0xC2AF80 +vtx_C2B010 = 0x8020A0D0; // type:data rom:0xC2B010 +vtx_C2B050 = 0x8020A110; // type:data rom:0xC2B050 +vtx_C2B220 = 0x8020A2E0; // type:data rom:0xC2B220 +vtx_C2B250 = 0x8020A310; // type:data rom:0xC2B250 +vtx_C2B2D0 = 0x8020A390; // type:data rom:0xC2B2D0 +vtx_C2B340 = 0x8020A400; // type:data rom:0xC2B340 +vtx_C2B3C0 = 0x8020A480; // type:data rom:0xC2B3C0 +vtx_C2B3E0 = 0x8020A4A0; // type:data rom:0xC2B3E0 +vtx_C2B410 = 0x8020A4D0; // type:data rom:0xC2B410 +vtx_C2B560 = 0x8020A620; // type:data rom:0xC2B560 +vtx_C2B6D0 = 0x8020A790; // type:data rom:0xC2B6D0 +vtx_C2B800 = 0x8020A8C0; // type:data rom:0xC2B800 +vtx_C2B850 = 0x8020A910; // type:data rom:0xC2B850 +vtx_C2B8E0 = 0x8020A9A0; // type:data rom:0xC2B8E0 +vtx_C2B9B0 = 0x8020AA70; // type:data rom:0xC2B9B0 +vtx_C2BA50 = 0x8020AB10; // type:data rom:0xC2BA50 +vtx_C2BB50 = 0x8020AC10; // type:data rom:0xC2BB50 +vtx_C2BD50 = 0x8020AE10; // type:data rom:0xC2BD50 +vtx_C2BE50 = 0x8020AF10; // type:data rom:0xC2BE50 +vtx_C2BF50 = 0x8020B010; // type:data rom:0xC2BF50 +vtx_C2BF60 = 0x8020B020; // type:data rom:0xC2BF60 +vtx_C2BFD0 = 0x8020B090; // type:data rom:0xC2BFD0 +vtx_C2C080 = 0x8020B140; // type:data rom:0xC2C080 +vtx_C2C0B0 = 0x8020B170; // type:data rom:0xC2C0B0 +vtx_C2C0F0 = 0x8020B1B0; // type:data rom:0xC2C0F0 +vtx_C2C130 = 0x8020B1F0; // type:data rom:0xC2C130 +vtx_C2C1C0 = 0x8020B280; // type:data rom:0xC2C1C0 +vtx_C2C300 = 0x8020B3C0; // type:data rom:0xC2C300 +vtx_C2C4E0 = 0x8020B5A0; // type:data rom:0xC2C4E0 +vtx_C2C6C0 = 0x8020B780; // type:data rom:0xC2C6C0 +vtx_C2C8A0 = 0x8020B960; // type:data rom:0xC2C8A0 +vtx_C2CA20 = 0x8020BAE0; // type:data rom:0xC2CA20 +vtx_C2CBA0 = 0x8020BC60; // type:data rom:0xC2CBA0 +vtx_C2CD20 = 0x8020BDE0; // type:data rom:0xC2CD20 +vtx_C2CEA0 = 0x8020BF60; // type:data rom:0xC2CEA0 +vtx_C2CED0 = 0x8020BF90; // type:data rom:0xC2CED0 +vtx_C2CF00 = 0x8020BFC0; // type:data rom:0xC2CF00 +vtx_C2CFC0 = 0x8020C080; // type:data rom:0xC2CFC0 +vtx_C2D140 = 0x8020C200; // type:data rom:0xC2D140 +vtx_C2D170 = 0x8020C230; // type:data rom:0xC2D170 +vtx_C2D1A0 = 0x8020C260; // type:data rom:0xC2D1A0 +vtx_C2D260 = 0x8020C320; // type:data rom:0xC2D260 +vtx_C2D3E0 = 0x8020C4A0; // type:data rom:0xC2D3E0 +vtx_C2D410 = 0x8020C4D0; // type:data rom:0xC2D410 +vtx_C2D440 = 0x8020C500; // type:data rom:0xC2D440 +vtx_C2D500 = 0x8020C5C0; // type:data rom:0xC2D500 +vtx_C2D560 = 0x8020C620; // type:data rom:0xC2D560 +vtx_C2D5C0 = 0x8020C680; // type:data rom:0xC2D5C0 +vtx_C2D620 = 0x8020C6E0; // type:data rom:0xC2D620 +vtx_C2D660 = 0x8020C720; // type:data rom:0xC2D660 +vtx_C2D6A0 = 0x8020C760; // type:data rom:0xC2D6A0 +vtx_C2D6E0 = 0x8020C7A0; // type:data rom:0xC2D6E0 +vtx_C2D830 = 0x8020C8F0; // type:data rom:0xC2D830 +vtx_C2D8F0 = 0x8020C9B0; // type:data rom:0xC2D8F0 +vtx_C2DA20 = 0x8020CAE0; // type:data rom:0xC2DA20 +vtx_C2DBE0 = 0x8020CCA0; // type:data rom:0xC2DBE0 +vtx_C2DCB0 = 0x8020CD70; // type:data rom:0xC2DCB0 +vtx_C2DD50 = 0x8020CE10; // type:data rom:0xC2DD50 +vtx_C2DD90 = 0x8020CE50; // type:data rom:0xC2DD90 +vtx_C2DEA0 = 0x8020CF60; // type:data rom:0xC2DEA0 +vtx_C2DFC0 = 0x8020D080; // type:data rom:0xC2DFC0 +vtx_C2E020 = 0x8020D0E0; // type:data rom:0xC2E020 +vtx_C2E1E0 = 0x8020D2A0; // type:data rom:0xC2E1E0 +vtx_C2E2B0 = 0x8020D370; // type:data rom:0xC2E2B0 +vtx_C2E360 = 0x8020D420; // type:data rom:0xC2E360 +vtx_C2E390 = 0x8020D450; // type:data rom:0xC2E390 +vtx_C2E4A0 = 0x8020D560; // type:data rom:0xC2E4A0 +vtx_C2E5D0 = 0x8020D690; // type:data rom:0xC2E5D0 +vtx_C2E620 = 0x8020D6E0; // type:data rom:0xC2E620 +vtx_C2E7B0 = 0x8020D870; // type:data rom:0xC2E7B0 +vtx_C2E800 = 0x8020D8C0; // type:data rom:0xC2E800 +vtx_C2E8C0 = 0x8020D980; // type:data rom:0xC2E8C0 +vtx_C2E980 = 0x8020DA40; // type:data rom:0xC2E980 +vtx_C2EA60 = 0x8020DB20; // type:data rom:0xC2EA60 dgb_02_UnkNpcAIFunc6 = 0x80240000; // type:func rom:0xC2EBA0 dgb_02_UnkNpcAIFunc7 = 0x8024006C; // type:func rom:0xC2EC0C dgb_02_UnkNpcAIFunc8 = 0x802400DC; // type:func rom:0xC2EC7C @@ -16098,7 +17051,7 @@ sam_03_UnkNpcAIFunc27 = 0x8024066C; // type:func rom:0xD1172C D_80242370_D13430 = 0x80242370; // type:data rom:0xD13430 sam_04_foliage_setup_shear_mtx = 0x80240000; // type:func rom:0xD135D0 sam_04_TransformFoliage = 0x80240070; // type:func rom:0xD13640 -func_80240240_D13810 = 0x80240240; // type:func rom:0xD13810 +sam_04_SetAngleClamped = 0x80240240; // type:func rom:0xD13810 sam_04_GetNpcCollisionHeight = 0x80240310; // type:func rom:0xD138E0 sam_04_AddPlayerHandsOffset = 0x8024036C; // type:func rom:0xD1393C func_8024053C_D13B0C = 0x8024053C; // type:func rom:0xD13B0C @@ -16948,7 +17901,7 @@ D_80247BD0_DA50A0 = 0x80247BD0; // type:data rom:0xDA50A0 D_80247BD8_DA50A8 = 0x80247BD8; // type:data rom:0xDA50A8 omo_03_UnsetCamera0MoveFlag1 = 0x80240000; // type:func rom:0xDA5240 dup_omo_03_UnsetCamera0MoveFlag1 = 0x80240020; // type:func rom:0xDA5260 -func_8024003C_DA527C = 0x8024003C; // type:func rom:0xDA527C +omo_03_SetAngleClamped = 0x8024003C; // type:func rom:0xDA527C func_80240104_DA5344 = 0x80240104; // type:func rom:0xDA5344 func_80240188_DA53C8 = 0x80240188; // type:func rom:0xDA53C8 func_8024020C_DA544C = 0x8024020C; // type:func rom:0xDA544C @@ -17029,7 +17982,7 @@ D_802455F8_DB78B8 = 0x802455F8; // type:data rom:0xDB78B8 D_80245600_DB78C0 = 0x80245600; // type:data rom:0xDB78C0 D_80245648_DB7908 = 0x80245648; // type:data rom:0xDB7908 omo_06_UnsetCamera0MoveFlag1 = 0x80240000; // type:func rom:0xDB7910 -func_8024001C_DB792C = 0x8024001C; // type:func rom:0xDB792C +omo_06_SetAngleClamped = 0x8024001C; // type:func rom:0xDB792C func_802400E4_DB79F4 = 0x802400E4; // type:func rom:0xDB79F4 func_80240168_DB7A78 = 0x80240168; // type:func rom:0xDB7A78 func_802401EC_DB7AFC = 0x802401EC; // type:func rom:0xDB7AFC @@ -17098,7 +18051,7 @@ D_802470B0_DC4360 = 0x802470B0; // type:data rom:0xDC4360 D_802470B8_DC4368 = 0x802470B8; // type:data rom:0xDC4368 D_802470C0_DC4370 = 0x802470C0; // type:data rom:0xDC4370 omo_08_UnsetCamera0MoveFlag1 = 0x80240000; // type:func rom:0xDC43D0 -func_8024001C_DC43EC = 0x8024001C; // type:func rom:0xDC43EC +omo_08_SetAngleClamped = 0x8024001C; // type:func rom:0xDC43EC func_802400E4_DC44B4 = 0x802400E4; // type:func rom:0xDC44B4 func_80240168_DC4538 = 0x80240168; // type:func rom:0xDC4538 func_802401EC_DC45BC = 0x802401EC; // type:func rom:0xDC45BC @@ -17178,7 +18131,7 @@ D_8024AB20_DD77F0 = 0x8024AB20; // type:data rom:0xDD77F0 D_8024AB28_DD77F8 = 0x8024AB28; // type:data rom:0xDD77F8 D_8024AB30_DD7800 = 0x8024AB30; // type:data rom:0xDD7800 omo_10_UnsetCamera0MoveFlag1 = 0x80240000; // type:func rom:0xDD79B0 -func_8024001C_DD79CC = 0x8024001C; // type:func rom:0xDD79CC +omo_10_SetAngleClamped = 0x8024001C; // type:func rom:0xDD79CC func_802400E4_DD7A94 = 0x802400E4; // type:func rom:0xDD7A94 func_80240168_DD7B18 = 0x80240168; // type:func rom:0xDD7B18 func_802401EC_DD7B9C = 0x802401EC; // type:func rom:0xDD7B9C @@ -17261,7 +18214,7 @@ omo_15_StarSpiritEffectFunc4 = 0x802405BC; // type:func rom:0xDE8D2C omo_15_StarSpiritEffectFunc5 = 0x802405FC; // type:func rom:0xDE8D6C omo_15_StarSpiritEffectFunc6 = 0x80240708; // type:func rom:0xDE8E78 omo_16_UnsetCamera0MoveFlag1 = 0x80240000; // type:func rom:0xDEBED0 -func_8024001C_DEBEEC = 0x8024001C; // type:func rom:0xDEBEEC +omo_16_SetAngleClamped = 0x8024001C; // type:func rom:0xDEBEEC func_802400E4_DEBFB4 = 0x802400E4; // type:func rom:0xDEBFB4 func_80240168_DEC038 = 0x80240168; // type:func rom:0xDEC038 func_802401EC_DEC0BC = 0x802401EC; // type:func rom:0xDEC0BC @@ -17270,7 +18223,7 @@ omo_16_UnkFloatFunc = 0x80240388; // type:func rom:0xDEC258 func_80240518_DEC3E8 = 0x80240518; // type:func rom:0xDEC3E8 func_8024055C_DEC42C = 0x8024055C; // type:func rom:0xDEC42C omo_17_UnsetCamera0MoveFlag1 = 0x80240000; // type:func rom:0xDEEEA0 -func_8024001C_DEEEBC = 0x8024001C; // type:func rom:0xDEEEBC +omo_17_SetAngleClamped = 0x8024001C; // type:func rom:0xDEEEBC func_802400E4_DEEF84 = 0x802400E4; // type:func rom:0xDEEF84 func_80240168_DEF008 = 0x80240168; // type:func rom:0xDEF008 func_802401EC_DEF08C = 0x802401EC; // type:func rom:0xDEF08C @@ -17896,7 +18849,7 @@ func_802410E4_EB9F34 = 0x802410E4; // type:func rom:0xEB9F34 EB9D90_UnkFloatFunc = 0x8024121C; // type:func rom:0xEBA06C EB9D90_SyncStatusMenu = 0x802413AC; // type:func rom:0xEBA1FC func_802413CC_EBA21C = 0x802413CC; // type:func rom:0xEBA21C -EB9D90_SyncStatusMenu = 0x802413EC; // type:func rom:0xEBA23C +func_802413EC_EBA23C = 0x802413EC; // type:func rom:0xEBA23C ascii_EC2000 = 0x802491B0; // type:data rom:0xEC2000 ascii_EC2008 = 0x802491B8; // type:data rom:0xEC2008 ascii_EC2010 = 0x802491C0; // type:data rom:0xEC2010 @@ -17933,7 +18886,7 @@ EC9D00_UnkFunc37 = 0x802400D4; // type:func rom:0xEC9DD4 EC9D00_UnkFunc38 = 0x80240120; // type:func rom:0xEC9E20 func_802401CC_EC9ECC = 0x802401CC; // type:func rom:0xEC9ECC EC9D00_SwitchToPartner = 0x8024041C; // type:func rom:0xECA11C -EC9D00_UnkFunc18 = 0x80240448; // type:func rom:0xECA148 +EC9D00_UnkFunc19 = 0x80240448; // type:func rom:0xECA148 EC9D00_UnkFunc20 = 0x80240480; // type:func rom:0xECA180 EC9D00_UnkFunc39 = 0x80240510; // type:func rom:0xECA210 EC9D00_UnkFunc21 = 0x80240544; // type:func rom:0xECA244 @@ -18063,7 +19016,7 @@ func_8024042C_EE69DC = 0x8024042C; // type:func rom:0xEE69DC func_8024046C_EE6A1C = 0x8024046C; // type:func rom:0xEE6A1C func_80240504_EE6AB4 = 0x80240504; // type:func rom:0xEE6AB4 func_802407D4_EE6D84 = 0x802407D4; // type:func rom:0xEE6D84 -EE70C0_UnkNpcAIFunc23 = 0x80240B10; // type:func rom:0xEE70C0 +func_80240B10_EE70C0 = 0x80240B10; // type:func rom:0xEE70C0 func_80240CC0_EE7270 = 0x80240CC0; // type:func rom:0xEE7270 EE70C0_UnkNpcAIFunc1 = 0x802412E8; // type:func rom:0xEE7898 EE70C0_UnkFunc4 = 0x802413A8; // type:func rom:0xEE7958 @@ -18106,7 +19059,7 @@ EED1E0_UnkFunc37 = 0x802401B4; // type:func rom:0xEED2B4 EED1E0_UnkFunc38 = 0x80240200; // type:func rom:0xEED300 func_802402AC_EED3AC = 0x802402AC; // type:func rom:0xEED3AC EED1E0_SwitchToPartner = 0x802404FC; // type:func rom:0xEED5FC -EED1E0_UnkFunc18 = 0x80240528; // type:func rom:0xEED628 +EED1E0_UnkFunc19 = 0x80240528; // type:func rom:0xEED628 EED1E0_UnkFunc20 = 0x80240560; // type:func rom:0xEED660 EED1E0_UnkFunc39 = 0x802405F0; // type:func rom:0xEED6F0 EED1E0_UnkFunc21 = 0x80240624; // type:func rom:0xEED724 @@ -18221,6 +19174,9 @@ kmr_20_config = 0x2800380; // type:data battle_item_insecticide_herb_temp = 0x28003C0; // type:data battle_item_insecticide_herb_temp2 = 0x28003D0; // type:data battle_item_mystery_tempStc = 0x2800410; // type:data +D_090000E0 = 0x90000E0; // type:data +D_090001B8 = 0x90001B8; // type:data +D_09000240 = 0x9000240; // type:data D_090002C0 = 0x90002C0; // type:data D_09000330 = 0x9000330; // type:data D_09000370 = 0x9000370; // type:data @@ -18337,321 +19293,26 @@ D_80097D80 = 0x80097D80; // type:data D_80097D88 = 0x80097D88; // type:data pad = 0x80098474; // type:data nuScPreNMIFlag = 0x8009A5B0; // type:data -D_8009A5B8 = 0x8009A5B8; // type:data -D_8009A5C0 = 0x8009A5C0; // type:data -D_8009A5C8 = 0x8009A5C8; // type:data -D_8009A5CC = 0x8009A5CC; // type:data -D_8009A5D0 = 0x8009A5D0; // type:data -D_8009A5D4 = 0x8009A5D4; // type:data -timeFreezeMode = 0x8009A5D8; // type:data -nuGfxZBuffer = 0x8009A5DC; // -nuContDataLockKey = 0x8009A5E0; // type:data -D_8009A5E4 = 0x8009A5E4; // type:data -D_8009A5E8 = 0x8009A5E8; // type:data -D_8009A5EC = 0x8009A5EC; // type:data -nuGfxCfbCounter = 0x8009A5F0; // type:data -mdl_currentModelTreeNodeInfo = 0x8009A5F4; // type:data -nuGfxDisplay = 0x8009A5F8; // -D_8009A5FC = 0x8009A5FC; // type:data -gGameState = 0x8009A600; // -gNpcCount = 0x8009A604; // type:data -D_8009A606 = 0x8009A606; // type:data -D_8009A608 = 0x8009A608; // type:data -D_8009A60C = 0x8009A60C; // type:data -nuGfxUcode = 0x8009A610; // type:data -nuContNum = 0x8009A614; // type:data -nuGfxTaskSpool = 0x8009A618; // -D_8009A61C = 0x8009A61C; // type:data -D_8009A620 = 0x8009A620; // type:data -D_8009A628 = 0x8009A628; // type:data -D_8009A62C = 0x8009A62C; // type:data -D_8009A630 = 0x8009A630; // type:data -gCurrentCamID = 0x8009A634; // type:data -nuPiCartHandle = 0x8009A638; // -D_8009A63C = 0x8009A63C; // type:data -D_8009A640 = 0x8009A640; // type:data -nuGfxCfb_ptr = 0x8009A64C; // type:data -gOverrideFlags = 0x8009A650; // type:data -D_8009A654 = 0x8009A654; // type:data -nuGfxCfb = 0x8009A658; // type:data -D_8009A660 = 0x8009A660; // type:data -D_8009A664 = 0x8009A664; // type:data -D_8009A668 = 0x8009A668; // type:data -gMasterGfxPos = 0x8009A66C; // -D_8009A670 = 0x8009A670; // type:data -gDisplayContext = 0x8009A674; // -D_8009A678 = 0x8009A678; // type:data -D_8009A680 = 0x8009A680; // type:data -D_8009A690 = 0x8009A690; // type:data -D_8009A6A0 = 0x8009A6A0; // type:data -D_8009A6A2 = 0x8009A6A2; // type:data -D_8009A6A4 = 0x8009A6A4; // type:data -D_8009A6A6 = 0x8009A6A6; // type:data -D_8009A6B0 = 0x8009A6B0; // type:data -logicalSaveInfo = 0x8009BA30; // type:data -physicalSaveInfo = 0x8009BA50; // type:data -nextAvailableSavePage = 0x8009BA80; // type:data -gCurtainScale = 0x8009BA90; // -gCurtainScaleGoal = 0x8009BA94; // -gCurtainFade = 0x8009BA98; // -gCurtainFadeGoal = 0x8009BA9C; // -gCurtainDrawCallback = 0x8009BAA0; // -D_8009BAA8 = 0x8009BAA8; // type:data D_8009BB30 = 0x8009BB30; // type:data -gCrashScreen = 0x8009BB30; // type:data D_8009C4E0 = 0x8009C4E0; // type:data D_8009C4FC = 0x8009C4FC; // type:data -nuGfxTask_ptr = 0x8009C510; // type:data -taskDoneMsg = 0x8009C514; // type:data -swapBufMsg = 0x8009C516; // type:data -GfxTaskMgrThread = 0x8009C518; // type:data -D_8009E6D0 = 0x8009E6D0; // type:data -nuSiMesgBuf = 0x8009E6F0; // type:data -siMgrThread = 0x8009E710; // type:data D_800A08C0 = 0x800A08C0; // type:data -blendedCamSettings = 0x800A08C0; // type:data -D_800A08DC = 0x800A08DC; // type:data -D_800A08E0 = 0x800A08E0; // type:data -D_800A08E4 = 0x800A08E4; // type:data -D_800A08E8 = 0x800A08E8; // type:data -D_800A08EC = 0x800A08EC; // type:data -gameMode = 0x800A08F0; // type:data -D_800A0900 = 0x800A0900; // type:data -D_800A0904 = 0x800A0904; // type:data -D_800A0908 = 0x800A0908; // type:data -D_800A0910 = 0x800A0910; // type:data -D_800A0914 = 0x800A0914; // type:data -D_800A0918 = 0x800A0918; // type:data -D_800A091C = 0x800A091C; // type:data -D_800A0920 = 0x800A0920; // type:data -D_800A0921 = 0x800A0921; // type:data -D_800A0922 = 0x800A0922; // type:data -D_800A0924 = 0x800A0924; // type:data -D_800A0930 = 0x800A0930; // type:data -D_800A0931 = 0x800A0931; // type:data -D_800A0932 = 0x800A0932; // type:data -gMapTransitionAlpha = 0x800A0940; // -D_800A0942 = 0x800A0942; // type:data -D_800A0944 = 0x800A0944; // type:data -D_800A0946 = 0x800A0946; // type:data -D_800A0948 = 0x800A0948; // type:data -D_800A0950 = 0x800A0950; // type:data -D_800A0954 = 0x800A0954; // type:data -D_800A0956 = 0x800A0956; // type:data -D_800A0958 = 0x800A0958; // type:data -D_800A095A = 0x800A095A; // type:data -D_800A095B = 0x800A095B; // type:data -D_800A095C = 0x800A095C; // type:data -D_800A095D = 0x800A095D; // type:data -D_800A095E = 0x800A095E; // type:data -D_800A095F = 0x800A095F; // type:data -D_800A0960 = 0x800A0960; // type:data -D_800A0963 = 0x800A0963; // type:data -D_800A0964 = 0x800A0964; // type:data -D_800A0970 = 0x800A0970; // type:data -D_800A0974 = 0x800A0974; // type:data -D_800A0978 = 0x800A0978; // type:data -D_800A097C = 0x800A097C; // type:data -D_800A0980 = 0x800A0980; // type:data -D_800A0988 = 0x800A0988; // type:data -gWorldNpcList = 0x800A0990; // -gBattleNpcList = 0x800A0A90; // -gCurrentNpcListPtr = 0x800A0B90; // -D_800A0B94 = 0x800A0B94; // type:data -D_800A0BA0 = 0x800A0BA0; // type:data -D_800A0BA4 = 0x800A0BA4; // type:data -D_800A0BA8 = 0x800A0BA8; // type:data -D_800A0BAC = 0x800A0BAC; // type:data -D_800A0BB0 = 0x800A0BB0; // type:data -D_800A0BB4 = 0x800A0BB4; // type:data -D_800A0BB8 = 0x800A0BB8; // type:data -D_800A0BC0 = 0x800A0BC0; // type:data -D_800A0F40 = 0x800A0F40; // type:data -D_800A0F44 = 0x800A0F44; // type:data -D_800A0F50 = 0x800A0F50; // type:data -D_800A0F58 = 0x800A0F58; // type:data D_800A1530 = 0x800A1530; // type:data dead_gCurrentCamID = 0x800A158C; // type:data D_800A15A4 = 0x800A15A4; // type:data dead_gOverrideFlags = 0x800A15A8; // type:data D_800A15C4 = 0x800A15C4; // type:data D_800A15CC = 0x800A15CC; // type:data -D_800A3510 = 0x800A3510; // type:data -D_800A3520 = 0x800A3520; // type:data -D_800A3628 = 0x800A3628; // type:data -nuAuFrameSampleSize = 0x800A3634; // type:data -D_800A3638 = 0x800A3638; // type:data -D_800A3640 = 0x800A3640; // type:data -D_800A3658 = 0x800A3658; // type:data -D_800A3720 = 0x800A3720; // type:data -nuAuDmaState = 0x800A3BD0; // -D_800A3BD4 = 0x800A3BD4; // type:data -nuAuDmaBuf = 0x800A3BE0; // -D_800A3BF0 = 0x800A3BF0; // type:data -D_800A3FD0 = 0x800A3FD0; // type:data -D_800A3FE0 = 0x800A3FE0; // type:data -D_800A3FE4 = 0x800A3FE4; // type:data -D_800A3FE8 = 0x800A3FE8; // type:data -D_800A3FEC = 0x800A3FEC; // type:data -D_800A3FEE = 0x800A3FEE; // type:data -D_800A3FF0 = 0x800A3FF0; // type:data -gEffectGraphicsData = 0x800A4000; // type:data -D_800A41C0 = 0x800A41C0; // type:data -gMap = 0x800A41E0; // type:data -gMapConfig = 0x800A41E8; // type:data -D_800A4230 = 0x800A4230; // type:data -D_800A4234 = 0x800A4234; // type:data -D_800A4238 = 0x800A4238; // type:data -D_800A423C = 0x800A423C; // type:data -D_800A4240 = 0x800A4240; // type:data -D_800A4244 = 0x800A4244; // type:data -D_800A4248 = 0x800A4248; // type:data -D_800A424C = 0x800A424C; // type:data -D_800A4250 = 0x800A4250; // type:data -D_800A4254 = 0x800A4254; // type:data -D_800A4258 = 0x800A4258; // type:data -D_800A425C = 0x800A425C; // type:data -D_800A4260 = 0x800A4260; // type:data -D_800A4264 = 0x800A4264; // type:data -D_800A4268 = 0x800A4268; // type:data -D_800A4270 = 0x800A4270; // type:data -D_800A4420 = 0x800A4420; // type:data -nuScStack = 0x800A65D0; // -nuScAudioStack = 0x800A85D0; // -nuScGraphicsStack = 0x800AA5D0; // -D_800AC5D0 = 0x800AC5D0; // type:data -D_800AC5E8 = 0x800AC5E8; // type:data -nuGfxMesgBuf = 0x800AC6B0; // type:data -nuContWaitMesgBuf = 0x800AE6D0; // type:data -nuContDataMutexBuf = 0x800AE6D4; // type:data -piMgrThread = 0x800AE6E0; // type:data __osPiMesgQueue = 0x800AF890; // type:data -piMgrMesgBuff = 0x800AF8A8; // type:data -D_800AF8B0 = 0x800AF8B0; // type:data -D_800AF8C0 = 0x800AF8C0; // type:data -D_800AF8C4 = 0x800AF8C4; // type:data -D_800AF8D0 = 0x800AF8D0; // type:data -D_800AF8D8 = 0x800AF8D8; // type:data -D_800AF8DC = 0x800AF8DC; // type:data -D_800AF8E0 = 0x800AF8E0; // type:data -D_800AF8E8 = 0x800AF8E8; // type:data -D_800AF8EC = 0x800AF8EC; // type:data -D_800AF8F0 = 0x800AF8F0; // type:data -D_800AF8F8 = 0x800AF8F8; // type:data -D_800AF8FC = 0x800AF8FC; // type:data -D_800AF900 = 0x800AF900; // type:data -D_800AF910 = 0x800AF910; // type:data -D_800AF918 = 0x800AF918; // type:data -D_800B0AD0 = 0x800B0AD0; // type:data -D_800B0AE8 = 0x800B0AE8; // type:data -D_800B0B00 = 0x800B0B00; // type:data -D_800B0B02 = 0x800B0B02; // type:data -D_800B0B04 = 0x800B0B04; // type:data -D_800B0B18 = 0x800B0B18; // type:data -D_800B0B1A = 0x800B0B1A; // type:data -D_800B0B1C = 0x800B0B1C; // type:data -D_800B0B30 = 0x800B0B30; // type:data -D_800B0B6C = 0x800B0B6C; // type:data __osFlashID = 0x800B0C30; // type:data __osFlashMsg = 0x800B0C40; // type:data __osFlashMessageQ = 0x800B0C58; // type:data __osFlashHandler = 0x800B0C70; // type:data __osFlashMsgBuf = 0x800B0CE4; // type:data __osFlashVersion = 0x800B0CE8; // type:data -wMapTexName = 0x800B0CF0; // type:data -D_800B0D08 = 0x800B0D08; // type:data -nuContWaitMesgQ = 0x800B0EB8; // type:data -D_800B0ED0 = 0x800B0ED0; // type:data -D_800B0F08 = 0x800B0F08; // type:data -D_800B0F0C = 0x800B0F0C; // type:data -gCurrentEncounter = 0x800B0F10; // size:0xB0 -LeoDiskHandle = 0x800B1B08; // type:data -D_800B1B0C = 0x800B1B0C; // type:data -D_800B1B0D = 0x800B1B0D; // type:data -D_800B1B0E = 0x800B1B0E; // type:data -D_800B1B0F = 0x800B1B0F; // type:data -D_800B1B10 = 0x800B1B10; // type:data -nuContStatus = 0x800B1B7C; // type:data -D_800B1B90 = 0x800B1B90; // type:data -nuContRmbCtl = 0x800B1D40; // -nuContData = 0x800B1D68; // -gCameras = 0x800B1D80; // type:data size:0x1560 -gCollisionData = 0x800B42E0; // type:data size:0x10 -nuGfxMesgQ = 0x800B42F0; // type:data -D_800B4308 = 0x800B4308; // type:data -D_800B430C = 0x800B430C; // type:data -D_800B430D = 0x800B430D; // type:data -D_800B430E = 0x800B430E; // type:data -D_800B430F = 0x800B430F; // type:data -D_800B4310 = 0x800B4310; // type:data -D_800B4311 = 0x800B4311; // type:data -D_800B4314 = 0x800B4314; // type:data -D_800B4318 = 0x800B4318; // type:data -gOsPiMessageQueue = 0x800B4380; // type:data -gEffectInstances = 0x800B4398; // type:data -CartRomHandle = 0x800B4518; // type:data -D_800B451C = 0x800B451C; // type:data -D_800B451D = 0x800B451D; // type:data -D_800B451E = 0x800B451E; // type:data -D_800B451F = 0x800B451F; // type:data -D_800B4520 = 0x800B4520; // type:data -D_800B6590 = 0x800B6590; // type:data D_800B7EF0 = 0x800B7EF0; // type:data -nuYieldBuf = 0x800B8590; // type:data dead_gCameras = 0x800B8D80; // type:data D_800B8DEC = 0x800B8DEC; // type:data -D_800B91A0 = 0x800B91A0; // type:data -D_800B91D0 = 0x800B91D0; // type:data -D_800D91D0 = 0x800D91D0; // type:data -D_800D91D4 = 0x800D91D4; // type:data -D_800D91DC = 0x800D91DC; // type:data -wMapHitName = 0x800D91E0; // type:data -nuSiMgrMesgQ = 0x800D91F8; // type:data -wMapShapeName = 0x800D9230; // type:data -D_800D9248 = 0x800D9248; // type:data struct:ALHeap -nuGfxTask = 0x800D9278; // type:data -D_800D95E8 = 0x800D95E8; // type:data -D_800D9620 = 0x800D9620; // type:data -D_800D9668 = 0x800D9668; // type:data -D_800D9680 = 0x800D9680; // type:data -rspbootUcodeBuffer = 0x800D9780; // type:data -D_800D9F80 = 0x800D9F80; // type:data -D_800DA000 = 0x800DA000; // type:data -D_800DA03C = 0x800DA03C; // type:data -D_800DA040 = 0x800DA040; // type:data -nusched = 0x800DA440; // -D_800DA444 = 0x800DA444; // type:data -D_800DA47C = 0x800DA47C; // type:data -D_800DA4B4 = 0x800DA4B4; // type:data -D_800DA55C = 0x800DA55C; // type:data -D_800DAAA8 = 0x800DAAA8; // type:data -D_800DAAB8 = 0x800DAAB8; // type:data -D_800DAABD = 0x800DAABD; // type:data -D_800DAAC0 = 0x800DAAC0; // type:data -nuContPfs = 0x800DAAD8; // -nuSiMesgQ = 0x800DAC78; // -D_800DAC90 = 0x800DAC90; // type:data -D_800DACA8 = 0x800DACA8; // type:data -gCurrentSaveFile = 0x800DACC0; // -nuContDataMutexQ = 0x800DC040; // type:data -D_800DC060 = 0x800DC060; // type:data -D_800DC064 = 0x800DC064; // type:data -gBattleState = 0x800DC068; // -gBattleStatus = 0x800DC070; // size:0x460 -D_800DC4D0 = 0x800DC4D0; // type:data -D_800DC4D4 = 0x800DC4D4; // type:data -D_800DC4D8 = 0x800DC4D8; // type:data -gBattleState2 = 0x800DC4DC; // type:data -D_800DC4E0 = 0x800DC4E0; // type:data -D_800DC4E4 = 0x800DC4E4; // type:data -D_800DC4E8 = 0x800DC4E8; // type:data -gCurrentBattleSection = 0x800DC4EA; // type:data -D_800DC4EB = 0x800DC4EB; // type:data -D_800DC4EC = 0x800DC4EC; // type:data -D_800DC4F0 = 0x800DC4F0; // type:data -D_800DC4F4 = 0x800DC4F4; // type:data -D_800DC4F8 = 0x800DC4F8; // type:data -D_800DC4FC = 0x800DC4FC; // type:data _use_partner_ability = 0x800EA6CC; // type:func D_800FBB60 = 0x800FBB60; // type:data D_800FBBE0 = 0x800FBBE0; // type:data @@ -18781,10 +19442,6 @@ D_80109710 = 0x80109710; // type:data D_801097D8 = 0x801097D8; // type:data D_80109800 = 0x80109800; // type:data D_80109820 = 0x80109820; // type:data -D_80109890 = 0x80109890; // type:data -D_80109898 = 0x80109898; // type:data -D_801098A0 = 0x801098A0; // type:data -D_801098BC = 0x801098BC; // type:data D_801098E0 = 0x801098E0; // type:data D_8010BAE8 = 0x8010BAE8; // type:data D_8010BB00 = 0x8010BB00; // type:data @@ -19059,6 +19716,7 @@ D_80155C98 = 0x80155C98; // type:data gMessageWindowProjMatrix = 0x80155CA0; // type:data D_80155D20 = 0x80155D20; // type:data gMessageDrawStatePtr = 0x80155D74; // type:data +msg_drawState = 0x80155D74; // type:data D_80155D80 = 0x80155D80; // type:data D_80155D84 = 0x80155D84; // type:data D_80155D88 = 0x80155D88; // type:data @@ -19084,6 +19742,9 @@ D_80156903 = 0x80156903; // type:data screen_overlay_frontZoom = 0x80156904; // type:data screen_overlay_backType = 0x80156908; // type:data D_8015690B = 0x8015690B; // type:data +screen_overlay_backZoom = 0x8015690C; // type:data +D_80156910 = 0x80156910; // type:data +D_80156920 = 0x80156920; // type:data D_80156948 = 0x80156948; // type:data fold_vtxBuf = 0x80156950; // type:data D_80156954 = 0x80156954; // @@ -19723,6 +20384,7 @@ D_80251468 = 0x80251468; // type:data D_80251470 = 0x80251470; // type:data D_80251478 = 0x80251478; // type:data D_802515C4 = 0x802515C4; // type:data +dgb_01_pad_1 = 0x80251A78; // type:data dgb_01_pad_111111 = 0x80251A78; // type:data D_80251C40 = 0x80251C40; // type:data D_80251C58 = 0x80251C58; // type:data @@ -19740,6 +20402,7 @@ D_80252A00 = 0x80252A00; // type:data D_80252BC8 = 0x80252BC8; // type:data D_80252D38 = 0x80252D38; // type:data D_80253060 = 0x80253060; // type:data +dgb_01_pad_2 = 0x80253158; // type:data D_80253378 = 0x80253378; // type:data D_80253384 = 0x80253384; // type:data D_8025338C = 0x8025338C; // type:data @@ -20409,58 +21072,20 @@ D_802BCE20 = 0x802BCE20; // type:data D_802BCE30 = 0x802BCE30; // type:data D_802BCE32 = 0x802BCE32; // type:data D_802BCE34 = 0x802BCE34; // type:data +D_802BD600 = 0x802BD600; // type:data goompa_802BD600 = 0x802BD600; // type:data D_802BDF30 = 0x802BDF30; // type:data -D_802BDF34 = 0x802BDF34; // type:data -D_802BDF38 = 0x802BDF38; // type:data -D_802BDF60 = 0x802BDF60; // type:data func_802BE070 = 0x802BE070; // D_802BE0C0 = 0x802BE0C0; // type:data -D_802BE0C4 = 0x802BE0C4; // type:data -D_802BE0E4 = 0x802BE0E4; // type:data -D_802BE0E8 = 0x802BE0E8; // type:data -D_802BE0EC = 0x802BE0EC; // type:data D_802BE300 = 0x802BE300; // type:data -D_802BE304 = 0x802BE304; // type:data -D_802BE308 = 0x802BE308; // type:data -D_802BE30C = 0x802BE30C; // type:data -D_802BE310 = 0x802BE310; // type:data D_802BE920 = 0x802BE920; // type:data -D_802BE924 = 0x802BE924; // type:data -D_802BE928 = 0x802BE928; // type:data -D_802BE92C = 0x802BE92C; // type:data -D_802BE930 = 0x802BE930; // type:data -D_802BE934 = 0x802BE934; // type:data -D_802BE938 = 0x802BE938; // type:data D_802BEBB0 = 0x802BEBB0; // type:data -D_802BEBB4 = 0x802BEBB4; // type:data -D_802BEBB8 = 0x802BEBB8; // type:data -D_802BEBBC = 0x802BEBBC; // type:data D_802BEBC0 = 0x802BEBC0; // type:data -D_802BEBC4 = 0x802BEBC4; // type:data D_802BEC50 = 0x802BEC50; // type:data -D_802BEC54 = 0x802BEC54; // type:data -D_802BEC58 = 0x802BEC58; // type:data -D_802BEC5C = 0x802BEC5C; // type:data -D_802BEC60 = 0x802BEC60; // type:data -D_802BEC64 = 0x802BEC64; // type:data -D_802BEC68 = 0x802BEC68; // type:data -D_802BEC6C = 0x802BEC6C; // type:data -D_802BEC70 = 0x802BEC70; // type:data -D_802BEC74 = 0x802BEC74; // type:data -D_802BEC78 = 0x802BEC78; // type:data +D_802BFEE0 = 0x802BFEE0; // type:data +D_802BFEF0 = 0x802BFEF0; // type:data D_802BFEFC = 0x802BFEFC; // type:data -D_802BFF00 = 0x802BFF00; // type:data -D_802BFF04 = 0x802BFF04; // type:data -D_802BFF08 = 0x802BFF08; // type:data -D_802BFF0C = 0x802BFF0C; // type:data -D_802BFF10 = 0x802BFF10; // type:data -D_802BFF14 = 0x802BFF14; // type:data -D_802BFF18 = 0x802BFF18; // type:data -D_802BFF1C = 0x802BFF1C; // type:data -D_802BFF20 = 0x802BFF20; // type:data -D_802BFF24 = 0x802BFF24; // type:data -D_802BFF28 = 0x802BFF28; // type:data +D_802BFF30 = 0x802BFF30; // type:data D_802C0000 = 0x802C0000; // type:data D_802C05CC = 0x802C05CC; // type:data D_802D9D80 = 0x802D9D80; // type:data @@ -20778,10 +21403,6 @@ D_E003E880 = 0xE003E880; // type:data D_E003E888 = 0xE003E888; // type:data D_E003E890 = 0xE003E890; // type:data D_E003E898 = 0xE003E898; // type:data -D_E0040840 = 0xE0040840; // type:data -D_E0040848 = 0xE0040848; // type:data -D_E0040880 = 0xE0040880; // type:data -D_E0040890 = 0xE0040890; // type:data D_E0040898 = 0xE0040898; // type:data D_E00408A0 = 0xE00408A0; // type:data D_E0042780 = 0xE0042780; // type:data @@ -21040,65 +21661,6 @@ D_E0098510 = 0xE0098510; // type:data D_E0098530 = 0xE0098530; // type:data D_E009AA78 = 0xE009AA78; // type:data D_E009AA80 = 0xE009AA80; // type:data -D_E009EDF0 = 0xE009EDF0; // type:data -D_E009EDF4 = 0xE009EDF4; // type:data -D_E009EDF8 = 0xE009EDF8; // type:data -D_E009EDFC = 0xE009EDFC; // type:data -D_E009EE00 = 0xE009EE00; // type:data -D_E009EE08 = 0xE009EE08; // type:data -D_E009EE10 = 0xE009EE10; // type:data -D_E009EE18 = 0xE009EE18; // type:data -D_E009EE20 = 0xE009EE20; // type:data -D_E009EE28 = 0xE009EE28; // type:data -D_E009EE30 = 0xE009EE30; // type:data -D_E009EE38 = 0xE009EE38; // type:data -D_E00A29D0 = 0xE00A29D0; // type:data -D_E00A29DC = 0xE00A29DC; // type:data -D_E00A2A24 = 0xE00A2A24; // type:data -D_E00A4AF0 = 0xE00A4AF0; // type:data -D_E00A4B20 = 0xE00A4B20; // type:data -D_E00A4B28 = 0xE00A4B28; // type:data -D_E00A4B30 = 0xE00A4B30; // type:data -D_E00A4B38 = 0xE00A4B38; // type:data -D_E00A8620 = 0xE00A8620; // type:data -D_E00A8690 = 0xE00A8690; // type:data -D_E00A86A0 = 0xE00A86A0; // type:data -D_E00AA6C0 = 0xE00AA6C0; // type:data -D_E00AA6EC = 0xE00AA6EC; // type:data -D_E00AC7B0 = 0xE00AC7B0; // type:data -D_E00AC7BC = 0xE00AC7BC; // type:data -D_E00AC7C8 = 0xE00AC7C8; // type:data -D_E00AC7F8 = 0xE00AC7F8; // type:data -D_E00AC83C = 0xE00AC83C; // type:data -D_E00AC880 = 0xE00AC880; // type:data -D_E00AC8D0 = 0xE00AC8D0; // type:data -D_E00AC8D8 = 0xE00AC8D8; // type:data -D_E00B07E0 = 0xE00B07E0; // type:data -D_E00B07E8 = 0xE00B07E8; // type:data -D_E00B2BA0 = 0xE00B2BA0; // type:data -D_E00B4CF0 = 0xE00B4CF0; // type:data -D_E00B4ED0 = 0xE00B4ED0; // type:data -D_E00B4ED8 = 0xE00B4ED8; // type:data -D_E00B4EE0 = 0xE00B4EE0; // type:data -D_E00B4EE8 = 0xE00B4EE8; // type:data -D_E00B4EF0 = 0xE00B4EF0; // type:data -D_E00B4EF8 = 0xE00B4EF8; // type:data -D_E00B6750 = 0xE00B6750; // type:data -D_E00B6758 = 0xE00B6758; // type:data -D_E00B6760 = 0xE00B6760; // type:data -D_E00B6768 = 0xE00B6768; // type:data -D_E00B8900 = 0xE00B8900; // type:data -D_E00B8B58 = 0xE00B8B58; // type:data -D_E00B8CA4 = 0xE00B8CA4; // type:data -D_E00B8CD0 = 0xE00B8CD0; // type:data -D_E00BAE80 = 0xE00BAE80; // type:data -D_E00BAE88 = 0xE00BAE88; // type:data -D_E00BAE90 = 0xE00BAE90; // type:data -D_E00BCE40 = 0xE00BCE40; // type:data -D_E00BCE50 = 0xE00BCE50; // type:data -D_E00BCE58 = 0xE00BCE58; // type:data -D_E00BCE60 = 0xE00BCE60; // type:data -D_E00BCE68 = 0xE00BCE68; // type:data D_E00BEAF0 = 0xE00BEAF0; // type:data D_E00BEB00 = 0xE00BEB00; // type:data D_E00BEB08 = 0xE00BEB08; // type:data @@ -21230,9 +21792,6 @@ D_E00E6970 = 0xE00E6970; // type:data D_E00E6990 = 0xE00E6990; // type:data D_E00E8630 = 0xE00E8630; // type:data D_E00E8634 = 0xE00E8634; // type:data -D_E00EAA50 = 0xE00EAA50; // type:data -D_E00EAA58 = 0xE00EAA58; // type:data -D_E00EAA60 = 0xE00EAA60; // type:data D_E00EAA68 = 0xE00EAA68; // type:data D_E00EAA70 = 0xE00EAA70; // type:data D_E010ACCC = 0xE010ACCC; // type:data