From ec0ae1254095f6aa68402884e3604fb16bc21208 Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Sun, 26 Jun 2022 06:21:38 -0400 Subject: [PATCH] Partner, map, engine funcs (#736) * phys_should_player_be_sliding * functions from brotenko * UnkTrigFunc001 * trd_05 * IsPartnerXXX funcs * nok funcs --- include/common_structs.h | 6 +- include/effects.h | 4 +- include/enums.h | 1 + include/functions.h | 5 + include/macros.h | 2 +- include/script_api/common.h | 2 +- include/variables.h | 4 - src/1A5830.c | 52 ++-- src/39210_len_aa0.c | 20 +- src/7bb60_len_41b0.c | 27 +- src/7fd10_len_b40.c | 220 ++++++++++++++- src/80850_len_3060.c | 4 + src/EE70C0.c | 2 +- src/battle/partner/goombario.c | 156 ++++++++--- src/battle/partner/kooper.c | 53 +++- src/battle/partner/lakilester.c | 28 +- src/bss2.c | 32 +-- src/encounter_api.c | 2 +- src/evt/fx_api.c | 32 +-- src/hud_element.h | 2 +- src/world/area_arn/arn_08/events.c | 4 +- src/world/area_dgb/dgb_18/C55F40.c | 6 +- src/world/area_isk/isk_04/97BF60.c | 30 ++- src/world/area_jan/jan_11/B71010.c | 9 +- src/world/area_kpa/kpa_12/A54CA0.c | 9 +- src/world/area_kpa/kpa_13/A56270.c | 9 +- src/world/area_kpa/kpa_14/A57830.c | 9 +- src/world/area_kzn/kzn_11/C804B0.c | 9 +- src/world/area_mac/mac_04/843030.c | 9 +- src/world/area_nok/nok_01/9C53E0.c | 92 ++++++- src/world/area_nok/nok_02/9D7990.c | 8 +- src/world/area_nok/nok_02/9D7AA0.c | 197 +++++++++++++- src/world/area_nok/nok_11/9F4A40.c | 12 +- src/world/area_nok/nok_12/9FA7F0.c | 26 +- src/world/area_nok/nok_12/9FA970.c | 19 +- src/world/area_nok/nok_13/A01420.c | 8 +- src/world/area_nok/nok_14/A02840.c | 26 +- src/world/area_omo/omo_14/DE5810.c | 9 +- src/world/area_sam/sam_01/CF7E80.c | 2 +- src/world/area_tik/tik_03/86F0F0.c | 3 +- src/world/area_trd/trd_03/9A4ED0.c | 2 +- src/world/area_trd/trd_05/9AE700.c | 132 ++++++++- src/world/area_trd/trd_09/9BD660.c | 21 +- src/world/area_trd/trd_09/9BD720.c | 30 ++- src/world/area_trd/trd_10/9C2910.c | 5 +- src/world/area_trd/trd_10/9C3130.c | 9 +- src/world/common/UnkTrigFunc001.inc.c | 15 ++ src/world/partners.c | 2 + ver/us/asm/data/EA3A80.data.s | 2 +- ver/us/asm/data/EA7390.data.s | 2 +- ver/us/asm/data/EAA810.data.s | 2 +- ver/us/asm/data/EB1920.data.s | 2 +- ver/us/asm/data/EB54C0.data.s | 2 +- ver/us/asm/data/EB7850.data.s | 2 +- ver/us/asm/data/EBA260.data.s | 2 +- ver/us/asm/data/EC2850.data.s | 2 +- ver/us/asm/data/EC78F0.data.s | 2 +- ver/us/asm/data/ECBC10.data.s | 2 +- ver/us/asm/data/ED1840.data.s | 2 +- ver/us/asm/data/ED5780.data.s | 2 +- ver/us/asm/data/ED9170.data.s | 2 +- ver/us/asm/data/EDC6D0.data.s | 2 +- ver/us/asm/data/EE20E0.data.s | 2 +- ver/us/asm/data/EE8970.data.s | 2 +- ver/us/asm/data/EEFAD0.data.s | 2 +- ver/us/asm/data/EF58E0.data.s | 2 +- ver/us/asm/data/EF8250.data.s | 2 +- ver/us/asm/data/battle/partner/70DED0.data.s | 15 -- .../data/world/area_jan/jan_11/B728B0.data.s | 2 +- .../data/world/area_kpa/kpa_12/A55620.data.s | 2 +- .../data/world/area_kpa/kpa_13/A56CA0.data.s | 2 +- .../data/world/area_kpa/kpa_14/A59060.data.s | 2 +- .../data/world/area_kzn/kzn_11/C83180.data.s | 2 +- .../data/world/area_mac/mac_04/8469B0.data.s | 2 +- .../data/world/area_sam/sam_01/D01D90.data.s | 2 +- .../data/world/area_trd/trd_03/9A60F0.data.s | 2 +- .../phys_should_player_be_sliding.s | 73 ----- .../partner/goombario/func_80238BCC_6F1CAC.s | 150 ----------- .../partner/goombario/func_80238EDC_6F1FBC.s | 96 ------- .../partner/kooper/func_80238114_6F5F94.s | 110 -------- .../partner/lakilester/func_8023803C_70BD4C.s | 7 + .../partner/lakilester/func_80238C58_70C968.s | 69 ----- .../partner/lakilester/func_80239140_70CE50.s | 10 + .../partner/lakilester/func_80239F84_70DC94.s | 7 + .../isk_04/97BF60/func_8024095C_97BF8C.s | 79 ------ .../jan_11/B71010/func_802407DC_B7103C.s | 14 - .../kpa_12/A54CA0/func_80240444_A54D94.s | 16 -- .../kpa_13/A56270/func_80240444_A56364.s | 16 -- .../kpa_14/A57830/func_80240840_A57CF0.s | 17 -- .../kzn_11/C804B0/func_80240434_C805D4.s | 16 -- .../mac_04/843030/func_802419AC_84457C.s | 14 - .../nok_01/9C53E0/func_8024243C_9C781C.s | 60 ----- .../nok_01/9C53E0/func_802426A4_9C7A84.s | 51 ---- .../nok_01/9C53E0/func_80242760_9C7B40.s | 16 -- .../nok_01/9C53E0/func_80242790_9C7B70.s | 16 -- .../nok_01/9C53E0/func_802427C0_9C7BA0.s | 21 -- .../nok_01/9C53E0/func_80242898_9C7C78.s | 12 - .../nok_01/9C53E0/func_802428B8_9C7C98.s | 12 - .../nok_01/9C53E0/func_80242910_9C7CF0.s | 12 - .../nok_02/9D7990/func_80240970_9D7990.s | 72 ----- .../nok_02/9D7AA0/func_80243010_9DA030.s | 51 ---- .../nok_02/9D7AA0/func_80243214_9DA234.s | 39 --- .../nok_02/9D7AA0/func_80243294_9DA2B4.s | 171 ------------ .../nok_02/9D7AA0/func_8024351C_9DA53C.s | 151 ----------- .../nok_02/9D7AA0/func_80243754_9DA774.s | 101 ------- .../nok_11/9F4A40/func_80241F08_9F6948.s | 16 -- .../nok_12/9FA7F0/func_80240000_9FA7F0.s | 103 ------- .../nok_12/9FA970/func_80240180_9FA970.s | 47 ---- .../nok_13/A01420/func_80241360_A01960.s | 31 --- .../nok_14/A02840/func_80240000_A02840.s | 103 ------- .../omo_14/DE5810/func_80240590_DE5C40.s | 17 -- .../sam_01/CF7E80/func_80241B20_CF9690.s | 96 ------- .../trd_03/9A4ED0/func_80240880_9A4ED0.s | 96 ------- .../trd_05/9AE700/func_80240020_9AE720.s | 255 ------------------ .../trd_05/9AE700/func_80240404_9AEB04.s | 62 ----- .../trd_05/9AE700/func_802404D0_9AEBD0.s | 18 -- .../trd_05/9AE700/func_80240508_9AEC08.s | 72 ----- .../trd_05/9AE700/func_802405FC_9AECFC.s | 79 ------ .../trd_09/9BD660/func_80240000_9BD660.s | 55 ---- .../trd_09/9BD720/func_802400C0_9BD720.s | 78 ------ .../trd_10/9C2910/func_802407F4_9C3104.s | 15 -- .../trd_10/9C3130/func_80240820_9C3130.s | 17 -- ver/us/splat.yaml | 1 + ver/us/symbol_addrs.txt | 7 +- ver/us/undefined_syms.txt | 1 - 125 files changed, 1239 insertions(+), 2844 deletions(-) create mode 100644 src/world/common/UnkTrigFunc001.inc.c delete mode 100644 ver/us/asm/nonmatchings/7bb60_len_41b0/phys_should_player_be_sliding.s delete mode 100644 ver/us/asm/nonmatchings/battle/partner/goombario/func_80238BCC_6F1CAC.s delete mode 100644 ver/us/asm/nonmatchings/battle/partner/goombario/func_80238EDC_6F1FBC.s delete mode 100644 ver/us/asm/nonmatchings/battle/partner/kooper/func_80238114_6F5F94.s delete mode 100644 ver/us/asm/nonmatchings/battle/partner/lakilester/func_80238C58_70C968.s delete mode 100644 ver/us/asm/nonmatchings/world/area_isk/isk_04/97BF60/func_8024095C_97BF8C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_jan/jan_11/B71010/func_802407DC_B7103C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kpa/kpa_12/A54CA0/func_80240444_A54D94.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kpa/kpa_13/A56270/func_80240444_A56364.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kpa/kpa_14/A57830/func_80240840_A57CF0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kzn/kzn_11/C804B0/func_80240434_C805D4.s delete mode 100644 ver/us/asm/nonmatchings/world/area_mac/mac_04/843030/func_802419AC_84457C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_8024243C_9C781C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802426A4_9C7A84.s delete mode 100644 ver/us/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80242760_9C7B40.s delete mode 100644 ver/us/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80242790_9C7B70.s delete mode 100644 ver/us/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802427C0_9C7BA0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80242898_9C7C78.s delete mode 100644 ver/us/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802428B8_9C7C98.s delete mode 100644 ver/us/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80242910_9C7CF0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_nok/nok_02/9D7990/func_80240970_9D7990.s delete mode 100644 ver/us/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80243010_9DA030.s delete mode 100644 ver/us/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80243214_9DA234.s delete mode 100644 ver/us/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80243294_9DA2B4.s delete mode 100644 ver/us/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_8024351C_9DA53C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80243754_9DA774.s delete mode 100644 ver/us/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80241F08_9F6948.s delete mode 100644 ver/us/asm/nonmatchings/world/area_nok/nok_12/9FA7F0/func_80240000_9FA7F0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_nok/nok_12/9FA970/func_80240180_9FA970.s delete mode 100644 ver/us/asm/nonmatchings/world/area_nok/nok_13/A01420/func_80241360_A01960.s delete mode 100644 ver/us/asm/nonmatchings/world/area_nok/nok_14/A02840/func_80240000_A02840.s delete mode 100644 ver/us/asm/nonmatchings/world/area_omo/omo_14/DE5810/func_80240590_DE5C40.s delete mode 100644 ver/us/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241B20_CF9690.s delete mode 100644 ver/us/asm/nonmatchings/world/area_trd/trd_03/9A4ED0/func_80240880_9A4ED0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_trd/trd_05/9AE700/func_80240020_9AE720.s delete mode 100644 ver/us/asm/nonmatchings/world/area_trd/trd_05/9AE700/func_80240404_9AEB04.s delete mode 100644 ver/us/asm/nonmatchings/world/area_trd/trd_05/9AE700/func_802404D0_9AEBD0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_trd/trd_05/9AE700/func_80240508_9AEC08.s delete mode 100644 ver/us/asm/nonmatchings/world/area_trd/trd_05/9AE700/func_802405FC_9AECFC.s delete mode 100644 ver/us/asm/nonmatchings/world/area_trd/trd_09/9BD660/func_80240000_9BD660.s delete mode 100644 ver/us/asm/nonmatchings/world/area_trd/trd_09/9BD720/func_802400C0_9BD720.s delete mode 100644 ver/us/asm/nonmatchings/world/area_trd/trd_10/9C2910/func_802407F4_9C3104.s delete mode 100644 ver/us/asm/nonmatchings/world/area_trd/trd_10/9C3130/func_80240820_9C3130.s diff --git a/include/common_structs.h b/include/common_structs.h index 597cc35955..8408121e96 100644 --- a/include/common_structs.h +++ b/include/common_structs.h @@ -1950,7 +1950,7 @@ typedef struct Actor { /* 0x21C */ u8 status; /* 0x21D */ s8 unk_21D; /* 0x21E */ s16 unk_21E; - /* 0x220 */ s8 isGlowing; + /* 0x220 */ s8 isGlowing; // not the case for goombario /* 0x221 */ s8 attackBoost; /* 0x222 */ s8 defenseBoost; /* 0x223 */ s8 chillOutAmount; /* attack reduction */ @@ -2453,7 +2453,7 @@ typedef struct FoldImageRecPart { /* 0x0A */ u16 height; /* 0x0C */ s16 xOffset; /* 0x0E */ s16 yOffset; - /* 0x10 */ u8 unk_10; + /* 0x10 */ u8 unk_10; // alpha? /* 0x11 */ char unk_11[0x7]; } FoldImageRecPart; // size = 0x18 @@ -2464,7 +2464,7 @@ typedef struct FoldImageRec { /* 0x0A */ u16 height; /* 0x0C */ s16 xOffset; /* 0x0E */ s16 yOffset; - /* 0x10 */ u8 unk_10; + /* 0x10 */ u8 unk_10; // alpha? /* 0x11 */ char unk_11[0x7]; /* 0x18 */ s16 unk_18; /* 0x1A */ char unk_1A[0x4]; diff --git a/include/effects.h b/include/effects.h index ee7f5eb391..3e39ff2880 100644 --- a/include/effects.h +++ b/include/effects.h @@ -969,7 +969,7 @@ EffectInstance* fx_shockwave(s32, f32, f32, f32); void fx_music_note(s32, f32, f32, f32); EffectInstance* fx_smoke_burst(s32, f32, f32, f32, f32, s32); void fx_sweat(s32, f32 x, f32 y, f32 z, f32 radius, f32 pitch, s32 duration); -void fx_sleep_bubble(s32, f32, f32, f32, f32, f32, s32*); +void fx_sleep_bubble(s32, f32, f32, f32, f32, f32, EffectInstance**); EffectInstance* fx_2A(s32, f32, f32, f32); EffectInstance* fx_windy_leaves(s32, f32, f32, f32); EffectInstance* fx_falling_leaves(s32, f32, f32, f32); @@ -980,7 +980,7 @@ void fx_big_snowflakes(s32, f32, f32, f32); EffectInstance* fx_debuff(s32, f32, f32, f32); void fx_green_impact(s32, f32, f32, f32, f32); EffectInstance* fx_radial_shimmer(s32, f32, f32, f32, f32, s32); -EffectInstance* fx_ending_decals(s32, f32, f32, f32, f32, s32*); +EffectInstance* fx_ending_decals(s32, f32, f32, f32, f32, EffectInstance**); EffectInstance* fx_light_rays(s32, f32, f32, f32, f32, s32*); EffectInstance* fx_lightning(s32, f32, f32, f32, f32, f32); EffectInstance* fx_fire_breath(s32, f32, f32, f32, f32, f32, f32, s32, s32, s32); diff --git a/include/enums.h b/include/enums.h index 514bf122b6..699b3c785d 100644 --- a/include/enums.h +++ b/include/enums.h @@ -2121,6 +2121,7 @@ enum PlayerStatusFlags { PLAYER_STATUS_FLAGS_FLYING = 0x00000008, PLAYER_STATUS_FLAGS_10 = 0x00000010, PLAYER_STATUS_FLAGS_20 = 0x00000020, + PLAYER_STATUS_FLAGS_40 = 0x00000040, PLAYER_STATUS_FLAGS_80 = 0x00000080, PLAYER_STATUS_FLAGS_100 = 0x00000100, PLAYER_STATUS_FLAGS_200 = 0x00000200, diff --git a/include/functions.h b/include/functions.h index abc1951df4..1e2ac1d6f9 100644 --- a/include/functions.h +++ b/include/functions.h @@ -265,6 +265,8 @@ s32 sign(s32 value); s32 func_80055448(s32); s32 func_80055464(s32, s32); s32 func_80055618(s32, s32); +s32 func_800557CC(s32); +s32 func_80055848(s32); s32 func_800E0208(void); s32 battle_heap_create(void); @@ -644,6 +646,8 @@ s32 find_item(s32); void enable_background_wave(void); +void func_80035DF0(s16); + // State funcs void state_init_startup(void); void state_step_startup(void); @@ -809,6 +813,7 @@ void sfx_adjust_env_sound_params(s32 soundID, u8 volume, u8 pan, s16 pitchShift) void sfx_stop_sound(s32 soundID); void partner_disable_input(void); +void partner_set_goal_pos(s32 x, s32 z); void func_80268798(s32, s32, s32, s32); void func_8026880C(s32, s32, s32); void func_802687E4(s32 arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4); diff --git a/include/macros.h b/include/macros.h index eb78711379..581c22e191 100644 --- a/include/macros.h +++ b/include/macros.h @@ -81,7 +81,7 @@ #define PACK_FILL_COLOR(r, g, b, a) (GPACK_RGBA5551(r, g, b, a) << 0x10) | GPACK_RGBA5551(r, g, b, a) -#define SQ(x) (x*x) +#define SQ(x) ((x)*(x)) #define CUBE(x) (x*x*x) #define QUART(x) (x*x*x*x) diff --git a/include/script_api/common.h b/include/script_api/common.h index 6f3e52ef0a..dc87ae8a0c 100644 --- a/include/script_api/common.h +++ b/include/script_api/common.h @@ -289,7 +289,7 @@ ApiStatus ModifyGlobalOverrideFlags(Evt* script, s32 isInitialCall); ApiStatus func_802CF56C(Evt* script, s32 isInitialCall); ApiStatus func_802CA988(Evt* script, s32 isInitialCall); ApiStatus func_802CDE68(Evt* script, s32 isInitialCall); -ApiStatus SetSleepBubbleUnk1C(Evt* script, s32 isInitialCall); +ApiStatus SetSleepBubbleTimeLeft(Evt* script, s32 isInitialCall); ApiStatus func_802D286C(Evt* script, s32 isInitialCall); ApiStatus func_802D2520(Evt* script, s32 isInitialCall); ApiStatus PushSong(Evt* script, s32 isInitialCall); diff --git a/include/variables.h b/include/variables.h index e2d3e2c84e..460b3d882b 100644 --- a/include/variables.h +++ b/include/variables.h @@ -79,10 +79,6 @@ extern s32 gEntityHideMode; extern s32 D_8010C92C; extern s32 D_8010C950; -extern s16 D_8010CD00; -extern s16 D_8010CD10; -extern s16 D_8010CD12; -extern s32 D_8010CD20; extern s32 D_801595A0; extern Struct8015A578 D_8015A578; diff --git a/src/1A5830.c b/src/1A5830.c index f9991549ad..ac54d0ba8c 100644 --- a/src/1A5830.c +++ b/src/1A5830.c @@ -794,37 +794,36 @@ s32 calc_enemy_damage_target(Actor* attacker) { return hitResult; } -// part before the first conditional needs work +// missing one move #ifdef NON_EQUIVALENT s32 dispatch_damage_event_actor(Actor* actor, s32 damageAmount, s32 originalEvent, s32 stopMotion) { BattleStatus* battleStatus = &gBattleStatus; - ActorMovementWalk* walk; - s32 dispatchEvent; - - u16 temp_v1; + ActorState* state; + s32 dispatchEvent = originalEvent; + s32 currentAttackDamage; + s32 hpChangeCounter; battleStatus->currentAttackDamage = damageAmount; - temp_v1 = actor->hpChangeCounter + battleStatus->currentAttackDamage; - actor->hpChangeCounter += temp_v1; - actor->damageCounter += temp_v1; + currentAttackDamage = battleStatus->currentAttackDamage; + + actor->hpChangeCounter += currentAttackDamage; + hpChangeCounter = actor->hpChangeCounter; + actor->damageCounter += hpChangeCounter; + actor->hpChangeCounter -= hpChangeCounter; battleStatus->lastAttackDamage = 0; - actor->hpChangeCounter -= temp_v1; - actor->currentHP -= temp_v1; - - dispatchEvent = originalEvent; - - walk = &actor->walk; + do { } while (0); + actor->currentHP -= hpChangeCounter; + state = &actor->state; if (actor->currentHP <= 0) { + dispatchEvent = EVENT_DEATH; battleStatus->lastAttackDamage += actor->currentHP; actor->currentHP = 0; - dispatchEvent = EVENT_DEATH; } - - battleStatus->lastAttackDamage += temp_v1; + battleStatus->lastAttackDamage += currentAttackDamage; actor->lastDamageTaken = battleStatus->lastAttackDamage; battleStatus->unk_19A = 0; - if (battleStatus->flags1 & 0x20) { + if (battleStatus->flags1 & BS_FLAGS1_SP_EVT_ACTIVE) { if (dispatchEvent == EVENT_HIT_COMBO) { dispatchEvent = EVENT_HIT; } @@ -832,7 +831,6 @@ s32 dispatch_damage_event_actor(Actor* actor, s32 damageAmount, s32 originalEven dispatchEvent = EVENT_IMMUNE; } } - if (dispatchEvent == EVENT_DEATH) { if (originalEvent == EVENT_SPIN_SMASH_LAUNCH_HIT) { dispatchEvent = EVENT_SPIN_SMASH_LAUNCH_DEATH; @@ -843,20 +841,18 @@ s32 dispatch_damage_event_actor(Actor* actor, s32 damageAmount, s32 originalEven } if (stopMotion == 0) { - s32 targetActorID = actor->targetActorID; // why? + s32 oldTargetActorID = actor->targetActorID; if (func_80263230(actor, actor) != 0) { - show_damage_popup(actor->targetData[0].pos.x, actor->targetData[0].pos.y, actor->targetData[0].pos.z, - battleStatus->lastAttackDamage, 0); - func_802666E4(actor, actor->targetData[0].pos.x, actor->targetData[0].pos.y, actor->targetData[0].pos.z, - battleStatus->lastAttackDamage); - actor->targetActorID = targetActorID; + show_damage_popup(actor->targetData[0].pos.x, actor->targetData[0].pos.y, actor->targetData[0].pos.z, battleStatus->lastAttackDamage, 0); + func_802666E4(actor, actor->targetData[0].pos.x, actor->targetData[0].pos.y, actor->targetData[0].pos.z, battleStatus->lastAttackDamage); + actor->targetActorID = oldTargetActorID; } else { - actor->targetActorID = targetActorID; + actor->targetActorID = oldTargetActorID; } } else { - show_damage_popup(walk->goalPos.x, walk->goalPos.y, walk->goalPos.z, battleStatus->lastAttackDamage, 0); - func_802666E4(actor, walk->goalPos.x, walk->goalPos.y, walk->goalPos.z, battleStatus->lastAttackDamage); + show_damage_popup(state->goalPos.x, state->goalPos.y, state->goalPos.z, battleStatus->lastAttackDamage, 0); + func_802666E4(actor, state->goalPos.x, state->goalPos.y, state->goalPos.z, battleStatus->lastAttackDamage); } if (battleStatus->lastAttackDamage > 0) { diff --git a/src/39210_len_aa0.c b/src/39210_len_aa0.c index 209df53e71..648a0a0f93 100644 --- a/src/39210_len_aa0.c +++ b/src/39210_len_aa0.c @@ -1,31 +1,31 @@ #include "common.h" -void get_npc_pos(s32 arg0, f32* outX, f32* outY, f32* outZ, s32* arg4) { +void get_npc_pos(s32 npcID, f32* outX, f32* outY, f32* outZ, s32* arg4) { PlayerStatus* playerStatus = &gPlayerStatus; Npc* npc; - s32 phi_v0; *outX = 0.0f; *outY = 0.0f; *outZ = 0.0f; - *arg4 = 0; + *arg4 = FALSE; - if (arg0 == -1) { + if (npcID == NPC_SELF) { *outX = playerStatus->position.x; *outY = playerStatus->position.y; *outZ = playerStatus->position.z; - phi_v0 = playerStatus->flags & 6; + if (playerStatus->flags & (PLAYER_STATUS_FLAGS_FALLING | PLAYER_STATUS_FLAGS_JUMPING)) { + *arg4 = TRUE; + } } else { - npc = get_npc_unsafe(arg0); + npc = get_npc_unsafe(npcID); *outX = npc->pos.x; *outY = npc->pos.y; *outZ = npc->pos.z; - phi_v0 = npc->flags & 0x800; + if (npc->flags & NPC_FLAG_JUMPING) { + *arg4 = TRUE; + } } - if (phi_v0 != 0) { - *arg4 = 1; - } } INCLUDE_ASM(s32, "39210_len_aa0", func_8005DECC); diff --git a/src/7bb60_len_41b0.c b/src/7bb60_len_41b0.c index f659b3ea25..18ff9be107 100644 --- a/src/7bb60_len_41b0.c +++ b/src/7bb60_len_41b0.c @@ -836,7 +836,32 @@ void collision_check_player_overlaps(void) { } } -INCLUDE_ASM(s32, "7bb60_len_41b0", phys_should_player_be_sliding); +s32 phys_should_player_be_sliding(void) { + PlayerStatus* playerStatus = &gPlayerStatus; + Shadow* shadow = get_shadow_by_index(playerStatus->shadowID); + s32 ret = FALSE; + + if (gGameStatusPtr->areaID == AREA_IWA) { + f32 temp_f0 = shadow->rotation.z + 180.0; + + if (temp_f0 != 0.0f) { + ret = TRUE; + switch (gGameStatusPtr->mapID) { + case 0: + if (fabsf(temp_f0) < 20.0f) { + ret = FALSE; + } + break; + case 1: + if (playerStatus->position.x >= -300.0f && playerStatus->position.x <= -140.0f) { + ret = FALSE; + } + break; + } + } + } + return ret; +} s32 phys_is_on_sloped_ground(void) { Shadow* playerShadow = get_shadow_by_index(gPlayerStatus.shadowID); diff --git a/src/7fd10_len_b40.c b/src/7fd10_len_b40.c index 3fe3b367d7..16342fc424 100644 --- a/src/7fd10_len_b40.c +++ b/src/7fd10_len_b40.c @@ -1,16 +1,31 @@ +#include "common_structs.h" +#include "hud_element.h" +#include "world/partners.h" +#include "macros.h" + +BSS s16 D_8010C9C0; +BSS char D_8010C9C4[0x4]; +BSS PopupMenu D_8010C9C8; +BSS s16 D_8010CCF8; +BSS s16 D_8010CCFA; +BSS s16 D_8010CCFC; +BSS s16 D_8010CCFE; +BSS s16 D_8010CD00; +BSS char D_8010CD04[0xC]; +BSS s16 D_8010CD10; +BSS s16 D_8010CD12; +BSS char D_8010CD14[0xA]; +BSS s32 D_8010CD20; +BSS char D_8010CD24[0xC]; + #include "common.h" #include "sprite.h" -#include "hud_element.h" #include "pause/pause_common.h" +#include "world/partners.h" extern s32 D_8008EEC0[12]; extern s32 D_8008EEF0[]; -extern s16 D_8010C9C0; -extern PopupMenu D_8010C9C8; -extern s16 D_8010CCF8; -extern s16 D_8010CCFA; -extern s16 D_8010CCFC; -extern s16 D_8010CCFE; + void func_800E6860(void) { PlayerStatus* playerStatus = &gPlayerStatus; @@ -165,7 +180,198 @@ s32 setup_item_popup(PopupMenu* menu) { return optionCount; } +// stack issues, yucky goto +#ifdef NON_MATCHING +void check_input_open_menus(void) { + static s16 D_8010C9C0; + + PartnerActionStatus* partnerActionStatus = &gPartnerActionStatus; + PlayerStatus* playerStatus = &gPlayerStatus; + PlayerData* playerData = &gPlayerData; + PopupMenu* popup = &D_8010C9C8; + s32 flags; + s32 numEntries; + s32 pressedButtons; + s32 currentButtons; + + if (gGameStatusPtr->disableScripts || + (gGameStatusPtr->peachFlags & 1) || + evt_get_variable(NULL, EVT_STORY_PROGRESS) == STORY_INTRO) + { + return; + } + + if (partnerActionStatus->partnerActionState != 0 && + (partnerActionStatus->actingPartner == PARTNER_SUSHIE || + partnerActionStatus->actingPartner == PARTNER_LAKILESTER || + partnerActionStatus->actingPartner == PARTNER_BOW)) + { + currentButtons = partnerActionStatus->currentButtons; + pressedButtons = partnerActionStatus->pressedButtons; + } else { + currentButtons = playerStatus->currentButtons; + pressedButtons = playerStatus->pressedButtons; + } + + if (evt_get_variable(NULL, EVT_STORY_PROGRESS) >= STORY_EPILOGUE) { + currentButtons &= ~(BUTTON_C_LEFT | BUTTON_C_RIGHT); + pressedButtons &= ~(BUTTON_C_LEFT | BUTTON_C_RIGHT); + } + + switch (D_8010CD00) { + case 0: + if (can_pause(currentButtons, pressedButtons)) { + D_8010CCF8 = 1; + if (pressedButtons & 1) { + D_8010CCF8 = 0; + } + if (pressedButtons & BUTTON_START) { + D_8010CCF8 = 2; + } + D_8010C9C0 = FALSE; +block_17: + switch (D_8010CCF8) { + case 0: + if (playerStatus->flags & PLAYER_STATUS_FLAGS_40) { + sfx_play_sound(0x21D); + if (D_8010C9C0) { + func_800E6860(); + playerStatus->flags &= ~PLAYER_STATUS_FLAGS_20; + gOverrideFlags &= ~GLOBAL_OVERRIDES_40; + set_time_freeze_mode(0); + } + } else { + numEntries = setup_partner_popup(popup); + if (numEntries == 0) { + return; + } + popup->numEntries = numEntries; + popup->popupType = 1; + popup->initialPos = D_8008EEF0[playerData->currentPartner] - 1; + break; + } + return; + case 1: + numEntries = setup_item_popup(popup); + if (numEntries == 0) { + return; + } + popup->popupType = 0; + popup->numEntries = numEntries; + popup->initialPos = 0; + break; + } + playerStatus->flags |= PLAYER_STATUS_FLAGS_20; + disable_player_input(); + partner_disable_input(); + D_8010CCFA = 3; + D_8010CD00 = 1; + D_8010CCFE = playerStatus->inputEnabledCounter; + } + break; + case 1: + flags = ~PLAYER_STATUS_FLAGS_20; + if ((func_800E6904() == 0) || is_picking_up_item() || D_8010CCFE < playerStatus->inputEnabledCounter) { + playerStatus->flags &= flags; + enable_player_input(); + partner_enable_input(); + D_8010CD00 = 0; + if (D_8010C9C0) { + func_800E6860(); + playerStatus->flags &= ~PLAYER_STATUS_FLAGS_20; + gOverrideFlags &= ~GLOBAL_OVERRIDES_40; + set_time_freeze_mode(0); + } + } else { + D_8010CCFA--; + if (D_8010CCFA == 0) { + D_8010CD00 = 2; + gOverrideFlags |= GLOBAL_OVERRIDES_40; + } + } + break; + case 2: + if (D_8010CCF8 == 2) { + set_game_mode(GAME_MODE_PAUSE); + sfx_play_sound(SOUND_MENU_OPEN); + D_8010CCFA = 10; + D_8010CD00 = 10; + return; + } + create_popup_menu(popup); + set_time_freeze_mode(3); + if (partnerActionStatus->partnerActionState == 0) { + set_action_state(ACTION_STATE_IDLE); + } + D_8010CD00++; + break; + case 3: + if (popup->result != -1) { + D_8010CCFC = popup->result; + if (D_8010CCFC != 0) { + hide_popup_menu(); + D_8010CCFA = 15; + D_8010CD00++; + } + } + break; + case 4: + D_8010CCFA--; + if (D_8010CCFA == 0) { + destroy_popup_menu(); + D_8010CD00 = 0; + enable_player_input(); + partner_enable_input(); + if (D_8010CCFC == -2) { + if ((setup_partner_popup(popup) == 0) || (setup_item_popup(popup) == 0)) { + D_8010CCFC = 0xFF; + } else { + switch (D_8010CCF8) { + case 0: + D_8010CCF8 = 1; + break; + case 1: + D_8010CCF8 = 0; + break; + } + D_8010C9C0 = TRUE; + goto block_17; + } + } + + if (D_8010CCFC != 0xFF) { + switch (D_8010CCF8) { + case 0: + switch_to_partner(popup->userIndex[D_8010CCFC - 1]); + break; + case 1: + use_consumable(popup->userIndex[D_8010CCFC - 1]); + gOverrideFlags |= GLOBAL_OVERRIDES_CANT_PICK_UP_ITEMS; + break; + } + } + func_800E6860(); + playerStatus->flags &= ~PLAYER_STATUS_FLAGS_20; + gOverrideFlags &= ~GLOBAL_OVERRIDES_40; + set_time_freeze_mode(0); + } + break; + case 10: + D_8010CCFA--; + if (D_8010CCFA == 0) { + func_800E6860(); + D_8010CD00 = 0; + playerStatus->flags &= ~PLAYER_STATUS_FLAGS_20; + gOverrideFlags &= ~GLOBAL_OVERRIDES_40; + enable_player_input(); + partner_enable_input(); + } + break; + } +} +#else INCLUDE_ASM(s32, "7fd10_len_b40", check_input_open_menus); +#endif void check_input_status_menu(void) { PlayerStatus* playerStatus = &gPlayerStatus; diff --git a/src/80850_len_3060.c b/src/80850_len_3060.c index 9a23fc0735..742c3c0a33 100644 --- a/src/80850_len_3060.c +++ b/src/80850_len_3060.c @@ -1,6 +1,9 @@ #include "common.h" #include "hud_element.h" +extern s16 D_8010CD10; +extern s16 D_8010CD12; + extern s32 TimesHudScript; extern s32 DigitHudScripts[10]; @@ -447,6 +450,7 @@ INCLUDE_ASM(s32, "80850_len_3060", status_menu_draw_number); INCLUDE_ASM(s32, "80850_len_3060", status_menu_draw_stat); +void update_status_menu(void); INCLUDE_ASM(s32, "80850_len_3060", update_status_menu); void coin_counter_draw_content(UNK_TYPE arg0, s32 posX, s32 posY) { diff --git a/src/EE70C0.c b/src/EE70C0.c index a19de3c49e..22859949cf 100644 --- a/src/EE70C0.c +++ b/src/EE70C0.c @@ -42,4 +42,4 @@ extern ApiStatus EE65B0_UpdateTexturePanSmooth; const s32 padding[] = {0, 0, 0}; // TODO sort out this mess -const s32 D_802453E0_EEB990[] = { 0x43A00000, 0x00000000, 0x00000000, 0x43870000, 0xC32A0000, 0x00000000, 0x425C0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x802401A8, &EE65B0_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80200000, 0x0019011F, 0x00000043, 0x00000002, 0x802D790C, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000005, 0x802E339C, 0x00000000, 0x0000007F, 0x00000000, 0x00000008, 0x00000012, 0x00000000, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0x00000035, 0x00000043, 0x00000005, 0x802E339C, 0x00000000, 0x00000034, 0x00000000, 0x00000008, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, 0x802E339C, 0x00000000, 0x00000035, 0x00000000, 0x00000008, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, 0x802DF78C, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, 0x80286004, 0x00000043, 0x00000003, 0x802D78AC, 0x80241760, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x80240120, 0x00080000, 0x00000000, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000026, 0x00000043, 0x00000002, 0x802E6F50, 0xFFFFFFFF, 0x00000043, 0x00000003, 0x802D8B60, 0x00000000, 0x00000000, 0x00000043, 0x00000006, 0x802D7CD8, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetSleepBubbleUnk1C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802D7B70, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x80048338, 0x00000000, 0x802412C0, 0x00000046, 0x00000001, 0x80241300, 0x00000043, 0x00000002, 0x802D790C, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000044, 0x00000001, 0x802404D8, 0x00000012, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000001, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0x8024017C, 0x00000044, 0x00000001, 0x80285C70, 0x00000013, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x0000000E, 0x7FFFFE00, 0x00000044, 0x00000001, 0x802413B0, 0x00000046, 0x00000001, 0x80240060, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00180018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x0000000C, 0x00000002, 0xF5DE0180, 0x00000035, 0x00000024, 0x00000002, 0xFE363C83, 0x00000007, 0x00000024, 0x00000002, 0xFE363C84, 0x00000005, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x0000000F, 0x00000024, 0x00000002, 0xFE363C84, 0x00000001, 0x00000013, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C85, 0x00000043, 0x00000005, 0x802DC654, 0x0000000A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000005, 0x802DB210, 0x0000000A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802DB210, 0x0000000B, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0xFE363C84, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C85, 0x00000043, 0x00000005, 0x802DC654, 0x0000000A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFF, 0x00000043, 0x00000005, 0x802DB210, 0x0000000A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802DB210, 0x0000000B, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0xFE363C84, 0x00000006, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000043, 0x00000002, 0x802DE404, 0x00000001, 0x00000043, 0x00000005, 0x802DB210, 0x0000000A, 0x00000000, 0x0000010E, 0x00000000, 0x00000043, 0x00000005, 0x802DB210, 0x0000000B, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, 0x802DC654, 0x0000000A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D8D40, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0x0000041A, 0x00000043, 0x00000004, 0x802D903C, 0x00000000, 0xF24AA280, 0xF24A8A80, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x802D9848, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0x0000012C, 0x00000043, 0x00000004, 0x802D903C, 0x00000000, 0xF24AB680, 0xF24A5280, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24A9480, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x802D9848, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, 0x802DD810, 0x0000000A, 0x00CB0009, 0x00CB0009, 0x00000205, 0x001100C3, 0x00000043, 0x00000003, 0x802DB654, 0x0000000A, 0x00CB0009, 0x00000056, 0x00000000, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0x000003E8, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24A8E80, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x802D9848, 0x00000000, 0xF24A7E80, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, 0x802DB5E8, 0x0000000A, 0xF24A7A80, 0x00000043, 0x00000005, 0x802DC654, 0x0000000A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000190, 0x00000043, 0x00000006, 0x802DBC24, 0x0000000A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000043, 0x00000003, 0x802D78AC, 0x80241768, 0x00000009, 0x00000008, 0x00000001, 0x00000046, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, 0x802DB3C8, 0x0000000B, 0x00000030, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, 0x802E1C00, 0xFFFFFFE2, 0x0000001E, 0x00000014, 0x0000000B, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, 0x802E1C7C, 0x00000043, 0x00000005, 0x802DB310, 0x0000000B, 0x00000000, 0x00000000, 0xFE363C80, 0x00000043, 0x00000005, 0x802DC654, 0x0000000A, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000005, 0x802DB210, 0x0000000B, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000005, 0x802E1C00, 0x0000001E, 0xFFFFFFE2, 0x00000014, 0x0000000B, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, 0x802E1C7C, 0x00000043, 0x00000005, 0x802DB310, 0x0000000B, 0x00000000, 0x00000000, 0xFE363C80, 0x00000043, 0x00000005, 0x802DC654, 0x0000000A, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000005, 0x802DB210, 0x0000000B, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C81, 0x000000DC, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, 0x802DF124, 0x0000000A, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, 0x802DB5E8, 0x0000000A, 0xF24A7A80, 0x00000043, 0x00000005, 0x802DC654, 0x0000000A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C81, 0x00000190, 0x00000043, 0x00000006, 0x802DBC24, 0x0000000A, 0xFE363C80, 0x00000113, 0xFE363C82, 0x0000001E, 0x00000045, 0x00000002, 0x8024032C, 0xFE363C89, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xF97188A6, 0x00000001, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000049, 0x00000001, 0xFE363C89, 0x00000043, 0x00000004, 0x802DC5C0, 0x0000000A, 0x00000100, 0x00000001, 0x00000043, 0x00000005, 0x802DC654, 0x0000000A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, 0x802DBC24, 0x0000000A, 0xFE363C80, 0x000001C2, 0xFE363C82, 0x0000001E, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0x00000032, 0x00000043, 0x00000006, 0x802DD810, 0x0000000A, 0x00CB0007, 0x00CB0001, 0x00000205, 0x0011009A, 0x00000043, 0x00000002, 0x802DE6A4, 0x00010021, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, 0x802DE6A4, 0x00080007, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, 0x802DE6A4, 0x00010002, 0x00000043, 0x00000006, 0x802DD810, 0x0000000A, 0x00CB0007, 0x00CB0001, 0x00000205, 0x0011009B, 0x00000024, 0x00000002, 0xF5DE0180, 0x00000032, 0x00000018, 0x00000001, 0x00000035, 0x00000043, 0x00000006, 0x802DD810, 0x0000000A, 0x00CB0007, 0x00CB0001, 0x00000205, 0x0011009C, 0x00000018, 0x00000001, 0x00000039, 0x0000000A, 0x00000002, 0xF8406102, 0x00000000, 0x00000043, 0x00000006, 0x802DD810, 0x0000000A, 0x00CB0007, 0x00CB0001, 0x00000205, 0x0011009D, 0x00000024, 0x00000002, 0xF8406102, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000006, 0x802DD810, 0x0000000A, 0x00CB0007, 0x00CB0001, 0x00000205, 0x0011009E, 0x00000013, 0x00000000, 0x0000001C, 0x00000000, 0x00000043, 0x00000006, 0x802DD810, 0x0000000A, 0x00CB0007, 0x00CB0001, 0x00000205, 0x0011009F, 0x00000023, 0x00000000, 0x00000024, 0x00000002, 0xF97188A6, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, 0x802DB4EC, 0x0000000A, 0x00000040, 0x00000028, 0x00000043, 0x00000003, 0x802DC7C8, 0x0000000A, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0x00000035, 0x00000043, 0x00000005, 0x802DB210, 0x0000000A, 0x00000000, 0x0000010E, 0x00000000, 0x00000043, 0x00000003, 0x80049154, 0xFFFFFFFF, 0x80240B28, 0x00000044, 0x00000001, 0x8024032C, 0x00000012, 0x00000000, 0x00000043, 0x00000005, 0x802DB210, 0x0000000A, 0x00000000, 0x000001C2, 0x00000000, 0x00000043, 0x00000003, 0x80049154, 0xFFFFFFFF, 0x80240B28, 0x00000024, 0x00000002, 0xF97188A6, 0x00000000, 0x00000044, 0x00000001, 0x8024094C, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, 0x802DC7C8, 0x0000000B, 0x00000000, 0x00000043, 0x00000003, 0x802DB654, 0x0000000B, 0x00CB0002, 0x00000043, 0x00000003, 0x802DD3E0, 0x0000000A, 0x00000003, 0x00000043, 0x00000003, 0x802DD3E0, 0x0000000B, 0x00000003, 0x00000043, 0x0000000A, 0x802DD520, 0x0000000A, 0x00000000, 0x00000001, 0x00000005, 0x00000005, 0x0000000D, 0x00000005, 0x00000000, 0x00000000, 0x00000043, 0x0000000A, 0x802DD520, 0x0000000B, 0x00000000, 0x00000001, 0x00000005, 0x00000005, 0x0000000D, 0x00000005, 0x00000000, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0x00000035, 0x00000043, 0x00000005, 0x802DB210, 0x0000000B, 0x00000000, 0x0000010E, 0xFFFFFFFB, 0x00000012, 0x00000000, 0x00000043, 0x00000005, 0x802DB210, 0x0000000B, 0x00000000, 0x000001C2, 0xFFFFFFFB, 0x00000043, 0x00000003, 0x80048F68, 0xFFFFFFFF, 0x8024079C, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x80240300, 0x00000000, 0x437A0000, 0x00000000, 0x00400D01, 0x80240CD0, 0x00000000, 0x00000000, 0x0000010E, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00000000, 0x00000000, 0x00000000, 0x001A00E1, 0x0000000B, 0x80240300, 0x00000000, 0x437A0000, 0x00000000, 0x00008F01, 0x80240DB4, 0x00000000, 0x00000000, 0x0000010E, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00000000, 0x00000000, 0x00000000, 0x001A00E1, 0x00000002, 0x80240EE0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xF84060F9, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF84060F9, 0x00000000, 0x00000043, 0x00000007, 0x8011A58C, 0x802CCF00, 0xFFFFFF4C, 0x00000000, 0xFFFFFFEE, 0x00000000, 0x80000000, 0x00000043, 0x00000002, 0x8011A804, 0x802412E0, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x0000000A, 0xF24A7CE7, 0x0000000D, 0xF24A7D80, 0x00000010, 0xF24A7E1A, 0x00000013, 0xF24A7EB4, 0x00000016, 0xF24A7F4D, 0x00000019, 0xF24A7EB4, 0x00000018, 0xF24A7E1A, 0x00000019, 0xF24A7D80, 0x00000018, 0xF24A7CE7, 0x0000000A, 0xF24A814D, 0x0000000A, 0x00000002, 0xF84060F9, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF84060F9, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000056, 0x00000000, 0x00000030, 0x00000001, 0x80241360, 0x00000005, 0x00000001, 0x0000000A, 0x00000032, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D8758, 0x00000000, 0x00000000, 0xFE363C81, 0xFE363C82, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, 0x802D8D40, 0x00000000, 0xFFFFFF56, 0x00000000, 0x00000023, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0xFFFFFF56, 0x00000000, 0x00000023, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0x00000258, 0x00000043, 0x00000004, 0x802D903C, 0x00000000, 0xF24ADE80, 0xF24A5680, 0x00000043, 0x00000004, 0x802D914C, 0x00000000, 0xF249B280, 0xF24ADE80, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24A8080, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x802D9848, 0x00000000, 0xF24A7E80, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000043, 0x0000000F, 0x802E58EC, 0x00000006, 0x00000004, 0xFFFFFF4C, 0x00000000, 0xFFFFFFF1, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, 0x802E58EC, 0x00000006, 0x00000004, 0xFFFFFF42, 0x00000000, 0xFFFFFFDD, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000006, 0x00000043, 0x00000004, 0x802D7AC0, 0x0000000B, 0x00000187, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, 0x802E1C00, 0x00000000, 0xFFFFFFCE, 0x00000078, 0x00000002, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, 0x802E1C7C, 0x00000043, 0x00000005, 0x802D6C60, 0x00000010, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x0000000C, 0x7FFFFE00, 0x00000043, 0x00000004, AddCoin, 0x00000001, 0x0000000E, 0x7FFFFE00, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, 0x802D9DE4, 0x00000000, 0xF24BE280, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x0000000C, 0x7FFFFE00, 0x00000043, 0x00000004, AddCoin, 0x00000001, 0x0000000E, 0x7FFFFE00, 0x00000043, 0x00000005, 0x802D6C60, 0x00000010, 0x00000000, 0xFFFFFFCE, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x666C6F5F, 0x31330000, 0x666C6F5F, 0x30300000, }; +const s32 D_802453E0_EEB990[] = { 0x43A00000, 0x00000000, 0x00000000, 0x43870000, 0xC32A0000, 0x00000000, 0x425C0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x802401A8, &EE65B0_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80200000, 0x0019011F, 0x00000043, 0x00000002, 0x802D790C, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000005, 0x802E339C, 0x00000000, 0x0000007F, 0x00000000, 0x00000008, 0x00000012, 0x00000000, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0x00000035, 0x00000043, 0x00000005, 0x802E339C, 0x00000000, 0x00000034, 0x00000000, 0x00000008, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, 0x802E339C, 0x00000000, 0x00000035, 0x00000000, 0x00000008, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, 0x802DF78C, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, 0x80286004, 0x00000043, 0x00000003, 0x802D78AC, 0x80241760, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x80240120, 0x00080000, 0x00000000, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000026, 0x00000043, 0x00000002, 0x802E6F50, 0xFFFFFFFF, 0x00000043, 0x00000003, 0x802D8B60, 0x00000000, 0x00000000, 0x00000043, 0x00000006, 0x802D7CD8, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetSleepBubbleTimeLeft, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802D7B70, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x80048338, 0x00000000, 0x802412C0, 0x00000046, 0x00000001, 0x80241300, 0x00000043, 0x00000002, 0x802D790C, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000044, 0x00000001, 0x802404D8, 0x00000012, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000001, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0x8024017C, 0x00000044, 0x00000001, 0x80285C70, 0x00000013, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x0000000E, 0x7FFFFE00, 0x00000044, 0x00000001, 0x802413B0, 0x00000046, 0x00000001, 0x80240060, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00180018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x0000000C, 0x00000002, 0xF5DE0180, 0x00000035, 0x00000024, 0x00000002, 0xFE363C83, 0x00000007, 0x00000024, 0x00000002, 0xFE363C84, 0x00000005, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x0000000F, 0x00000024, 0x00000002, 0xFE363C84, 0x00000001, 0x00000013, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C85, 0x00000043, 0x00000005, 0x802DC654, 0x0000000A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000005, 0x802DB210, 0x0000000A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802DB210, 0x0000000B, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0xFE363C84, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C85, 0x00000043, 0x00000005, 0x802DC654, 0x0000000A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFF, 0x00000043, 0x00000005, 0x802DB210, 0x0000000A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802DB210, 0x0000000B, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0xFE363C84, 0x00000006, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000043, 0x00000002, 0x802DE404, 0x00000001, 0x00000043, 0x00000005, 0x802DB210, 0x0000000A, 0x00000000, 0x0000010E, 0x00000000, 0x00000043, 0x00000005, 0x802DB210, 0x0000000B, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, 0x802DC654, 0x0000000A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D8D40, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0x0000041A, 0x00000043, 0x00000004, 0x802D903C, 0x00000000, 0xF24AA280, 0xF24A8A80, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x802D9848, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0x0000012C, 0x00000043, 0x00000004, 0x802D903C, 0x00000000, 0xF24AB680, 0xF24A5280, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24A9480, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x802D9848, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, 0x802DD810, 0x0000000A, 0x00CB0009, 0x00CB0009, 0x00000205, 0x001100C3, 0x00000043, 0x00000003, 0x802DB654, 0x0000000A, 0x00CB0009, 0x00000056, 0x00000000, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0x000003E8, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24A8E80, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x802D9848, 0x00000000, 0xF24A7E80, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, 0x802DB5E8, 0x0000000A, 0xF24A7A80, 0x00000043, 0x00000005, 0x802DC654, 0x0000000A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000190, 0x00000043, 0x00000006, 0x802DBC24, 0x0000000A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000043, 0x00000003, 0x802D78AC, 0x80241768, 0x00000009, 0x00000008, 0x00000001, 0x00000046, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, 0x802DB3C8, 0x0000000B, 0x00000030, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, 0x802E1C00, 0xFFFFFFE2, 0x0000001E, 0x00000014, 0x0000000B, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, 0x802E1C7C, 0x00000043, 0x00000005, 0x802DB310, 0x0000000B, 0x00000000, 0x00000000, 0xFE363C80, 0x00000043, 0x00000005, 0x802DC654, 0x0000000A, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000005, 0x802DB210, 0x0000000B, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000005, 0x802E1C00, 0x0000001E, 0xFFFFFFE2, 0x00000014, 0x0000000B, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, 0x802E1C7C, 0x00000043, 0x00000005, 0x802DB310, 0x0000000B, 0x00000000, 0x00000000, 0xFE363C80, 0x00000043, 0x00000005, 0x802DC654, 0x0000000A, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000005, 0x802DB210, 0x0000000B, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C81, 0x000000DC, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, 0x802DF124, 0x0000000A, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, 0x802DB5E8, 0x0000000A, 0xF24A7A80, 0x00000043, 0x00000005, 0x802DC654, 0x0000000A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C81, 0x00000190, 0x00000043, 0x00000006, 0x802DBC24, 0x0000000A, 0xFE363C80, 0x00000113, 0xFE363C82, 0x0000001E, 0x00000045, 0x00000002, 0x8024032C, 0xFE363C89, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xF97188A6, 0x00000001, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000049, 0x00000001, 0xFE363C89, 0x00000043, 0x00000004, 0x802DC5C0, 0x0000000A, 0x00000100, 0x00000001, 0x00000043, 0x00000005, 0x802DC654, 0x0000000A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, 0x802DBC24, 0x0000000A, 0xFE363C80, 0x000001C2, 0xFE363C82, 0x0000001E, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0x00000032, 0x00000043, 0x00000006, 0x802DD810, 0x0000000A, 0x00CB0007, 0x00CB0001, 0x00000205, 0x0011009A, 0x00000043, 0x00000002, 0x802DE6A4, 0x00010021, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, 0x802DE6A4, 0x00080007, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, 0x802DE6A4, 0x00010002, 0x00000043, 0x00000006, 0x802DD810, 0x0000000A, 0x00CB0007, 0x00CB0001, 0x00000205, 0x0011009B, 0x00000024, 0x00000002, 0xF5DE0180, 0x00000032, 0x00000018, 0x00000001, 0x00000035, 0x00000043, 0x00000006, 0x802DD810, 0x0000000A, 0x00CB0007, 0x00CB0001, 0x00000205, 0x0011009C, 0x00000018, 0x00000001, 0x00000039, 0x0000000A, 0x00000002, 0xF8406102, 0x00000000, 0x00000043, 0x00000006, 0x802DD810, 0x0000000A, 0x00CB0007, 0x00CB0001, 0x00000205, 0x0011009D, 0x00000024, 0x00000002, 0xF8406102, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000006, 0x802DD810, 0x0000000A, 0x00CB0007, 0x00CB0001, 0x00000205, 0x0011009E, 0x00000013, 0x00000000, 0x0000001C, 0x00000000, 0x00000043, 0x00000006, 0x802DD810, 0x0000000A, 0x00CB0007, 0x00CB0001, 0x00000205, 0x0011009F, 0x00000023, 0x00000000, 0x00000024, 0x00000002, 0xF97188A6, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, 0x802DB4EC, 0x0000000A, 0x00000040, 0x00000028, 0x00000043, 0x00000003, 0x802DC7C8, 0x0000000A, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0x00000035, 0x00000043, 0x00000005, 0x802DB210, 0x0000000A, 0x00000000, 0x0000010E, 0x00000000, 0x00000043, 0x00000003, 0x80049154, 0xFFFFFFFF, 0x80240B28, 0x00000044, 0x00000001, 0x8024032C, 0x00000012, 0x00000000, 0x00000043, 0x00000005, 0x802DB210, 0x0000000A, 0x00000000, 0x000001C2, 0x00000000, 0x00000043, 0x00000003, 0x80049154, 0xFFFFFFFF, 0x80240B28, 0x00000024, 0x00000002, 0xF97188A6, 0x00000000, 0x00000044, 0x00000001, 0x8024094C, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, 0x802DC7C8, 0x0000000B, 0x00000000, 0x00000043, 0x00000003, 0x802DB654, 0x0000000B, 0x00CB0002, 0x00000043, 0x00000003, 0x802DD3E0, 0x0000000A, 0x00000003, 0x00000043, 0x00000003, 0x802DD3E0, 0x0000000B, 0x00000003, 0x00000043, 0x0000000A, 0x802DD520, 0x0000000A, 0x00000000, 0x00000001, 0x00000005, 0x00000005, 0x0000000D, 0x00000005, 0x00000000, 0x00000000, 0x00000043, 0x0000000A, 0x802DD520, 0x0000000B, 0x00000000, 0x00000001, 0x00000005, 0x00000005, 0x0000000D, 0x00000005, 0x00000000, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0x00000035, 0x00000043, 0x00000005, 0x802DB210, 0x0000000B, 0x00000000, 0x0000010E, 0xFFFFFFFB, 0x00000012, 0x00000000, 0x00000043, 0x00000005, 0x802DB210, 0x0000000B, 0x00000000, 0x000001C2, 0xFFFFFFFB, 0x00000043, 0x00000003, 0x80048F68, 0xFFFFFFFF, 0x8024079C, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x80240300, 0x00000000, 0x437A0000, 0x00000000, 0x00400D01, 0x80240CD0, 0x00000000, 0x00000000, 0x0000010E, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00000000, 0x00000000, 0x00000000, 0x001A00E1, 0x0000000B, 0x80240300, 0x00000000, 0x437A0000, 0x00000000, 0x00008F01, 0x80240DB4, 0x00000000, 0x00000000, 0x0000010E, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00000000, 0x00000000, 0x00000000, 0x001A00E1, 0x00000002, 0x80240EE0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xF84060F9, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF84060F9, 0x00000000, 0x00000043, 0x00000007, 0x8011A58C, 0x802CCF00, 0xFFFFFF4C, 0x00000000, 0xFFFFFFEE, 0x00000000, 0x80000000, 0x00000043, 0x00000002, 0x8011A804, 0x802412E0, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x0000000A, 0xF24A7CE7, 0x0000000D, 0xF24A7D80, 0x00000010, 0xF24A7E1A, 0x00000013, 0xF24A7EB4, 0x00000016, 0xF24A7F4D, 0x00000019, 0xF24A7EB4, 0x00000018, 0xF24A7E1A, 0x00000019, 0xF24A7D80, 0x00000018, 0xF24A7CE7, 0x0000000A, 0xF24A814D, 0x0000000A, 0x00000002, 0xF84060F9, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF84060F9, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000056, 0x00000000, 0x00000030, 0x00000001, 0x80241360, 0x00000005, 0x00000001, 0x0000000A, 0x00000032, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D8758, 0x00000000, 0x00000000, 0xFE363C81, 0xFE363C82, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, 0x802D8D40, 0x00000000, 0xFFFFFF56, 0x00000000, 0x00000023, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0xFFFFFF56, 0x00000000, 0x00000023, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0x00000258, 0x00000043, 0x00000004, 0x802D903C, 0x00000000, 0xF24ADE80, 0xF24A5680, 0x00000043, 0x00000004, 0x802D914C, 0x00000000, 0xF249B280, 0xF24ADE80, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24A8080, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x802D9848, 0x00000000, 0xF24A7E80, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000043, 0x0000000F, 0x802E58EC, 0x00000006, 0x00000004, 0xFFFFFF4C, 0x00000000, 0xFFFFFFF1, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, 0x802E58EC, 0x00000006, 0x00000004, 0xFFFFFF42, 0x00000000, 0xFFFFFFDD, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000006, 0x00000043, 0x00000004, 0x802D7AC0, 0x0000000B, 0x00000187, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, 0x802E1C00, 0x00000000, 0xFFFFFFCE, 0x00000078, 0x00000002, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, 0x802E1C7C, 0x00000043, 0x00000005, 0x802D6C60, 0x00000010, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x0000000C, 0x7FFFFE00, 0x00000043, 0x00000004, AddCoin, 0x00000001, 0x0000000E, 0x7FFFFE00, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, 0x802D9DE4, 0x00000000, 0xF24BE280, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x0000000C, 0x7FFFFE00, 0x00000043, 0x00000004, AddCoin, 0x00000001, 0x0000000E, 0x7FFFFE00, 0x00000043, 0x00000005, 0x802D6C60, 0x00000010, 0x00000000, 0xFFFFFFCE, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x666C6F5F, 0x31330000, 0x666C6F5F, 0x30300000, }; diff --git a/src/battle/partner/goombario.c b/src/battle/partner/goombario.c index 54fdd0606d..22614675d9 100644 --- a/src/battle/partner/goombario.c +++ b/src/battle/partner/goombario.c @@ -36,13 +36,13 @@ ApiStatus func_80238EDC_6F1FBC(Evt* script, s32 isInitialCall); ApiStatus N(func_80238000_6F10E0)(Evt* script, s32 isInitialCall) { BattleStatus* battleStatus = &gBattleStatus; - Actor* partnerActor = battleStatus->partnerActor; - f32 posX = partnerActor->currentPos.x; - f32 posY = partnerActor->currentPos.y; - f32 posZ = partnerActor->currentPos.z; - f32 goalX = partnerActor->state.goalPos.x; - f32 goalY = partnerActor->state.goalPos.y; - f32 goalZ = partnerActor->state.goalPos.z; + Actor* partner = battleStatus->partnerActor; + f32 posX = partner->currentPos.x; + f32 posY = partner->currentPos.y; + f32 posZ = partner->currentPos.z; + f32 goalX = partner->state.goalPos.x; + f32 goalY = partner->state.goalPos.y; + f32 goalZ = partner->state.goalPos.z; script->varTable[0] = (dist3D(posX, posY, posZ, goalX, goalY, goalZ) * 15.0f) / 100.0f; @@ -78,40 +78,40 @@ INCLUDE_ASM(s32, "battle/partner/goombario", func_8023817C_6F125C); ApiStatus N(func_80238A20_6F1B00)(Evt* script, s32 isInitialCall) { BattleStatus* battleStatus = &gBattleStatus; - Actor* partnerActor = gBattleStatus.partnerActor; - Vec3f* pos = &partnerActor->state.currentPos; + Actor* partner = gBattleStatus.partnerActor; + Vec3f* pos = &partner->state.currentPos; if (isInitialCall) { script->functionTemp[0] = 0; } if (script->functionTemp[0] == 0) { - partnerActor->state.currentPos.x = partnerActor->currentPos.x; - partnerActor->state.currentPos.y = partnerActor->currentPos.y; - partnerActor->state.currentPos.z = partnerActor->currentPos.z; + partner->state.currentPos.x = partner->currentPos.x; + partner->state.currentPos.y = partner->currentPos.y; + partner->state.currentPos.z = partner->currentPos.z; script->functionTemp[0] = 1; } - if (partnerActor->state.velocity > 0.0f) { - set_animation(0x100, 0, partnerActor->state.animJumpRise); + if (partner->state.velocity > 0.0f) { + set_animation(0x100, 0, partner->state.animJumpRise); } - if (partnerActor->state.velocity < 0.0f) { - set_animation(0x100, 0, partnerActor->state.animJumpFall); + if (partner->state.velocity < 0.0f) { + set_animation(0x100, 0, partner->state.animJumpFall); } - partnerActor->state.currentPos.y = (partnerActor->state.currentPos.y + partnerActor->state.velocity); - partnerActor->state.velocity = (partnerActor->state.velocity - partnerActor->state.acceleration); - add_xz_vec3f(pos, partnerActor->state.speed, partnerActor->state.angle); - partnerActor->currentPos.x = partnerActor->state.currentPos.x; - partnerActor->currentPos.y = partnerActor->state.currentPos.y; - partnerActor->currentPos.z = partnerActor->state.currentPos.z; + partner->state.currentPos.y = (partner->state.currentPos.y + partner->state.velocity); + partner->state.velocity = (partner->state.velocity - partner->state.acceleration); + add_xz_vec3f(pos, partner->state.speed, partner->state.angle); + partner->currentPos.x = partner->state.currentPos.x; + partner->currentPos.y = partner->state.currentPos.y; + partner->currentPos.z = partner->state.currentPos.z; - if (partnerActor->currentPos.y < 10.0f) { - partnerActor->currentPos.y = 10.0f; + if (partner->currentPos.y < 10.0f) { + partner->currentPos.y = 10.0f; - play_movement_dust_effects(2, partnerActor->currentPos.x, partnerActor->currentPos.y, partnerActor->currentPos.z, - partnerActor->yaw); + play_movement_dust_effects(2, partner->currentPos.x, partner->currentPos.y, partner->currentPos.z, + partner->yaw); sfx_play_sound(SOUND_SOFT_LAND); return ApiStatus_DONE1; @@ -122,9 +122,9 @@ ApiStatus N(func_80238A20_6F1B00)(Evt* script, s32 isInitialCall) { ApiStatus func_80238B60_6F1C40(Evt* script, s32 isInitialCall) { BattleStatus* battleStatus = &gBattleStatus; - Actor* partnerActor = battleStatus->partnerActor; - Actor* targetActor = get_actor(partnerActor->targetActorID); - s32* tattle = &bActorTattles[targetActor->actorType]; + Actor* partner = battleStatus->partnerActor; + Actor* target = get_actor(partner->targetActorID); + s32* tattle = &bActorTattles[target->actorType]; script->varTable[0] = *tattle; @@ -132,13 +132,41 @@ ApiStatus func_80238B60_6F1C40(Evt* script, s32 isInitialCall) { script->varTable[0] = bActorTattles[0]; } - save_tattle_flags(targetActor->actorType); + save_tattle_flags(target->actorType); return ApiStatus_DONE2; } -INCLUDE_ASM(s32, "battle/partner/goombario", func_80238BCC_6F1CAC); +ApiStatus func_80238BCC_6F1CAC(Evt* script, s32 isInitalCall) { + Actor* target = get_actor(gBattleStatus.partnerActor->targetActorID); + s32 xSize; + + if (!(target->flags & ACTOR_FLAG_HP_OFFSET_BELOW)) { + script->varTable[1] = script->varTable[1] + (((target->size.y / 3) & 0xFF) * target->scalingFactor); + script->varTable[1] += ((target->size.y / 4) * target->scalingFactor); + } else { + script->varTable[1] = script->varTable[1] - (((target->size.y / 3) & 0xFF) * target->scalingFactor); + script->varTable[1] -= ((target->size.y / 4) * target->scalingFactor); + } + + if (target->flags & ACTOR_FLAG_8000) { + script->varTable[1] -= (target->size.y / 2) * target->scalingFactor; + } + + xSize = target->size.y * target->scalingFactor; + if (xSize < target->size.x) { + xSize = target->size.x; + } + + script->varTable[3] = xSize + 76; + script->varTable[0] += bActorOffsets[target->actorType].tattleCam.x; + script->varTable[1] += bActorOffsets[target->actorType].tattleCam.y; + script->varTable[3] += bActorOffsets[target->actorType].tattleCam.z; + + return ApiStatus_DONE2; +} + ApiStatus func_80238E04_6F1EE4(Evt* script, s32 isInitialCall) { D_8023CDA0 = fx_tattle_window(0, 206, 144, 0, 1.0f, 0); @@ -157,23 +185,23 @@ ApiStatus func_80238E48_6F1F28(Evt* script, s32 isInitialCall) { ApiStatus func_80238E74_6F1F54(Evt* script, s32 isInitialCall) { BattleStatus* battleStatus = &gBattleStatus; - Actor* partnerActor = battleStatus->partnerActor; + Actor* partner = battleStatus->partnerActor; script->varTable[0] = FALSE; switch (battleStatus->selectedMoveID) { case 134: - if (partnerActor->isGlowing >= 99) { + if (partner->isGlowing >= 99) { script->varTable[0] = TRUE; } break; case 135: - if (partnerActor->isGlowing >= 99) { + if (partner->isGlowing >= 99) { script->varTable[0] = TRUE; } break; case 136: - if (partnerActor->isGlowing >= 99) { + if (partner->isGlowing >= 99) { script->varTable[0] = TRUE; } break; @@ -182,7 +210,51 @@ ApiStatus func_80238E74_6F1F54(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -INCLUDE_ASM(s32, "battle/partner/goombario", func_80238EDC_6F1FBC); +ApiStatus func_80238EDC_6F1FBC(Evt* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + BattleStatus* battleStatus = &gBattleStatus; + Actor* partner = battleStatus->partnerActor; + s32 boostAmount; + s32 x, y, z; + + D_8023CDA4 = 0; + if (partner->isGlowing > 0) { + D_8023CDA4 = 1; + } + + boostAmount = 0; + switch (battleStatus->selectedMoveID) { + case MOVE_TATTLE: + partner->isGlowing += 2; + boostAmount = 1; + if (partner->isGlowing >= 99) { + partner->isGlowing = 99; + } + break; + case MOVE_CHARGE: + partner->isGlowing += 2; + boostAmount = 1; + if (partner->isGlowing >= 99) { + partner->isGlowing = 99; + } + break; + case MOVE_MULTIBONK: + partner->isGlowing += 2; + boostAmount = 1; + if (partner->isGlowing >= 99) { + partner->isGlowing = 99; + } + break; + } + + x = evt_get_variable(script, *args++); + y = evt_get_variable(script, *args++); + z = evt_get_variable(script, *args++); + fx_stat_change(boostAmount, x, y, z, 1.0f, 60); + + gBattleStatus.flags1 |= BS_FLAGS1_40000000; + return ApiStatus_DONE2; +} ApiStatus N(StopGlowing)(Evt* script, s32 isInitialCall) { BattleStatus* battleStatus = &gBattleStatus; @@ -194,15 +266,15 @@ ApiStatus N(StopGlowing)(Evt* script, s32 isInitialCall) { } ApiStatus N(StopGlowingAndGet)(Evt* script, s32 isInitialCall) { - Actor* partnerActor = gBattleStatus.partnerActor; + Actor* partner = gBattleStatus.partnerActor; - if (!(gBattleStatus.flags1 & 0x40000000)) { - partnerActor->isGlowing = FALSE; + if (!(gBattleStatus.flags1 & BS_FLAGS1_40000000)) { + partner->isGlowing = FALSE; } - script->varTable[0] = partnerActor->isGlowing; - partnerActor->isGlowing = FALSE; - gBattleStatus.flags1 &= ~0x40000000; + script->varTable[0] = partner->isGlowing; + partner->isGlowing = FALSE; + gBattleStatus.flags1 &= ~BS_FLAGS1_40000000; return ApiStatus_DONE2; } diff --git a/src/battle/partner/kooper.c b/src/battle/partner/kooper.c index 8091996893..9eeac65a91 100644 --- a/src/battle/partner/kooper.c +++ b/src/battle/partner/kooper.c @@ -59,8 +59,57 @@ ApiStatus func_80238000_6F5E80(Evt* script, s32 isInitialCall) { return ApiStatus_BLOCK; } -ApiStatus func_80238114_6F5F94(Evt* script, s32 isInitialCall); -INCLUDE_ASM(s32, "battle/partner/kooper", func_80238114_6F5F94); +ApiStatus func_80238114_6F5F94(Evt* script, s32 isInitialCall) { + SelectableTarget* target; + Actor* actor = gBattleStatus.partnerActor; + Actor* targetActor; + ActorPart* targetActorPart; + f32 x; + f32 targetX; + s32 i; + + if (isInitialCall) { + script->functionTemp[0] = 0; + actor->selectedTargetIndex = 0; + } + + if (script->functionTemp[0] == 0) { + for (i = 0; i < actor->targetListLength; i++) { + x = actor->currentPos.x; + target = &actor->targetData[actor->targetIndexList[i]]; + targetX = target->pos.x; + targetActor = get_actor(target->actorID); + + if (targetActor != NULL) { + targetActorPart = get_actor_part(targetActor, target->partID); + + if (targetActor->transStatus == 0) { + if (!(targetActorPart->eventFlags & 0x20)) { + if (x > targetX) { + targetActor->yaw += 33; + } else { + targetActor->yaw = 0; + } + + targetActor->yaw = clamp_angle(targetActor->yaw); + } + } + } + } + + if (actor->state.varTable[0] != 0) { + for (i = 0; i < actor->targetListLength; i++) { + target = &actor->targetData[actor->targetIndexList[i]]; + targetActor = get_actor(target->actorID); + if (targetActor) { + targetActor->yaw = 0.0f; + } + } + return ApiStatus_DONE2; + } + } + return ApiStatus_BLOCK; +} ApiStatus N(AverageTargetDizzyChance)(Evt* script, s32 isInitialCall) { BattleStatus* battleStatus = &gBattleStatus; diff --git a/src/battle/partner/lakilester.c b/src/battle/partner/lakilester.c index 5d3419b1f5..db58fdf6e4 100644 --- a/src/battle/partner/lakilester.c +++ b/src/battle/partner/lakilester.c @@ -1,6 +1,7 @@ #include "common.h" #include "effects.h" +extern f32 D_8023D1E0; extern s32 D_8023D2C8; extern s32 D_8023D330; extern s32 D_8023D334; @@ -49,7 +50,32 @@ ApiStatus func_80238C14_70C924(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -INCLUDE_ASM(s32, "battle/partner/lakilester", func_80238C58_70C968); +ApiStatus func_80238C58_70C968(Evt* script, s32 isInitialCall) { + BattleStatus* battleStatus = &gBattleStatus; + Actor* actor = battleStatus->playerActor; + EffectInstanceData* effectData; // TODO remove this struct and replace it with the effect-specific one + + if (isInitialCall) { + script->functionTemp[0] = 0; + } + + switch (script->functionTemp[0]) { + case 0: + D_8023D1E0 = 0.1f; + fx_ending_decals(0, actor->currentPos.x, actor->currentPos.y, actor->currentPos.z, 0.1f, &battleStatus->cloudNineEffect); + script->functionTemp[0] = 1; + break; + case 1: + if (D_8023D1E0 >= 1.0) { + return ApiStatus_DONE2; + } + effectData = battleStatus->cloudNineEffect->data; + effectData->rotation.x += 0.2; + D_8023D1E0 += 0.2; + break; + } + return ApiStatus_BLOCK; +} ApiStatus func_80238D48_70CA58(Evt* script, s32 isInitialCall) { if (gBattleStatus.cloudNineTurnsLeft < script->varTable[10]) { diff --git a/src/bss2.c b/src/bss2.c index e6fc8a9154..97d50040c3 100644 --- a/src/bss2.c +++ b/src/bss2.c @@ -43,21 +43,23 @@ BSS s32 D_8010C9A0; BSS char D_8010C9A4[0xC]; BSS s32 D_8010C9B0; BSS char D_8010C9B4[0xC]; -BSS s32 D_8010C9C0; -BSS char D_8010C9C4[0x4]; -BSS s32 D_8010C9C8; -BSS char D_8010C9CC[0x32C]; -BSS s16 D_8010CCF8; -BSS s16 D_8010CCFA; -BSS s16 D_8010CCFC; -BSS s16 D_8010CCFE; -BSS s32 D_8010CD00; -BSS char D_8010CD04[0xC]; -BSS s16 D_8010CD10; -BSS s16 D_8010CD12; -BSS char D_8010CD14[0xC]; -BSS s32 D_8010CD20; -BSS char D_8010CD24[0xC]; + +// Moved to 7fd10_len_b40.c +// BSS s32 D_8010C9C0; +// BSS char D_8010C9C4[0x4]; +// BSS s32 D_8010C9C8; +// BSS char D_8010C9CC[0x32C]; +// BSS s16 D_8010CCF8; +// BSS s16 D_8010CCFA; +// BSS s16 D_8010CCFC; +// BSS s16 D_8010CCFE; +// BSS s32 D_8010CD00; +// BSS char D_8010CD04[0xC]; +// BSS s16 D_8010CD10; +// BSS s16 D_8010CD12; +// BSS char D_8010CD14[0xC]; +// BSS s32 D_8010CD20; +// BSS char D_8010CD24[0xC]; // Moved to partners.c // BSS s32 D_8010CD30; diff --git a/src/encounter_api.c b/src/encounter_api.c index 5329acb4f3..9963ddf325 100644 --- a/src/encounter_api.c +++ b/src/encounter_api.c @@ -650,7 +650,7 @@ ApiStatus GetNpcVar(Evt* script, s32 isInitialCall) { Enemy* npc = script->owner1.enemy; s32 npcID = evt_get_variable(script, *args++); s32 varIdx = evt_get_variable(script, *args++); - s32 var3 = *args; + s32 var3 = *args++; if (npcID == NPC_SELF) { npcID = npc->npcID; diff --git a/src/evt/fx_api.c b/src/evt/fx_api.c index 60e6c0bbad..d90d2f8bef 100644 --- a/src/evt/fx_api.c +++ b/src/evt/fx_api.c @@ -41,11 +41,11 @@ ApiStatus func_802D7690(Evt* script, s32 isInitialCall) { s32 duration = evt_get_variable(script, *args++); f32 offsetX, offsetY, offsetZ; f32 sinA, cosA; - + if (isInitialCall) { script->functionTemp[0] = 0; } - + offsetX = rand_int(10) - 5; offsetZ = rand_int(10) - 5; offsetY = -2.0f - ((SQ(offsetX) + SQ(offsetZ)) / 5.0f); @@ -55,7 +55,8 @@ ApiStatus func_802D7690(Evt* script, s32 isInitialCall) { posX + ((sinA * magnitude * script->functionTemp[0]) / duration) + offsetX, posY + 15.5f + offsetY, posZ + ((-cosA * magnitude * script->functionTemp[0]) / duration) + offsetZ, - 0.0f); + 0.0f + ); script->functionTemp[0]++; if (script->functionTemp[0] < duration) { @@ -80,7 +81,7 @@ ApiStatus ShowEmote(Evt* script, s32 isInitialCall) { Npc* npc; s32 emoteHandle; f32 x, y, z, r; - + switch (emoterType) { case EMOTER_PLAYER: // show emote from player @@ -220,12 +221,12 @@ ApiStatus ShowSweat(Evt* script) { Npc* npc; f32 x, y, z, r; - + switch (emoterType) { case EMOTER_PLAYER: x = gPlayerStatus.position.x; y = gPlayerStatus.position.y + (gPlayerStatus.colliderHeight * 2) / 3; - z = gPlayerStatus.position.z; + z = gPlayerStatus.position.z; r = gPlayerStatus.colliderHeight / 3; break; case EMOTER_NPC: @@ -245,7 +246,7 @@ ApiStatus ShowSweat(Evt* script) { r = radius; break; } - + fx_sweat(type, x, y, z, r, pitch, duration); return ApiStatus_DONE2; } @@ -253,7 +254,7 @@ ApiStatus ShowSweat(Evt* script) { ApiStatus ShowSleepBubble(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; s32 npcID = evt_get_variable(script, *args++); - s32 type = evt_get_variable(script, *args++); + s32 type = evt_get_variable(script, *args++); f32 pitch = evt_get_float_variable(script, *args++); s32 emoterType = evt_get_variable(script, *args++); f32 posX = evt_get_float_variable(script, *args++); @@ -264,8 +265,8 @@ ApiStatus ShowSleepBubble(Evt* script, s32 isInitialCall) { Npc* npc; f32 x, y, z, r; - s32 effectHandle; - + EffectInstance* effectHandle; + switch (emoterType) { case EMOTER_PLAYER: x = gPlayerStatus.position.x; @@ -292,17 +293,16 @@ ApiStatus ShowSleepBubble(Evt* script, s32 isInitialCall) { } fx_sleep_bubble(type, x, y, z, r, pitch, &effectHandle); - evt_set_variable(script, outVar, effectHandle); + evt_set_variable(script, outVar, (s32)effectHandle); return ApiStatus_DONE2; } -//TODO rename after field is identified -ApiStatus SetSleepBubbleUnk1C(Evt* script, s32 isInitialCall) { +ApiStatus SetSleepBubbleTimeLeft(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; EffectInstance* effect = (EffectInstance*)evt_get_variable(script, *args++); s32 value = evt_get_variable(script, *args++); - ((s32*)(effect->data))[7] = value; // offset 0x1C in SleepBubbleFX data + ((SleepBubbleFXData*)(effect->data))->timeLeft = value; return ApiStatus_DONE2; } @@ -481,7 +481,7 @@ ApiStatus PlayEffect(Evt* script, s32 isInitialCall) { fx_sweat(iVar1, fVar2, fVar3, fVar4, fVar5, fVar6, iVar7); break; case EFFECT_SLEEP_BUBBLE: - fx_sleep_bubble(iVar1, fVar2, fVar3, fVar4, fVar5, fVar6, &sp38); + fx_sleep_bubble(iVar1, fVar2, fVar3, fVar4, fVar5, fVar6, (EffectInstance**)&sp38); evt_set_variable(script, a7, sp38); break; case EFFECT_WINDY_LEAVES: @@ -517,7 +517,7 @@ ApiStatus PlayEffect(Evt* script, s32 isInitialCall) { fx_radial_shimmer(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6); break; case EFFECT_ENDING_DECALS: - fx_ending_decals(iVar1, fVar2, fVar3, fVar4, fVar5, &sp34); + fx_ending_decals(iVar1, fVar2, fVar3, fVar4, fVar5, (EffectInstance**)&sp34); evt_set_variable(script, a6, sp34); break; case EFFECT_LIGHT_RAYS: diff --git a/src/hud_element.h b/src/hud_element.h index 31908bcefd..591c36b1dc 100644 --- a/src/hud_element.h +++ b/src/hud_element.h @@ -1,7 +1,7 @@ #ifndef HUD_ELEMENT_H #define HUD_ELEMENT_H -#include "common.h" +#include "common_structs.h" #include "icon_offsets.h" #define HUD_ELEMENT_BATTLE_ID_MASK 0x800 diff --git a/src/world/area_arn/arn_08/events.c b/src/world/area_arn/arn_08/events.c index ae16864e68..65ad9895a0 100644 --- a/src/world/area_arn/arn_08/events.c +++ b/src/world/area_arn/arn_08/events.c @@ -1,9 +1,7 @@ #include "arn_08.h" #include "sprite/npc/tubbas_heart.h" #include "sprite/npc/yakkey.h" - -extern Npc* wPartnerNpc; -void partner_set_goal_pos(s32, s32); +#include "world/partners.h" enum { NPC_TUBBAS_HEART, diff --git a/src/world/area_dgb/dgb_18/C55F40.c b/src/world/area_dgb/dgb_18/C55F40.c index cfa2112caf..da0052f5a7 100644 --- a/src/world/area_dgb/dgb_18/C55F40.c +++ b/src/world/area_dgb/dgb_18/C55F40.c @@ -334,7 +334,7 @@ EvtScript N(idle_80241654) = { EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_2038, 0) EVT_CALL(RandInt, 10, EVT_VAR(1)) EVT_ADD(EVT_VAR(1), 10) - EVT_CALL(SetSleepBubbleUnk1C, EVT_VAR(0), EVT_VAR(1)) + EVT_CALL(SetSleepBubbleTimeLeft, EVT_VAR(0), EVT_VAR(1)) EVT_WAIT_FRAMES(30) EVT_END_LOOP EVT_END_THREAD @@ -377,7 +377,7 @@ EvtScript N(idle_80242494) = { EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_2038, 0) EVT_CALL(RandInt, 10, EVT_VAR(1)) EVT_ADD(EVT_VAR(1), 10) - EVT_CALL(SetSleepBubbleUnk1C, EVT_VAR(0), EVT_VAR(1)) + EVT_CALL(SetSleepBubbleTimeLeft, EVT_VAR(0), EVT_VAR(1)) EVT_WAIT_FRAMES(30) EVT_END_LOOP EVT_END_THREAD @@ -390,7 +390,7 @@ EvtScript N(npcAI_802426B0) = { EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_2039, 0) EVT_CALL(ShowSleepBubble, 0, 0, 50, 2, 552, 111, 128, 30, EVT_VAR(0)) EVT_WAIT_FRAMES(360) - EVT_CALL(SetSleepBubbleUnk1C, EVT_VAR(0), 20) + EVT_CALL(SetSleepBubbleTimeLeft, EVT_VAR(0), 20) EVT_CALL(SetNpcVar, -1, 1, 2) EVT_WAIT_FRAMES(20) EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_2F1, 0) diff --git a/src/world/area_isk/isk_04/97BF60.c b/src/world/area_isk/isk_04/97BF60.c index 30b300d8c1..5a47494958 100644 --- a/src/world/area_isk/isk_04/97BF60.c +++ b/src/world/area_isk/isk_04/97BF60.c @@ -2,4 +2,32 @@ #include "world/common/SwitchToPartner.inc.c" -INCLUDE_ASM(s32, "world/area_isk/isk_04/97BF60", func_8024095C_97BF8C); +#include "world/partners.h" +extern s32 D_80242288_97D8B8; + +// duplicate of func_802400C0_9BD720 +ApiStatus func_8024095C_97BF8C(Evt* script, s32 isInitialCall) { + PlayerStatus* playerStatus = &gPlayerStatus; + + switch (D_80242288_97D8B8) { + case 0: + D_80242288_97D8B8 = 1; + return ApiStatus_BLOCK; + case 1: + case 2: + D_80242288_97D8B8++; + return ApiStatus_BLOCK; + case 3: + wPartnerNpc->pos.x = playerStatus->position.x - 30.0f; + wPartnerNpc->pos.z = playerStatus->position.z + 30.0f; + partner_clear_player_tracking(wPartnerNpc); + partner_set_goal_pos(playerStatus->position.x, playerStatus->position.z); + func_800EF3D4(0); + set_npc_yaw(wPartnerNpc, 90.0f); + playerStatus->targetYaw = 90.0f; + playerStatus->currentYaw = 90.0f; + playerStatus->spriteFacingAngle = 0.0f; + return ApiStatus_DONE2; + } + return ApiStatus_BLOCK; +} diff --git a/src/world/area_jan/jan_11/B71010.c b/src/world/area_jan/jan_11/B71010.c index 29262f2224..281bc9de68 100644 --- a/src/world/area_jan/jan_11/B71010.c +++ b/src/world/area_jan/jan_11/B71010.c @@ -2,4 +2,11 @@ #include "world/common/GetFloorCollider.inc.c" -INCLUDE_ASM(s32, "world/area_jan/jan_11/B71010", func_802407DC_B7103C); +ApiStatus N(IsPartnerWatt)(Evt* script, s32 isInitialCall) { + if (gPartnerActionStatus.actingPartner == PARTNER_WATT) { + script->varTable[9] = TRUE; + } else { + script->varTable[9] = FALSE; + } + return ApiStatus_DONE2; +} diff --git a/src/world/area_kpa/kpa_12/A54CA0.c b/src/world/area_kpa/kpa_12/A54CA0.c index c81738d5a3..687157bb96 100644 --- a/src/world/area_kpa/kpa_12/A54CA0.c +++ b/src/world/area_kpa/kpa_12/A54CA0.c @@ -9,4 +9,11 @@ ApiStatus N(func_80240350_A54CA0)(Evt* script, s32 isInitialCall) { INCLUDE_ASM(s32, "world/area_kpa/kpa_12/A54CA0", func_8024037C_A54CCC); -INCLUDE_ASM(s32, "world/area_kpa/kpa_12/A54CA0", func_80240444_A54D94); +ApiStatus N(IsPartnerLakilester)(Evt* script, s32 isInitialCall) { + if (gPartnerActionStatus.actingPartner == PARTNER_LAKILESTER) { + script->varTable[9] = TRUE; + } else { + script->varTable[9] = FALSE; + } + return ApiStatus_DONE2; +} diff --git a/src/world/area_kpa/kpa_13/A56270.c b/src/world/area_kpa/kpa_13/A56270.c index 62fa9644b0..55202ca334 100644 --- a/src/world/area_kpa/kpa_13/A56270.c +++ b/src/world/area_kpa/kpa_13/A56270.c @@ -9,4 +9,11 @@ ApiStatus N(func_80240350_A56270)(Evt* script, s32 isInitialCall) { INCLUDE_ASM(s32, "world/area_kpa/kpa_13/A56270", func_8024037C_A5629C); -INCLUDE_ASM(s32, "world/area_kpa/kpa_13/A56270", func_80240444_A56364); +ApiStatus N(IsPartnerLakilester)(Evt* script, s32 isInitialCall) { + if (gPartnerActionStatus.actingPartner == PARTNER_LAKILESTER) { + script->varTable[9] = TRUE; + } else { + script->varTable[9] = FALSE; + } + return ApiStatus_DONE2; +} diff --git a/src/world/area_kpa/kpa_14/A57830.c b/src/world/area_kpa/kpa_14/A57830.c index 98677d5cb3..a705adccab 100644 --- a/src/world/area_kpa/kpa_14/A57830.c +++ b/src/world/area_kpa/kpa_14/A57830.c @@ -21,4 +21,11 @@ ApiStatus N(func_80240710_A57BC0)(Evt* script, s32 isInitialCall) { INCLUDE_ASM(s32, "world/area_kpa/kpa_14/A57830", func_8024073C_A57BEC); -INCLUDE_ASM(s32, "world/area_kpa/kpa_14/A57830", func_80240840_A57CF0); +ApiStatus N(IsPartnerLakilester)(Evt* script, s32 isInitialCall) { + if (gPartnerActionStatus.actingPartner == PARTNER_LAKILESTER) { + script->varTable[9] = TRUE; + } else { + script->varTable[9] = FALSE; + } + return ApiStatus_DONE2; +} diff --git a/src/world/area_kzn/kzn_11/C804B0.c b/src/world/area_kzn/kzn_11/C804B0.c index 3622955144..d7061a0857 100644 --- a/src/world/area_kzn/kzn_11/C804B0.c +++ b/src/world/area_kzn/kzn_11/C804B0.c @@ -4,4 +4,11 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_11/C804B0", func_80240310_C804B0); #include "world/common/GetFloorCollider.inc.c" -INCLUDE_ASM(s32, "world/area_kzn/kzn_11/C804B0", func_80240434_C805D4); +ApiStatus N(IsPartnerLakilester)(Evt* script, s32 isInitialCall) { + if (gPartnerActionStatus.actingPartner == PARTNER_LAKILESTER) { + script->varTable[9] = TRUE; + } else { + script->varTable[9] = FALSE; + } + return ApiStatus_DONE2; +} diff --git a/src/world/area_mac/mac_04/843030.c b/src/world/area_mac/mac_04/843030.c index 548f01b0a1..9fdeaebca7 100644 --- a/src/world/area_mac/mac_04/843030.c +++ b/src/world/area_mac/mac_04/843030.c @@ -37,7 +37,14 @@ ApiStatus PostChapter4StatUpdate(Evt* script, s32 isInitialCall) { #include "world/common/GetFloorCollider.inc.c" -INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_802419AC_84457C); +ApiStatus N(IsPartnerBow)(Evt* script, s32 isInitialCall) { + if (gPartnerActionStatus.actingPartner == PARTNER_BOW) { + script->varTable[0] = TRUE; + } else { + script->varTable[0] = FALSE; + } + return ApiStatus_DONE2; +} #include "world/common/GetPlayerCoins.inc.c" diff --git a/src/world/area_nok/nok_01/9C53E0.c b/src/world/area_nok/nok_01/9C53E0.c index fd4d63d7e3..7b7069968e 100644 --- a/src/world/area_nok/nok_01/9C53E0.c +++ b/src/world/area_nok/nok_01/9C53E0.c @@ -1,4 +1,8 @@ #include "nok_01.h" +#include "effects.h" + +extern s32 D_8024856C_9CD94C; +extern s32 D_80248570_9CD950; static char* N(exit_str_0) = "nok_13"; static char* N(exit_str_1) = "nok_02"; @@ -21,7 +25,25 @@ extern EffectInstance* N(Quizmo_VannaTEffect); #include "world/common/AddPlayerHandsOffset.inc.c" +// Requires data migration +#ifdef NON_MATCHING +ApiStatus func_80242028_9C7408(Evt* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + + if (isInitialCall) { + D_8024856C_9CD94C = FALSE; + } + + if (D_8024856C_9CD94C) { + D_8024856C_9CD94C = FALSE; + evt_set_variable(script, *args++, D_80248570_9CD950); + return ApiStatus_DONE2; + } + return ApiStatus_BLOCK; +} +#else INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80242028_9C7408); +#endif INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_8024207C_9C745C); @@ -30,26 +52,80 @@ INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_802420B4_9C7494); extern s32 N(LetterDelivery_SavedNpcAnim); #include "world/common/LetterDelivery.inc.c" -INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_8024243C_9C781C); +ApiStatus func_8024243C_9C781C(Evt* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + s32 npcID = evt_get_variable(script, *args++); + s32 outVar = *args++; + f32 angle = clamp_angle((get_npc_safe(npcID)->yaw + 180.0f) - gCameras[gCurrentCameraID].currentYaw); + s32 outVal; + + outVal = FALSE; + if (angle > 270.0f || angle < 90.0f) { + outVal = TRUE; + } + + evt_set_variable(script, outVar, outVal); + return ApiStatus_DONE2; +} #include "common/UnkFloatFunc.inc.c" -INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_802426A4_9C7A84); +ApiStatus func_802426A4_9C7A84(Evt* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + f32 temp_f20; + f32 temp_f22; + f32 f3; -INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80242760_9C7B40); + temp_f22 = evt_get_variable(script, *args++); + temp_f20 = evt_get_variable(script, *args++); + f3 = evt_get_variable(script, *args++); -INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80242790_9C7B70); + fx_explosion(0, temp_f22, temp_f20 + 15.0f, f3); + exec_ShakeCam1(0, 0, 20); + return ApiStatus_DONE2; +} -INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_802427C0_9C7BA0); +ApiStatus func_80242760_9C7B40(Evt* script, s32 isInitialCall) { + func_800E98EC(); + func_800E9894(); + open_status_menu_long(); + return ApiStatus_DONE2; +} + +ApiStatus func_80242790_9C7B70(Evt* script, s32 isInitialCall) { + func_800E9900(); + func_800E98C4(); + close_status_menu(); + return ApiStatus_DONE2; +} + +ApiStatus func_802427C0_9C7BA0(Evt* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + + evt_get_variable(script, *args++); + func_80055448(16); + func_80055760(4); + func_8005566C(0, 250, 1); + return ApiStatus_DONE2; +} INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80242804_9C7BE4); INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80242858_9C7C38); -INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80242898_9C7C78); +ApiStatus func_80242898_9C7C78(Evt* script, s32 isInitialCall) { + func_80055848(4); + return ApiStatus_DONE2; +} -INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_802428B8_9C7C98); +ApiStatus func_802428B8_9C7C98(Evt* script, s32 isInitialCall) { + func_800557CC(100); + return ApiStatus_DONE2; +} INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_802428D8_9C7CB8); -INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80242910_9C7CF0); +ApiStatus func_80242910_9C7CF0(Evt* script, s32 isInitialCall) { + gPlayerData.tradeEventStartTime = gPlayerData.frameCounter; + return ApiStatus_DONE2; +} diff --git a/src/world/area_nok/nok_02/9D7990.c b/src/world/area_nok/nok_02/9D7990.c index ee22a5c420..d5e82e7885 100644 --- a/src/world/area_nok/nok_02/9D7990.c +++ b/src/world/area_nok/nok_02/9D7990.c @@ -1,3 +1,9 @@ #include "nok_02.h" +#include "effects.h" -INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7990", func_80240970_9D7990); +ApiStatus func_80240970_9D7990(Evt* script, s32 isInitialCall) { + fx_walking_dust(2, rand_int(200) - 100, rand_int(150), -180.0f, 0.0f, 0.0f); + fx_walking_dust(2, rand_int(200) - 100, rand_int(150), -180.0f, 0.0f, 0.0f); + fx_walking_dust(2, rand_int(200) - 100, rand_int(150), -180.0f, 0.0f, 0.0f); + return ApiStatus_DONE2; +} diff --git a/src/world/area_nok/nok_02/9D7AA0.c b/src/world/area_nok/nok_02/9D7AA0.c index 5fa4ff321c..f834bc89ce 100644 --- a/src/world/area_nok/nok_02/9D7AA0.c +++ b/src/world/area_nok/nok_02/9D7AA0.c @@ -30,14 +30,201 @@ extern s32 N(LetterDelivery_SavedNpcAnim); #include "world/common/SwitchToPartner.inc.c" -INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80243010_9DA030); +ApiStatus func_80243010_9DA030(Evt* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + f32 temp_f20; + f32 temp_f22; + f32 f3; + temp_f22 = evt_get_variable(script, *args++); + temp_f20 = evt_get_variable(script, *args++); + f3 = evt_get_variable(script, *args++); + + fx_explosion(0, temp_f22, temp_f20 + 15.0f, f3); + exec_ShakeCam1(0, 0, 20); + return ApiStatus_DONE2; +} + +// float regalloc +#ifdef NON_MATCHING +ApiStatus func_802430CC_9DA0EC(Evt* script, s32 isInitialCall) { + PlayerStatus* playerStatus = &gPlayerStatus; + Bytecode* args = script->ptrReadPos; + Npc* npc1 = evt_get_variable(script, *args++); + Npc* npc2 = evt_get_variable(script, *args++); + s32 outVal = FALSE; + f32 xDiff, zDiff; + + if (playerStatus->currentSpeed >= 4.0f) { + script->varTable[2]++; + if (script->varTable[2] > 2) { + script->varTable[2] = 2; + } + } else { + script->varTable[2] = 0; + } + + xDiff = npc1->pos.x - playerStatus->position.x; + zDiff = npc1->pos.z - playerStatus->position.z; + if ((SQ(xDiff) + SQ(zDiff) < 6400.0f) && (script->varTable[2] >= 2)) { + outVal = TRUE; + } + + xDiff = npc1->pos.x - npc2->pos.x; + zDiff = npc1->pos.z - npc2->pos.z; + if (SQ(xDiff) + SQ(zDiff) < 1600.0f) { + outVal = TRUE; + } + + script->varTable[0] = outVal; + return ApiStatus_DONE2; +} +#else INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_802430CC_9DA0EC); +#endif -INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80243214_9DA234); +ApiStatus func_80243214_9DA234(Evt* script, s32 isInitialCall) { + PlayerStatus* playerStatus = &gPlayerStatus; -INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80243294_9DA2B4); + if (playerStatus->currentSpeed >= 4.0f) { + script->varTable[2]++; + if (script->varTable[2] > 2) { + script->varTable[2] = 2; + } + } else { + script->varTable[2] = 0; + } -INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_8024351C_9DA53C); + script->varTable[0] = 1; + if (script->varTable[2] >= 2) { + script->varTable[0] = 0; + } + if (playerStatus->currentSpeed == 0.0f) { + script->varTable[0] = 0; + } -INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80243754_9DA774); + return ApiStatus_DONE2; +} + +ApiStatus func_80243294_9DA2B4(Evt* script, s32 isInitialCall) { + PlayerStatus* playerStatus = &gPlayerStatus; + Bytecode* args = script->ptrReadPos; + s32 randRange = 10000; + Npc* npc1 = evt_get_variable(script, *args++); + Npc* npc2 = evt_get_variable(script, *args++); + f32 xDiff, zDiff; + f32 x, z; + f32 dist; + s32 rand; + + while (TRUE) { + rand = rand_int(randRange); + x = ((rand - (randRange / 2)) / 100) + npc1->pos.x; + rand = rand_int(randRange); + z = ((rand - (randRange / 2)) / 100) + npc1->pos.z; + + xDiff = x - -150.0f; + zDiff = z - 250.0f; + if (SQ(xDiff) + SQ(zDiff) < 22500.0f) { + xDiff = x - playerStatus->position.x; + zDiff = z - playerStatus->position.z; + if (SQ(xDiff) + SQ(zDiff) > 6400.0f) { + xDiff = x - npc2->pos.x; + zDiff = z - npc2->pos.z; + if (SQ(xDiff) + SQ(zDiff) > 1600.0f) { + break; + } + } + } + + randRange += 5000; + if (randRange > 30000) { + randRange = 30000; + } + } + xDiff = x - npc1->pos.x; + zDiff = z - npc1->pos.z; + dist = SQ(xDiff) + SQ(zDiff); + if (dist != 0.0f) { + dist = sqrtf(dist) / 10.0f; + } + script->varTable[10] = x; + script->varTable[11] = z; + script->varTable[12] = (s32) dist + 1; + return ApiStatus_DONE2; +} + +ApiStatus func_8024351C_9DA53C(Evt* script, s32 isInitialCall) { + PlayerStatus* playerStatus = &gPlayerStatus; + Bytecode* args = script->ptrReadPos; + s32 randRange = 10000; + Npc* npc = evt_get_variable(script, *args++); + f32 xDiff, zDiff; + f32 x, z; + f32 dist; + s32 rand; + + while (TRUE) { + rand = rand_int(randRange); + x = ((rand - (randRange / 2)) / 100) + npc->pos.x; + rand = rand_int(randRange); + z = ((rand - (randRange / 2)) / 100) + npc->pos.z; + + xDiff = x - -150.0f; + zDiff = z - 250.0f; + if (SQ(xDiff) + SQ(zDiff) < 22500.0f) { + xDiff = x - playerStatus->position.x; + zDiff = z - playerStatus->position.z; + if (SQ(xDiff) + SQ(zDiff) > 6400.0f) { + break; + } + } + + randRange += 5000; + if (randRange > 30000) { + randRange = 30000; + } + } + xDiff = x - npc->pos.x; + zDiff = z - npc->pos.z; + dist = SQ(xDiff) + SQ(zDiff); + if (dist != 0.0f) { + dist = sqrtf(dist) / 10.0f; + } + script->varTable[10] = x; + script->varTable[11] = z; + script->varTable[12] = (s32) dist + 1; + return ApiStatus_DONE2; +} + +ApiStatus func_80243754_9DA774(Evt* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + Npc* npc; + f32 yaw; + + if (isInitialCall) { + script->functionTempPtr[1] = npc = evt_get_variable(script, *args++); + npc->moveToPos.x = (evt_get_variable(script, *args++) + npc->pos.x) * 0.5f; + npc->moveToPos.z = (evt_get_variable(script, *args++) + npc->pos.z) * 0.5f; + npc->moveToPos.y = dist2D(npc->moveToPos.x, npc->moveToPos.z, npc->pos.x, npc->pos.z); + script->functionTemp[2] = atan2(npc->moveToPos.x, npc->moveToPos.z, npc->pos.x, npc->pos.z); + npc->duration = 0; + } + + npc = script->functionTempPtr[1]; + npc->pos.x = npc->moveToPos.x; + npc->pos.z = npc->moveToPos.z; + + npc->duration += 9; + if (npc->duration >= 360) { + npc->duration = 360; + } + yaw = script->functionTemp[2] + npc->duration; + npc->yaw = clamp_angle(yaw + 90.0f); + npc_move_heading(npc, npc->moveToPos.y, yaw); + + if (npc->duration == 360) { + return ApiStatus_DONE2; + } + return ApiStatus_BLOCK; +} diff --git a/src/world/area_nok/nok_11/9F4A40.c b/src/world/area_nok/nok_11/9F4A40.c index 436c0cfbd4..b688e9061d 100644 --- a/src/world/area_nok/nok_11/9F4A40.c +++ b/src/world/area_nok/nok_11/9F4A40.c @@ -9,7 +9,17 @@ static char* N(exit_str_1) = "nok_12"; #include "common/foliage.inc.c" -INCLUDE_ASM(s32, "world/area_nok/nok_11/9F4A40", func_80241F08_9F6948); +ApiStatus func_80241F08_9F6948(Evt* script, s32 isInitialCall) { + PlayerData* playerData = &gPlayerData; + + if (playerData->coins >= 100) { + script->varTable[0] = FALSE; + } else { + script->varTable[0] = TRUE; + } + + return ApiStatus_DONE2; +} ApiStatus func_80241F30_9F6970(Evt* script, s32 isInitialCall) { PlayerData* playerData = &gPlayerData; diff --git a/src/world/area_nok/nok_12/9FA7F0.c b/src/world/area_nok/nok_12/9FA7F0.c index aceb331412..4a1b03d3f8 100644 --- a/src/world/area_nok/nok_12/9FA7F0.c +++ b/src/world/area_nok/nok_12/9FA7F0.c @@ -3,4 +3,28 @@ static char* N(exit_str_0) = "nok_11"; static char* N(exit_str_1) = "nok_13"; -INCLUDE_ASM(s32, "world/area_nok/nok_12/9FA7F0", func_80240000_9FA7F0); +// copy of func_80240000_A02840 +ApiStatus func_80240000_9FA7F0(Evt* script, s32 isInitialCall) { + PlayerStatus* playerStatus = &gPlayerStatus; + EncounterStatus* encounterStatus = &gCurrentEncounter; + Bytecode *args = script->ptrReadPos; + s32 xMin = evt_get_variable(script, *args++); + s32 xMax = evt_get_variable(script, *args++); + s32 zMin = evt_get_variable(script, *args++); + s32 zMax = evt_get_variable(script, *args++); + s32 var5 = evt_get_variable(script, *args++); + s32 var6 = evt_get_variable(script, *args++); + s32 stage = var5; + s32 i; + + if (xMin <= playerStatus->position.x && playerStatus->position.x <= xMax && + zMin <= playerStatus->position.z && playerStatus->position.z <= zMax) + { + stage = var6; + } + + for (i = 0; i < encounterStatus->numEncounters; i++) { + encounterStatus->encounterList[i]->stage = stage; + } + return ApiStatus_DONE2; +} diff --git a/src/world/area_nok/nok_12/9FA970.c b/src/world/area_nok/nok_12/9FA970.c index 65a3e3e2b9..25155db610 100644 --- a/src/world/area_nok/nok_12/9FA970.c +++ b/src/world/area_nok/nok_12/9FA970.c @@ -1,5 +1,22 @@ #include "nok_12.h" -INCLUDE_ASM(s32, "world/area_nok/nok_12/9FA970", func_80240180_9FA970); +ApiStatus func_80240180_9FA970(Evt* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + Enemy* enemy = script->owner1.enemy; + s32 npcID = evt_get_variable(script, *args++); + s32 tableIdx = evt_get_variable(script, *args++); + s32 val = evt_get_variable(script, *args++); + + if (npcID == NPC_SELF) { + npcID = enemy->npcID; + } + + enemy = get_enemy_safe(npcID); + if (enemy != NULL) { + enemy->varTable[tableIdx] = val; + } + + return ApiStatus_DONE2; +} #include "world/common/SetEntityPosition.inc.c" diff --git a/src/world/area_nok/nok_13/A01420.c b/src/world/area_nok/nok_13/A01420.c index 75e1da8ef8..8278412a87 100644 --- a/src/world/area_nok/nok_13/A01420.c +++ b/src/world/area_nok/nok_13/A01420.c @@ -2,6 +2,12 @@ INCLUDE_ASM(s32, "world/area_nok/nok_13/A01420", func_80240E20_A01420); -INCLUDE_ASM(s32, "world/area_nok/nok_13/A01420", func_80241360_A01960); +ApiStatus func_80241360_A01960(Evt* script) { + Bytecode* args = script->ptrReadPos; + s32 a0 = *args++; + + evt_set_variable(script, a0, atan2(-364.0f, -135.0f, gPlayerStatus.position.x, gPlayerStatus.position.z)); + return ApiStatus_DONE2; +} INCLUDE_ASM(s32, "world/area_nok/nok_13/A01420", func_802413CC_A019CC); diff --git a/src/world/area_nok/nok_14/A02840.c b/src/world/area_nok/nok_14/A02840.c index 183c3c4484..86faa6fdd3 100644 --- a/src/world/area_nok/nok_14/A02840.c +++ b/src/world/area_nok/nok_14/A02840.c @@ -3,4 +3,28 @@ static char* N(exit_str_0) = "nok_13"; static char* N(exit_str_1) = "nok_15"; -INCLUDE_ASM(s32, "world/area_nok/nok_14/A02840", func_80240000_A02840); +// copy of func_80240000_9FA7F0 +ApiStatus func_80240000_A02840(Evt* script, s32 isInitialCall) { + PlayerStatus* playerStatus = &gPlayerStatus; + EncounterStatus* encounterStatus = &gCurrentEncounter; + Bytecode *args = script->ptrReadPos; + s32 xMin = evt_get_variable(script, *args++); + s32 xMax = evt_get_variable(script, *args++); + s32 zMin = evt_get_variable(script, *args++); + s32 zMax = evt_get_variable(script, *args++); + s32 var5 = evt_get_variable(script, *args++); + s32 var6 = evt_get_variable(script, *args++); + s32 stage = var5; + s32 i; + + if (xMin <= playerStatus->position.x && playerStatus->position.x <= xMax && + zMin <= playerStatus->position.z && playerStatus->position.z <= zMax) + { + stage = var6; + } + + for (i = 0; i < encounterStatus->numEncounters; i++) { + encounterStatus->encounterList[i]->stage = stage; + } + return ApiStatus_DONE2; +} diff --git a/src/world/area_omo/omo_14/DE5810.c b/src/world/area_omo/omo_14/DE5810.c index 4c7c886fa1..1c47970f4e 100644 --- a/src/world/area_omo/omo_14/DE5810.c +++ b/src/world/area_omo/omo_14/DE5810.c @@ -6,4 +6,11 @@ INCLUDE_ASM(s32, "world/area_omo/omo_14/DE5810", func_802403FC_DE5AAC); INCLUDE_ASM(s32, "world/area_omo/omo_14/DE5810", func_80240564_DE5C14); -INCLUDE_ASM(s32, "world/area_omo/omo_14/DE5810", func_80240590_DE5C40); +ApiStatus N(IsPartnerWatt)(Evt* script, s32 isInitialCall) { + if (gPartnerActionStatus.actingPartner == PARTNER_WATT) { + script->varTable[1] = TRUE; + } else { + script->varTable[1] = FALSE; + } + return ApiStatus_DONE2; +} diff --git a/src/world/area_sam/sam_01/CF7E80.c b/src/world/area_sam/sam_01/CF7E80.c index 8928757222..50500c8603 100644 --- a/src/world/area_sam/sam_01/CF7E80.c +++ b/src/world/area_sam/sam_01/CF7E80.c @@ -28,7 +28,7 @@ extern s32 N(LetterDelivery_SavedNpcAnim); #include "common/GetItemEntityPosition.inc.c" -INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_80241B20_CF9690); +#include "world/common/UnkTrigFunc001.inc.c" #define NAMESPACE dup_sam_01 #include "world/common/StashVars.inc.c" diff --git a/src/world/area_tik/tik_03/86F0F0.c b/src/world/area_tik/tik_03/86F0F0.c index 81c33d9227..ee3b31390b 100644 --- a/src/world/area_tik/tik_03/86F0F0.c +++ b/src/world/area_tik/tik_03/86F0F0.c @@ -1,10 +1,9 @@ #include "tik_03.h" +#include "world/partners.h" #include "world/common/UnkPosFunc2.inc.c" -void partner_set_goal_pos(s32, s32); extern s32 D_80242EBC_8719BC; -extern Npc* wPartnerNpc; extern s32 D_80242930_871430[4]; ApiStatus func_80240960_86F460(Evt* script, s32 isInitialCall) { diff --git a/src/world/area_trd/trd_03/9A4ED0.c b/src/world/area_trd/trd_03/9A4ED0.c index 435b2e14ae..9e74d000e0 100644 --- a/src/world/area_trd/trd_03/9A4ED0.c +++ b/src/world/area_trd/trd_03/9A4ED0.c @@ -1,3 +1,3 @@ #include "trd_03.h" -INCLUDE_ASM(s32, "world/area_trd/trd_03/9A4ED0", func_80240880_9A4ED0); +#include "world/common/UnkTrigFunc001.inc.c" diff --git a/src/world/area_trd/trd_05/9AE700.c b/src/world/area_trd/trd_05/9AE700.c index 159154d2d9..d1fcf7a67d 100644 --- a/src/world/area_trd/trd_05/9AE700.c +++ b/src/world/area_trd/trd_05/9AE700.c @@ -1,19 +1,141 @@ #include "trd_05.h" +#include "sprite.h" static char* N(exit_str_0) = "trd_04"; static char* N(exit_str_1) = "trd_00"; +typedef struct UnkTrdStruct { + /* 0x00 */ s32 foldStateID; + /* 0x04 */ s32 entityID; + /* 0x08 */ s32 playerSpriteID; + /* 0x0C */ s32 rasterID; + /* 0x10 */ Vec3f pos; + /* 0x1C */ Vec3f rot; + /* 0x28 */ Vec3f scale; +} UnkTrdStruct; // size = 0x34 + +BSS UnkTrdStruct N(D_80243090); + ApiStatus func_80240000_9AE700(Evt* script, s32 isInitialCall) { func_80035DF0(5); return ApiStatus_DONE2; } -INCLUDE_ASM(s32, "world/area_trd/trd_05/9AE700", func_80240020_9AE720); +void func_80240020_9AE720(void) { + FoldImageRecPart recPart; + SpriteRasterInfo sp30; + Matrix4f sp40; + Matrix4f sp80; + UnkTrdStruct* unkTrd = &N(D_80243090); + s32 frameMod4; -INCLUDE_ASM(s32, "world/area_trd/trd_05/9AE700", func_80240404_9AEB04); + gDPPipeSync(gMasterGfxPos++); + gDPSetCycleType(gMasterGfxPos++, G_CYC_1CYCLE); + gSPClearGeometryMode(gMasterGfxPos++, G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN | + G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH); + gSPSetGeometryMode(gMasterGfxPos++, G_ZBUFFER | G_SHADE | G_SHADING_SMOOTH); + gSPTexture(gMasterGfxPos++, -1, -1, 0, G_TX_RENDERTILE, G_ON); + gDPSetTextureLOD(gMasterGfxPos++, G_TL_TILE); + gDPSetTexturePersp(gMasterGfxPos++, G_TP_PERSP); + gDPSetTextureFilter(gMasterGfxPos++, G_TF_BILERP); + gDPSetColorDither(gMasterGfxPos++, G_CD_DISABLE); + gDPSetTextureDetail(gMasterGfxPos++, G_TD_CLAMP); + gDPSetTextureConvert(gMasterGfxPos++, G_TC_FILT); + gDPSetCombineKey(gMasterGfxPos++, G_CK_NONE); + gDPSetAlphaCompare(gMasterGfxPos++, G_AC_NONE); -INCLUDE_ASM(s32, "world/area_trd/trd_05/9AE700", func_802404D0_9AEBD0); + guTranslateF(sp40, unkTrd->pos.x, unkTrd->pos.y, unkTrd->pos.z); + guRotateF(sp80, unkTrd->rot.x, 1.0f, 0.0f, 0.0f); + guMtxCatF(sp80, sp40, sp40); + guRotateF(sp80, unkTrd->rot.y, 0.0f, 1.0f, 0.0f); + guMtxCatF(sp80, sp40, sp40); + guRotateF(sp80, unkTrd->rot.z, 0.0f, 0.0f, 1.0f); + guMtxCatF(sp80, sp40, sp40); + guScaleF(sp80, unkTrd->scale.x, unkTrd->scale.y, unkTrd->scale.z); + guMtxCatF(sp80, sp40, sp40); + guMtxF2L(sp40, &gDisplayContext->matrixStack[gMatrixListPos]); -INCLUDE_ASM(s32, "world/area_trd/trd_05/9AE700", func_80240508_9AEC08); + gSPMatrix(gMasterGfxPos++, VIRTUAL_TO_PHYSICAL(&gDisplayContext->matrixStack[gMatrixListPos++]), + G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + unkTrd->playerSpriteID = 8; -INCLUDE_ASM(s32, "world/area_trd/trd_05/9AE700", func_802405FC_9AECFC); + frameMod4 = gGameStatusPtr->frameCounter % 4; + if (frameMod4 == 0) { + unkTrd->rasterID = 0x25; + } else if (frameMod4 >= 2U) { + if (frameMod4 >= 3U) { + unkTrd->rasterID = 0x24; + } else { + unkTrd->rasterID = 0x27; + } + } else { + unkTrd->rasterID = 0x26; + } + + spr_get_player_raster_info(&sp30, unkTrd->playerSpriteID, unkTrd->rasterID); + recPart.raster = sp30.raster; + recPart.palette = sp30.defaultPal; + recPart.width = sp30.width; + recPart.height = sp30.height; + recPart.xOffset = -(sp30.width / 2); + recPart.yOffset = (sp30.height / 2); + recPart.unk_10 = 255; + fold_appendGfx_component(unkTrd->foldStateID, &recPart, 0, sp40); + + gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); +} + +ApiStatus func_80240404_9AEB04(Evt* script, s32 isInitialCall) { + N(D_80243090).pos.x = gPlayerStatus.position.x; + N(D_80243090).pos.y = gPlayerStatus.position.y + (gPlayerStatus.colliderHeight * SPRITE_PIXEL_SCALE * 0.5); + N(D_80243090).pos.z = gPlayerStatus.position.z; + N(D_80243090).rot.x = 0.0f; + N(D_80243090).rot.y = 0.0f; + N(D_80243090).rot.z = 0.0f; + N(D_80243090).scale.x = SPRITE_WORLD_SCALE; + N(D_80243090).scale.y = SPRITE_WORLD_SCALE; + N(D_80243090).scale.z = SPRITE_WORLD_SCALE; + N(D_80243090).foldStateID = func_8013A704(1); + N(D_80243090).entityID = create_generic_entity_world(0, func_80240020_9AE720); + return ApiStatus_DONE2; +} + +ApiStatus func_802404D0_9AEBD0(Evt* script, s32 isInitialCall) { + func_8013A854(N(D_80243090).foldStateID); + free_generic_entity(N(D_80243090).entityID); + return ApiStatus_DONE2; +} + +ApiStatus func_80240508_9AEC08(Evt* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + s32 x = evt_get_float_variable(script, *args++); + s32 y = evt_get_float_variable(script, *args++); + s32 z = evt_get_float_variable(script, *args++); + + N(D_80243090).pos.x = x; + N(D_80243090).pos.y = y + (gPlayerStatus.colliderHeight * SPRITE_PIXEL_SCALE * 0.5); + N(D_80243090).pos.z = z; + return ApiStatus_DONE2; +} + +static const char* N(exit_str_2) = "trd_06"; + +ApiStatus func_802405FC_9AECFC(Evt* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + s32 add = evt_get_variable(script, *args++); + s32 x = evt_get_float_variable(script, *args++); + s32 y = evt_get_float_variable(script, *args++); + s32 z = evt_get_float_variable(script, *args++); + UnkTrdStruct* unkTrd = &N(D_80243090); + + if (!add) { + unkTrd->rot.x = x; + unkTrd->rot.y = y; + unkTrd->rot.z = z; + } else { + unkTrd->rot.x += x; + unkTrd->rot.y += y; + unkTrd->rot.z += z; + } + return ApiStatus_DONE2; +} diff --git a/src/world/area_trd/trd_09/9BD660.c b/src/world/area_trd/trd_09/9BD660.c index c6e5114392..7610f6f4b6 100644 --- a/src/world/area_trd/trd_09/9BD660.c +++ b/src/world/area_trd/trd_09/9BD660.c @@ -5,4 +5,23 @@ static char* N(exit_str_1) = "trd_10"; static char* N(exit_str_2) = "trd_09"; static char* N(exit_str_3) = ""; -INCLUDE_ASM(s32, "world/area_trd/trd_09/9BD660", func_80240000_9BD660); +ApiStatus func_80240000_9BD660(Evt* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + Enemy* npc = script->owner1.enemy; + s32 npcID = evt_get_variable(script, *args++); + s32 varIdx = evt_get_variable(script, *args++); + s32 var3 = *args++; + + if (npcID == NPC_SELF) { + npcID = npc->npcID; + } + + npc = get_enemy(npcID); + if (npc != NULL) { + evt_set_variable(script, var3, npc->varTable[varIdx]); + } else { + evt_set_variable(script, var3, -1); + } + + return ApiStatus_DONE2; +} diff --git a/src/world/area_trd/trd_09/9BD720.c b/src/world/area_trd/trd_09/9BD720.c index bb26c20a8d..db5284a3f3 100644 --- a/src/world/area_trd/trd_09/9BD720.c +++ b/src/world/area_trd/trd_09/9BD720.c @@ -1,3 +1,31 @@ #include "trd_09.h" -INCLUDE_ASM(s32, "world/area_trd/trd_09/9BD720", func_802400C0_9BD720); +#include "world/partners.h" +extern s32 D_80245234_9C2894; + +// duplicate of func_8024095C_97BF8C +ApiStatus func_802400C0_9BD720(Evt* script, s32 isInitialCall) { + PlayerStatus* playerStatus = &gPlayerStatus; + + switch (D_80245234_9C2894) { + case 0: + D_80245234_9C2894 = 1; + return ApiStatus_BLOCK; + case 1: + case 2: + D_80245234_9C2894++; + return ApiStatus_BLOCK; + case 3: + wPartnerNpc->pos.x = playerStatus->position.x - 30.0f; + wPartnerNpc->pos.z = playerStatus->position.z + 30.0f; + partner_clear_player_tracking(wPartnerNpc); + partner_set_goal_pos(playerStatus->position.x, playerStatus->position.z); + func_800EF3D4(0); + set_npc_yaw(wPartnerNpc, 90.0f); + playerStatus->targetYaw = 90.0f; + playerStatus->currentYaw = 90.0f; + playerStatus->spriteFacingAngle = 0.0f; + return ApiStatus_DONE2; + } + return ApiStatus_BLOCK; +} diff --git a/src/world/area_trd/trd_10/9C2910.c b/src/world/area_trd/trd_10/9C2910.c index 7635ffc42b..964b480299 100644 --- a/src/world/area_trd/trd_10/9C2910.c +++ b/src/world/area_trd/trd_10/9C2910.c @@ -6,4 +6,7 @@ static char* N(exit_str_0) = "kmr_23"; static char* N(exit_str_1) = "trd_06"; static char* N(exit_str_2) = "trd_09"; -INCLUDE_ASM(s32, "world/area_trd/trd_10/9C2910", func_802407F4_9C3104); +ApiStatus func_802407F4_9C3104(Evt* script, s32 isInitialCall) { + func_80035DF0(10); + return ApiStatus_DONE2; +} diff --git a/src/world/area_trd/trd_10/9C3130.c b/src/world/area_trd/trd_10/9C3130.c index dc186718af..caaa2e1cd4 100644 --- a/src/world/area_trd/trd_10/9C3130.c +++ b/src/world/area_trd/trd_10/9C3130.c @@ -1,3 +1,10 @@ #include "trd_10.h" -INCLUDE_ASM(s32, "world/area_trd/trd_10/9C3130", func_80240820_9C3130); +ApiStatus N(IsPartnerBombette)(Evt* script, s32 isInitialCall) { + if (gPlayerData.currentPartner == PARTNER_BOMBETTE) { + script->varTable[0] = TRUE; + } else { + script->varTable[0] = FALSE; + } + return ApiStatus_DONE2; +} diff --git a/src/world/common/UnkTrigFunc001.inc.c b/src/world/common/UnkTrigFunc001.inc.c new file mode 100644 index 0000000000..85d12ae2ba --- /dev/null +++ b/src/world/common/UnkTrigFunc001.inc.c @@ -0,0 +1,15 @@ +#include "common.h" +#include "npc.h" + +ApiStatus N(UnkTrigFunc001)(Evt* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + s32 temp_s2 = evt_get_variable(script, *args++); + s32 temp_s3 = evt_get_variable(script, *args++); + f32 temp_f24 = evt_get_variable(script, *args++); + + script->varTable[0] = temp_s2 + (sin_deg(gCameras[CAM_DEFAULT].currentYaw + 270.0f + temp_f24) * 100.0f); + script->varTable[1] = temp_s3 - (cos_deg(gCameras[CAM_DEFAULT].currentYaw + 270.0f + temp_f24) * 100.0f); + script->varTable[2] = temp_s2 + (sin_deg(gCameras[CAM_DEFAULT].currentYaw + 90.0f + temp_f24) * 100.0f); + script->varTable[3] = temp_s3 - (cos_deg(gCameras[CAM_DEFAULT].currentYaw + 90.0f + temp_f24) * 100.0f); + return ApiStatus_DONE2; +} diff --git a/src/world/partners.c b/src/world/partners.c index 822c27fd49..e3a8f1cfc3 100644 --- a/src/world/partners.c +++ b/src/world/partners.c @@ -2,6 +2,8 @@ #include "partners.h" #include "macros.h" +extern s32 D_8010CD20; + // BSS BSS s32 D_8010CD34; BSS PlayerPathElement gPlayerMoveHistory[40]; diff --git a/ver/us/asm/data/EA3A80.data.s b/ver/us/asm/data/EA3A80.data.s index c941d666df..d5e18d2123 100644 --- a/ver/us/asm/data/EA3A80.data.s +++ b/ver/us/asm/data/EA3A80.data.s @@ -24,7 +24,7 @@ dlabel D_8024356C_EA3E6C .word 0x00000047, 0x00000005, D_802434B4_EA3DB4, 0x00080000, 0x00000000, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80243510_EA3E10, 0x00080000, 0x00000002, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802435B4_EA3EB4 -.word 0x00000024, 0x00000002, 0xF5DE0329, 0x00000012, 0x00000043, 0x00000002, 0x802E6F50, 0x000A000B, 0x00000043, 0x00000006, 0x802D7CD8, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetSleepBubbleUnk1C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802D7B70, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x80048338, 0x00000001, D_802458F0_EA61F0, 0x00000046, 0x00000001, D_8024380C_EA410C, 0x00000024, 0x00000002, 0xFE363C80, D_8024356C_EA3E6C, 0x00000044, 0x00000001, 0x80285C70, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, 0x802E339C, 0x00000000, 0x00000029, 0x00000000, 0x00000008, 0x00000043, 0x00000002, 0x802E376C, 0x00000004, 0x00000044, 0x00000001, D_80245DC8_EA66C8, 0x00000024, 0x00000002, 0xFE363C80, 0x0000002A, 0x00000044, 0x00000001, D_8024327C_EA3B7C, 0x00000024, 0x00000002, 0xFE363C80, 0x0000002B, 0x00000044, 0x00000001, D_80243398_EA3C98, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x01010101, 0x01010101, 0x01010101, 0x01010101, 0x01010101, 0x01010101, 0x01010101, 0x01010101, 0x01010101, 0x01010101, 0x01010101, 0x01010101, 0x01010101, 0x01010101, 0x01010000 +.word 0x00000024, 0x00000002, 0xF5DE0329, 0x00000012, 0x00000043, 0x00000002, 0x802E6F50, 0x000A000B, 0x00000043, 0x00000006, 0x802D7CD8, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetSleepBubbleTimeLeft, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802D7B70, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x80048338, 0x00000001, D_802458F0_EA61F0, 0x00000046, 0x00000001, D_8024380C_EA410C, 0x00000024, 0x00000002, 0xFE363C80, D_8024356C_EA3E6C, 0x00000044, 0x00000001, 0x80285C70, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, 0x802E339C, 0x00000000, 0x00000029, 0x00000000, 0x00000008, 0x00000043, 0x00000002, 0x802E376C, 0x00000004, 0x00000044, 0x00000001, D_80245DC8_EA66C8, 0x00000024, 0x00000002, 0xFE363C80, 0x0000002A, 0x00000044, 0x00000001, D_8024327C_EA3B7C, 0x00000024, 0x00000002, 0xFE363C80, 0x0000002B, 0x00000044, 0x00000001, D_80243398_EA3C98, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x01010101, 0x01010101, 0x01010101, 0x01010101, 0x01010101, 0x01010101, 0x01010101, 0x01010101, 0x01010101, 0x01010101, 0x01010101, 0x01010101, 0x01010101, 0x01010101, 0x01010000 dlabel D_8024372C_EA402C .word 0x00000024, 0x00000002, 0xF84060A4, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/EA7390.data.s b/ver/us/asm/data/EA7390.data.s index 4ebe324566..9af69a55d1 100644 --- a/ver/us/asm/data/EA7390.data.s +++ b/ver/us/asm/data/EA7390.data.s @@ -36,7 +36,7 @@ dlabel D_80240B4C_EA7B1C .word 0x00000043, 0x00000002, 0x802D796C, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000044, 0x00000001, 0x80285FC0, 0x00000044, 0x00000001, D_80240818_EA77E8, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80240818_EA77E8, 0x00000044, 0x00000001, 0x80285C70, 0x00000008, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80240BCC_EA7B9C -.word 0x00000024, 0x00000002, 0xF5DE0329, 0x00000012, 0x00000043, 0x00000002, 0x802E6F50, 0x000A000C, 0x00000043, 0x00000006, 0x802D7CD8, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetSleepBubbleUnk1C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802D7B70, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x80048338, 0x00000001, D_80241A4C_EA8A1C, 0x00000046, 0x00000001, D_80241A70_EA8A40, 0x00000044, 0x00000001, D_80240B4C_EA7B1C, 0x00000043, 0x00000005, 0x802E339C, 0x00000000, 0x00000029, 0x00000000, 0x00000008, 0x00000043, 0x00000002, 0x802E376C, 0x00000004, 0x0000000C, 0x00000002, 0xF5DE0180, 0x00000025, 0x00000043, 0x00000003, 0x802D6708, 0x00000021, 0x00000000, 0x00000043, 0x00000003, 0x802D6708, 0x00000022, 0x00000000, 0x00000043, 0x00000003, 0x802D6708, 0x00000023, 0x00000000, 0x00000043, 0x00000003, 0x802D6708, 0x00000024, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000000, 0x7FFFFE00, 0x00000012, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000001, 0x7FFFFE00, 0x00000013, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x00000000, 0x00000003, 0x00000056, 0x00000000, 0x00000043, 0x00000002, 0x802D7384, D_80240B2C_EA7AFC, 0x00000057, 0x00000000, 0x00000044, 0x00000001, D_8024087C_EA784C, 0x00000024, 0x00000002, 0xFE363C80, 0x00000026, 0x00000044, 0x00000001, D_802404CC_EA749C, 0x00000024, 0x00000002, 0xFE363C80, 0x00000027, 0x00000044, 0x00000001, D_802405E8_EA75B8, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000024, 0x00000002, 0xF5DE0329, 0x00000012, 0x00000043, 0x00000002, 0x802E6F50, 0x000A000C, 0x00000043, 0x00000006, 0x802D7CD8, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetSleepBubbleTimeLeft, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802D7B70, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x80048338, 0x00000001, D_80241A4C_EA8A1C, 0x00000046, 0x00000001, D_80241A70_EA8A40, 0x00000044, 0x00000001, D_80240B4C_EA7B1C, 0x00000043, 0x00000005, 0x802E339C, 0x00000000, 0x00000029, 0x00000000, 0x00000008, 0x00000043, 0x00000002, 0x802E376C, 0x00000004, 0x0000000C, 0x00000002, 0xF5DE0180, 0x00000025, 0x00000043, 0x00000003, 0x802D6708, 0x00000021, 0x00000000, 0x00000043, 0x00000003, 0x802D6708, 0x00000022, 0x00000000, 0x00000043, 0x00000003, 0x802D6708, 0x00000023, 0x00000000, 0x00000043, 0x00000003, 0x802D6708, 0x00000024, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000000, 0x7FFFFE00, 0x00000012, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000001, 0x7FFFFE00, 0x00000013, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x00000000, 0x00000003, 0x00000056, 0x00000000, 0x00000043, 0x00000002, 0x802D7384, D_80240B2C_EA7AFC, 0x00000057, 0x00000000, 0x00000044, 0x00000001, D_8024087C_EA784C, 0x00000024, 0x00000002, 0xFE363C80, 0x00000026, 0x00000044, 0x00000001, D_802404CC_EA749C, 0x00000024, 0x00000002, 0xFE363C80, 0x00000027, 0x00000044, 0x00000001, D_802405E8_EA75B8, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80240DC0_EA7D90 .word 0x00000000, 0x00280018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 diff --git a/ver/us/asm/data/EAA810.data.s b/ver/us/asm/data/EAA810.data.s index 35bc61f70a..b045f44cbf 100644 --- a/ver/us/asm/data/EAA810.data.s +++ b/ver/us/asm/data/EAA810.data.s @@ -39,7 +39,7 @@ dlabel D_80242AD0_EAB5B0 .word 0x0000004D, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, 0x802E1C00, 0x00000000, 0x000000B4, 0x00000028, 0x0000000C, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, 0x802E1C7C, 0x0000002F, 0x00000002, 0xFE363C80, 0xF24C0A80, 0x0000002D, 0x00000002, 0xFE363C80, 0xF24A7E1A, 0x00000043, 0x00000005, 0x802D6208, 0x00000032, 0x00000001, 0xFE363C80, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000005, 0x802E1C00, 0x000000B4, 0x00000000, 0x00000028, 0x0000000B, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, 0x802E1C7C, 0x0000002F, 0x00000002, 0xFE363C80, 0xF24C0A80, 0x0000002D, 0x00000002, 0xFE363C80, 0xF24A7E1A, 0x00000043, 0x00000005, 0x802D6208, 0x00000032, 0x00000001, 0xFE363C80, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242C48_EAB728 -.word 0x00000024, 0x00000002, 0xF5DE0329, 0x00000012, 0x00000043, 0x00000002, 0x802E6F50, 0x000A000D, 0x00000043, 0x00000006, 0x802D7CD8, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetSleepBubbleUnk1C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802D7B70, 0x00000000, 0x00000001, 0x00000043, 0x00000002, 0x802D790C, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000003, 0x00000043, 0x00000003, 0x80048338, 0x00000001, D_80247DDC_EB08BC, 0x00000012, 0x00000000, 0x00000043, 0x00000003, 0x80048338, 0x00000001, D_80247DB8_EB0898, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_802482C0_EB0DA0, 0x00000043, 0x00000002, 0x802D790C, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000003, 0x00000056, 0x00000000, 0x00000046, 0x00000001, D_80244C78_EAD758, 0x00000044, 0x00000001, D_80242750_EAB230, 0x00000057, 0x00000000, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80242750_EAB230, 0x00000044, 0x00000001, 0x80285C70, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0x00000023, 0x00000043, 0x00000003, 0x802D7044, 0x0000002E, 0x00000000, 0x00000043, 0x00000003, 0x802D7044, 0x00000030, 0x00000000, 0x00000043, 0x00000003, 0x802D7044, 0x00000040, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x0000002C, 0x7FFFFE00, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x0000002E, 0x7FFFFE00, 0x00000016, 0x00000001, 0x00000023, 0x00000043, 0x00000003, 0x802D7044, 0x0000002B, 0x00000000, 0x00000043, 0x00000003, 0x802D7044, 0x00000040, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000029, 0x7FFFFE00, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x0000002E, 0x7FFFFE00, 0x00000019, 0x00000001, 0x00000023, 0x00000043, 0x00000003, 0x802D7044, 0x0000002B, 0x00000000, 0x00000043, 0x00000003, 0x802D7044, 0x00000030, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000029, 0x7FFFFE00, 0x00000023, 0x00000000, 0x00000044, 0x00000001, D_802427B4_EAB294, 0x00000024, 0x00000002, 0xFE363C80, 0x00000022, 0x00000044, 0x00000001, D_80241F2C_EAAA0C, 0x00000024, 0x00000002, 0xFE363C80, 0x00000023, 0x00000044, 0x00000001, D_80242048_EAAB28, 0x00000044, 0x00000001, D_80241DB0_EAA890, 0x00000044, 0x00000001, D_80242AD0_EAB5B0, 0x00000044, 0x00000001, D_80248068_EB0B48, 0x00000044, 0x00000001, D_80242164_EAAC44, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 +.word 0x00000024, 0x00000002, 0xF5DE0329, 0x00000012, 0x00000043, 0x00000002, 0x802E6F50, 0x000A000D, 0x00000043, 0x00000006, 0x802D7CD8, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetSleepBubbleTimeLeft, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802D7B70, 0x00000000, 0x00000001, 0x00000043, 0x00000002, 0x802D790C, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000003, 0x00000043, 0x00000003, 0x80048338, 0x00000001, D_80247DDC_EB08BC, 0x00000012, 0x00000000, 0x00000043, 0x00000003, 0x80048338, 0x00000001, D_80247DB8_EB0898, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_802482C0_EB0DA0, 0x00000043, 0x00000002, 0x802D790C, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000003, 0x00000056, 0x00000000, 0x00000046, 0x00000001, D_80244C78_EAD758, 0x00000044, 0x00000001, D_80242750_EAB230, 0x00000057, 0x00000000, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80242750_EAB230, 0x00000044, 0x00000001, 0x80285C70, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0x00000023, 0x00000043, 0x00000003, 0x802D7044, 0x0000002E, 0x00000000, 0x00000043, 0x00000003, 0x802D7044, 0x00000030, 0x00000000, 0x00000043, 0x00000003, 0x802D7044, 0x00000040, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x0000002C, 0x7FFFFE00, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x0000002E, 0x7FFFFE00, 0x00000016, 0x00000001, 0x00000023, 0x00000043, 0x00000003, 0x802D7044, 0x0000002B, 0x00000000, 0x00000043, 0x00000003, 0x802D7044, 0x00000040, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000029, 0x7FFFFE00, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x0000002E, 0x7FFFFE00, 0x00000019, 0x00000001, 0x00000023, 0x00000043, 0x00000003, 0x802D7044, 0x0000002B, 0x00000000, 0x00000043, 0x00000003, 0x802D7044, 0x00000030, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000029, 0x7FFFFE00, 0x00000023, 0x00000000, 0x00000044, 0x00000001, D_802427B4_EAB294, 0x00000024, 0x00000002, 0xFE363C80, 0x00000022, 0x00000044, 0x00000001, D_80241F2C_EAAA0C, 0x00000024, 0x00000002, 0xFE363C80, 0x00000023, 0x00000044, 0x00000001, D_80242048_EAAB28, 0x00000044, 0x00000001, D_80241DB0_EAA890, 0x00000044, 0x00000001, D_80242AD0_EAB5B0, 0x00000044, 0x00000001, D_80248068_EB0B48, 0x00000044, 0x00000001, D_80242164_EAAC44, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 dlabel D_80242F60_EABA40 .word 0x00000000, 0x00280018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 diff --git a/ver/us/asm/data/EB1920.data.s b/ver/us/asm/data/EB1920.data.s index 5db7ecd161..8f85fae1f2 100644 --- a/ver/us/asm/data/EB1920.data.s +++ b/ver/us/asm/data/EB1920.data.s @@ -42,7 +42,7 @@ dlabel D_8024149C_EB22FC .word 0x00000043, 0x0000000F, 0x802E58EC, 0x00000042, 0x00000000, 0x00000002, 0x00000002, 0x00000001, 0x0000000A, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802D7044, 0x00000013, 0x00000000, 0x00000043, 0x00000003, 0x802D7044, 0x00000016, 0x00000001, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x0000001A, 0x7FFFFE00, 0x00000024, 0x00000002, 0xF5DE0180, 0x00000025, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241548_EB23A8 -.word 0x00000024, 0x00000002, 0xF5DE0329, 0x00000012, 0x00000043, 0x00000002, 0x802E6F50, 0x000A000E, 0x00000043, 0x00000006, 0x802D7CD8, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetSleepBubbleUnk1C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802D7B70, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x802D8B60, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x80048338, 0x00000001, D_80244294_EB50F4, 0x00000024, 0x00000002, 0xFE363C80, D_80240D24_EB1B84, 0x00000044, 0x00000001, 0x80285C70, 0x00000008, 0x00000001, 0x00000001, 0x00000044, 0x00000001, D_80242250_EB30B0, 0x0000000C, 0x00000002, 0xF5DE0180, 0x00000025, 0x00000043, 0x00000003, 0x802D7044, 0x00000016, 0x00000000, 0x00000047, 0x00000005, D_8024149C_EB22FC, 0x00100000, D_8024148C_EB22EC, 0x00000001, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000003, 0x802D7044, 0x00000013, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x0000001A, 0x7FFFFE00, 0x00000013, 0x00000000, 0x00000044, 0x00000001, D_80240B20_EB1980, 0x00000044, 0x00000001, D_8024106C_EB1ECC, 0x00000044, 0x00000001, D_80240D6C_EB1BCC, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000024, 0x00000002, 0xF5DE0329, 0x00000012, 0x00000043, 0x00000002, 0x802E6F50, 0x000A000E, 0x00000043, 0x00000006, 0x802D7CD8, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetSleepBubbleTimeLeft, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802D7B70, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x802D8B60, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x80048338, 0x00000001, D_80244294_EB50F4, 0x00000024, 0x00000002, 0xFE363C80, D_80240D24_EB1B84, 0x00000044, 0x00000001, 0x80285C70, 0x00000008, 0x00000001, 0x00000001, 0x00000044, 0x00000001, D_80242250_EB30B0, 0x0000000C, 0x00000002, 0xF5DE0180, 0x00000025, 0x00000043, 0x00000003, 0x802D7044, 0x00000016, 0x00000000, 0x00000047, 0x00000005, D_8024149C_EB22FC, 0x00100000, D_8024148C_EB22EC, 0x00000001, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000003, 0x802D7044, 0x00000013, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x0000001A, 0x7FFFFE00, 0x00000013, 0x00000000, 0x00000044, 0x00000001, D_80240B20_EB1980, 0x00000044, 0x00000001, D_8024106C_EB1ECC, 0x00000044, 0x00000001, D_80240D6C_EB1BCC, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 dlabel D_802416D0_EB2530 .word 0x00000000, 0x00280018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 diff --git a/ver/us/asm/data/EB54C0.data.s b/ver/us/asm/data/EB54C0.data.s index 0716c1b498..fc55c40fdc 100644 --- a/ver/us/asm/data/EB54C0.data.s +++ b/ver/us/asm/data/EB54C0.data.s @@ -39,7 +39,7 @@ dlabel D_80240D30_EB5E60 .word 0x00000007, 0x43480000, 0x43160000, 0x43340000, 0x00000009, 0x43480000, 0x43160000, 0x43340000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000 dlabel D_80240D60_EB5E90 -.word 0x00000024, 0x00000002, 0xF5DE0329, 0x00000012, 0x00000043, 0x00000002, 0x802E6F50, 0x000A000F, 0x00000043, 0x00000006, 0x802D7CD8, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetSleepBubbleUnk1C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802D7B70, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x80048338, 0x00000001, D_802420C0_EB71F0, 0x00000046, 0x00000001, D_80240EE0_EB6010, 0x00000024, 0x00000002, 0xFE363C80, D_80240790_EB58C0, 0x00000044, 0x00000001, 0x80285C70, 0x00000008, 0x00000001, 0x00000001, 0x00000044, 0x00000001, D_802403E0_EB5510, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x00000013, 0x00000003, 0x00000056, 0x00000000, 0x00000043, 0x00000002, 0x802D7384, D_80240D30_EB5E60, 0x00000057, 0x00000000, 0x00000044, 0x00000001, D_802407BC_EB58EC, 0x00000044, 0x00000001, D_802408A8_EB59D8, 0x00000044, 0x00000001, D_80240A34_EB5B64, 0x00000024, 0x00000002, 0xFE363C80, 0x0000002E, 0x00000044, 0x00000001, D_802404EC_EB561C, 0x00000024, 0x00000002, 0xFE363C80, 0x0000002F, 0x00000044, 0x00000001, D_80240608_EB5738, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000024, 0x00000002, 0xF5DE0329, 0x00000012, 0x00000043, 0x00000002, 0x802E6F50, 0x000A000F, 0x00000043, 0x00000006, 0x802D7CD8, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetSleepBubbleTimeLeft, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802D7B70, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x80048338, 0x00000001, D_802420C0_EB71F0, 0x00000046, 0x00000001, D_80240EE0_EB6010, 0x00000024, 0x00000002, 0xFE363C80, D_80240790_EB58C0, 0x00000044, 0x00000001, 0x80285C70, 0x00000008, 0x00000001, 0x00000001, 0x00000044, 0x00000001, D_802403E0_EB5510, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x00000013, 0x00000003, 0x00000056, 0x00000000, 0x00000043, 0x00000002, 0x802D7384, D_80240D30_EB5E60, 0x00000057, 0x00000000, 0x00000044, 0x00000001, D_802407BC_EB58EC, 0x00000044, 0x00000001, D_802408A8_EB59D8, 0x00000044, 0x00000001, D_80240A34_EB5B64, 0x00000024, 0x00000002, 0xFE363C80, 0x0000002E, 0x00000044, 0x00000001, D_802404EC_EB561C, 0x00000024, 0x00000002, 0xFE363C80, 0x0000002F, 0x00000044, 0x00000001, D_80240608_EB5738, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80240EE0_EB6010 .word 0x00000043, 0x00000008, 0x8011A58C, 0x802F92E0, 0x000001E0, 0x000000EB, 0x000000AF, 0x00000000, 0x00000000, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/EB7850.data.s b/ver/us/asm/data/EB7850.data.s index 1ac2578e4a..9335c66d70 100644 --- a/ver/us/asm/data/EB7850.data.s +++ b/ver/us/asm/data/EB7850.data.s @@ -27,7 +27,7 @@ dlabel D_80240A20_EB7C50 .word 0x00000044, 0x00000001, D_802409B4_EB7BE4, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000003, 0x802D6480, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8A, 0xFFFFFF97, 0x00000024, 0x00000002, 0xFE363C85, 0x00000028, 0x00000043, 0x00000005, 0x802D5FE0, 0x00000013, 0x00000000, 0xFD050F8A, 0x00000000, 0x00000008, 0x00000001, 0x00000006, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, 0x802D67E4, 0x00000000, 0x00000000, 0xFE363C80, 0xFE363C81, 0x00000043, 0x00000005, 0x802D67E4, 0x00000000, 0x00000001, 0xFE363C82, 0xFE363C83, 0x00000028, 0x00000002, 0xFE363C80, 0x000002BC, 0x00000027, 0x00000002, 0xFE363C81, 0x000002BC, 0x00000027, 0x00000002, 0xFE363C82, 0x000000C8, 0x00000028, 0x00000002, 0xFE363C83, 0x0000012C, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000028, 0x0000000C, 0x00000002, 0xFD050F8A, 0x00000A8C, 0x00000027, 0x00000002, 0xFD050F8A, 0x00000014, 0x00000012, 0x00000000, 0x00000028, 0x00000002, 0xFE363C85, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C85, 0x00000000, 0x00000028, 0x00000002, 0xFE363C85, 0x00000001, 0x00000028, 0x00000002, 0xFD050F8A, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, 0x802D5FE0, 0x00000013, 0x00000000, 0xFD050F8A, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80240C34_EB7E64 -.word 0x00000024, 0x00000002, 0xF5DE0329, 0x00000012, 0x00000043, 0x00000002, 0x802E6F50, 0x000A0010, 0x00000043, 0x00000006, 0x802D7CD8, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetSleepBubbleUnk1C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802D7B70, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x80048338, 0x00000001, D_80241BE0_EB8E10, 0x00000044, 0x00000001, D_80240670_EB78A0, 0x00000044, 0x00000001, D_80240A20_EB7C50, 0x00000024, 0x00000002, 0xFE363C80, 0x00000010, 0x00000044, 0x00000001, D_8024074C_EB797C, 0x00000024, 0x00000002, 0xFE363C80, 0x00000011, 0x00000044, 0x00000001, D_80240868_EB7A98, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000024, 0x00000002, 0xF5DE0329, 0x00000012, 0x00000043, 0x00000002, 0x802E6F50, 0x000A0010, 0x00000043, 0x00000006, 0x802D7CD8, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetSleepBubbleTimeLeft, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802D7B70, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x80048338, 0x00000001, D_80241BE0_EB8E10, 0x00000044, 0x00000001, D_80240670_EB78A0, 0x00000044, 0x00000001, D_80240A20_EB7C50, 0x00000024, 0x00000002, 0xFE363C80, 0x00000010, 0x00000044, 0x00000001, D_8024074C_EB797C, 0x00000024, 0x00000002, 0xFE363C80, 0x00000011, 0x00000044, 0x00000001, D_80240868_EB7A98, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 dlabel D_80240D20_EB7F50 .word 0x00000000, 0x00280018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 diff --git a/ver/us/asm/data/EBA260.data.s b/ver/us/asm/data/EBA260.data.s index a8db02c804..cf229aff6c 100644 --- a/ver/us/asm/data/EBA260.data.s +++ b/ver/us/asm/data/EBA260.data.s @@ -42,7 +42,7 @@ dlabel D_8024208C_EBAEDC .word 0x00000043, 0x00000002, 0x802D796C, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000044, 0x00000001, 0x80285FC0, 0x00000044, 0x00000001, D_80241FD4_EBAE24, 0x00000012, 0x00000000, 0x00000043, 0x00000002, 0x802D790C, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000008, 0x00000024, 0x00000002, 0xF97188AC, 0x00000000, 0x00000013, 0x00000000, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000046, 0x00000001, D_80241BC0_EBAA10, 0x00000044, 0x00000001, D_80241FD4_EBAE24, 0x00000057, 0x00000000, 0x00000021, 0x00000002, 0x00000001, 0x00000006, 0x00000024, 0x00000002, 0xFE363C80, D_80241FD4_EBAE24, 0x00000044, 0x00000001, 0x80285C70, 0x00000016, 0x00000001, 0x00000007, 0x00000056, 0x00000000, 0x00000046, 0x00000001, D_8024837C_EC11CC, 0x00000044, 0x00000001, D_80241FD4_EBAE24, 0x00000057, 0x00000000, 0x00000016, 0x00000001, 0x00000008, 0x00000056, 0x00000000, 0x00000046, 0x00000001, D_80247BFC_EC0A4C, 0x00000044, 0x00000001, D_80241FD4_EBAE24, 0x00000057, 0x00000000, 0x00000016, 0x00000001, 0x00000009, 0x00000044, 0x00000001, D_802429C8_EBB818, 0x00000024, 0x00000002, 0xFE363C80, D_80241FD4_EBAE24, 0x00000044, 0x00000001, 0x80285C70, 0x00000016, 0x00000001, 0x0000000A, 0x00000044, 0x00000001, D_80241FD4_EBAE24, 0x00000016, 0x00000001, 0x0000000B, 0x00000044, 0x00000001, D_80245EE8_EBED38, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000047, 0x00000005, D_80242FFC_EBBE4C, 0x00000100, 0x00000002, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242278_EBB0C8 -.word 0x00000024, 0x00000002, 0xF5DE0329, 0x00000026, 0x00000043, 0x00000002, 0x802E6F50, 0xFFFFFFFF, 0x00000043, 0x00000003, 0x802D8B60, 0x00000000, 0x00000000, 0x00000043, 0x00000006, 0x802D7CD8, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetSleepBubbleUnk1C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802D7B70, 0x00000000, 0x00000001, 0x00000024, 0x00000002, 0xF8406340, 0x00000001, 0x0000000C, 0x00000002, 0xF5DE0180, 0x00000037, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000030, 0x7FFFFE00, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF8405C87, 0x00000000, 0x00000043, 0x00000002, 0x802D790C, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x0000000B, 0x00000043, 0x00000003, 0x80048338, 0x00000000, D_80246864_EBF6B4, 0x00000012, 0x00000000, 0x00000043, 0x00000003, 0x80048338, 0x00000000, D_80245E14_EBEC64, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80249160_EC1FB0, 0x00000043, 0x00000003, 0x802D75C0, 0x0000002E, 0x00000051, 0x00000044, 0x00000001, D_80248F78_EC1DC8, 0x00000044, 0x00000001, D_80248E60_EC1CB0, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x0000001E, 0x00000006, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x0000001F, 0x00000006, 0x00000024, 0x00000002, 0xFE363C80, 0x00000096, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFEF2, 0x00000024, 0x00000002, 0xFE363C82, 0x0000019A, 0x00000024, 0x00000002, 0xFE363C83, 0x000000AA, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_802416F0_EBA540, 0x00000024, 0x00000002, 0xFE363C80, 0x00000073, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFE3E, 0x00000024, 0x00000002, 0xFE363C82, 0x000000FA, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFEF2, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_802416F0_EBA540, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFEB6, 0x00000024, 0x00000002, 0xFE363C81, 0x000000DC, 0x00000024, 0x00000002, 0xFE363C82, 0x0000002D, 0x00000024, 0x00000002, 0xFE363C83, 0x0000019A, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_802416F0_EBA540, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFE5C, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFEFC, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFF74, 0x00000024, 0x00000002, 0xFE363C83, 0x000000A0, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_802416F0_EBA540, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x0000001A, 0x7FFFFE00, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000012, 0x7FFFFE00, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x0000000E, 0x7FFFFE00, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000006, 0x7FFFFE00, 0x00000044, 0x00000001, D_8024208C_EBAEDC, 0x00000043, 0x00000002, 0x802D796C, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000002, 0x802D790C, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000008, 0x00000001, 0x00000041, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80241500_EBA350, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000035, 0x00000043, 0x00000001, func_80240000_EB8E50, 0x00000013, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, 0x802D6688, 0x00000023, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, 0x802E1D00, 0x0000012C, 0xFE363C81, 0x00000027, 0x00000002, 0xFE363C81, 0x00000064, 0x00000043, 0x00000003, 0x802E1D00, 0x00000001, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C82, 0x00000001, 0x00000008, 0x00000001, 0xFE363C81, 0x00000005, 0x00000001, 0xFE363C82, 0x00000043, 0x00000005, 0x802D67E4, 0x0000000C, 0x00000000, 0xFFFF8000, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000005, 0x802D67E4, 0x0000000C, 0x00000000, 0xFFFF0000, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000005, 0x802D67E4, 0x0000000C, 0x00000000, 0xFFFE8000, 0x00000000, 0x00000043, 0x00000003, 0x802E1D00, 0x00000005, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C83, 0x00000002, 0x00000008, 0x00000001, 0xFE363C83, 0x00000043, 0x00000005, 0x802D67E4, 0x0000000C, 0x00000000, 0xFFFF0000, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000005, 0x802D67E4, 0x0000000C, 0x00000000, 0xFFFF8000, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000005, 0x802D67E4, 0x0000000C, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802E1D00, 0x00000005, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C83, 0x00000002, 0x00000008, 0x00000001, 0xFE363C83, 0x00000006, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000024, 0x00000002, 0xF5DE0329, 0x00000026, 0x00000043, 0x00000002, 0x802E6F50, 0xFFFFFFFF, 0x00000043, 0x00000003, 0x802D8B60, 0x00000000, 0x00000000, 0x00000043, 0x00000006, 0x802D7CD8, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetSleepBubbleTimeLeft, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802D7B70, 0x00000000, 0x00000001, 0x00000024, 0x00000002, 0xF8406340, 0x00000001, 0x0000000C, 0x00000002, 0xF5DE0180, 0x00000037, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000030, 0x7FFFFE00, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF8405C87, 0x00000000, 0x00000043, 0x00000002, 0x802D790C, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x0000000B, 0x00000043, 0x00000003, 0x80048338, 0x00000000, D_80246864_EBF6B4, 0x00000012, 0x00000000, 0x00000043, 0x00000003, 0x80048338, 0x00000000, D_80245E14_EBEC64, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80249160_EC1FB0, 0x00000043, 0x00000003, 0x802D75C0, 0x0000002E, 0x00000051, 0x00000044, 0x00000001, D_80248F78_EC1DC8, 0x00000044, 0x00000001, D_80248E60_EC1CB0, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x0000001E, 0x00000006, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x0000001F, 0x00000006, 0x00000024, 0x00000002, 0xFE363C80, 0x00000096, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFEF2, 0x00000024, 0x00000002, 0xFE363C82, 0x0000019A, 0x00000024, 0x00000002, 0xFE363C83, 0x000000AA, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_802416F0_EBA540, 0x00000024, 0x00000002, 0xFE363C80, 0x00000073, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFE3E, 0x00000024, 0x00000002, 0xFE363C82, 0x000000FA, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFEF2, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_802416F0_EBA540, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFEB6, 0x00000024, 0x00000002, 0xFE363C81, 0x000000DC, 0x00000024, 0x00000002, 0xFE363C82, 0x0000002D, 0x00000024, 0x00000002, 0xFE363C83, 0x0000019A, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_802416F0_EBA540, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFE5C, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFEFC, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFF74, 0x00000024, 0x00000002, 0xFE363C83, 0x000000A0, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_802416F0_EBA540, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x0000001A, 0x7FFFFE00, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000012, 0x7FFFFE00, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x0000000E, 0x7FFFFE00, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000006, 0x7FFFFE00, 0x00000044, 0x00000001, D_8024208C_EBAEDC, 0x00000043, 0x00000002, 0x802D796C, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000002, 0x802D790C, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000008, 0x00000001, 0x00000041, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80241500_EBA350, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000035, 0x00000043, 0x00000001, func_80240000_EB8E50, 0x00000013, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, 0x802D6688, 0x00000023, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, 0x802E1D00, 0x0000012C, 0xFE363C81, 0x00000027, 0x00000002, 0xFE363C81, 0x00000064, 0x00000043, 0x00000003, 0x802E1D00, 0x00000001, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C82, 0x00000001, 0x00000008, 0x00000001, 0xFE363C81, 0x00000005, 0x00000001, 0xFE363C82, 0x00000043, 0x00000005, 0x802D67E4, 0x0000000C, 0x00000000, 0xFFFF8000, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000005, 0x802D67E4, 0x0000000C, 0x00000000, 0xFFFF0000, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000005, 0x802D67E4, 0x0000000C, 0x00000000, 0xFFFE8000, 0x00000000, 0x00000043, 0x00000003, 0x802E1D00, 0x00000005, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C83, 0x00000002, 0x00000008, 0x00000001, 0xFE363C83, 0x00000043, 0x00000005, 0x802D67E4, 0x0000000C, 0x00000000, 0xFFFF0000, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000005, 0x802D67E4, 0x0000000C, 0x00000000, 0xFFFF8000, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000005, 0x802D67E4, 0x0000000C, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802E1D00, 0x00000005, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C83, 0x00000002, 0x00000008, 0x00000001, 0xFE363C83, 0x00000006, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242870_EBB6C0 .word 0x00000000, 0x00180018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 diff --git a/ver/us/asm/data/EC2850.data.s b/ver/us/asm/data/EC2850.data.s index 1e7a8069d4..99273912d4 100644 --- a/ver/us/asm/data/EC2850.data.s +++ b/ver/us/asm/data/EC2850.data.s @@ -27,7 +27,7 @@ dlabel D_80240C04_EC2E04 .word 0x00000047, 0x00000005, D_80240B4C_EC2D4C, 0x00080000, 0x00000000, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240BA8_EC2DA8, 0x00080000, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80240C4C_EC2E4C -.word 0x00000024, 0x00000002, 0xF5DE0329, 0x00000026, 0x00000043, 0x00000002, 0x802E6F50, 0xFFFFFFFF, 0x00000043, 0x00000003, 0x802D8B60, 0x00000000, 0x00000000, 0x00000043, 0x00000006, 0x802D7CD8, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetSleepBubbleUnk1C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802D7B70, 0x00000000, 0x00000001, 0x00000024, 0x00000002, 0xF971889B, 0x00000000, 0x00000024, 0x00000002, 0xF971889C, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E81, 0x00000000, 0x00000043, 0x00000003, 0x80048338, 0x00000000, D_80244464_EC6664, 0x00000046, 0x00000001, D_80244F20_EC7120, 0x00000046, 0x00000001, D_80241F14_EC4114, 0x00000044, 0x00000001, D_80244E94_EC7094, 0x00000044, 0x00000001, D_80244F10_EC7110, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x00000009, 0x00000006, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFF6F, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFEB1, 0x00000024, 0x00000002, 0xFE363C82, 0x000000B6, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFF4C, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_802408A0_EC2AA0, 0x00000024, 0x00000002, 0xFE363C80, 0x000000C8, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF56, 0x00000024, 0x00000002, 0xFE363C82, 0x00000136, 0x00000024, 0x00000002, 0xFE363C83, 0x00000096, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_802408A0_EC2AA0, 0x00000043, 0x00000002, 0x802D790C, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000002, 0x00000044, 0x00000001, D_8024101C_EC321C, 0x00000012, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000001, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, D_80240C04_EC2E04, 0x00000044, 0x00000001, 0x80285C70, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_802406C0_EC28C0, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000035, 0x00000043, 0x00000001, EC2200_DeadUnkFunc1, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000024, 0x00000002, 0xF5DE0329, 0x00000026, 0x00000043, 0x00000002, 0x802E6F50, 0xFFFFFFFF, 0x00000043, 0x00000003, 0x802D8B60, 0x00000000, 0x00000000, 0x00000043, 0x00000006, 0x802D7CD8, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetSleepBubbleTimeLeft, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802D7B70, 0x00000000, 0x00000001, 0x00000024, 0x00000002, 0xF971889B, 0x00000000, 0x00000024, 0x00000002, 0xF971889C, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E81, 0x00000000, 0x00000043, 0x00000003, 0x80048338, 0x00000000, D_80244464_EC6664, 0x00000046, 0x00000001, D_80244F20_EC7120, 0x00000046, 0x00000001, D_80241F14_EC4114, 0x00000044, 0x00000001, D_80244E94_EC7094, 0x00000044, 0x00000001, D_80244F10_EC7110, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x00000009, 0x00000006, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFF6F, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFEB1, 0x00000024, 0x00000002, 0xFE363C82, 0x000000B6, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFF4C, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_802408A0_EC2AA0, 0x00000024, 0x00000002, 0xFE363C80, 0x000000C8, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF56, 0x00000024, 0x00000002, 0xFE363C82, 0x00000136, 0x00000024, 0x00000002, 0xFE363C83, 0x00000096, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_802408A0_EC2AA0, 0x00000043, 0x00000002, 0x802D790C, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000002, 0x00000044, 0x00000001, D_8024101C_EC321C, 0x00000012, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000001, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, D_80240C04_EC2E04, 0x00000044, 0x00000001, 0x80285C70, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_802406C0_EC28C0, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000035, 0x00000043, 0x00000001, EC2200_DeadUnkFunc1, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 dlabel D_80240ED0_EC30D0 .word 0x00000000, 0x00180018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 diff --git a/ver/us/asm/data/EC78F0.data.s b/ver/us/asm/data/EC78F0.data.s index 3b88807d3f..66535f832c 100644 --- a/ver/us/asm/data/EC78F0.data.s +++ b/ver/us/asm/data/EC78F0.data.s @@ -27,7 +27,7 @@ dlabel D_80240C74_EC7E24 .word 0x00000047, 0x00000005, D_80240C18_EC7DC8, 0x00080000, 0x00000000, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80240CA0_EC7E50 -.word 0x00000024, 0x00000002, 0xF5DE0329, 0x00000026, 0x00000043, 0x00000002, 0x802E6F50, 0xFFFFFFFF, 0x00000043, 0x00000003, 0x802D8B60, 0x00000000, 0x00000000, 0x00000043, 0x00000006, 0x802D7CD8, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetSleepBubbleUnk1C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802D7B70, 0x00000000, 0x00000001, 0x00000024, 0x00000002, 0xF9718886, 0x00000000, 0x00000043, 0x00000003, 0x80048338, 0x00000000, D_80242B0C_EC9CBC, 0x00000046, 0x00000001, D_802428C4_EC9A74, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x00000006, 0x00000006, 0x00000024, 0x00000002, 0xFE363C80, 0x00000129, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFFA1, 0x00000024, 0x00000002, 0xFE363C82, 0x0000017F, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFBF, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_8024096C_EC7B1C, 0x00000024, 0x00000002, 0xFE363C80, 0x00000125, 0x00000024, 0x00000002, 0xFE363C81, 0x00000047, 0x00000024, 0x00000002, 0xFE363C82, 0x0000017A, 0x00000024, 0x00000002, 0xFE363C83, 0x00000071, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_8024096C_EC7B1C, 0x00000024, 0x00000002, 0xFE363C80, 0x00000015, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFEA6, 0x00000024, 0x00000002, 0xFE363C82, 0x00000093, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFF0E, 0x00000024, 0x00000002, 0xFE363C84, 0x00000014, 0x00000044, 0x00000001, D_8024096C_EC7B1C, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFEA2, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF42, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFFAF, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFF96, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_8024096C_EC7B1C, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFE84, 0x00000024, 0x00000002, 0xFE363C81, 0x00000055, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFFA1, 0x00000024, 0x00000002, 0xFE363C83, 0x00000096, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_8024096C_EC7B1C, 0x00000043, 0x00000003, 0x802D6688, 0x00000033, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000031, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000032, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF9C, 0x00000024, 0x00000002, 0xFE363C82, 0x00000064, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000001, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, D_802408D0_EC7A80, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000003, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFB50, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0x00000000, 0x00000024, 0x00000002, 0xFE363C86, 0x00000001, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, D_802408D0_EC7A80, 0x00000057, 0x00000000, 0x00000043, 0x00000002, 0x802D790C, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000044, 0x00000001, D_80241C14_EC8DC4, 0x00000012, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000001, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, D_80240C74_EC7E24, 0x00000044, 0x00000001, 0x80285C70, 0x00000044, 0x00000001, D_802424F4_EC96A4, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_802407A0_EC7950, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000035, 0x00000043, 0x00000001, EC71B0_SpawnSunEffect, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_80240344_EC74F4, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000024, 0x00000002, 0xF5DE0329, 0x00000026, 0x00000043, 0x00000002, 0x802E6F50, 0xFFFFFFFF, 0x00000043, 0x00000003, 0x802D8B60, 0x00000000, 0x00000000, 0x00000043, 0x00000006, 0x802D7CD8, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetSleepBubbleTimeLeft, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802D7B70, 0x00000000, 0x00000001, 0x00000024, 0x00000002, 0xF9718886, 0x00000000, 0x00000043, 0x00000003, 0x80048338, 0x00000000, D_80242B0C_EC9CBC, 0x00000046, 0x00000001, D_802428C4_EC9A74, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x00000006, 0x00000006, 0x00000024, 0x00000002, 0xFE363C80, 0x00000129, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFFA1, 0x00000024, 0x00000002, 0xFE363C82, 0x0000017F, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFBF, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_8024096C_EC7B1C, 0x00000024, 0x00000002, 0xFE363C80, 0x00000125, 0x00000024, 0x00000002, 0xFE363C81, 0x00000047, 0x00000024, 0x00000002, 0xFE363C82, 0x0000017A, 0x00000024, 0x00000002, 0xFE363C83, 0x00000071, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_8024096C_EC7B1C, 0x00000024, 0x00000002, 0xFE363C80, 0x00000015, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFEA6, 0x00000024, 0x00000002, 0xFE363C82, 0x00000093, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFF0E, 0x00000024, 0x00000002, 0xFE363C84, 0x00000014, 0x00000044, 0x00000001, D_8024096C_EC7B1C, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFEA2, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF42, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFFAF, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFF96, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_8024096C_EC7B1C, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFE84, 0x00000024, 0x00000002, 0xFE363C81, 0x00000055, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFFA1, 0x00000024, 0x00000002, 0xFE363C83, 0x00000096, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_8024096C_EC7B1C, 0x00000043, 0x00000003, 0x802D6688, 0x00000033, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000031, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000032, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF9C, 0x00000024, 0x00000002, 0xFE363C82, 0x00000064, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000001, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, D_802408D0_EC7A80, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000003, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFB50, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0x00000000, 0x00000024, 0x00000002, 0xFE363C86, 0x00000001, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, D_802408D0_EC7A80, 0x00000057, 0x00000000, 0x00000043, 0x00000002, 0x802D790C, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000044, 0x00000001, D_80241C14_EC8DC4, 0x00000012, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000001, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, D_80240C74_EC7E24, 0x00000044, 0x00000001, 0x80285C70, 0x00000044, 0x00000001, D_802424F4_EC96A4, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_802407A0_EC7950, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000035, 0x00000043, 0x00000001, EC71B0_SpawnSunEffect, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_80240344_EC74F4, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 dlabel D_80241220_EC83D0 .word 0x00000000, 0x00380028, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000030, 0x00000001, 0xFE363C80, 0x00000034, 0x00000004, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C85, 0xFE363C8F, 0xFE363C87, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, EC7590_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0x00000001, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, 0x802D7A04, 0xFE363C83, 0x00000153, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, EC7590_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0xFFFFFFFF, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000005, 0x802D5FE0, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C82, 0x00000000, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000033, 0x00000003, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000033, 0x00000003, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000007, 0x802E4410, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000012, 0x00000000, 0x00000043, 0x00000003, 0x802E2F8C, 0xFE363C8A, 0xFE363C8B, 0x0000000A, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000003, 0x802E2F30, 0xFE363C8A, 0x00000001, 0x00000043, 0x00000007, 0x802E4410, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000046, 0x00000001, 0xFE363C84, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/ECBC10.data.s b/ver/us/asm/data/ECBC10.data.s index a19773fb6e..67b9ebc772 100644 --- a/ver/us/asm/data/ECBC10.data.s +++ b/ver/us/asm/data/ECBC10.data.s @@ -45,7 +45,7 @@ dlabel D_80242A5C_ECC75C .word 0x00000009, 0xC4070000, 0x00000000, 0x42480000, 0x0000000A, 0x42700000, 0x00000000, 0x42480000, 0x0000000F, 0x42700000, 0x00000000, 0x42480000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000 dlabel D_80242A9C_ECC79C -.word 0x00000024, 0x00000002, 0xF5DE0329, 0x00000026, 0x00000043, 0x00000002, 0x802E6F50, 0xFFFFFFFF, 0x00000043, 0x00000003, 0x802D8B60, 0x00000000, 0x00000000, 0x00000043, 0x00000006, 0x802D7CD8, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetSleepBubbleUnk1C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802D7B70, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x80048338, 0x00000000, D_80244EF4_ECEBF4, 0x00000046, 0x00000001, D_80242628_ECC328, 0x00000044, 0x00000001, D_80245F8C_ECFC8C, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x00000013, 0x00000002, 0x00000056, 0x00000000, 0x00000043, 0x00000002, 0x802D7384, D_80242A5C_ECC75C, 0x00000057, 0x00000000, 0x00000043, 0x00000003, 0x802D6688, 0x00000016, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000017, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000019, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000001B, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000001D, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000001F, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000029, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000018, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000001A, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000001C, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000001E, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000020, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0x0000008C, 0x0000000D, 0x00000002, 0xFE363C80, 0x00010000, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFF0000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, 0x802D67E4, 0x00000001, 0x00000000, 0xFE363C80, 0x00000000, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFF38, 0x0000000C, 0x00000002, 0xFE363C81, 0x00000000, 0x00000027, 0x00000002, 0xFE363C81, 0x00010000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, 0x802D67E4, 0x00000002, 0x00000000, 0xFE363C81, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x00000015, 0x00000006, 0x00000024, 0x00000002, 0xFE363C80, 0x0000008C, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF77, 0x00000024, 0x00000002, 0xFE363C82, 0x00000154, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFC4, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_802426B0_ECC3B0, 0x00000024, 0x00000002, 0xFE363C80, 0x000001C2, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF77, 0x00000024, 0x00000002, 0xFE363C82, 0x0000024E, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFC4, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_802426B0_ECC3B0, 0x00000044, 0x00000001, D_80245944_ECF644, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000001, 0x7FFFFE00, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000005, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, D_80242A14_ECC714, 0x00000044, 0x00000001, 0x80285C70, 0x00000046, 0x00000001, D_80241F70_ECBC70, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000035, 0x00000043, 0x00000001, ECAA40_DeadUnkFunc1, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000024, 0x00000002, 0xF5DE0329, 0x00000026, 0x00000043, 0x00000002, 0x802E6F50, 0xFFFFFFFF, 0x00000043, 0x00000003, 0x802D8B60, 0x00000000, 0x00000000, 0x00000043, 0x00000006, 0x802D7CD8, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetSleepBubbleTimeLeft, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802D7B70, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x80048338, 0x00000000, D_80244EF4_ECEBF4, 0x00000046, 0x00000001, D_80242628_ECC328, 0x00000044, 0x00000001, D_80245F8C_ECFC8C, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x00000013, 0x00000002, 0x00000056, 0x00000000, 0x00000043, 0x00000002, 0x802D7384, D_80242A5C_ECC75C, 0x00000057, 0x00000000, 0x00000043, 0x00000003, 0x802D6688, 0x00000016, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000017, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000019, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000001B, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000001D, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000001F, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000029, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000018, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000001A, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000001C, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000001E, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000020, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0x0000008C, 0x0000000D, 0x00000002, 0xFE363C80, 0x00010000, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFF0000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, 0x802D67E4, 0x00000001, 0x00000000, 0xFE363C80, 0x00000000, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFF38, 0x0000000C, 0x00000002, 0xFE363C81, 0x00000000, 0x00000027, 0x00000002, 0xFE363C81, 0x00010000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, 0x802D67E4, 0x00000002, 0x00000000, 0xFE363C81, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x00000015, 0x00000006, 0x00000024, 0x00000002, 0xFE363C80, 0x0000008C, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF77, 0x00000024, 0x00000002, 0xFE363C82, 0x00000154, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFC4, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_802426B0_ECC3B0, 0x00000024, 0x00000002, 0xFE363C80, 0x000001C2, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF77, 0x00000024, 0x00000002, 0xFE363C82, 0x0000024E, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFC4, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_802426B0_ECC3B0, 0x00000044, 0x00000001, D_80245944_ECF644, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000001, 0x7FFFFE00, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000005, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, D_80242A14_ECC714, 0x00000044, 0x00000001, 0x80285C70, 0x00000046, 0x00000001, D_80241F70_ECBC70, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000035, 0x00000043, 0x00000001, ECAA40_DeadUnkFunc1, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 dlabel D_80242EE0_ECCBE0 .word 0x3FC00000, 0x0000001E, 0x0000001E, 0x42C80000, 0x41F00000, 0x00000003, 0x4019999A, 0x0000000F, 0x00000001, 0x430C0000, 0x41F00000, 0x00000001 diff --git a/ver/us/asm/data/ED1840.data.s b/ver/us/asm/data/ED1840.data.s index 7ee3c91794..4aa9bfaa21 100644 --- a/ver/us/asm/data/ED1840.data.s +++ b/ver/us/asm/data/ED1840.data.s @@ -21,7 +21,7 @@ dlabel D_80241C84_ED1C74 .word 0x00000047, 0x00000005, D_80241BCC_ED1BBC, 0x00080000, 0x00000000, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80241C28_ED1C18, 0x00080000, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241CCC_ED1CBC -.word 0x00000024, 0x00000002, 0xF5DE0329, 0x00000026, 0x00000043, 0x00000002, 0x802E6F50, 0xFFFFFFFF, 0x00000043, 0x00000006, 0x802D7CD8, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetSleepBubbleUnk1C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802D7B70, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x80048338, 0x00000000, D_8024417C_ED416C, 0x00000044, 0x00000001, D_8024260C_ED25FC, 0x00000044, 0x00000001, D_802434D8_ED34C8, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x00000009, 0x00000006, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFE01, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFFFC, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFEC1, 0x00000024, 0x00000002, 0xFE363C83, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80241920_ED1910, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFED2, 0x00000024, 0x00000002, 0xFE363C81, 0x0000004D, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFFE0, 0x00000024, 0x00000002, 0xFE363C83, 0x00000074, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80241920_ED1910, 0x00000024, 0x00000002, 0xFE363C80, 0x00000033, 0x00000024, 0x00000002, 0xFE363C81, 0x00000012, 0x00000024, 0x00000002, 0xFE363C82, 0x0000008D, 0x00000024, 0x00000002, 0xFE363C83, 0x0000007F, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80241920_ED1910, 0x00000024, 0x00000002, 0xFE363C80, 0x000000EA, 0x00000024, 0x00000002, 0xFE363C81, 0x00000026, 0x00000024, 0x00000002, 0xFE363C82, 0x000001F6, 0x00000024, 0x00000002, 0xFE363C83, 0x00000062, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80241920_ED1910, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFDF3, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF5D, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFE70, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFB0, 0x00000024, 0x00000002, 0xFE363C84, 0x0000003C, 0x00000044, 0x00000001, D_80241920_ED1910, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFEA6, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF6C, 0x00000024, 0x00000002, 0xFE363C82, 0x00000205, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFA5, 0x00000024, 0x00000002, 0xFE363C84, 0x0000003C, 0x00000044, 0x00000001, D_80241920_ED1910, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000001, 0x7FFFFE00, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000005, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, D_80241C84_ED1C74, 0x00000044, 0x00000001, 0x80285C70, 0x00000046, 0x00000001, D_802418B0_ED18A0, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000035, 0x00000043, 0x00000001, ECFFF0_DeadUnkFunc1, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000004D, 0x00000001, 0x0000000B, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C8C, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C8D, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C84, 0x00000028, 0x00000002, 0xFE363C8C, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C8D, 0xFE363C81, 0x00000026, 0x00000002, 0xFE363C80, 0xFE363C8C, 0x0000002F, 0x00000002, 0xFE363C80, 0xF24C0A80, 0x00000026, 0x00000002, 0xFE363C8F, 0xF24C0A80, 0x0000002F, 0x00000002, 0xFE363C8F, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C8F, 0x0000000B, 0x00000024, 0x00000002, 0xFE363C85, 0x000000C8, 0x0000002A, 0x00000002, 0xFE363C85, 0xFE363C8F, 0x00000027, 0x00000002, 0xFE363C85, 0x00000001, 0x00000005, 0x00000001, 0xFE363C85, 0x00000043, 0x00000003, 0x802E1D00, 0xFE363C8C, 0xFE363C80, 0x00000043, 0x00000003, 0x802E1D00, 0xFE363C8D, 0xFE363C81, 0x00000043, 0x00000003, 0x802E1D00, 0x000000C7, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C83, 0x000000D2, 0x00000028, 0x00000002, 0xFE363C83, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C8B, 0x00000027, 0x00000002, 0xFE363C82, 0xFE363C8E, 0x00000043, 0x0000000F, 0x802E58EC, 0x0000000D, 0xFE363C80, 0xFE363C82, 0xFE363C81, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0xFE363C8F, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, 0x802E1D00, 0xFE363C8C, 0xFE363C80, 0x00000043, 0x00000003, 0x802E1D00, 0xFE363C8D, 0xFE363C81, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C8B, 0x00000043, 0x0000000F, 0x802E58EC, 0x0000000D, 0xFE363C80, 0xFE363C8E, 0xFE363C81, 0x000000C8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0xFE363C8F, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000024, 0x00000002, 0xF5DE0329, 0x00000026, 0x00000043, 0x00000002, 0x802E6F50, 0xFFFFFFFF, 0x00000043, 0x00000006, 0x802D7CD8, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetSleepBubbleTimeLeft, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802D7B70, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x80048338, 0x00000000, D_8024417C_ED416C, 0x00000044, 0x00000001, D_8024260C_ED25FC, 0x00000044, 0x00000001, D_802434D8_ED34C8, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x00000009, 0x00000006, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFE01, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFFFC, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFEC1, 0x00000024, 0x00000002, 0xFE363C83, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80241920_ED1910, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFED2, 0x00000024, 0x00000002, 0xFE363C81, 0x0000004D, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFFE0, 0x00000024, 0x00000002, 0xFE363C83, 0x00000074, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80241920_ED1910, 0x00000024, 0x00000002, 0xFE363C80, 0x00000033, 0x00000024, 0x00000002, 0xFE363C81, 0x00000012, 0x00000024, 0x00000002, 0xFE363C82, 0x0000008D, 0x00000024, 0x00000002, 0xFE363C83, 0x0000007F, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80241920_ED1910, 0x00000024, 0x00000002, 0xFE363C80, 0x000000EA, 0x00000024, 0x00000002, 0xFE363C81, 0x00000026, 0x00000024, 0x00000002, 0xFE363C82, 0x000001F6, 0x00000024, 0x00000002, 0xFE363C83, 0x00000062, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80241920_ED1910, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFDF3, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF5D, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFE70, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFB0, 0x00000024, 0x00000002, 0xFE363C84, 0x0000003C, 0x00000044, 0x00000001, D_80241920_ED1910, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFEA6, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF6C, 0x00000024, 0x00000002, 0xFE363C82, 0x00000205, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFA5, 0x00000024, 0x00000002, 0xFE363C84, 0x0000003C, 0x00000044, 0x00000001, D_80241920_ED1910, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000001, 0x7FFFFE00, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000005, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, D_80241C84_ED1C74, 0x00000044, 0x00000001, 0x80285C70, 0x00000046, 0x00000001, D_802418B0_ED18A0, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000035, 0x00000043, 0x00000001, ECFFF0_DeadUnkFunc1, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000004D, 0x00000001, 0x0000000B, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C8C, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C8D, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C84, 0x00000028, 0x00000002, 0xFE363C8C, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C8D, 0xFE363C81, 0x00000026, 0x00000002, 0xFE363C80, 0xFE363C8C, 0x0000002F, 0x00000002, 0xFE363C80, 0xF24C0A80, 0x00000026, 0x00000002, 0xFE363C8F, 0xF24C0A80, 0x0000002F, 0x00000002, 0xFE363C8F, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C8F, 0x0000000B, 0x00000024, 0x00000002, 0xFE363C85, 0x000000C8, 0x0000002A, 0x00000002, 0xFE363C85, 0xFE363C8F, 0x00000027, 0x00000002, 0xFE363C85, 0x00000001, 0x00000005, 0x00000001, 0xFE363C85, 0x00000043, 0x00000003, 0x802E1D00, 0xFE363C8C, 0xFE363C80, 0x00000043, 0x00000003, 0x802E1D00, 0xFE363C8D, 0xFE363C81, 0x00000043, 0x00000003, 0x802E1D00, 0x000000C7, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C83, 0x000000D2, 0x00000028, 0x00000002, 0xFE363C83, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C8B, 0x00000027, 0x00000002, 0xFE363C82, 0xFE363C8E, 0x00000043, 0x0000000F, 0x802E58EC, 0x0000000D, 0xFE363C80, 0xFE363C82, 0xFE363C81, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0xFE363C8F, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, 0x802E1D00, 0xFE363C8C, 0xFE363C80, 0x00000043, 0x00000003, 0x802E1D00, 0xFE363C8D, 0xFE363C81, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C8B, 0x00000043, 0x0000000F, 0x802E58EC, 0x0000000D, 0xFE363C80, 0xFE363C8E, 0xFE363C81, 0x000000C8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0xFE363C8F, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802422EC_ED22DC .word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C85, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C84, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000043, 0x00000003, 0x802D6708, 0xFE363C86, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000001, ED0030_UnkFunc43, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, 0x802D6708, 0xFE363C86, 0x00000001, 0x00000057, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C84, 0x00000024, 0x00000002, 0xFE363C82, 0xFE363C85, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C82, 0x00000008, 0x00000043, 0x0000000F, 0x802E58EC, 0x00000011, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000028, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000043, 0x00000007, 0x802E4310, 0xFE363C8A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000E, 0x00000000, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, 0x802E382C, 0x000000F8, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000057, 0x00000000, 0x00000043, 0x00000005, 0x802E1C00, 0x00000000, 0x000000B4, 0x00000014, 0x00000002, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, 0x802E1C7C, 0x00000043, 0x00000006, 0x802D60E4, 0xFE363C88, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, 0x802D60E4, 0xFE363C89, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000003, 0x802D6708, 0xFE363C87, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/ED5780.data.s b/ver/us/asm/data/ED5780.data.s index 1d29924131..b1cad5059b 100644 --- a/ver/us/asm/data/ED5780.data.s +++ b/ver/us/asm/data/ED5780.data.s @@ -27,7 +27,7 @@ dlabel D_80241A78_ED5C98 .word 0x00000047, 0x00000005, D_80241A1C_ED5C3C, 0x00080000, 0x00000000, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241AA4_ED5CC4 -.word 0x00000024, 0x00000002, 0xF5DE0329, 0x00000026, 0x00000043, 0x00000002, 0x802E6F50, 0xFFFFFFFF, 0x00000043, 0x00000003, 0x802D8B60, 0x00000000, 0x00000000, 0x00000043, 0x00000006, 0x802D7CD8, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetSleepBubbleUnk1C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802D7B70, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x80048338, 0x00000000, D_80244144_ED8364, 0x00000046, 0x00000001, D_80241720_ED5940, 0x00000044, 0x00000001, D_80244B40_ED8D60, 0x00000044, 0x00000001, D_802436E8_ED7908, 0x00000044, 0x00000001, D_80242BD8_ED6DF8, 0x00000044, 0x00000001, D_80244164_ED8384, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x0000000B, 0x00000006, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x0000000C, 0x00000006, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFEF7, 0x00000024, 0x00000002, 0xFE363C81, 0x000000F7, 0x00000024, 0x00000002, 0xFE363C82, 0x000000C7, 0x00000024, 0x00000002, 0xFE363C83, 0x00000139, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80241770_ED5990, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFED4, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFEED, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFF74, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFF47, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80241770_ED5990, 0x00000024, 0x00000002, 0xFE363C80, 0x00000107, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF08, 0x00000024, 0x00000002, 0xFE363C82, 0x0000016A, 0x00000024, 0x00000002, 0xFE363C83, 0x00000092, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80241770_ED5990, 0x00000043, 0x00000002, 0x802D790C, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000001, 0x00000044, 0x00000001, D_8024333C_ED755C, 0x00000016, 0x00000001, 0x00000002, 0x00000044, 0x00000001, D_802428DC_ED6AFC, 0x00000044, 0x00000001, D_80241A78_ED5C98, 0x0000001C, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000001, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, D_80241A78_ED5C98, 0x00000044, 0x00000001, 0x80285C70, 0x00000023, 0x00000000, 0x00000046, 0x00000001, D_802415D0_ED57F0, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000035, 0x00000043, 0x00000001, ED4260_DeadUnkFunc1, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000024, 0x00000002, 0xF5DE0329, 0x00000026, 0x00000043, 0x00000002, 0x802E6F50, 0xFFFFFFFF, 0x00000043, 0x00000003, 0x802D8B60, 0x00000000, 0x00000000, 0x00000043, 0x00000006, 0x802D7CD8, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetSleepBubbleTimeLeft, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802D7B70, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x80048338, 0x00000000, D_80244144_ED8364, 0x00000046, 0x00000001, D_80241720_ED5940, 0x00000044, 0x00000001, D_80244B40_ED8D60, 0x00000044, 0x00000001, D_802436E8_ED7908, 0x00000044, 0x00000001, D_80242BD8_ED6DF8, 0x00000044, 0x00000001, D_80244164_ED8384, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x0000000B, 0x00000006, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x0000000C, 0x00000006, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFEF7, 0x00000024, 0x00000002, 0xFE363C81, 0x000000F7, 0x00000024, 0x00000002, 0xFE363C82, 0x000000C7, 0x00000024, 0x00000002, 0xFE363C83, 0x00000139, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80241770_ED5990, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFED4, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFEED, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFF74, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFF47, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80241770_ED5990, 0x00000024, 0x00000002, 0xFE363C80, 0x00000107, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF08, 0x00000024, 0x00000002, 0xFE363C82, 0x0000016A, 0x00000024, 0x00000002, 0xFE363C83, 0x00000092, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80241770_ED5990, 0x00000043, 0x00000002, 0x802D790C, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000001, 0x00000044, 0x00000001, D_8024333C_ED755C, 0x00000016, 0x00000001, 0x00000002, 0x00000044, 0x00000001, D_802428DC_ED6AFC, 0x00000044, 0x00000001, D_80241A78_ED5C98, 0x0000001C, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000001, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, D_80241A78_ED5C98, 0x00000044, 0x00000001, 0x80285C70, 0x00000023, 0x00000000, 0x00000046, 0x00000001, D_802415D0_ED57F0, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000035, 0x00000043, 0x00000001, ED4260_DeadUnkFunc1, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 dlabel ED42A0_varStash .word 0x00000000 diff --git a/ver/us/asm/data/ED9170.data.s b/ver/us/asm/data/ED9170.data.s index b5e03b79ae..5c7064e232 100644 --- a/ver/us/asm/data/ED9170.data.s +++ b/ver/us/asm/data/ED9170.data.s @@ -48,7 +48,7 @@ dlabel D_802416C8_EDA4E8 .word 0x00000047, 0x00000005, D_802414B8_EDA2D8, 0x00080000, 0x00000000, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_8024145C_EDA27C, 0x00080000, 0x00000004, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000024, 0x00000002, 0xFE363C81, 0x00000023, 0x00000024, 0x00000002, 0xFE363C82, D_80241514_EDA334, 0x00000047, 0x00000005, D_8024167C_EDA49C, 0x00000080, 0xFE363C81, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000003, 0x00000024, 0x00000002, 0xFE363C81, 0x00000022, 0x00000024, 0x00000002, 0xFE363C82, D_80241550_EDA370, 0x00000047, 0x00000005, D_8024167C_EDA49C, 0x00000080, 0xFE363C81, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000004, 0x00000024, 0x00000002, 0xFE363C81, 0x00000021, 0x00000024, 0x00000002, 0xFE363C82, D_8024158C_EDA3AC, 0x00000047, 0x00000005, D_8024167C_EDA49C, 0x00000080, 0xFE363C81, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000005, 0x00000024, 0x00000002, 0xFE363C81, 0x00000020, 0x00000024, 0x00000002, 0xFE363C82, D_802415C8_EDA3E8, 0x00000047, 0x00000005, D_8024167C_EDA49C, 0x00000080, 0xFE363C81, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000006, 0x00000024, 0x00000002, 0xFE363C81, 0x0000001F, 0x00000024, 0x00000002, 0xFE363C82, D_80241604_EDA424, 0x00000047, 0x00000005, D_8024167C_EDA49C, 0x00000080, 0xFE363C81, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000007, 0x00000024, 0x00000002, 0xFE363C81, 0x0000001E, 0x00000024, 0x00000002, 0xFE363C82, D_80241640_EDA460, 0x00000047, 0x00000005, D_8024167C_EDA49C, 0x00000080, 0xFE363C81, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802418D8_EDA6F8 -.word 0x00000024, 0x00000002, 0xF5DE0329, 0x00000026, 0x00000043, 0x00000002, 0x802E6F50, 0xFFFFFFFF, 0x00000043, 0x00000003, 0x802D8B60, 0x00000000, 0x00000000, 0x00000043, 0x00000006, 0x802D7CD8, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetSleepBubbleUnk1C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802D7B70, 0x00000000, 0x00000001, 0x00000043, 0x00000002, 0x800482D8, 0x00000007, 0x00000043, 0x00000003, 0x80048338, 0x00000000, D_80243104_EDBF24, 0x00000046, 0x00000001, D_80243120_EDBF40, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000001, 0x7FFFFE00, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000005, 0x7FFFFE00, 0x00000043, 0x00000002, 0x802D790C, 0xFE363C80, 0x0000000E, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, D_802416C8_EDA4E8, 0x00000044, 0x00000001, 0x80285C70, 0x00000044, 0x00000001, D_80242270_EDB090, 0x00000008, 0x00000001, 0x00000001, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, D_802416C8_EDA4E8, 0x00000044, 0x00000001, D_8024072C_ED954C, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80240410_ED9230, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000035, 0x00000043, 0x00000001, func_80240318_ED9138, 0x00000013, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x00000009, 0x00000009, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x0000000A, 0x00000009, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x0000000B, 0x00000009, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x0000000C, 0x00000009, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000024, 0x00000002, 0xF5DE0329, 0x00000026, 0x00000043, 0x00000002, 0x802E6F50, 0xFFFFFFFF, 0x00000043, 0x00000003, 0x802D8B60, 0x00000000, 0x00000000, 0x00000043, 0x00000006, 0x802D7CD8, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetSleepBubbleTimeLeft, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802D7B70, 0x00000000, 0x00000001, 0x00000043, 0x00000002, 0x800482D8, 0x00000007, 0x00000043, 0x00000003, 0x80048338, 0x00000000, D_80243104_EDBF24, 0x00000046, 0x00000001, D_80243120_EDBF40, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000001, 0x7FFFFE00, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000005, 0x7FFFFE00, 0x00000043, 0x00000002, 0x802D790C, 0xFE363C80, 0x0000000E, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, D_802416C8_EDA4E8, 0x00000044, 0x00000001, 0x80285C70, 0x00000044, 0x00000001, D_80242270_EDB090, 0x00000008, 0x00000001, 0x00000001, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, D_802416C8_EDA4E8, 0x00000044, 0x00000001, D_8024072C_ED954C, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80240410_ED9230, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000035, 0x00000043, 0x00000001, func_80240318_ED9138, 0x00000013, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x00000009, 0x00000009, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x0000000A, 0x00000009, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x0000000B, 0x00000009, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x0000000C, 0x00000009, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 dlabel D_80241AF0_EDA910 .word 0x00000000, 0x00200018, 0x00000000, 0x00000000, 0x00000000, 0x8007D3C0, 0x00000000, 0x8007D4EC, 0x00000000, 0x00000000, 0x00140000 diff --git a/ver/us/asm/data/EDC6D0.data.s b/ver/us/asm/data/EDC6D0.data.s index 898ec66555..07a79d9aa0 100644 --- a/ver/us/asm/data/EDC6D0.data.s +++ b/ver/us/asm/data/EDC6D0.data.s @@ -24,7 +24,7 @@ dlabel D_80240B78_EDCB58 .word 0x00000047, 0x00000005, D_80240B1C_EDCAFC, 0x00080000, 0x00000000, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80240BA4_EDCB84 -.word 0x00000024, 0x00000002, 0xF5DE0329, 0x00000026, 0x00000043, 0x00000002, 0x802E6F50, 0xFFFFFFFF, 0x00000043, 0x00000003, 0x802D8B60, 0x00000000, 0x00000000, 0x00000043, 0x00000006, 0x802D7CD8, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetSleepBubbleUnk1C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802D7B70, 0x00000000, 0x00000001, 0x00000024, 0x00000002, 0xF9718896, 0x00000000, 0x00000043, 0x00000003, 0x80048338, 0x00000000, D_802429B8_EDE998, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x0000000B, 0x00000006, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFFBF, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF2E, 0x00000024, 0x00000002, 0xFE363C82, 0x0000005A, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFF92, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80240870_EDC850, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFF38, 0x00000024, 0x00000002, 0xFE363C81, 0x00000082, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFFB0, 0x00000024, 0x00000002, 0xFE363C83, 0x000000AA, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80240870_EDC850, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFEF2, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFFB0, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFF1F, 0x00000024, 0x00000002, 0xFE363C83, 0x0000007D, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80240870_EDC850, 0x00000043, 0x00000002, 0x802D790C, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000044, 0x00000001, D_802419F4_EDD9D4, 0x00000012, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000001, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, D_80240B78_EDCB58, 0x00000044, 0x00000001, 0x80285C70, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80240750_EDC730, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000035, 0x00000043, 0x00000001, func_80240000_EDBFE0, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000024, 0x00000002, 0xF5DE0329, 0x00000026, 0x00000043, 0x00000002, 0x802E6F50, 0xFFFFFFFF, 0x00000043, 0x00000003, 0x802D8B60, 0x00000000, 0x00000000, 0x00000043, 0x00000006, 0x802D7CD8, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetSleepBubbleTimeLeft, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802D7B70, 0x00000000, 0x00000001, 0x00000024, 0x00000002, 0xF9718896, 0x00000000, 0x00000043, 0x00000003, 0x80048338, 0x00000000, D_802429B8_EDE998, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x0000000B, 0x00000006, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFFBF, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF2E, 0x00000024, 0x00000002, 0xFE363C82, 0x0000005A, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFF92, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80240870_EDC850, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFF38, 0x00000024, 0x00000002, 0xFE363C81, 0x00000082, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFFB0, 0x00000024, 0x00000002, 0xFE363C83, 0x000000AA, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80240870_EDC850, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFEF2, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFFB0, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFF1F, 0x00000024, 0x00000002, 0xFE363C83, 0x0000007D, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80240870_EDC850, 0x00000043, 0x00000002, 0x802D790C, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000044, 0x00000001, D_802419F4_EDD9D4, 0x00000012, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000001, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, D_80240B78_EDCB58, 0x00000044, 0x00000001, 0x80285C70, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80240750_EDC730, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000035, 0x00000043, 0x00000001, func_80240000_EDBFE0, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 dlabel D_80240E30_EDCE10 .word 0x00000000, 0x00380028, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 diff --git a/ver/us/asm/data/EE20E0.data.s b/ver/us/asm/data/EE20E0.data.s index 7eb8d9690c..d517cc5485 100644 --- a/ver/us/asm/data/EE20E0.data.s +++ b/ver/us/asm/data/EE20E0.data.s @@ -36,7 +36,7 @@ dlabel D_80243E54_EE2814 .word 0x00000047, 0x00000005, D_80243DF8_EE27B8, 0x00080000, 0x00000000, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80243D9C_EE275C, 0x00080000, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80243E9C_EE285C -.word 0x00000024, 0x00000002, 0xF5DE0329, 0x00000026, 0x00000043, 0x00000002, 0x802E6F50, 0xFFFFFFFF, 0x00000043, 0x00000003, 0x802D8B60, 0x00000000, 0x00000000, 0x00000043, 0x00000006, 0x802D7CD8, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetSleepBubbleUnk1C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802D7B70, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x80048338, 0x00000000, D_80247A4C_EE640C, 0x00000046, 0x00000001, D_80243A28_EE23E8, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x0000000D, 0x00000006, 0x00000024, 0x00000002, 0xFE363C80, 0x00000112, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF77, 0x00000024, 0x00000002, 0xFE363C82, 0x00000247, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFC0, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80243AF0_EE24B0, 0x00000024, 0x00000002, 0xFE363C80, 0x000001B1, 0x00000024, 0x00000002, 0xFE363C81, 0x0000006C, 0x00000024, 0x00000002, 0xFE363C82, 0x00000244, 0x00000024, 0x00000002, 0xFE363C83, 0x000000A9, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80243AF0_EE24B0, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFE34, 0x00000024, 0x00000002, 0xFE363C81, 0x0000005A, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFF83, 0x00000024, 0x00000002, 0xFE363C83, 0x00000082, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80243AF0_EE24B0, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFE5C, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF7E, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFEFC, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFA6, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80243AF0_EE24B0, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFF24, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF77, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFCE, 0x00000024, 0x00000002, 0xFE363C84, 0x000000A0, 0x00000044, 0x00000001, D_80243AF0_EE24B0, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000001, 0x7FFFFE00, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000005, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, D_80243E54_EE2814, 0x00000044, 0x00000001, 0x80285C70, 0x00000046, 0x00000001, D_80243960_EE2320, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000035, 0x00000043, 0x00000001, func_80240000_EDE9C0, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000024, 0x00000002, 0xF5DE0329, 0x00000026, 0x00000043, 0x00000002, 0x802E6F50, 0xFFFFFFFF, 0x00000043, 0x00000003, 0x802D8B60, 0x00000000, 0x00000000, 0x00000043, 0x00000006, 0x802D7CD8, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetSleepBubbleTimeLeft, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802D7B70, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x80048338, 0x00000000, D_80247A4C_EE640C, 0x00000046, 0x00000001, D_80243A28_EE23E8, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x0000000D, 0x00000006, 0x00000024, 0x00000002, 0xFE363C80, 0x00000112, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF77, 0x00000024, 0x00000002, 0xFE363C82, 0x00000247, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFC0, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80243AF0_EE24B0, 0x00000024, 0x00000002, 0xFE363C80, 0x000001B1, 0x00000024, 0x00000002, 0xFE363C81, 0x0000006C, 0x00000024, 0x00000002, 0xFE363C82, 0x00000244, 0x00000024, 0x00000002, 0xFE363C83, 0x000000A9, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80243AF0_EE24B0, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFE34, 0x00000024, 0x00000002, 0xFE363C81, 0x0000005A, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFF83, 0x00000024, 0x00000002, 0xFE363C83, 0x00000082, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80243AF0_EE24B0, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFE5C, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF7E, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFEFC, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFA6, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80243AF0_EE24B0, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFF24, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF77, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFCE, 0x00000024, 0x00000002, 0xFE363C84, 0x000000A0, 0x00000044, 0x00000001, D_80243AF0_EE24B0, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000001, 0x7FFFFE00, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000005, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, D_80243E54_EE2814, 0x00000044, 0x00000001, 0x80285C70, 0x00000046, 0x00000001, D_80243960_EE2320, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000035, 0x00000043, 0x00000001, func_80240000_EDE9C0, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802441B0_EE2B70 .word 0x00000000, 0x00200018, 0x00000000, 0x00000000, 0x00000000, 0x8007D3C0, 0x00000000, 0x8007D4EC, 0x00000000, 0x00000000, 0x00140000 diff --git a/ver/us/asm/data/EE8970.data.s b/ver/us/asm/data/EE8970.data.s index 951aec2657..011579ec30 100644 --- a/ver/us/asm/data/EE8970.data.s +++ b/ver/us/asm/data/EE8970.data.s @@ -24,7 +24,7 @@ dlabel D_8024262C_EE8BDC .word 0x0000001F, 0xC3FA0000, 0x00000000, 0xC2B40000, 0x00000019, 0xC3FF0000, 0x00000000, 0x00000000, 0x00000020, 0xC3FA0000, 0x00000000, 0x42DC0000, 0x00000021, 0xC37A0000, 0x00000000, 0xC2B40000, 0x0000001A, 0xC3700000, 0x00000000, 0x00000000, 0x00000022, 0xC37A0000, 0x00000000, 0x42DC0000, 0x0000001B, 0xC2480000, 0x00000000, 0x41C80000, 0x0000001C, 0x428C0000, 0x42700000, 0xC2BE0000, 0x0000001D, 0x43CD0000, 0x42700000, 0xC2BE0000, 0x0000001E, 0x44098000, 0x00000000, 0x42480000, 0x00000023, 0xC2480000, 0x00000000, 0x42DC0000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000 dlabel D_802426EC_EE8C9C -.word 0x00000024, 0x00000002, 0xF5DE0329, 0x00000026, 0x00000043, 0x00000002, 0x802E6F50, 0xFFFFFFFF, 0x00000043, 0x00000006, 0x802D7CD8, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetSleepBubbleUnk1C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802D7B70, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x80048338, 0x00000000, D_80244F30_EEB4E0, 0x00000044, 0x00000001, D_80244F60_EEB510, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x00000009, 0x00000002, 0x00000056, 0x00000000, 0x00000043, 0x00000002, 0x802D7384, D_8024262C_EE8BDC, 0x00000057, 0x00000000, 0x00000043, 0x00000003, 0x802D6688, 0x0000001D, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000001F, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000020, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000023, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000024, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000027, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000029, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000002B, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000002D, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000002F, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000031, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000033, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000035, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000001E, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000021, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000022, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000025, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000026, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000002A, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000002C, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000002E, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000030, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000032, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000034, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000036, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0x0000008C, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, D_80242490_EE8A40, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF38, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, D_80242490_EE8A40, 0x00000057, 0x00000000, 0x00000044, 0x00000001, D_80243EA8_EEA458, 0x00000044, 0x00000001, D_80245254_EEB804, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000001, 0x7FFFFE00, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000005, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, D_802425E4_EE8B94, 0x00000044, 0x00000001, 0x80285C70, 0x00000046, 0x00000001, D_80242420_EE89D0, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000035, 0x00000043, 0x00000001, func_8024030C_EE68BC, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000024, 0x00000002, 0xF5DE0329, 0x00000026, 0x00000043, 0x00000002, 0x802E6F50, 0xFFFFFFFF, 0x00000043, 0x00000006, 0x802D7CD8, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetSleepBubbleTimeLeft, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802D7B70, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x80048338, 0x00000000, D_80244F30_EEB4E0, 0x00000044, 0x00000001, D_80244F60_EEB510, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x00000009, 0x00000002, 0x00000056, 0x00000000, 0x00000043, 0x00000002, 0x802D7384, D_8024262C_EE8BDC, 0x00000057, 0x00000000, 0x00000043, 0x00000003, 0x802D6688, 0x0000001D, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000001F, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000020, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000023, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000024, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000027, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000029, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000002B, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000002D, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000002F, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000031, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000033, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000035, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000001E, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000021, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000022, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000025, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000026, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000002A, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000002C, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000002E, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000030, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000032, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000034, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000036, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0x0000008C, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, D_80242490_EE8A40, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF38, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, D_80242490_EE8A40, 0x00000057, 0x00000000, 0x00000044, 0x00000001, D_80243EA8_EEA458, 0x00000044, 0x00000001, D_80245254_EEB804, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000001, 0x7FFFFE00, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000005, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, D_802425E4_EE8B94, 0x00000044, 0x00000001, 0x80285C70, 0x00000046, 0x00000001, D_80242420_EE89D0, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000035, 0x00000043, 0x00000001, func_8024030C_EE68BC, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 dlabel D_80242C30_EE91E0 .word 0x0000004D, 0x00000001, 0x0000000B, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C8C, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C8D, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C84, 0x00000028, 0x00000002, 0xFE363C8C, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C8D, 0xFE363C81, 0x00000026, 0x00000002, 0xFE363C80, 0xFE363C8C, 0x0000002F, 0x00000002, 0xFE363C80, 0xF24C0A80, 0x00000026, 0x00000002, 0xFE363C8F, 0xF24C0A80, 0x0000002F, 0x00000002, 0xFE363C8F, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C8F, 0x0000000B, 0x00000024, 0x00000002, 0xFE363C85, 0x000000C8, 0x0000002A, 0x00000002, 0xFE363C85, 0xFE363C8F, 0x00000027, 0x00000002, 0xFE363C85, 0x00000001, 0x00000005, 0x00000001, 0xFE363C85, 0x00000043, 0x00000003, 0x802E1D00, 0xFE363C8C, 0xFE363C80, 0x00000043, 0x00000003, 0x802E1D00, 0xFE363C8D, 0xFE363C81, 0x00000043, 0x00000003, 0x802E1D00, 0x000000C7, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C83, 0x000000D2, 0x00000028, 0x00000002, 0xFE363C83, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C8B, 0x00000027, 0x00000002, 0xFE363C82, 0xFE363C8E, 0x00000043, 0x0000000F, 0x802E58EC, 0x0000000D, 0xFE363C80, 0xFE363C82, 0xFE363C81, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0xFE363C8F, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, 0x802E1D00, 0xFE363C8C, 0xFE363C80, 0x00000043, 0x00000003, 0x802E1D00, 0xFE363C8D, 0xFE363C81, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C8B, 0x00000043, 0x0000000F, 0x802E58EC, 0x0000000D, 0xFE363C80, 0xFE363C8E, 0xFE363C81, 0x000000C8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0xFE363C8F, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/EEFAD0.data.s b/ver/us/asm/data/EEFAD0.data.s index 0ca1ec6868..6c19fa76c6 100644 --- a/ver/us/asm/data/EEFAD0.data.s +++ b/ver/us/asm/data/EEFAD0.data.s @@ -21,7 +21,7 @@ dlabel D_80242BA0_EEFCA0 .word 0x0000000A, 0xC39B0000, 0x00000000, 0x00000000, 0x0000000B, 0x43988000, 0x42C80000, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000 dlabel D_80242BD0_EEFCD0 -.word 0x00000024, 0x00000002, 0xF5DE0329, 0x00000026, 0x00000043, 0x00000002, 0x802E6F50, 0xFFFFFFFF, 0x00000043, 0x00000006, 0x802D7CD8, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetSleepBubbleUnk1C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802D7B70, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x80048338, 0x00000000, D_80244534_EF1634, 0x00000046, 0x00000001, D_80243FA4_EF10A4, 0x00000044, 0x00000001, D_802434CC_EF05CC, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x00000009, 0x00000002, 0x00000056, 0x00000000, 0x00000043, 0x00000002, 0x802D7384, D_80242BA0_EEFCA0, 0x00000057, 0x00000000, 0x00000043, 0x00000003, 0x802D6688, 0x00000010, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000011, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000012, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000014, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000016, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000018, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000013, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000015, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000017, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000019, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0x0000008C, 0x0000000D, 0x00000002, 0xFE363C80, 0x00010000, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFF0000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, 0x802D67E4, 0x00000001, 0x00000000, 0xFE363C80, 0x00000000, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFF38, 0x0000000C, 0x00000002, 0xFE363C81, 0x00000000, 0x00000027, 0x00000002, 0xFE363C81, 0x00010000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, 0x802D67E4, 0x00000002, 0x00000000, 0xFE363C81, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000057, 0x00000000, 0x00000044, 0x00000001, D_80245224_EF2324, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000001, 0x7FFFFE00, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000005, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, D_80242B58_EEFC58, 0x00000044, 0x00000001, 0x80285C70, 0x00000046, 0x00000001, D_80242A30_EEFB30, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000035, 0x00000043, 0x00000001, EED100_DeadUnkFunc1, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000024, 0x00000002, 0xF5DE0329, 0x00000026, 0x00000043, 0x00000002, 0x802E6F50, 0xFFFFFFFF, 0x00000043, 0x00000006, 0x802D7CD8, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetSleepBubbleTimeLeft, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802D7B70, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x80048338, 0x00000000, D_80244534_EF1634, 0x00000046, 0x00000001, D_80243FA4_EF10A4, 0x00000044, 0x00000001, D_802434CC_EF05CC, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x00000009, 0x00000002, 0x00000056, 0x00000000, 0x00000043, 0x00000002, 0x802D7384, D_80242BA0_EEFCA0, 0x00000057, 0x00000000, 0x00000043, 0x00000003, 0x802D6688, 0x00000010, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000011, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000012, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000014, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000016, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000018, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000013, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000015, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000017, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000019, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0x0000008C, 0x0000000D, 0x00000002, 0xFE363C80, 0x00010000, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFF0000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, 0x802D67E4, 0x00000001, 0x00000000, 0xFE363C80, 0x00000000, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFF38, 0x0000000C, 0x00000002, 0xFE363C81, 0x00000000, 0x00000027, 0x00000002, 0xFE363C81, 0x00010000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, 0x802D67E4, 0x00000002, 0x00000000, 0xFE363C81, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000057, 0x00000000, 0x00000044, 0x00000001, D_80245224_EF2324, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000001, 0x7FFFFE00, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000005, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, D_80242B58_EEFC58, 0x00000044, 0x00000001, 0x80285C70, 0x00000046, 0x00000001, D_80242A30_EEFB30, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000035, 0x00000043, 0x00000001, EED100_DeadUnkFunc1, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242F00_EF0000 .word 0x0000004D, 0x00000001, 0x0000000B, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C8C, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C8D, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C84, 0x00000028, 0x00000002, 0xFE363C8C, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C8D, 0xFE363C81, 0x00000026, 0x00000002, 0xFE363C80, 0xFE363C8C, 0x0000002F, 0x00000002, 0xFE363C80, 0xF24C0A80, 0x00000026, 0x00000002, 0xFE363C8F, 0xF24C0A80, 0x0000002F, 0x00000002, 0xFE363C8F, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C8F, 0x0000000B, 0x00000024, 0x00000002, 0xFE363C85, 0x000000C8, 0x0000002A, 0x00000002, 0xFE363C85, 0xFE363C8F, 0x00000027, 0x00000002, 0xFE363C85, 0x00000001, 0x00000005, 0x00000001, 0xFE363C85, 0x00000043, 0x00000003, 0x802E1D00, 0xFE363C8C, 0xFE363C80, 0x00000043, 0x00000003, 0x802E1D00, 0xFE363C8D, 0xFE363C81, 0x00000043, 0x00000003, 0x802E1D00, 0x000000C7, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C83, 0x000000D2, 0x00000028, 0x00000002, 0xFE363C83, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C8B, 0x00000027, 0x00000002, 0xFE363C82, 0xFE363C8E, 0x00000043, 0x0000000F, 0x802E58EC, 0x0000000D, 0xFE363C80, 0xFE363C82, 0xFE363C81, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0xFE363C8F, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, 0x802E1D00, 0xFE363C8C, 0xFE363C80, 0x00000043, 0x00000003, 0x802E1D00, 0xFE363C8D, 0xFE363C81, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C8B, 0x00000043, 0x0000000F, 0x802E58EC, 0x0000000D, 0xFE363C80, 0xFE363C8E, 0xFE363C81, 0x000000C8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0xFE363C8F, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/EF58E0.data.s b/ver/us/asm/data/EF58E0.data.s index 30b3fa2640..556bcdc9a2 100644 --- a/ver/us/asm/data/EF58E0.data.s +++ b/ver/us/asm/data/EF58E0.data.s @@ -24,7 +24,7 @@ dlabel D_8024374C_EF5D5C .word 0x0000000F, 0xC4048000, 0x00000000, 0xC2DC0000, 0x00000011, 0xC4070000, 0x00000000, 0xC2480000, 0x00000010, 0xC4048000, 0x00000000, 0x42A00000, 0x00000014, 0xC3870000, 0x00000000, 0xC2F00000, 0x00000013, 0xC3870000, 0x00000000, 0xC2F00000, 0x00000012, 0xC3870000, 0x00000000, 0x420C0000, 0x00000017, 0xC3020000, 0x00000000, 0xC2480000, 0x00000016, 0xC3020000, 0x00000000, 0xC2480000, 0x00000015, 0xC30C0000, 0x00000000, 0x42960000, 0x0000001B, 0x42F00000, 0x00000000, 0xC2480000, 0x0000001A, 0x42F00000, 0x00000000, 0xC2480000, 0x00000018, 0x43020000, 0x00000000, 0x42700000, 0x00000019, 0x42F00000, 0x00000000, 0x42F00000, 0x0000001F, 0x438C0000, 0x00000000, 0xC2DC0000, 0x0000001E, 0x438C0000, 0x00000000, 0xC2DC0000, 0x0000001D, 0x43870000, 0x00000000, 0xC2480000, 0x0000001C, 0x438C0000, 0x00000000, 0x42480000, 0x00000021, 0x44034000, 0x00000000, 0xC28C0000, 0x00000020, 0x44034000, 0x00000000, 0x42480000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000 dlabel D_8024388C_EF5E9C -.word 0x00000024, 0x00000002, 0xF5DE0329, 0x00000026, 0x00000043, 0x00000002, 0x802E6F50, 0xFFFFFFFF, 0x00000043, 0x00000006, 0x802D7CD8, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetSleepBubbleUnk1C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802D7B70, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x80048338, 0x00000000, D_802452D8_EF78E8, 0x00000046, 0x00000001, D_80245330_EF7940, 0x00000044, 0x00000001, D_80244334_EF6944, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x0000000F, 0x00000006, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x00000010, 0x00000006, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x00000014, 0x00000006, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x00000017, 0x00000006, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x00000019, 0x00000006, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x0000001B, 0x00000006, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x0000001C, 0x00000006, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x0000001F, 0x00000006, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x00000020, 0x00000006, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFD20, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF77, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFDF6, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFF8A, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_802433A0_EF59B0, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFD28, 0x00000024, 0x00000002, 0xFE363C81, 0x0000004C, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFE10, 0x00000024, 0x00000002, 0xFE363C83, 0x00000089, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_802433A0_EF59B0, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFF60, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF8B, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFFA4, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFCA, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_802433A0_EF59B0, 0x00000024, 0x00000002, 0xFE363C80, 0x0000004C, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF84, 0x00000024, 0x00000002, 0xFE363C82, 0x00000096, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFC9, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_802433A0_EF59B0, 0x00000024, 0x00000002, 0xFE363C80, 0x000000C0, 0x00000024, 0x00000002, 0xFE363C81, 0x0000003C, 0x00000024, 0x00000002, 0xFE363C82, 0x00000135, 0x00000024, 0x00000002, 0xFE363C83, 0x00000085, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_802433A0_EF59B0, 0x00000024, 0x00000002, 0xFE363C80, 0x000001E8, 0x00000024, 0x00000002, 0xFE363C81, 0x0000002E, 0x00000024, 0x00000002, 0xFE363C82, 0x000002DD, 0x00000024, 0x00000002, 0xFE363C83, 0x00000089, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_802433A0_EF59B0, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x00000009, 0x00000002, 0x00000056, 0x00000000, 0x00000043, 0x00000002, 0x802D7384, D_8024374C_EF5D5C, 0x00000057, 0x00000000, 0x00000043, 0x00000003, 0x802D6688, 0x0000001E, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000020, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000021, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000024, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000025, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000028, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000002A, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000002C, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000002D, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000030, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000031, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000034, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000036, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000038, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000039, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000003C, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000003D, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000040, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000001F, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000022, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000023, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000026, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000027, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000002B, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000002E, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000002F, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000032, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000033, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000037, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000003A, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000003B, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000003E, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000003F, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0x0000008C, 0x0000000D, 0x00000002, 0xFE363C80, 0x00010000, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFF0000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, 0x802D67E4, 0x00000001, 0x00000000, 0xFE363C80, 0x00000000, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFF38, 0x0000000C, 0x00000002, 0xFE363C81, 0x00000000, 0x00000027, 0x00000002, 0xFE363C81, 0x00010000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, 0x802D67E4, 0x00000002, 0x00000000, 0xFE363C81, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000001, 0x7FFFFE00, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000005, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, D_80243704_EF5D14, 0x00000044, 0x00000001, 0x80285C70, 0x00000046, 0x00000001, D_80243330_EF5940, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000035, 0x00000043, 0x00000001, EF2610_DeadUnkFunc1, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 +.word 0x00000024, 0x00000002, 0xF5DE0329, 0x00000026, 0x00000043, 0x00000002, 0x802E6F50, 0xFFFFFFFF, 0x00000043, 0x00000006, 0x802D7CD8, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetSleepBubbleTimeLeft, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802D7B70, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x80048338, 0x00000000, D_802452D8_EF78E8, 0x00000046, 0x00000001, D_80245330_EF7940, 0x00000044, 0x00000001, D_80244334_EF6944, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x0000000F, 0x00000006, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x00000010, 0x00000006, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x00000014, 0x00000006, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x00000017, 0x00000006, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x00000019, 0x00000006, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x0000001B, 0x00000006, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x0000001C, 0x00000006, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x0000001F, 0x00000006, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x00000020, 0x00000006, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFD20, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF77, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFDF6, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFF8A, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_802433A0_EF59B0, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFD28, 0x00000024, 0x00000002, 0xFE363C81, 0x0000004C, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFE10, 0x00000024, 0x00000002, 0xFE363C83, 0x00000089, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_802433A0_EF59B0, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFF60, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF8B, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFFA4, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFCA, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_802433A0_EF59B0, 0x00000024, 0x00000002, 0xFE363C80, 0x0000004C, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF84, 0x00000024, 0x00000002, 0xFE363C82, 0x00000096, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFC9, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_802433A0_EF59B0, 0x00000024, 0x00000002, 0xFE363C80, 0x000000C0, 0x00000024, 0x00000002, 0xFE363C81, 0x0000003C, 0x00000024, 0x00000002, 0xFE363C82, 0x00000135, 0x00000024, 0x00000002, 0xFE363C83, 0x00000085, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_802433A0_EF59B0, 0x00000024, 0x00000002, 0xFE363C80, 0x000001E8, 0x00000024, 0x00000002, 0xFE363C81, 0x0000002E, 0x00000024, 0x00000002, 0xFE363C82, 0x000002DD, 0x00000024, 0x00000002, 0xFE363C83, 0x00000089, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_802433A0_EF59B0, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x00000009, 0x00000002, 0x00000056, 0x00000000, 0x00000043, 0x00000002, 0x802D7384, D_8024374C_EF5D5C, 0x00000057, 0x00000000, 0x00000043, 0x00000003, 0x802D6688, 0x0000001E, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000020, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000021, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000024, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000025, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000028, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000002A, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000002C, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000002D, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000030, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000031, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000034, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000036, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000038, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000039, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000003C, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000003D, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000040, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000001F, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000022, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000023, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000026, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000027, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000002B, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000002E, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000002F, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000032, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000033, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000037, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000003A, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000003B, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000003E, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000003F, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0x0000008C, 0x0000000D, 0x00000002, 0xFE363C80, 0x00010000, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFF0000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, 0x802D67E4, 0x00000001, 0x00000000, 0xFE363C80, 0x00000000, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFF38, 0x0000000C, 0x00000002, 0xFE363C81, 0x00000000, 0x00000027, 0x00000002, 0xFE363C81, 0x00010000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, 0x802D67E4, 0x00000002, 0x00000000, 0xFE363C81, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000001, 0x7FFFFE00, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000005, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, D_80243704_EF5D14, 0x00000044, 0x00000001, 0x80285C70, 0x00000046, 0x00000001, D_80243330_EF5940, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000035, 0x00000043, 0x00000001, EF2610_DeadUnkFunc1, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 dlabel D_80244080_EF6690 .word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80240040_EF2650, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0xFE363C84, 0x00000043, 0x00000002, D_802DF3F0, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000017, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, 0x802D6400, 0xFE363C85, 0x00000043, 0x00000006, 0x802E382C, 0x000001DB, 0x00400000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x0000000C, 0x00000002, 0xFE363C87, 0x0000005A, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000024, 0x00000002, 0xFE363C88, 0x00000006, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0xFE363C89, 0x7FFFFE00, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C88, 0x00000001, 0x00000027, 0x00000002, 0xFE363C87, 0xFE363C88, 0x00000013, 0x00000000, 0x00000004, 0x00000001, 0x00000032, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C87, 0x00000000, 0x00000028, 0x00000002, 0xFE363C88, 0x00000001, 0x00000027, 0x00000002, 0xFE363C87, 0xFE363C88, 0x0000000E, 0x00000002, 0xFE363C87, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, 0x802D6400, 0xFE363C85, 0x00000043, 0x00000006, 0x802E382C, 0x000001DC, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000057, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000001, 0xFE363C89, 0x7FFFFE00, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x00000032, 0x0000000F, 0x00000002, 0xFE363C87, 0x0000005A, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFFFF, 0x00000024, 0x00000002, 0xFE363C87, 0x0000005A, 0x00000013, 0x00000000, 0x00000043, 0x00000006, 0x802D60E4, 0xFE363C85, 0xFE363C87, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000043, 0x00000006, 0x802D60E4, 0xFE363C86, 0xFE363C87, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/EF8250.data.s b/ver/us/asm/data/EF8250.data.s index 68f341783d..63db12a351 100644 --- a/ver/us/asm/data/EF8250.data.s +++ b/ver/us/asm/data/EF8250.data.s @@ -21,7 +21,7 @@ dlabel D_802409E4_EF8464 .word 0x0000000B, 0xC3480000, 0x00000000, 0x42F00000, 0x0000000C, 0x00000000, 0x00000000, 0x42F00000, 0x0000000D, 0x432A0000, 0x00000000, 0x42F00000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000 dlabel D_80240A24_EF84A4 -.word 0x00000024, 0x00000002, 0xF5DE0329, 0x00000026, 0x00000043, 0x00000002, 0x802E6F50, 0xFFFFFFFF, 0x00000043, 0x00000003, 0x802D8B60, 0x00000000, 0x00000000, 0x00000043, 0x00000006, 0x802D7CD8, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetSleepBubbleUnk1C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802D7B70, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x80048338, 0x00000000, D_802466CC_EFE14C, 0x00000044, 0x00000001, D_80247054_EFEAD4, 0x00000044, 0x00000001, D_802436E0_EFB160, 0x00000044, 0x00000001, D_80245704_EFD184, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x00000008, 0x00000002, 0x00000056, 0x00000000, 0x00000043, 0x00000002, 0x802D7384, D_802409E4_EF8464, 0x00000057, 0x00000000, 0x00000043, 0x00000003, 0x802D6688, 0x00000009, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000000B, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000000C, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000000D, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000000E, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000000F, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000007, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000008, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000000A, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000010, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000011, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF74, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, D_802408C0_EF8340, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF38, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, D_802408C0_EF8340, 0x00000057, 0x00000000, 0x00000043, 0x00000002, 0x802D790C, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000001, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, D_802409B8_EF8438, 0x00000044, 0x00000001, 0x80285C70, 0x00000012, 0x00000000, 0x00000044, 0x00000001, D_80244088_EFBB08, 0x00000044, 0x00000001, D_802409B8_EF8438, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80240830_EF82B0, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000035, 0x00000043, 0x00000001, EF7A80_DeadUnkFunc1, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000024, 0x00000002, 0xF5DE0329, 0x00000026, 0x00000043, 0x00000002, 0x802E6F50, 0xFFFFFFFF, 0x00000043, 0x00000003, 0x802D8B60, 0x00000000, 0x00000000, 0x00000043, 0x00000006, 0x802D7CD8, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetSleepBubbleTimeLeft, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802D7B70, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x80048338, 0x00000000, D_802466CC_EFE14C, 0x00000044, 0x00000001, D_80247054_EFEAD4, 0x00000044, 0x00000001, D_802436E0_EFB160, 0x00000044, 0x00000001, D_80245704_EFD184, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x00000008, 0x00000002, 0x00000056, 0x00000000, 0x00000043, 0x00000002, 0x802D7384, D_802409E4_EF8464, 0x00000057, 0x00000000, 0x00000043, 0x00000003, 0x802D6688, 0x00000009, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000000B, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000000C, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000000D, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000000E, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000000F, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000007, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000008, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000000A, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000010, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000011, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF74, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, D_802408C0_EF8340, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF38, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, D_802408C0_EF8340, 0x00000057, 0x00000000, 0x00000043, 0x00000002, 0x802D790C, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000001, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, D_802409B8_EF8438, 0x00000044, 0x00000001, 0x80285C70, 0x00000012, 0x00000000, 0x00000044, 0x00000001, D_80244088_EFBB08, 0x00000044, 0x00000001, D_802409B8_EF8438, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80240830_EF82B0, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000035, 0x00000043, 0x00000001, EF7A80_DeadUnkFunc1, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 dlabel D_80240E90_EF8910 .word 0x0000004D, 0x00000001, 0x0000000B, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x0000000F, 0x802E58EC, 0x0000005E, 0x00000000, 0xF24A3A80, 0xF24C1280, 0xF24A6A1A, 0xF24BBE1A, 0xF24C1280, 0xF24A6A1A, 0xF24A7C80, 0x00000006, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000001, func_80240340_EF7DC0, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x0000000F, 0x802E58EC, 0x0000005E, 0x00000000, 0xF24BBE1A, 0xF24C1280, 0xF24A6A1A, 0xF24A3A80, 0xF24C1280, 0xF24A6A1A, 0xF24A7C80, 0x00000006, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000001, func_80240340_EF7DC0, 0x00000008, 0x00000001, 0x00000004, 0x0000000F, 0x00000002, 0xF5DE027D, 0x00000003, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000006, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x0000000F, 0x802E58EC, 0x0000005E, 0x00000000, 0xF24A3A80, 0xF24C1280, 0xF24A6A1A, 0xF24BBE1A, 0xF24C1280, 0xF24A6A1A, 0xF24A7C80, 0x00000006, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000001, func_80240340_EF7DC0, 0x00000008, 0x00000001, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x00000002, 0x00000043, 0x0000000F, 0x802E58EC, 0x0000005E, 0x00000000, 0xF24BBE1A, 0xF24C1280, 0xF24A6A1A, 0xF24A3A80, 0xF24C1280, 0xF24A6A1A, 0xF24A7C80, 0x00000006, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000001, func_80240340_EF7DC0, 0x00000008, 0x00000001, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x00000002, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/battle/partner/70DED0.data.s b/ver/us/asm/data/battle/partner/70DED0.data.s index 4719ee54c5..5f849466d2 100644 --- a/ver/us/asm/data/battle/partner/70DED0.data.s +++ b/ver/us/asm/data/battle/partner/70DED0.data.s @@ -73,18 +73,3 @@ dlabel D_8023CCC0_7109D0 dlabel D_8023CCC4_7109D4 .word 0x00000043, 0x00000002, LoadActionCommand, 0x00000014, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000043, 0x00000007, SetupMashMeter, 0x00000001, 0x00000064, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, func_80269344, 0x0000000F, 0x00000043, 0x00000002, func_80269EAC, 0x00000014, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000013, 0x00000043, 0x00000004, SetBattleCamTarget, 0xFFFFFFD3, 0x00000036, 0x00000000, 0x00000043, 0x00000002, SetBattleCamOffsetZ, 0x00000000, 0x00000043, 0x00000002, SetBattleCamZoom, 0x00000118, 0x00000043, 0x00000002, MoveBattleCamOver, 0x00000028, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000002, SetGoalToHome, 0x00000100, 0x00000043, 0x00000004, SetAnimation, 0x00000100, 0xFFFFFFFF, 0x00100003, 0x00000043, 0x00000005, AddGoalPos, 0x00000100, 0x00000028, 0x00000014, 0x00000000, 0x00000043, 0x00000005, FlyToGoal, 0x00000100, 0x0000001E, 0x00000000, 0x0000000A, 0x00000043, 0x00000004, SetAnimation, 0x00000100, 0xFFFFFFFF, 0x00100001, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000001, func_80238D8C_70CA9C, 0x00000043, 0x00000005, func_802A91A0_42DBB0, 0x00000000, 0x00000093, 0x00000003, 0xFE363C80, 0x00000043, 0x00000003, SetBattleFlagBits, 0x00004000, 0x00000000, 0x00000043, 0x00000005, SetActorRotationOffset, 0x00000100, 0x00000000, 0x00000014, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000013, 0x00000043, 0x00000004, SetBattleCamTarget, 0x00000023, 0x00000036, 0x00000000, 0x00000043, 0x00000002, SetBattleCamOffsetZ, 0x00000000, 0x00000043, 0x00000002, SetBattleCamZoom, 0x000001AE, 0x00000043, 0x00000002, MoveBattleCamOver, 0x00000096, 0x00000043, 0x00000004, func_8024ECF8, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000100, 0x00000288, 0x00000056, 0x00000000, 0x00000043, 0x00000001, func_80239140_70CE50, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000005, 0x00000001, 0x00000096, 0x00000043, 0x00000001, func_8023A1B0_70DEC0, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetActionSuccessCopy, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000064, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, GetActionSuccessCopy, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000019, 0x00000001, 0x00000063, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000004, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000033, 0x00000023, 0x00000000, 0x00000043, 0x00000001, InitTargetIterator, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetGoalToTarget, 0xFFFFFF81, 0x00000043, 0x00000001, func_8023906C_70CD7C, 0x0000000D, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000056, 0x00000000, 0x00000043, 0x00000001, func_80239F84_70DC94, 0x00000043, 0x00000003, SetBattleFlagBits, 0x01000000, 0x00000001, 0x00000043, 0x00000002, RemoveActor, 0xFE363C8A, 0x00000057, 0x00000000, 0x00000012, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000007, PartnerDamageEnemy, 0xFE363C82, 0x10000000, 0x00000000, 0x00000000, 0x00000000, 0x00000820, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x0000000B, 0x00000043, 0x00000003, ChooseNextTarget, 0x00000000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000022, 0x00000043, 0x00000005, SetActorRotation, 0x00000100, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetActorRotationOffset, 0x00000100, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_8023AAF8_70E808, 0x00000043, 0x00000004, SetAnimation, 0x00000100, 0xFFFFFFFF, 0x00100002, 0x00000043, 0x00000001, func_8023A19C_70DEAC, 0x00000043, 0x00000001, func_80280818, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_8023D1B0_710EC0 -.double 6.7 - -dlabel D_8023D1B8_710EC8 -.double 0.2 - -dlabel D_8023D1C0_710ED0 -.double 0.1 - -dlabel D_8023D1C8_710ED8 -.double 2.8 - -dlabel D_8023D1D0_710EE0 -.double 1.4, 0.0 diff --git a/ver/us/asm/data/world/area_jan/jan_11/B728B0.data.s b/ver/us/asm/data/world/area_jan/jan_11/B728B0.data.s index 39eb5d78e6..01c1ee8ca6 100644 --- a/ver/us/asm/data/world/area_jan/jan_11/B728B0.data.s +++ b/ver/us/asm/data/world/area_jan/jan_11/B728B0.data.s @@ -9,7 +9,7 @@ dlabel D_8024207C_B728DC .word 0x00000024, 0x00000002, 0xF9718882, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x000001F0, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x0000000A, 0x00000002, 0xF9718882, 0x00000001, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802420F4_B72954 -.word 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, jan_11_GetFloorCollider, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_802407DC_B7103C, 0x0000000A, 0x00000002, 0xFE363C89, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x0000000C, 0x00000002, 0xFE363C82, 0x00000055, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0x0000000C, 0x00000002, 0xFE363C81, 0xFE363C84, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFCE, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C81, 0x0000001E, 0x00000013, 0x00000000, 0x00000043, 0x00000002, SetPlayerSpeed, 0xF24A7E80, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C83, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0xFFFFFFFF, 0x00000000, 0x00000028, 0x00000002, 0xFE363C84, 0xFE363C81, 0x0000002A, 0x00000002, 0xFE363C84, 0x00000002, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C84, 0x00000043, 0x00000007, AdjustCam, 0x00000000, 0xF24A8A80, 0xFE363C84, 0x0000015E, 0xF24ABE80, 0xF24A5E80, 0x00000024, 0x00000002, 0xF9718882, 0x00000001, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFF, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000057, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x0097000B, 0x0097000A, 0x00000000, 0x001000AE, 0x00000043, 0x00000005, EndSpeech, 0xFFFFFFFF, 0x00970004, 0x00970001, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000300, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00970003, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xF24A8E80, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFFFFFF9C, 0x00000032, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000200, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000057, 0x00000000, 0x00000024, 0x00000002, 0xF8406052, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0xF840604E, 0x00000027, 0x00000002, 0xFE363C80, 0xF840604F, 0x00000027, 0x00000002, 0xFE363C80, 0xF8406050, 0x00000027, 0x00000002, 0xFE363C80, 0xF8406051, 0x00000027, 0x00000002, 0xFE363C80, 0xF8406052, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000005, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000004E, 0x00000000, 0x00000008, 0x00000024, 0x00000002, 0xF5DE0180, 0x00000010, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010032, 0x00000008, 0x00000001, 0x00000078, 0x00000044, 0x00000001, 0x80240850, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000012, 0x00000000, 0x00000008, 0x00000001, 0x00000023, 0x00000013, 0x00000000, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, jan_11_GetFloorCollider, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, jan_11_IsPartnerWatt, 0x0000000A, 0x00000002, 0xFE363C89, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x0000000C, 0x00000002, 0xFE363C82, 0x00000055, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0x0000000C, 0x00000002, 0xFE363C81, 0xFE363C84, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFCE, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C81, 0x0000001E, 0x00000013, 0x00000000, 0x00000043, 0x00000002, SetPlayerSpeed, 0xF24A7E80, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C83, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0xFFFFFFFF, 0x00000000, 0x00000028, 0x00000002, 0xFE363C84, 0xFE363C81, 0x0000002A, 0x00000002, 0xFE363C84, 0x00000002, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C84, 0x00000043, 0x00000007, AdjustCam, 0x00000000, 0xF24A8A80, 0xFE363C84, 0x0000015E, 0xF24ABE80, 0xF24A5E80, 0x00000024, 0x00000002, 0xF9718882, 0x00000001, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFF, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000057, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x0097000B, 0x0097000A, 0x00000000, 0x001000AE, 0x00000043, 0x00000005, EndSpeech, 0xFFFFFFFF, 0x00970004, 0x00970001, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000300, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00970003, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xF24A8E80, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFFFFFF9C, 0x00000032, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000200, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000057, 0x00000000, 0x00000024, 0x00000002, 0xF8406052, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0xF840604E, 0x00000027, 0x00000002, 0xFE363C80, 0xF840604F, 0x00000027, 0x00000002, 0xFE363C80, 0xF8406050, 0x00000027, 0x00000002, 0xFE363C80, 0xF8406051, 0x00000027, 0x00000002, 0xFE363C80, 0xF8406052, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000005, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000004E, 0x00000000, 0x00000008, 0x00000024, 0x00000002, 0xF5DE0180, 0x00000010, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010032, 0x00000008, 0x00000001, 0x00000078, 0x00000044, 0x00000001, 0x80240850, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000012, 0x00000000, 0x00000008, 0x00000001, 0x00000023, 0x00000013, 0x00000000, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242544_B72DA4 .word 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00970006, 0x00970006, 0x00000000, 0x001000AD, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_12/A55620.data.s b/ver/us/asm/data/world/area_kpa/kpa_12/A55620.data.s index ccad0e949f..6f142454f0 100644 --- a/ver/us/asm/data/world/area_kpa/kpa_12/A55620.data.s +++ b/ver/us/asm/data/world/area_kpa/kpa_12/A55620.data.s @@ -24,4 +24,4 @@ dlabel D_802410CC_A55A1C .word 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x0000005B, 0x00000046, 0x00000001, D_80240F98_A558E8, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x0000005E, 0x00000046, 0x00000001, D_80240F98_A558E8, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000061, 0x00000046, 0x00000001, D_80240F98_A558E8, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C82, 0x00000064, 0x00000046, 0x00000001, D_80240F98_A558E8, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802411A0_A55AF0 -.word 0x0000004D, 0x00000001, 0x0000000B, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000001D, 0x00000065, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x0000007D, 0x00000028, 0x00000002, 0xFE363C81, 0xFE363C80, 0x00000043, 0x00000005, MakeLerp, 0xFE363C80, 0x0000007D, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0x00000067, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000001D, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C84, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000043, 0x00000003, func_8024037C_A54CCC, 0xFE363C84, 0x0000001D, 0x0000000D, 0x00000002, 0xFE363C80, 0x0000005F, 0x00000043, 0x00000001, func_80240444_A54D94, 0x0000000A, 0x00000002, 0xFE363C89, 0x00000001, 0x00000043, 0x00000002, kpa_12_func_80240350_A54CA0, 0xFE363C82, 0x0000000A, 0x00000002, 0xFE363C82, 0x00000051, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000005, MakeLerp, 0xFE363C80, 0x00000000, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0x00000067, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000001D, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C84, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000043, 0x00000003, func_8024037C_A54CCC, 0xFE363C84, 0x0000001D, 0x0000000C, 0x00000002, 0xFE363C80, 0x0000001E, 0x00000043, 0x00000001, func_80240444_A54D94, 0x0000000A, 0x00000002, 0xFE363C89, 0x00000001, 0x00000043, 0x00000002, kpa_12_func_80240350_A54CA0, 0xFE363C82, 0x0000000A, 0x00000002, 0xFE363C82, 0x00000050, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000015, 0x0000005A, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000017, 0x0000005D, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000019, 0x00000060, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000001B, 0x00000063, 0x00000047, 0x00000005, D_80240EA8_A557F8, 0x00000080, 0x00000015, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240EE4_A55834, 0x00000080, 0x00000017, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240F20_A55870, 0x00000080, 0x00000019, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240F5C_A558AC, 0x00000080, 0x0000001B, 0x00000001, 0x00000000, 0x00000044, 0x00000001, D_802410CC_A55A1C, 0x00000044, 0x00000001, D_802411A0_A55AF0, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 +.word 0x0000004D, 0x00000001, 0x0000000B, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000001D, 0x00000065, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x0000007D, 0x00000028, 0x00000002, 0xFE363C81, 0xFE363C80, 0x00000043, 0x00000005, MakeLerp, 0xFE363C80, 0x0000007D, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0x00000067, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000001D, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C84, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000043, 0x00000003, func_8024037C_A54CCC, 0xFE363C84, 0x0000001D, 0x0000000D, 0x00000002, 0xFE363C80, 0x0000005F, 0x00000043, 0x00000001, kpa_12_IsPartnerLakilester, 0x0000000A, 0x00000002, 0xFE363C89, 0x00000001, 0x00000043, 0x00000002, kpa_12_func_80240350_A54CA0, 0xFE363C82, 0x0000000A, 0x00000002, 0xFE363C82, 0x00000051, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000005, MakeLerp, 0xFE363C80, 0x00000000, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0x00000067, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000001D, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C84, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000043, 0x00000003, func_8024037C_A54CCC, 0xFE363C84, 0x0000001D, 0x0000000C, 0x00000002, 0xFE363C80, 0x0000001E, 0x00000043, 0x00000001, kpa_12_IsPartnerLakilester, 0x0000000A, 0x00000002, 0xFE363C89, 0x00000001, 0x00000043, 0x00000002, kpa_12_func_80240350_A54CA0, 0xFE363C82, 0x0000000A, 0x00000002, 0xFE363C82, 0x00000050, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000015, 0x0000005A, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000017, 0x0000005D, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000019, 0x00000060, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000001B, 0x00000063, 0x00000047, 0x00000005, D_80240EA8_A557F8, 0x00000080, 0x00000015, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240EE4_A55834, 0x00000080, 0x00000017, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240F20_A55870, 0x00000080, 0x00000019, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240F5C_A558AC, 0x00000080, 0x0000001B, 0x00000001, 0x00000000, 0x00000044, 0x00000001, D_802410CC_A55A1C, 0x00000044, 0x00000001, D_802411A0_A55AF0, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_13/A56CA0.data.s b/ver/us/asm/data/world/area_kpa/kpa_13/A56CA0.data.s index 641d58eae3..64e29fc22d 100644 --- a/ver/us/asm/data/world/area_kpa/kpa_13/A56CA0.data.s +++ b/ver/us/asm/data/world/area_kpa/kpa_13/A56CA0.data.s @@ -3,4 +3,4 @@ .section .data dlabel D_80240D80_A56CA0 -.word 0x0000004D, 0x00000001, 0x0000000B, 0x00000056, 0x00000000, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000021, 0x00000070, 0x00000043, 0x00000005, TranslateGroup, 0x00000072, 0x0000007D, 0x00000000, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000021, 0x0000000A, 0x00000002, 0xF840618E, 0x00000000, 0x00000003, 0x00000001, 0x0000000B, 0x0000000A, 0x00000002, 0xF9718885, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x0000000B, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x0000001E, 0xF24A7C80, 0x00000024, 0x00000002, 0xF840618E, 0x00000001, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x0000007D, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFF9C, 0x00000005, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C81, 0xFFFFFF9C, 0x00000043, 0x00000005, MakeLerp, 0xFE363C80, 0xFFFFFF9C, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0x00000072, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000021, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C84, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000043, 0x00000003, func_8024037C_A5629C, 0xFE363C84, 0x00000021, 0x0000000C, 0x00000002, 0xFE363C80, 0xFFFFFFBA, 0x00000043, 0x00000001, func_80240444_A56364, 0x0000000A, 0x00000002, 0xFE363C89, 0x00000001, 0x00000043, 0x00000002, kpa_13_func_80240350_A56270, 0xFE363C82, 0x0000000A, 0x00000002, 0xFE363C82, 0x0000005A, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000024, 0x00000002, 0xFE363C81, 0x0000007D, 0x00000028, 0x00000002, 0xFE363C81, 0xFE363C80, 0x00000043, 0x00000005, MakeLerp, 0xFE363C80, 0x0000007D, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0x00000072, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000021, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C84, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000043, 0x00000003, func_8024037C_A5629C, 0xFE363C84, 0x00000021, 0x0000000D, 0x00000002, 0xFE363C80, 0x0000005F, 0x00000043, 0x00000001, func_80240444_A56364, 0x0000000A, 0x00000002, 0xFE363C89, 0x00000001, 0x00000043, 0x00000002, kpa_13_func_80240350_A56270, 0xFE363C82, 0x0000000A, 0x00000002, 0xFE363C82, 0x0000005B, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000023, 0x00000073, 0x00000043, 0x00000005, TranslateGroup, 0x00000075, 0x0000004B, 0x00000000, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000023, 0x0000000A, 0x00000002, 0xF840618F, 0x00000000, 0x00000003, 0x00000001, 0x0000000C, 0x0000000A, 0x00000002, 0xF9718886, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x0000000C, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x0000001E, 0xF24A7C80, 0x00000024, 0x00000002, 0xF840618F, 0x00000001, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x0000004B, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFF9C, 0x00000005, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C81, 0xFFFFFF9C, 0x00000043, 0x00000005, MakeLerp, 0xFE363C80, 0xFFFFFF9C, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0x00000075, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000023, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C84, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000043, 0x00000003, func_8024037C_A5629C, 0xFE363C84, 0x00000023, 0x0000000C, 0x00000002, 0xFE363C80, 0xFFFFFFBA, 0x00000043, 0x00000001, func_80240444_A56364, 0x0000000A, 0x00000002, 0xFE363C89, 0x00000001, 0x00000043, 0x00000002, kpa_13_func_80240350_A56270, 0xFE363C82, 0x0000000A, 0x00000002, 0xFE363C82, 0x0000005A, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000024, 0x00000002, 0xFE363C81, 0x0000004B, 0x00000028, 0x00000002, 0xFE363C81, 0xFE363C80, 0x00000043, 0x00000005, MakeLerp, 0xFE363C80, 0x0000004B, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0x00000075, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000023, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C84, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000043, 0x00000003, func_8024037C_A5629C, 0xFE363C84, 0x00000023, 0x0000000D, 0x00000002, 0xFE363C80, 0x0000002D, 0x00000043, 0x00000001, func_80240444_A56364, 0x0000000A, 0x00000002, 0xFE363C89, 0x00000001, 0x00000043, 0x00000002, kpa_13_func_80240350_A56270, 0xFE363C82, 0x0000000A, 0x00000002, 0xFE363C82, 0x0000005B, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 +.word 0x0000004D, 0x00000001, 0x0000000B, 0x00000056, 0x00000000, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000021, 0x00000070, 0x00000043, 0x00000005, TranslateGroup, 0x00000072, 0x0000007D, 0x00000000, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000021, 0x0000000A, 0x00000002, 0xF840618E, 0x00000000, 0x00000003, 0x00000001, 0x0000000B, 0x0000000A, 0x00000002, 0xF9718885, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x0000000B, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x0000001E, 0xF24A7C80, 0x00000024, 0x00000002, 0xF840618E, 0x00000001, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x0000007D, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFF9C, 0x00000005, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C81, 0xFFFFFF9C, 0x00000043, 0x00000005, MakeLerp, 0xFE363C80, 0xFFFFFF9C, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0x00000072, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000021, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C84, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000043, 0x00000003, func_8024037C_A5629C, 0xFE363C84, 0x00000021, 0x0000000C, 0x00000002, 0xFE363C80, 0xFFFFFFBA, 0x00000043, 0x00000001, kpa_13_IsPartnerLakilester, 0x0000000A, 0x00000002, 0xFE363C89, 0x00000001, 0x00000043, 0x00000002, kpa_13_func_80240350_A56270, 0xFE363C82, 0x0000000A, 0x00000002, 0xFE363C82, 0x0000005A, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000024, 0x00000002, 0xFE363C81, 0x0000007D, 0x00000028, 0x00000002, 0xFE363C81, 0xFE363C80, 0x00000043, 0x00000005, MakeLerp, 0xFE363C80, 0x0000007D, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0x00000072, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000021, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C84, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000043, 0x00000003, func_8024037C_A5629C, 0xFE363C84, 0x00000021, 0x0000000D, 0x00000002, 0xFE363C80, 0x0000005F, 0x00000043, 0x00000001, kpa_13_IsPartnerLakilester, 0x0000000A, 0x00000002, 0xFE363C89, 0x00000001, 0x00000043, 0x00000002, kpa_13_func_80240350_A56270, 0xFE363C82, 0x0000000A, 0x00000002, 0xFE363C82, 0x0000005B, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000023, 0x00000073, 0x00000043, 0x00000005, TranslateGroup, 0x00000075, 0x0000004B, 0x00000000, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000023, 0x0000000A, 0x00000002, 0xF840618F, 0x00000000, 0x00000003, 0x00000001, 0x0000000C, 0x0000000A, 0x00000002, 0xF9718886, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x0000000C, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x0000001E, 0xF24A7C80, 0x00000024, 0x00000002, 0xF840618F, 0x00000001, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x0000004B, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFF9C, 0x00000005, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C81, 0xFFFFFF9C, 0x00000043, 0x00000005, MakeLerp, 0xFE363C80, 0xFFFFFF9C, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0x00000075, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000023, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C84, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000043, 0x00000003, func_8024037C_A5629C, 0xFE363C84, 0x00000023, 0x0000000C, 0x00000002, 0xFE363C80, 0xFFFFFFBA, 0x00000043, 0x00000001, kpa_13_IsPartnerLakilester, 0x0000000A, 0x00000002, 0xFE363C89, 0x00000001, 0x00000043, 0x00000002, kpa_13_func_80240350_A56270, 0xFE363C82, 0x0000000A, 0x00000002, 0xFE363C82, 0x0000005A, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000024, 0x00000002, 0xFE363C81, 0x0000004B, 0x00000028, 0x00000002, 0xFE363C81, 0xFE363C80, 0x00000043, 0x00000005, MakeLerp, 0xFE363C80, 0x0000004B, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0x00000075, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000023, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C84, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000043, 0x00000003, func_8024037C_A5629C, 0xFE363C84, 0x00000023, 0x0000000D, 0x00000002, 0xFE363C80, 0x0000002D, 0x00000043, 0x00000001, kpa_13_IsPartnerLakilester, 0x0000000A, 0x00000002, 0xFE363C89, 0x00000001, 0x00000043, 0x00000002, kpa_13_func_80240350_A56270, 0xFE363C82, 0x0000000A, 0x00000002, 0xFE363C82, 0x0000005B, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_14/A59060.data.s b/ver/us/asm/data/world/area_kpa/kpa_14/A59060.data.s index f973b09a6c..b3ee386937 100644 --- a/ver/us/asm/data/world/area_kpa/kpa_14/A59060.data.s +++ b/ver/us/asm/data/world/area_kpa/kpa_14/A59060.data.s @@ -3,4 +3,4 @@ .section .data dlabel D_80241BB0_A59060 -.word 0x0000004D, 0x00000001, 0x0000000B, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000005E, 0x00000067, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFE363C80, 0x000000AF, 0x000000AF, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0x00000069, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000005E, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C84, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000043, 0x00000004, func_8024073C_A57BEC, 0xFE363C84, 0x0000005E, 0xFD050F8B, 0x0000000D, 0x00000002, 0xFE363C80, 0x00000091, 0x00000043, 0x00000001, func_80240840_A57CF0, 0x0000000A, 0x00000002, 0xFE363C89, 0x00000001, 0x00000043, 0x00000002, kpa_14_func_80240710_A57BC0, 0xFE363C82, 0x0000000A, 0x00000002, 0xFE363C82, 0x00000065, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000005, MakeLerp, 0xFE363C80, 0x00000000, 0x000000AF, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0x00000069, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000005E, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C84, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000043, 0x00000004, func_8024073C_A57BEC, 0xFE363C84, 0x0000005E, 0xFD050F8B, 0x0000000C, 0x00000002, 0xFE363C80, 0x0000001E, 0x00000043, 0x00000001, func_80240840_A57CF0, 0x0000000A, 0x00000002, 0xFE363C89, 0x00000001, 0x00000043, 0x00000002, kpa_14_func_80240710_A57BC0, 0xFE363C82, 0x0000000A, 0x00000002, 0xFE363C82, 0x00000064, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 +.word 0x0000004D, 0x00000001, 0x0000000B, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000005E, 0x00000067, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFE363C80, 0x000000AF, 0x000000AF, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0x00000069, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000005E, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C84, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000043, 0x00000004, func_8024073C_A57BEC, 0xFE363C84, 0x0000005E, 0xFD050F8B, 0x0000000D, 0x00000002, 0xFE363C80, 0x00000091, 0x00000043, 0x00000001, kpa_14_IsPartnerLakilester, 0x0000000A, 0x00000002, 0xFE363C89, 0x00000001, 0x00000043, 0x00000002, kpa_14_func_80240710_A57BC0, 0xFE363C82, 0x0000000A, 0x00000002, 0xFE363C82, 0x00000065, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000005, MakeLerp, 0xFE363C80, 0x00000000, 0x000000AF, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0x00000069, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000005E, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C84, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000043, 0x00000004, func_8024073C_A57BEC, 0xFE363C84, 0x0000005E, 0xFD050F8B, 0x0000000C, 0x00000002, 0xFE363C80, 0x0000001E, 0x00000043, 0x00000001, kpa_14_IsPartnerLakilester, 0x0000000A, 0x00000002, 0xFE363C89, 0x00000001, 0x00000043, 0x00000002, kpa_14_func_80240710_A57BC0, 0xFE363C82, 0x0000000A, 0x00000002, 0xFE363C82, 0x00000064, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kzn/kzn_11/C83180.data.s b/ver/us/asm/data/world/area_kzn/kzn_11/C83180.data.s index 079695302c..546fbcc127 100644 --- a/ver/us/asm/data/world/area_kzn/kzn_11/C83180.data.s +++ b/ver/us/asm/data/world/area_kzn/kzn_11/C83180.data.s @@ -3,4 +3,4 @@ .section .data dlabel D_80242FE0_C83180 -.word 0x0000004D, 0x00000001, 0x0000000B, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000001A, 0x00000019, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000019, 0x00000017, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000018, 0x00000018, 0x00000024, 0x00000002, 0xFE363C80, 0x0000003C, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFE363C80, 0xFFFFFFC4, 0x00000078, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0x0000001A, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000001A, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000019, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000018, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C84, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000043, 0x00000004, func_80240310_C804B0, 0xFE363C84, 0x0000001A, 0x00000019, 0x0000000C, 0x00000002, 0xFE363C80, 0xFFFFFFD3, 0x00000043, 0x00000001, func_80240434_C805D4, 0x0000000A, 0x00000002, 0xFE363C89, 0x00000001, 0x00000043, 0x00000002, kzn_11_GetFloorCollider, 0xFE363C82, 0x0000000A, 0x00000002, 0xFE363C82, 0x0000003E, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000005, MakeLerp, 0xFE363C80, 0x0000003C, 0x00000078, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0x0000001A, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000001A, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000019, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000018, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C84, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000043, 0x00000004, func_80240310_C804B0, 0xFE363C84, 0x0000001A, 0x00000019, 0x0000000D, 0x00000002, 0xFE363C80, 0x0000002D, 0x00000043, 0x00000001, func_80240434_C805D4, 0x0000000A, 0x00000002, 0xFE363C89, 0x00000001, 0x00000043, 0x00000002, kzn_11_GetFloorCollider, 0xFE363C82, 0x0000000A, 0x00000002, 0xFE363C82, 0x0000003F, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x0000000B, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000001E, 0x00000020, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000001D, 0x0000001E, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000001C, 0x0000001F, 0x00000024, 0x00000002, 0xFE363C80, 0x00000087, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFE363C80, 0xFFFFFFC4, 0x000000C3, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0x00000021, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000001E, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000001D, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000001C, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C84, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000043, 0x00000004, func_80240310_C804B0, 0xFE363C84, 0x0000001E, 0x0000001D, 0x0000000C, 0x00000002, 0xFE363C80, 0xFFFFFFD3, 0x00000043, 0x00000001, func_80240434_C805D4, 0x0000000A, 0x00000002, 0xFE363C89, 0x00000001, 0x00000043, 0x00000002, kzn_11_GetFloorCollider, 0xFE363C82, 0x0000000A, 0x00000002, 0xFE363C82, 0x0000003E, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000005, MakeLerp, 0xFE363C80, 0x00000087, 0x000000C3, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0x00000021, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000001E, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000001D, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000001C, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C84, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000043, 0x00000004, func_80240310_C804B0, 0xFE363C84, 0x0000001E, 0x0000001D, 0x0000000D, 0x00000002, 0xFE363C80, 0x00000078, 0x00000043, 0x00000001, func_80240434_C805D4, 0x0000000A, 0x00000002, 0xFE363C89, 0x00000001, 0x00000043, 0x00000002, kzn_11_GetFloorCollider, 0xFE363C82, 0x0000000A, 0x00000002, 0xFE363C82, 0x0000003F, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 +.word 0x0000004D, 0x00000001, 0x0000000B, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000001A, 0x00000019, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000019, 0x00000017, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000018, 0x00000018, 0x00000024, 0x00000002, 0xFE363C80, 0x0000003C, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFE363C80, 0xFFFFFFC4, 0x00000078, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0x0000001A, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000001A, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000019, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000018, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C84, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000043, 0x00000004, func_80240310_C804B0, 0xFE363C84, 0x0000001A, 0x00000019, 0x0000000C, 0x00000002, 0xFE363C80, 0xFFFFFFD3, 0x00000043, 0x00000001, kzn_11_IsPartnerLakilester, 0x0000000A, 0x00000002, 0xFE363C89, 0x00000001, 0x00000043, 0x00000002, kzn_11_GetFloorCollider, 0xFE363C82, 0x0000000A, 0x00000002, 0xFE363C82, 0x0000003E, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000005, MakeLerp, 0xFE363C80, 0x0000003C, 0x00000078, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0x0000001A, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000001A, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000019, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000018, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C84, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000043, 0x00000004, func_80240310_C804B0, 0xFE363C84, 0x0000001A, 0x00000019, 0x0000000D, 0x00000002, 0xFE363C80, 0x0000002D, 0x00000043, 0x00000001, kzn_11_IsPartnerLakilester, 0x0000000A, 0x00000002, 0xFE363C89, 0x00000001, 0x00000043, 0x00000002, kzn_11_GetFloorCollider, 0xFE363C82, 0x0000000A, 0x00000002, 0xFE363C82, 0x0000003F, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x0000000B, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000001E, 0x00000020, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000001D, 0x0000001E, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000001C, 0x0000001F, 0x00000024, 0x00000002, 0xFE363C80, 0x00000087, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFE363C80, 0xFFFFFFC4, 0x000000C3, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0x00000021, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000001E, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000001D, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000001C, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C84, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000043, 0x00000004, func_80240310_C804B0, 0xFE363C84, 0x0000001E, 0x0000001D, 0x0000000C, 0x00000002, 0xFE363C80, 0xFFFFFFD3, 0x00000043, 0x00000001, kzn_11_IsPartnerLakilester, 0x0000000A, 0x00000002, 0xFE363C89, 0x00000001, 0x00000043, 0x00000002, kzn_11_GetFloorCollider, 0xFE363C82, 0x0000000A, 0x00000002, 0xFE363C82, 0x0000003E, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000005, MakeLerp, 0xFE363C80, 0x00000087, 0x000000C3, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0x00000021, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000001E, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000001D, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000001C, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C84, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000043, 0x00000004, func_80240310_C804B0, 0xFE363C84, 0x0000001E, 0x0000001D, 0x0000000D, 0x00000002, 0xFE363C80, 0x00000078, 0x00000043, 0x00000001, kzn_11_IsPartnerLakilester, 0x0000000A, 0x00000002, 0xFE363C89, 0x00000001, 0x00000043, 0x00000002, kzn_11_GetFloorCollider, 0xFE363C82, 0x0000000A, 0x00000002, 0xFE363C82, 0x0000003F, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_mac/mac_04/8469B0.data.s b/ver/us/asm/data/world/area_mac/mac_04/8469B0.data.s index 93ac3c96ec..537648059d 100644 --- a/ver/us/asm/data/world/area_mac/mac_04/8469B0.data.s +++ b/ver/us/asm/data/world/area_mac/mac_04/8469B0.data.s @@ -162,7 +162,7 @@ dlabel D_80248624_84B1F4 .word 0x00000043, 0x00000004, PlaySoundAtNpc, 0x0000000E, 0x0000203E, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x0000000E, 0x00000262, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0x0000000E, 0x00000000, 0x00000000, 0x00000014, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000006, SpeakToPlayer, 0x0000000E, 0x003B0311, 0x003B0301, 0x00000000, 0x000600B2, 0x00000043, 0x00000004, InterpNpcYaw, 0x0000000E, 0x000000B4, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000E, 0x003B0302, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000E, 0x003B0303, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000E, 0x003B0304, 0x00000008, 0x00000001, 0x00000004, 0x00000046, 0x00000001, D_80248128_84ACF8, 0x00000024, 0x00000002, 0xFE363C80, 0x0000000E, 0x00000045, 0x00000002, D_802480E0_84ACB0, 0xFE363C8A, 0x00000043, 0x00000005, NpcMoveTo, 0x0000000E, 0xFFFFFE0B, 0x000000DF, 0x0000000F, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000046, 0x00000001, D_802481E0_84ADB0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80248798_84B368 -.word 0x0000004D, 0x00000001, 0x000000EF, 0x0000000B, 0x00000002, 0xF5DE0180, 0xFFFFFFF5, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000005, 0x00000001, 0x00000096, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C82, 0x000000C8, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_802419AC_84457C, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x00000001, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000C, 0x00000002, 0xFE363C82, 0x00000064, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x0000000D, 0x00000002, 0xFE363C82, 0x000000C8, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000046, 0x00000001, D_80248128_84ACF8, 0x00000043, 0x00000005, SetNpcPos, 0x0000000E, 0xFFFFFE0B, 0x00000014, 0x000000DF, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000E, 0x003B0302, 0x00000043, 0x00000005, NpcMoveTo, 0x0000000E, 0xFFFFFE06, 0x000000A8, 0x0000000F, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000E, 0x003B0300, 0x00000046, 0x00000001, D_802481E0_84ADB0, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x00000046, 0x00000001, D_802483B8_84AF88, 0x00000012, 0x00000000, 0x00000046, 0x00000001, D_80248624_84B1F4, 0x00000043, 0x00000002, mac_04_GetFloorCollider, 0xFE363C80, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000044, 0x00000001, D_80248798_84B368, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x0000000E, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000004D, 0x00000001, 0x000000EF, 0x0000000B, 0x00000002, 0xF5DE0180, 0xFFFFFFF5, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000005, 0x00000001, 0x00000096, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C82, 0x000000C8, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, mac_04_IsPartnerBow, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x00000001, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000C, 0x00000002, 0xFE363C82, 0x00000064, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x0000000D, 0x00000002, 0xFE363C82, 0x000000C8, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000046, 0x00000001, D_80248128_84ACF8, 0x00000043, 0x00000005, SetNpcPos, 0x0000000E, 0xFFFFFE0B, 0x00000014, 0x000000DF, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000E, 0x003B0302, 0x00000043, 0x00000005, NpcMoveTo, 0x0000000E, 0xFFFFFE06, 0x000000A8, 0x0000000F, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000E, 0x003B0300, 0x00000046, 0x00000001, D_802481E0_84ADB0, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x00000046, 0x00000001, D_802483B8_84AF88, 0x00000012, 0x00000000, 0x00000046, 0x00000001, D_80248624_84B1F4, 0x00000043, 0x00000002, mac_04_GetFloorCollider, 0xFE363C80, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000044, 0x00000001, D_80248798_84B368, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x0000000E, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80248A14_84B5E4 .word 0x00000043, 0x00000005, GetNpcPos, 0x0000000F, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C83, 0x00000014, 0x00000043, 0x00000007, MakeItemEntity, 0x00010020, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x00000005, 0x00000001, 0x0000001E, 0x00000043, 0x00000005, GetNpcPos, 0x0000000F, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C83, 0x00000014, 0x00000043, 0x00000005, SetItemPos, 0xFE363C89, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C89, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFF3, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000D, 0x00000002, 0xF5DE0180, 0xFFFFFFF8, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000B, 0x00000002, 0xF8405CA2, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x0000000F, 0x000000FA, 0x00000014, 0xFFFFFE6E, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000F, 0x003B0004, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00880004, 0x00880001, 0x00000000, 0x00060000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000008, 0x00000001, 0x00000014, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x00000024, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C80, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0x00000000, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000017, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000039, 0x000001C1, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C80, 0x00000008, 0x00000043, 0x00000006, RotateModel, 0x00000053, 0xFE363C80, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFF8, 0x00000043, 0x00000006, RotateModel, 0x00000053, 0xFE363C80, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000039, 0x000001C2, 0x00000000, 0x00000057, 0x00000000, 0x00000044, 0x00000001, D_80248A14_84B5E4, 0x00000024, 0x00000002, 0xFE363C80, 0x0000000F, 0x00000045, 0x00000002, D_802480E0_84ACB0, 0xFE363C8A, 0x00000043, 0x00000005, NpcMoveTo, 0x0000000F, 0x000000FE, 0xFFFFFFBE, 0x0000001E, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000005, SetNpcPos, 0x0000000F, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000024, 0x00000002, 0xF8405CA2, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_sam/sam_01/D01D90.data.s b/ver/us/asm/data/world/area_sam/sam_01/D01D90.data.s index 2cdc8569ae..398212e3ba 100644 --- a/ver/us/asm/data/world/area_sam/sam_01/D01D90.data.s +++ b/ver/us/asm/data/world/area_sam/sam_01/D01D90.data.s @@ -12,4 +12,4 @@ dlabel D_8024A460_D01FD0 .word 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000013, 0x000001C1, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000050, 0x00000014, 0x0000000A, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x00000029, 0xFE363C80, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024A510_D02080 -.word 0x00000043, 0x00000005, MakeLerp, 0x00000050, 0x00000000, 0x00000014, 0x0000000A, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x00000029, 0xFE363C80, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000013, 0x000001C2, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_802D2B6C, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000100, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000002, 0x00000100, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xF246CA1A, 0xF24A7A80, 0xF249C41A, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xF245CA80, 0xF249A3B4, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24F2A80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000014, 0x00000046, 0x00000001, D_8024A460_D01FD0, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000046, 0x00000001, D_8024A510_D02080, 0x00000057, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000002, 0x00000040, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0x00000002, 0xFFFFFF01, 0x00000000, 0x0000001C, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000002, 0xF24A8280, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00CF0002, 0x00000043, 0x00000005, NpcMoveTo, 0x00000002, 0xFFFFFF01, 0xFFFFFFE2, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00CF0001, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000002, 0x00CF0004, 0x00CF0001, 0x00000000, 0x00120005, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFF01, 0x00000000, 0xFFFFFF6A, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF250BA80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A801A, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0xFFFFFEE4, 0x00000000, 0xFFFFFF5B, 0x00000043, 0x00000003, InterpPlayerYaw, 0x000000B4, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFFFFFEC0, 0x00000000, 0xFFFFFF42, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0x000000B4, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00CF0002, 0x00000043, 0x00000005, NpcMoveTo, 0x00000002, 0xFFFFFF01, 0xFFFFFFD8, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00080007, 0x00000043, 0x00000005, NpcMoveTo, 0x00000002, 0xFFFFFF01, 0xFFFFFF5B, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0x00000000, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0x00000000, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000002, 0xFFFFFF01, 0xFFFFFF47, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00CF0001, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000002, 0x00000262, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0x00000002, 0x00000000, 0x00000000, 0x0000001E, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00CF0002, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000002, 0xF24A7C80, 0x00000043, 0x00000005, NpcMoveTo, 0x00000002, 0xFFFFFF01, 0xFFFFFF38, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00CF0006, 0x00000008, 0x00000001, 0x00000023, 0x00000056, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000079, 0x00000000, 0x00000008, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00CF0009, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000002, 0x00CF0009, 0x00CF0009, 0x00000000, 0x00120006, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000001, 0x00000057, 0x00000000, 0x00000043, 0x00000008, SetMotionBlurParams, 0x00000000, 0x00000000, 0x00000000, 0x00000140, 0x000000F0, 0x00000080, 0x0000000A, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000005, GetNpcPos, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24DC280, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24AA280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000005, GetNpcPos, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF250BA80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24AA280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000006, 0x00000000, 0x00000043, 0x00000008, SetMotionBlurParams, 0x00000000, 0x00000000, 0x00000000, 0x00000140, 0x000000F0, 0x00000000, 0x0000000A, 0x00000003, 0x00000001, 0x00000002, 0x0000000A, 0x00000002, 0xFAA2B580, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000002, 0xF24A9280, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00CF0003, 0x00000043, 0x00000005, NpcMoveTo, 0x00000002, 0xFFFFFF01, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000002, 0xFFFFFF01, 0x00000000, 0x0000003C, 0x00000008, 0x00000001, 0x0000001E, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0001002B, 0x00000008, 0x00000001, 0x0000003C, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000001, 0x00000057, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x00120007, 0x000000A0, 0x00000028, 0x00000003, 0x00000001, 0x00000064, 0x0000000A, 0x00000002, 0xFAA2B580, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000064, 0x00000013, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF253DA80, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AB680, 0xF24A5A80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7CE7, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, InterpPlayerYaw, 0x000000B4, 0x00000005, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, InterpPlayerYaw, 0x00000000, 0x00000005, 0x00000008, 0x00000001, 0x0000005A, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, InterpPlayerYaw, 0x000000B4, 0x00000005, 0x00000057, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xF246CA1A, 0xF24A7A80, 0xF249C41A, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xF245CA80, 0xF249A3B4, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24F2A80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFFFFFECE, 0x00000000, 0xFFFFFF8C, 0x00000043, 0x00000003, SetNpcYaw, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000002, 0x00CF0009, 0x00CF0009, 0x00000005, 0x00120008, 0x00000008, 0x00000001, 0x00000014, 0x00000046, 0x00000001, D_8024A460_D01FD0, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000046, 0x00000001, D_8024A510_D02080, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000003, 0xFFFFFF01, 0x00000000, 0x00000032, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000003, 0xF24A8280, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00D00002, 0x00000043, 0x00000005, NpcMoveTo, 0x00000003, 0xFFFFFF01, 0xFFFFFFB5, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00D00001, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000001, 0x00000057, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000002, 0xFFFFFF01, 0x00000000, 0x00000050, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000002, 0xF24A8280, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00CF0002, 0x00000043, 0x00000005, NpcMoveTo, 0x00000002, 0xFFFFFF01, 0xFFFFFFEC, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00CF0001, 0x00000003, 0x00000001, 0x00000005, 0x0000000A, 0x00000002, 0xFAA2B580, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000005, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000002, 0x00CF0008, 0x00CF0007, 0x00000000, 0x00120009, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000003, 0x000000B4, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000003, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFF01, 0x00000000, 0xFFFFFF6A, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF250BA80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A801A, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, PlayerMoveTo, 0xFFFFFEC5, 0xFFFFFF6A, 0x00000014, 0x00000043, 0x00000003, InterpPlayerYaw, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00D00002, 0x00000043, 0x00000005, NpcMoveTo, 0x00000003, 0xFFFFFF01, 0xFFFFFF4C, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00D00001, 0x00000008, 0x00000001, 0x00000014, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00CF0002, 0x00000043, 0x00000005, NpcMoveTo, 0x00000002, 0xFFFFFF01, 0xFFFFFFBA, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00CF0001, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000001, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00D00006, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00D00001, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x00D00004, 0x00D00001, 0x00000000, 0x0012000A, 0x00000003, 0x00000001, 0x00000006, 0x0000000A, 0x00000002, 0xFAA2B580, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000006, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000002, 0x00CF0008, 0x00CF0007, 0x00000000, 0x0012000B, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xF2452880, 0xF24A7A80, 0xF247A7B4, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xF2433E80, 0xF24D4A80, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0xF2471E80, 0xF247BE80, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AC080, 0xF24A5A80, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24E6280, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, GetAngleToPlayer, 0x00000003, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000003, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000003, 0x00000000, 0x00000008, 0x00000001, 0x0000000D, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x00D00004, 0x00D00001, 0x00000000, 0x0012000C, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00090000, 0x00000008, 0x00000001, 0x00000023, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x00D00004, 0x00D00001, 0x00000000, 0x0012000D, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000002, 0x00CF0008, 0x00CF0007, 0x00000000, 0x0012000E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00090000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x00D00004, 0x00D00001, 0x00000000, 0x0012000F, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010029, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000007, SpeakToNpc, 0xFFFFFFFC, 0x00010008, 0x00010001, 0x00000000, 0x00000003, 0x00120010, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000007, SpeakToNpc, 0xFFFFFFFC, 0x0002000D, 0x00020003, 0x00000000, 0x00000003, 0x00120011, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000007, SpeakToNpc, 0xFFFFFFFC, 0x0003000E, 0x00030003, 0x00000000, 0x00000003, 0x00120012, 0x00000016, 0x00000001, 0x00000004, 0x00000043, 0x00000007, SpeakToNpc, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000000, 0x00000003, 0x00120013, 0x00000016, 0x00000001, 0x00000009, 0x00000043, 0x00000007, SpeakToNpc, 0xFFFFFFFC, 0x00050004, 0x00050001, 0x00000000, 0x00000003, 0x00120014, 0x00000016, 0x00000001, 0x00000006, 0x00000043, 0x00000007, SpeakToNpc, 0xFFFFFFFC, 0x00060004, 0x00060001, 0x00000000, 0x00000003, 0x00120015, 0x00000016, 0x00000001, 0x00000007, 0x00000043, 0x00000007, SpeakToNpc, 0xFFFFFFFC, 0x00070004, 0x00070001, 0x00000000, 0x00000003, 0x00120016, 0x00000016, 0x00000001, 0x00000008, 0x00000043, 0x00000007, SpeakToNpc, 0xFFFFFFFC, 0x00080009, 0x00080001, 0x00000000, 0x00000003, 0x00120017, 0x00000023, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x00D00004, 0x00D00001, 0x00000000, 0x00120018, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010029, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x00D00005, 0x00D00007, 0x00000000, 0x00120019, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010029, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x00D00004, 0x00D00001, 0x00000000, 0x0012001A, 0x00000043, 0x00000005, SetNpcPos, 0x00000009, 0xFFFFFF6A, 0x00000000, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000009, 0x0000005A, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x0000000A, 0xFFFFFFA6, 0x00000000, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x0000000A, 0x0000010E, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x0000000B, 0xFFFFFF88, 0x00000000, 0xFFFFFFE2, 0x00000043, 0x00000004, InterpNpcYaw, 0x0000000B, 0x000000B4, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x0000000C, 0xFFFFFF88, 0x00000000, 0x0000001E, 0x00000043, 0x00000004, InterpNpcYaw, 0x0000000C, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000100, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000002, 0x00000100, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000024, 0x00000002, 0xF5DE0180, 0x0000003F, 0x00000024, 0x00000002, 0xF5DE028E, 0x00000000, 0x00000024, 0x00000002, 0xFD050F80, 0x00000000, 0x00000024, 0x00000002, 0xFD050F81, 0x00000000, 0x00000024, 0x00000002, 0xFD050F82, 0x00000000, 0x00000024, 0x00000002, 0xFD050F83, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000001, func_802D2B6C, 0x00000008, 0x00000001, 0x00000014, 0x00000013, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000102, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFC, 0xF24A8680, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFC, 0xFFFFFEFA, 0xFFFFFF99, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000057, 0x00000000, 0x00000043, 0x00000003, GetAngleToPlayer, 0x00000003, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000003, 0xFE363C80, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x00D00004, 0x00D00001, 0x00000000, 0x0012001D, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00080007, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000005, GetNpcPos, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24F2A80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFFFFFF01, 0x00000000, 0xFFFFFF79, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000003, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x00D00004, 0x00D00001, 0x00000000, 0x0012001E, 0x00000043, 0x00000005, GetNpcPos, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00D00002, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000003, 0xF24A8280, 0x00000043, 0x00000005, NpcMoveTo, 0x00000003, 0xFE363C80, 0xFE363C82, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00D00001, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00D00006, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00D00001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x00D00004, 0x00D00001, 0x00000005, 0x0012001F, 0x00000043, 0x00000003, GetAngleToPlayer, 0x00000003, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000003, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010029, 0x00000008, 0x00000001, 0x00000014, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0x00000014, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C80, 0xFE363C82, 0x00000014, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000004, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000102, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFC, 0xFFFFFECE, 0xFFFFFF8C, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0x00000004, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C82, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00D00002, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000003, 0xF24A8280, 0x00000043, 0x00000005, NpcMoveTo, 0x00000003, 0xFE363C80, 0xFE363C82, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00D00001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x00D00004, 0x00D00001, 0x00000000, 0x00120020, 0x00000043, 0x00000005, GetNpcPos, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, GetNpcPos, 0x00000003, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x0000002C, 0x00000002, 0xFE363C80, 0xFE363C83, 0x0000002C, 0x00000002, 0xFE363C81, 0xFE363C84, 0x0000002C, 0x00000002, 0xFE363C82, 0xFE363C85, 0x0000002F, 0x00000002, 0xFE363C80, 0xF24A8280, 0x0000002F, 0x00000002, 0xFE363C81, 0xF24A8280, 0x0000002F, 0x00000002, 0xFE363C82, 0xF24A8280, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000004, 0x00D10004, 0x00D10001, 0x00000000, 0x00120021, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0x00000002, 0x00000003, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0x00000004, 0x00000003, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000004, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000003, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0x00000003, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x00D00005, 0x00D00007, 0x00000000, 0x00120022, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0x00000002, 0x00000004, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0x00000003, 0x00000004, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000003, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000004, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0x00000004, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000004, 0x00D10004, 0x00D10001, 0x00000000, 0x00120023, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0x00000004, 0x00000002, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000004, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0x00000003, 0x00000002, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000003, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000002, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0x00000002, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000002, 0x00CF0008, 0x00CF0007, 0x00000000, 0x00120024, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24F2A80, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AC080, 0xF24A6080, 0x00000043, 0x00000004, func_80241B20_CF9690, 0xFE363C80, 0xFE363C82, 0x0000002D, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xFE363C80, 0xFE363C81, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0x00000002, 0x00000003, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0x00000004, 0x00000003, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000004, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000003, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0x00000003, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x00D00005, 0x00D00007, 0x00000000, 0x00120025, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00CE0006, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x000003E4, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00CE0005, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00CE0006, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x000003E4, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00CE0005, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00CE0006, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_80241B20_CF9690, 0xFE363C80, 0xFE363C82, 0xFFFFFFA1, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xFE363C80, 0xFE363C81, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000003, FadeOutMusic, 0x00000000, 0x000001F4, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00CE0006, 0x00CE0006, 0x00000000, 0x00120026, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0x00000003, 0x00000000, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000003, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0x00000002, 0x00000000, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0x00000004, 0x00000000, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000004, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000000, 0x00000000, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0x00000000, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x000003E4, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00CE0005, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00CE0006, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x000003E4, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00CE0005, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00CE0006, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x0000000B, 0x00000027, 0x00000002, 0xFE363C82, 0x0000000A, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0xFFFFFEF2, 0x00000000, 0xFFFFFF33, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000000, 0x00000001, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00CE0007, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00CE0001, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x0000032C, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFE363C80, 0x00000000, 0xFE363C82, 0x0000000A, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000007A, 0x00000000, 0x00000008, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00CE0004, 0x00CE0001, 0x00000000, 0x00120027, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0x000000B4, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00CF000A, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000002, 0xF24A7E80, 0x00000043, 0x00000005, GetNpcPos, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, NpcJump0, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00CF0001, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000002, 0x00CF0004, 0x00CF0001, 0x00000000, 0x00120028, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00CE0004, 0x00CE0001, 0x00000000, 0x00120029, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000007, SpeakToNpc, 0x00000003, 0x00D00004, 0x00D00001, 0x00000000, 0x00000000, 0x0012002A, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000007, SpeakToNpc, 0x00000000, 0x00CE0004, 0x00CE0001, 0x00000000, 0x00000003, 0x0012002B, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24EDA80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00CE000B, 0x00CE0001, 0x00000000, 0x0012002C, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x000000C8, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0x00000003, 0x00000000, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000003, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0x00000004, 0x00000000, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000004, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0x00000002, 0x00000000, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000002, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x0000000D, 0x00000100, 0x00000001, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000000, 0xF24A8680, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00CE0002, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000100, 0x00000001, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0xFFFFFEC0, 0xFFFFFEFE, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0x000000B4, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00CE0001, 0x00000008, 0x00000001, 0x0000001E, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0x0000001E, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C80, 0xFE363C82, 0x00000014, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000000, 0x00000000, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000032, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000000, 0x00000000, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x00000008, 0x00000043, 0x00000005, GetNpcPos, 0x0000000D, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000002C, 0x00000002, 0xFE363C81, 0xF24A7F80, 0x00000043, 0x00000005, SetNpcPos, 0x0000000D, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00CE000A, 0x00000008, 0x00000001, 0x0000001E, 0x00000045, 0x00000002, D_8024A220_D01D90, 0xFE363C8A, 0x00000043, 0x00000005, GetNpcPos, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C82, 0xFFFFFFE7, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xF245CA80, 0xF24A7A80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7BB4, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00CE0008, 0x00000043, 0x00000005, GetNpcPos, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C82, 0xFFFFFFDD, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0xFE363C80, 0xFE363C82, 0x00000000, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000008, 0x00000001, 0x0000000A, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000005, 0x00000001, 0x00000007, 0x00000043, 0x00000005, GetNpcPos, 0x0000000D, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C82, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0x0000000D, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000100, 0x00000000, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000007, SpeakToNpc, 0x00000000, 0x00CE0004, 0x00CE0001, 0x00000000, 0x00000004, 0x0012002D, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00CE0009, 0x00000008, 0x00000001, 0x0000003C, 0x00000043, 0x00000005, GetNpcPos, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C82, 0xFFFFFFFB, 0x00000043, 0x00000005, NpcMoveTo, 0x00000004, 0xFE363C80, 0xFE363C82, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00CE0001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000004, 0x00D10005, 0x00000043, 0x00000007, SpeakToNpc, 0x00000004, 0x00D10007, 0x00D10006, 0x00000000, 0x00000000, 0x0012002E, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000002, 0x00000000, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000004, 0x00000000, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000003, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x00D00004, 0x00D00001, 0x00000000, 0x0012002F, 0x00000043, 0x00000005, GetNpcPos, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7BB4, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000000, 0xF24A8680, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000100, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00CE0002, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0xFFFFFF07, 0xFFFFFF93, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00CE0001, 0x00000005, 0x00000001, 0x00000064, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0x00000000, 0x00000003, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000064, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0x00000002, 0x00000003, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000003, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000003, 0x00000100, 0x00000001, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000003, 0xF24A8680, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00D00002, 0x00000043, 0x00000005, NpcMoveTo, 0x00000003, 0xFFFFFF2E, 0xFFFFFFB0, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000003, 0xFFFFFF06, 0xFFFFFFF6, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00D00001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000003, 0x00000100, 0x00000000, 0x00000046, 0x00000001, D_8024A460_D01FD0, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00D00002, 0x00000043, 0x00000005, NpcMoveTo, 0x00000003, 0xFFFFFF06, 0x00000032, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00D00001, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00CE0004, 0x00CE0001, 0x00000000, 0x00120030, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000004, 0x00D10007, 0x00D10006, 0x00000000, 0x00120031, 0x00000045, 0x00000002, D_8024A380_D01EF0, 0xFE363C8A, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000004, 0xF24A8680, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000004, 0x00D10008, 0x00000043, 0x00000005, NpcMoveTo, 0x00000004, 0xFFFFFF06, 0x00000032, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000004, 0x00D10006, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, RemoveItemEntity, 0xFD050F84, 0x00000046, 0x00000001, D_8024A510_D02080, 0x00000024, 0x00000002, 0xF5DE0180, 0x00000043, 0x00000044, 0x00000001, 0x80241FB0, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00CE0004, 0x00CE0001, 0x00000005, 0x00120032, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24E6280, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8680, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00CE0004, 0x00CE0001, 0x00000000, 0x00120033, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00080007, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00CE0004, 0x00CE0001, 0x00000000, 0x00120034, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000100, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000003, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000004, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000004, 0x00000004, 0x00000001, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000004, 0x00000000, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFD050F80, 0x00000000, 0x00000024, 0x00000002, 0xFD050F81, 0x00000000, 0x00000024, 0x00000002, 0xFD050F82, 0x00000000, 0x00000024, 0x00000002, 0xFD050F83, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000040, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000002, 0x00000040, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x0000000D, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000043, 0x00000005, MakeLerp, 0x00000050, 0x00000000, 0x00000014, 0x0000000A, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x00000029, 0xFE363C80, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000013, 0x000001C2, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_802D2B6C, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000100, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000002, 0x00000100, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xF246CA1A, 0xF24A7A80, 0xF249C41A, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xF245CA80, 0xF249A3B4, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24F2A80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000014, 0x00000046, 0x00000001, D_8024A460_D01FD0, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000046, 0x00000001, D_8024A510_D02080, 0x00000057, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000002, 0x00000040, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0x00000002, 0xFFFFFF01, 0x00000000, 0x0000001C, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000002, 0xF24A8280, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00CF0002, 0x00000043, 0x00000005, NpcMoveTo, 0x00000002, 0xFFFFFF01, 0xFFFFFFE2, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00CF0001, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000002, 0x00CF0004, 0x00CF0001, 0x00000000, 0x00120005, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFF01, 0x00000000, 0xFFFFFF6A, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF250BA80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A801A, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0xFFFFFEE4, 0x00000000, 0xFFFFFF5B, 0x00000043, 0x00000003, InterpPlayerYaw, 0x000000B4, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFFFFFEC0, 0x00000000, 0xFFFFFF42, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0x000000B4, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00CF0002, 0x00000043, 0x00000005, NpcMoveTo, 0x00000002, 0xFFFFFF01, 0xFFFFFFD8, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00080007, 0x00000043, 0x00000005, NpcMoveTo, 0x00000002, 0xFFFFFF01, 0xFFFFFF5B, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0x00000000, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0x00000000, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000002, 0xFFFFFF01, 0xFFFFFF47, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00CF0001, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000002, 0x00000262, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0x00000002, 0x00000000, 0x00000000, 0x0000001E, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00CF0002, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000002, 0xF24A7C80, 0x00000043, 0x00000005, NpcMoveTo, 0x00000002, 0xFFFFFF01, 0xFFFFFF38, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00CF0006, 0x00000008, 0x00000001, 0x00000023, 0x00000056, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000079, 0x00000000, 0x00000008, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00CF0009, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000002, 0x00CF0009, 0x00CF0009, 0x00000000, 0x00120006, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000001, 0x00000057, 0x00000000, 0x00000043, 0x00000008, SetMotionBlurParams, 0x00000000, 0x00000000, 0x00000000, 0x00000140, 0x000000F0, 0x00000080, 0x0000000A, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000005, GetNpcPos, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24DC280, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24AA280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000005, GetNpcPos, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF250BA80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24AA280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000006, 0x00000000, 0x00000043, 0x00000008, SetMotionBlurParams, 0x00000000, 0x00000000, 0x00000000, 0x00000140, 0x000000F0, 0x00000000, 0x0000000A, 0x00000003, 0x00000001, 0x00000002, 0x0000000A, 0x00000002, 0xFAA2B580, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000002, 0xF24A9280, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00CF0003, 0x00000043, 0x00000005, NpcMoveTo, 0x00000002, 0xFFFFFF01, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000002, 0xFFFFFF01, 0x00000000, 0x0000003C, 0x00000008, 0x00000001, 0x0000001E, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0001002B, 0x00000008, 0x00000001, 0x0000003C, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000001, 0x00000057, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x00120007, 0x000000A0, 0x00000028, 0x00000003, 0x00000001, 0x00000064, 0x0000000A, 0x00000002, 0xFAA2B580, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000064, 0x00000013, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF253DA80, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AB680, 0xF24A5A80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7CE7, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, InterpPlayerYaw, 0x000000B4, 0x00000005, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, InterpPlayerYaw, 0x00000000, 0x00000005, 0x00000008, 0x00000001, 0x0000005A, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, InterpPlayerYaw, 0x000000B4, 0x00000005, 0x00000057, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xF246CA1A, 0xF24A7A80, 0xF249C41A, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xF245CA80, 0xF249A3B4, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24F2A80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFFFFFECE, 0x00000000, 0xFFFFFF8C, 0x00000043, 0x00000003, SetNpcYaw, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000002, 0x00CF0009, 0x00CF0009, 0x00000005, 0x00120008, 0x00000008, 0x00000001, 0x00000014, 0x00000046, 0x00000001, D_8024A460_D01FD0, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000046, 0x00000001, D_8024A510_D02080, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000003, 0xFFFFFF01, 0x00000000, 0x00000032, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000003, 0xF24A8280, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00D00002, 0x00000043, 0x00000005, NpcMoveTo, 0x00000003, 0xFFFFFF01, 0xFFFFFFB5, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00D00001, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000001, 0x00000057, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000002, 0xFFFFFF01, 0x00000000, 0x00000050, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000002, 0xF24A8280, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00CF0002, 0x00000043, 0x00000005, NpcMoveTo, 0x00000002, 0xFFFFFF01, 0xFFFFFFEC, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00CF0001, 0x00000003, 0x00000001, 0x00000005, 0x0000000A, 0x00000002, 0xFAA2B580, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000005, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000002, 0x00CF0008, 0x00CF0007, 0x00000000, 0x00120009, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000003, 0x000000B4, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000003, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFF01, 0x00000000, 0xFFFFFF6A, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF250BA80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A801A, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, PlayerMoveTo, 0xFFFFFEC5, 0xFFFFFF6A, 0x00000014, 0x00000043, 0x00000003, InterpPlayerYaw, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00D00002, 0x00000043, 0x00000005, NpcMoveTo, 0x00000003, 0xFFFFFF01, 0xFFFFFF4C, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00D00001, 0x00000008, 0x00000001, 0x00000014, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00CF0002, 0x00000043, 0x00000005, NpcMoveTo, 0x00000002, 0xFFFFFF01, 0xFFFFFFBA, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00CF0001, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000001, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00D00006, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00D00001, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x00D00004, 0x00D00001, 0x00000000, 0x0012000A, 0x00000003, 0x00000001, 0x00000006, 0x0000000A, 0x00000002, 0xFAA2B580, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000006, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000002, 0x00CF0008, 0x00CF0007, 0x00000000, 0x0012000B, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xF2452880, 0xF24A7A80, 0xF247A7B4, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xF2433E80, 0xF24D4A80, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0xF2471E80, 0xF247BE80, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AC080, 0xF24A5A80, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24E6280, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, GetAngleToPlayer, 0x00000003, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000003, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000003, 0x00000000, 0x00000008, 0x00000001, 0x0000000D, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x00D00004, 0x00D00001, 0x00000000, 0x0012000C, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00090000, 0x00000008, 0x00000001, 0x00000023, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x00D00004, 0x00D00001, 0x00000000, 0x0012000D, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000002, 0x00CF0008, 0x00CF0007, 0x00000000, 0x0012000E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00090000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x00D00004, 0x00D00001, 0x00000000, 0x0012000F, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010029, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000007, SpeakToNpc, 0xFFFFFFFC, 0x00010008, 0x00010001, 0x00000000, 0x00000003, 0x00120010, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000007, SpeakToNpc, 0xFFFFFFFC, 0x0002000D, 0x00020003, 0x00000000, 0x00000003, 0x00120011, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000007, SpeakToNpc, 0xFFFFFFFC, 0x0003000E, 0x00030003, 0x00000000, 0x00000003, 0x00120012, 0x00000016, 0x00000001, 0x00000004, 0x00000043, 0x00000007, SpeakToNpc, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000000, 0x00000003, 0x00120013, 0x00000016, 0x00000001, 0x00000009, 0x00000043, 0x00000007, SpeakToNpc, 0xFFFFFFFC, 0x00050004, 0x00050001, 0x00000000, 0x00000003, 0x00120014, 0x00000016, 0x00000001, 0x00000006, 0x00000043, 0x00000007, SpeakToNpc, 0xFFFFFFFC, 0x00060004, 0x00060001, 0x00000000, 0x00000003, 0x00120015, 0x00000016, 0x00000001, 0x00000007, 0x00000043, 0x00000007, SpeakToNpc, 0xFFFFFFFC, 0x00070004, 0x00070001, 0x00000000, 0x00000003, 0x00120016, 0x00000016, 0x00000001, 0x00000008, 0x00000043, 0x00000007, SpeakToNpc, 0xFFFFFFFC, 0x00080009, 0x00080001, 0x00000000, 0x00000003, 0x00120017, 0x00000023, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x00D00004, 0x00D00001, 0x00000000, 0x00120018, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010029, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x00D00005, 0x00D00007, 0x00000000, 0x00120019, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010029, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x00D00004, 0x00D00001, 0x00000000, 0x0012001A, 0x00000043, 0x00000005, SetNpcPos, 0x00000009, 0xFFFFFF6A, 0x00000000, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000009, 0x0000005A, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x0000000A, 0xFFFFFFA6, 0x00000000, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x0000000A, 0x0000010E, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x0000000B, 0xFFFFFF88, 0x00000000, 0xFFFFFFE2, 0x00000043, 0x00000004, InterpNpcYaw, 0x0000000B, 0x000000B4, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x0000000C, 0xFFFFFF88, 0x00000000, 0x0000001E, 0x00000043, 0x00000004, InterpNpcYaw, 0x0000000C, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000100, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000002, 0x00000100, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000024, 0x00000002, 0xF5DE0180, 0x0000003F, 0x00000024, 0x00000002, 0xF5DE028E, 0x00000000, 0x00000024, 0x00000002, 0xFD050F80, 0x00000000, 0x00000024, 0x00000002, 0xFD050F81, 0x00000000, 0x00000024, 0x00000002, 0xFD050F82, 0x00000000, 0x00000024, 0x00000002, 0xFD050F83, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000001, func_802D2B6C, 0x00000008, 0x00000001, 0x00000014, 0x00000013, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000102, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFC, 0xF24A8680, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFC, 0xFFFFFEFA, 0xFFFFFF99, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000057, 0x00000000, 0x00000043, 0x00000003, GetAngleToPlayer, 0x00000003, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000003, 0xFE363C80, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x00D00004, 0x00D00001, 0x00000000, 0x0012001D, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00080007, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000005, GetNpcPos, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24F2A80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFFFFFF01, 0x00000000, 0xFFFFFF79, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000003, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x00D00004, 0x00D00001, 0x00000000, 0x0012001E, 0x00000043, 0x00000005, GetNpcPos, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00D00002, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000003, 0xF24A8280, 0x00000043, 0x00000005, NpcMoveTo, 0x00000003, 0xFE363C80, 0xFE363C82, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00D00001, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00D00006, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00D00001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x00D00004, 0x00D00001, 0x00000005, 0x0012001F, 0x00000043, 0x00000003, GetAngleToPlayer, 0x00000003, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000003, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010029, 0x00000008, 0x00000001, 0x00000014, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0x00000014, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C80, 0xFE363C82, 0x00000014, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000004, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000102, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFC, 0xFFFFFECE, 0xFFFFFF8C, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0x00000004, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C82, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00D00002, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000003, 0xF24A8280, 0x00000043, 0x00000005, NpcMoveTo, 0x00000003, 0xFE363C80, 0xFE363C82, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00D00001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x00D00004, 0x00D00001, 0x00000000, 0x00120020, 0x00000043, 0x00000005, GetNpcPos, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, GetNpcPos, 0x00000003, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x0000002C, 0x00000002, 0xFE363C80, 0xFE363C83, 0x0000002C, 0x00000002, 0xFE363C81, 0xFE363C84, 0x0000002C, 0x00000002, 0xFE363C82, 0xFE363C85, 0x0000002F, 0x00000002, 0xFE363C80, 0xF24A8280, 0x0000002F, 0x00000002, 0xFE363C81, 0xF24A8280, 0x0000002F, 0x00000002, 0xFE363C82, 0xF24A8280, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000004, 0x00D10004, 0x00D10001, 0x00000000, 0x00120021, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0x00000002, 0x00000003, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0x00000004, 0x00000003, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000004, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000003, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0x00000003, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x00D00005, 0x00D00007, 0x00000000, 0x00120022, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0x00000002, 0x00000004, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0x00000003, 0x00000004, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000003, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000004, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0x00000004, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000004, 0x00D10004, 0x00D10001, 0x00000000, 0x00120023, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0x00000004, 0x00000002, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000004, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0x00000003, 0x00000002, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000003, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000002, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0x00000002, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000002, 0x00CF0008, 0x00CF0007, 0x00000000, 0x00120024, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24F2A80, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AC080, 0xF24A6080, 0x00000043, 0x00000004, sam_01_UnkTrigFunc001, 0xFE363C80, 0xFE363C82, 0x0000002D, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xFE363C80, 0xFE363C81, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0x00000002, 0x00000003, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0x00000004, 0x00000003, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000004, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000003, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0x00000003, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x00D00005, 0x00D00007, 0x00000000, 0x00120025, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00CE0006, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x000003E4, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00CE0005, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00CE0006, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x000003E4, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00CE0005, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00CE0006, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, sam_01_UnkTrigFunc001, 0xFE363C80, 0xFE363C82, 0xFFFFFFA1, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xFE363C80, 0xFE363C81, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000003, FadeOutMusic, 0x00000000, 0x000001F4, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00CE0006, 0x00CE0006, 0x00000000, 0x00120026, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0x00000003, 0x00000000, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000003, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0x00000002, 0x00000000, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0x00000004, 0x00000000, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000004, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000000, 0x00000000, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0x00000000, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x000003E4, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00CE0005, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00CE0006, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x000003E4, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00CE0005, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00CE0006, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x0000000B, 0x00000027, 0x00000002, 0xFE363C82, 0x0000000A, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0xFFFFFEF2, 0x00000000, 0xFFFFFF33, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000000, 0x00000001, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00CE0007, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00CE0001, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x0000032C, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFE363C80, 0x00000000, 0xFE363C82, 0x0000000A, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000007A, 0x00000000, 0x00000008, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00CE0004, 0x00CE0001, 0x00000000, 0x00120027, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0x000000B4, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00CF000A, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000002, 0xF24A7E80, 0x00000043, 0x00000005, GetNpcPos, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, NpcJump0, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00CF0001, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000002, 0x00CF0004, 0x00CF0001, 0x00000000, 0x00120028, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00CE0004, 0x00CE0001, 0x00000000, 0x00120029, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000007, SpeakToNpc, 0x00000003, 0x00D00004, 0x00D00001, 0x00000000, 0x00000000, 0x0012002A, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000007, SpeakToNpc, 0x00000000, 0x00CE0004, 0x00CE0001, 0x00000000, 0x00000003, 0x0012002B, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24EDA80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00CE000B, 0x00CE0001, 0x00000000, 0x0012002C, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x000000C8, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0x00000003, 0x00000000, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000003, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0x00000004, 0x00000000, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000004, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0x00000002, 0x00000000, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000002, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x0000000D, 0x00000100, 0x00000001, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000000, 0xF24A8680, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00CE0002, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000100, 0x00000001, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0xFFFFFEC0, 0xFFFFFEFE, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0x000000B4, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00CE0001, 0x00000008, 0x00000001, 0x0000001E, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0x0000001E, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C80, 0xFE363C82, 0x00000014, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000000, 0x00000000, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000032, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000000, 0x00000000, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x00000008, 0x00000043, 0x00000005, GetNpcPos, 0x0000000D, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000002C, 0x00000002, 0xFE363C81, 0xF24A7F80, 0x00000043, 0x00000005, SetNpcPos, 0x0000000D, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00CE000A, 0x00000008, 0x00000001, 0x0000001E, 0x00000045, 0x00000002, D_8024A220_D01D90, 0xFE363C8A, 0x00000043, 0x00000005, GetNpcPos, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C82, 0xFFFFFFE7, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xF245CA80, 0xF24A7A80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7BB4, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00CE0008, 0x00000043, 0x00000005, GetNpcPos, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C82, 0xFFFFFFDD, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0xFE363C80, 0xFE363C82, 0x00000000, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000008, 0x00000001, 0x0000000A, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000005, 0x00000001, 0x00000007, 0x00000043, 0x00000005, GetNpcPos, 0x0000000D, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C82, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0x0000000D, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000100, 0x00000000, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000007, SpeakToNpc, 0x00000000, 0x00CE0004, 0x00CE0001, 0x00000000, 0x00000004, 0x0012002D, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00CE0009, 0x00000008, 0x00000001, 0x0000003C, 0x00000043, 0x00000005, GetNpcPos, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C82, 0xFFFFFFFB, 0x00000043, 0x00000005, NpcMoveTo, 0x00000004, 0xFE363C80, 0xFE363C82, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00CE0001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000004, 0x00D10005, 0x00000043, 0x00000007, SpeakToNpc, 0x00000004, 0x00D10007, 0x00D10006, 0x00000000, 0x00000000, 0x0012002E, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000002, 0x00000000, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000004, 0x00000000, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000003, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x00D00004, 0x00D00001, 0x00000000, 0x0012002F, 0x00000043, 0x00000005, GetNpcPos, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7BB4, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000000, 0xF24A8680, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000100, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00CE0002, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0xFFFFFF07, 0xFFFFFF93, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00CE0001, 0x00000005, 0x00000001, 0x00000064, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0x00000000, 0x00000003, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000064, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0x00000002, 0x00000003, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000003, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000003, 0x00000100, 0x00000001, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000003, 0xF24A8680, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00D00002, 0x00000043, 0x00000005, NpcMoveTo, 0x00000003, 0xFFFFFF2E, 0xFFFFFFB0, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000003, 0xFFFFFF06, 0xFFFFFFF6, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00D00001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000003, 0x00000100, 0x00000000, 0x00000046, 0x00000001, D_8024A460_D01FD0, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00D00002, 0x00000043, 0x00000005, NpcMoveTo, 0x00000003, 0xFFFFFF06, 0x00000032, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00D00001, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00CE0004, 0x00CE0001, 0x00000000, 0x00120030, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000004, 0x00D10007, 0x00D10006, 0x00000000, 0x00120031, 0x00000045, 0x00000002, D_8024A380_D01EF0, 0xFE363C8A, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000004, 0xF24A8680, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000004, 0x00D10008, 0x00000043, 0x00000005, NpcMoveTo, 0x00000004, 0xFFFFFF06, 0x00000032, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000004, 0x00D10006, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, RemoveItemEntity, 0xFD050F84, 0x00000046, 0x00000001, D_8024A510_D02080, 0x00000024, 0x00000002, 0xF5DE0180, 0x00000043, 0x00000044, 0x00000001, 0x80241FB0, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00CE0004, 0x00CE0001, 0x00000005, 0x00120032, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24E6280, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8680, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00CE0004, 0x00CE0001, 0x00000000, 0x00120033, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00080007, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00CE0004, 0x00CE0001, 0x00000000, 0x00120034, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000100, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000003, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000004, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000004, 0x00000004, 0x00000001, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000004, 0x00000000, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFD050F80, 0x00000000, 0x00000024, 0x00000002, 0xFD050F81, 0x00000000, 0x00000024, 0x00000002, 0xFD050F82, 0x00000000, 0x00000024, 0x00000002, 0xFD050F83, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000040, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000002, 0x00000040, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x0000000D, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_trd/trd_03/9A60F0.data.s b/ver/us/asm/data/world/area_trd/trd_03/9A60F0.data.s index 5a0210152f..ecc8950101 100644 --- a/ver/us/asm/data/world/area_trd/trd_03/9A60F0.data.s +++ b/ver/us/asm/data/world/area_trd/trd_03/9A60F0.data.s @@ -51,4 +51,4 @@ dlabel D_80242FCC_9A761C .word 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0xFE363C88, 0x00000007, 0x00000002, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0xFE363C89, 0x00000000, 0x00000000, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C87, 0x7FFFFE00, 0x00000043, 0x00000002, PlaySound, 0x00000026, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000002, 0xF24A7BB4, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802430A0_9A76F0 -.word 0x00000043, 0x00000005, MakeLerp, 0xFE363C88, 0x00000000, 0x00000007, 0x00000002, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0xFE363C89, 0x00000000, 0x00000000, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0xFE363C87, 0x7FFFFE00, 0x00000043, 0x00000002, PlaySound, 0x00000026, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000002, 0xF24A7BB4, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000003, 0x00000001, 0x0000007B, 0x00000043, 0x00000002, GetPlayerActionState, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x0000007B, 0x00000013, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFEC5, 0x00000078, 0xFFFFFFCE, 0x00000043, 0x00000004, func_80240880_9A4ED0, 0xFFFFFEC5, 0xFFFFFF9C, 0x0000003C, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xFE363C80, 0xFE363C81, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8480, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x0000000F, 0x0000000A, 0x00000002, 0xFD050F80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x00000039, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFF6F, 0x00000024, 0x00000002, 0xFE363C89, 0x00000014, 0x00000044, 0x00000001, D_802430A0_9A76F0, 0x00000008, 0x00000001, 0x00000009, 0x00000024, 0x00000002, 0xFE363C87, 0x00000035, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFFA1, 0x00000024, 0x00000002, 0xFE363C89, 0x00000011, 0x00000044, 0x00000001, D_802430A0_9A76F0, 0x00000008, 0x00000001, 0x00000009, 0x00000024, 0x00000002, 0xFE363C87, 0x00000034, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFFA1, 0x00000024, 0x00000002, 0xFE363C89, 0x00000010, 0x00000044, 0x00000001, D_802430A0_9A76F0, 0x00000008, 0x00000001, 0x00000009, 0x00000024, 0x00000002, 0xFE363C87, 0x0000003A, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFF6F, 0x00000024, 0x00000002, 0xFE363C89, 0x00000013, 0x00000044, 0x00000001, D_802430A0_9A76F0, 0x00000008, 0x00000001, 0x00000009, 0x00000024, 0x00000002, 0xFE363C87, 0x00000033, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFFA1, 0x00000024, 0x00000002, 0xFE363C89, 0x0000000F, 0x00000044, 0x00000001, D_802430A0_9A76F0, 0x00000008, 0x00000001, 0x00000009, 0x00000024, 0x00000002, 0xFE363C87, 0x00000032, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFFA1, 0x00000024, 0x00000002, 0xFE363C89, 0x0000000E, 0x00000044, 0x00000001, D_802430A0_9A76F0, 0x00000008, 0x00000001, 0x00000009, 0x00000024, 0x00000002, 0xFE363C87, 0x0000003B, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFF6F, 0x00000024, 0x00000002, 0xFE363C89, 0x00000012, 0x00000044, 0x00000001, D_802430A0_9A76F0, 0x00000008, 0x00000001, 0x00000009, 0x00000024, 0x00000002, 0xFD050F80, 0x00000001, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x0000003B, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFF6F, 0x00000024, 0x00000002, 0xFE363C89, 0x00000012, 0x00000044, 0x00000001, D_80242FCC_9A761C, 0x00000008, 0x00000001, 0x00000009, 0x00000024, 0x00000002, 0xFE363C87, 0x00000032, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFFA1, 0x00000024, 0x00000002, 0xFE363C89, 0x0000000E, 0x00000044, 0x00000001, D_80242FCC_9A761C, 0x00000008, 0x00000001, 0x00000009, 0x00000024, 0x00000002, 0xFE363C87, 0x00000033, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFFA1, 0x00000024, 0x00000002, 0xFE363C89, 0x0000000F, 0x00000044, 0x00000001, D_80242FCC_9A761C, 0x00000008, 0x00000001, 0x00000009, 0x00000024, 0x00000002, 0xFE363C87, 0x0000003A, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFF6F, 0x00000024, 0x00000002, 0xFE363C89, 0x00000013, 0x00000044, 0x00000001, D_80242FCC_9A761C, 0x00000008, 0x00000001, 0x00000009, 0x00000024, 0x00000002, 0xFE363C87, 0x00000034, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFFA1, 0x00000024, 0x00000002, 0xFE363C89, 0x00000010, 0x00000044, 0x00000001, D_80242FCC_9A761C, 0x00000008, 0x00000001, 0x00000009, 0x00000024, 0x00000002, 0xFE363C87, 0x00000035, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFFA1, 0x00000024, 0x00000002, 0xFE363C89, 0x00000011, 0x00000044, 0x00000001, D_80242FCC_9A761C, 0x00000008, 0x00000001, 0x00000009, 0x00000024, 0x00000002, 0xFE363C87, 0x00000039, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFF6F, 0x00000024, 0x00000002, 0xFE363C89, 0x00000014, 0x00000044, 0x00000001, D_80242FCC_9A761C, 0x00000008, 0x00000001, 0x00000009, 0x00000024, 0x00000002, 0xFD050F80, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8480, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000003, 0x00000001, 0x0000007B, 0x00000043, 0x00000002, GetPlayerActionState, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x0000007B, 0x00000013, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x000000D2, 0x00000078, 0xFFFFFFCE, 0x00000043, 0x00000004, func_80240880_9A4ED0, 0x000000D2, 0xFFFFFF9C, 0xFFFFFFC4, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xFE363C80, 0xFE363C81, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8480, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x0000000F, 0x0000000A, 0x00000002, 0xFD050F80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x0000003B, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFF6F, 0x00000024, 0x00000002, 0xFE363C89, 0x00000012, 0x00000044, 0x00000001, D_802430A0_9A76F0, 0x00000008, 0x00000001, 0x00000009, 0x00000024, 0x00000002, 0xFE363C87, 0x00000032, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFFA1, 0x00000024, 0x00000002, 0xFE363C89, 0x0000000E, 0x00000044, 0x00000001, D_802430A0_9A76F0, 0x00000008, 0x00000001, 0x00000009, 0x00000024, 0x00000002, 0xFE363C87, 0x00000033, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFFA1, 0x00000024, 0x00000002, 0xFE363C89, 0x0000000F, 0x00000044, 0x00000001, D_802430A0_9A76F0, 0x00000008, 0x00000001, 0x00000009, 0x00000024, 0x00000002, 0xFE363C87, 0x0000003A, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFF6F, 0x00000024, 0x00000002, 0xFE363C89, 0x00000013, 0x00000044, 0x00000001, D_802430A0_9A76F0, 0x00000008, 0x00000001, 0x00000009, 0x00000024, 0x00000002, 0xFE363C87, 0x00000034, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFFA1, 0x00000024, 0x00000002, 0xFE363C89, 0x00000010, 0x00000044, 0x00000001, D_802430A0_9A76F0, 0x00000008, 0x00000001, 0x00000009, 0x00000024, 0x00000002, 0xFE363C87, 0x00000035, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFFA1, 0x00000024, 0x00000002, 0xFE363C89, 0x00000011, 0x00000044, 0x00000001, D_802430A0_9A76F0, 0x00000008, 0x00000001, 0x00000009, 0x00000024, 0x00000002, 0xFE363C87, 0x00000039, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFF6F, 0x00000024, 0x00000002, 0xFE363C89, 0x00000014, 0x00000044, 0x00000001, D_802430A0_9A76F0, 0x00000008, 0x00000001, 0x00000009, 0x00000024, 0x00000002, 0xFD050F80, 0x00000001, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x00000039, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFF6F, 0x00000024, 0x00000002, 0xFE363C89, 0x00000014, 0x00000044, 0x00000001, D_80242FCC_9A761C, 0x00000008, 0x00000001, 0x00000009, 0x00000024, 0x00000002, 0xFE363C87, 0x00000035, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFFA1, 0x00000024, 0x00000002, 0xFE363C89, 0x00000011, 0x00000044, 0x00000001, D_80242FCC_9A761C, 0x00000008, 0x00000001, 0x00000009, 0x00000024, 0x00000002, 0xFE363C87, 0x00000034, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFFA1, 0x00000024, 0x00000002, 0xFE363C89, 0x00000010, 0x00000044, 0x00000001, D_80242FCC_9A761C, 0x00000008, 0x00000001, 0x00000009, 0x00000024, 0x00000002, 0xFE363C87, 0x0000003A, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFF6F, 0x00000024, 0x00000002, 0xFE363C89, 0x00000013, 0x00000044, 0x00000001, D_80242FCC_9A761C, 0x00000008, 0x00000001, 0x00000009, 0x00000024, 0x00000002, 0xFE363C87, 0x00000033, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFFA1, 0x00000024, 0x00000002, 0xFE363C89, 0x0000000F, 0x00000044, 0x00000001, D_80242FCC_9A761C, 0x00000008, 0x00000001, 0x00000009, 0x00000024, 0x00000002, 0xFE363C87, 0x00000032, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFFA1, 0x00000024, 0x00000002, 0xFE363C89, 0x0000000E, 0x00000044, 0x00000001, D_80242FCC_9A761C, 0x00000008, 0x00000001, 0x00000009, 0x00000024, 0x00000002, 0xFE363C87, 0x0000003B, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFF6F, 0x00000024, 0x00000002, 0xFE363C89, 0x00000012, 0x00000044, 0x00000001, D_80242FCC_9A761C, 0x00000008, 0x00000001, 0x00000009, 0x00000024, 0x00000002, 0xFD050F80, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8480, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000043, 0x00000005, MakeLerp, 0xFE363C88, 0x00000000, 0x00000007, 0x00000002, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0xFE363C89, 0x00000000, 0x00000000, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0xFE363C87, 0x7FFFFE00, 0x00000043, 0x00000002, PlaySound, 0x00000026, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000002, 0xF24A7BB4, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000003, 0x00000001, 0x0000007B, 0x00000043, 0x00000002, GetPlayerActionState, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x0000007B, 0x00000013, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFEC5, 0x00000078, 0xFFFFFFCE, 0x00000043, 0x00000004, trd_03_UnkTrigFunc001, 0xFFFFFEC5, 0xFFFFFF9C, 0x0000003C, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xFE363C80, 0xFE363C81, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8480, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x0000000F, 0x0000000A, 0x00000002, 0xFD050F80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x00000039, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFF6F, 0x00000024, 0x00000002, 0xFE363C89, 0x00000014, 0x00000044, 0x00000001, D_802430A0_9A76F0, 0x00000008, 0x00000001, 0x00000009, 0x00000024, 0x00000002, 0xFE363C87, 0x00000035, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFFA1, 0x00000024, 0x00000002, 0xFE363C89, 0x00000011, 0x00000044, 0x00000001, D_802430A0_9A76F0, 0x00000008, 0x00000001, 0x00000009, 0x00000024, 0x00000002, 0xFE363C87, 0x00000034, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFFA1, 0x00000024, 0x00000002, 0xFE363C89, 0x00000010, 0x00000044, 0x00000001, D_802430A0_9A76F0, 0x00000008, 0x00000001, 0x00000009, 0x00000024, 0x00000002, 0xFE363C87, 0x0000003A, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFF6F, 0x00000024, 0x00000002, 0xFE363C89, 0x00000013, 0x00000044, 0x00000001, D_802430A0_9A76F0, 0x00000008, 0x00000001, 0x00000009, 0x00000024, 0x00000002, 0xFE363C87, 0x00000033, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFFA1, 0x00000024, 0x00000002, 0xFE363C89, 0x0000000F, 0x00000044, 0x00000001, D_802430A0_9A76F0, 0x00000008, 0x00000001, 0x00000009, 0x00000024, 0x00000002, 0xFE363C87, 0x00000032, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFFA1, 0x00000024, 0x00000002, 0xFE363C89, 0x0000000E, 0x00000044, 0x00000001, D_802430A0_9A76F0, 0x00000008, 0x00000001, 0x00000009, 0x00000024, 0x00000002, 0xFE363C87, 0x0000003B, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFF6F, 0x00000024, 0x00000002, 0xFE363C89, 0x00000012, 0x00000044, 0x00000001, D_802430A0_9A76F0, 0x00000008, 0x00000001, 0x00000009, 0x00000024, 0x00000002, 0xFD050F80, 0x00000001, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x0000003B, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFF6F, 0x00000024, 0x00000002, 0xFE363C89, 0x00000012, 0x00000044, 0x00000001, D_80242FCC_9A761C, 0x00000008, 0x00000001, 0x00000009, 0x00000024, 0x00000002, 0xFE363C87, 0x00000032, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFFA1, 0x00000024, 0x00000002, 0xFE363C89, 0x0000000E, 0x00000044, 0x00000001, D_80242FCC_9A761C, 0x00000008, 0x00000001, 0x00000009, 0x00000024, 0x00000002, 0xFE363C87, 0x00000033, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFFA1, 0x00000024, 0x00000002, 0xFE363C89, 0x0000000F, 0x00000044, 0x00000001, D_80242FCC_9A761C, 0x00000008, 0x00000001, 0x00000009, 0x00000024, 0x00000002, 0xFE363C87, 0x0000003A, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFF6F, 0x00000024, 0x00000002, 0xFE363C89, 0x00000013, 0x00000044, 0x00000001, D_80242FCC_9A761C, 0x00000008, 0x00000001, 0x00000009, 0x00000024, 0x00000002, 0xFE363C87, 0x00000034, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFFA1, 0x00000024, 0x00000002, 0xFE363C89, 0x00000010, 0x00000044, 0x00000001, D_80242FCC_9A761C, 0x00000008, 0x00000001, 0x00000009, 0x00000024, 0x00000002, 0xFE363C87, 0x00000035, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFFA1, 0x00000024, 0x00000002, 0xFE363C89, 0x00000011, 0x00000044, 0x00000001, D_80242FCC_9A761C, 0x00000008, 0x00000001, 0x00000009, 0x00000024, 0x00000002, 0xFE363C87, 0x00000039, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFF6F, 0x00000024, 0x00000002, 0xFE363C89, 0x00000014, 0x00000044, 0x00000001, D_80242FCC_9A761C, 0x00000008, 0x00000001, 0x00000009, 0x00000024, 0x00000002, 0xFD050F80, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8480, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000003, 0x00000001, 0x0000007B, 0x00000043, 0x00000002, GetPlayerActionState, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x0000007B, 0x00000013, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x000000D2, 0x00000078, 0xFFFFFFCE, 0x00000043, 0x00000004, trd_03_UnkTrigFunc001, 0x000000D2, 0xFFFFFF9C, 0xFFFFFFC4, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xFE363C80, 0xFE363C81, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8480, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x0000000F, 0x0000000A, 0x00000002, 0xFD050F80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x0000003B, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFF6F, 0x00000024, 0x00000002, 0xFE363C89, 0x00000012, 0x00000044, 0x00000001, D_802430A0_9A76F0, 0x00000008, 0x00000001, 0x00000009, 0x00000024, 0x00000002, 0xFE363C87, 0x00000032, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFFA1, 0x00000024, 0x00000002, 0xFE363C89, 0x0000000E, 0x00000044, 0x00000001, D_802430A0_9A76F0, 0x00000008, 0x00000001, 0x00000009, 0x00000024, 0x00000002, 0xFE363C87, 0x00000033, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFFA1, 0x00000024, 0x00000002, 0xFE363C89, 0x0000000F, 0x00000044, 0x00000001, D_802430A0_9A76F0, 0x00000008, 0x00000001, 0x00000009, 0x00000024, 0x00000002, 0xFE363C87, 0x0000003A, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFF6F, 0x00000024, 0x00000002, 0xFE363C89, 0x00000013, 0x00000044, 0x00000001, D_802430A0_9A76F0, 0x00000008, 0x00000001, 0x00000009, 0x00000024, 0x00000002, 0xFE363C87, 0x00000034, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFFA1, 0x00000024, 0x00000002, 0xFE363C89, 0x00000010, 0x00000044, 0x00000001, D_802430A0_9A76F0, 0x00000008, 0x00000001, 0x00000009, 0x00000024, 0x00000002, 0xFE363C87, 0x00000035, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFFA1, 0x00000024, 0x00000002, 0xFE363C89, 0x00000011, 0x00000044, 0x00000001, D_802430A0_9A76F0, 0x00000008, 0x00000001, 0x00000009, 0x00000024, 0x00000002, 0xFE363C87, 0x00000039, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFF6F, 0x00000024, 0x00000002, 0xFE363C89, 0x00000014, 0x00000044, 0x00000001, D_802430A0_9A76F0, 0x00000008, 0x00000001, 0x00000009, 0x00000024, 0x00000002, 0xFD050F80, 0x00000001, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x00000039, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFF6F, 0x00000024, 0x00000002, 0xFE363C89, 0x00000014, 0x00000044, 0x00000001, D_80242FCC_9A761C, 0x00000008, 0x00000001, 0x00000009, 0x00000024, 0x00000002, 0xFE363C87, 0x00000035, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFFA1, 0x00000024, 0x00000002, 0xFE363C89, 0x00000011, 0x00000044, 0x00000001, D_80242FCC_9A761C, 0x00000008, 0x00000001, 0x00000009, 0x00000024, 0x00000002, 0xFE363C87, 0x00000034, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFFA1, 0x00000024, 0x00000002, 0xFE363C89, 0x00000010, 0x00000044, 0x00000001, D_80242FCC_9A761C, 0x00000008, 0x00000001, 0x00000009, 0x00000024, 0x00000002, 0xFE363C87, 0x0000003A, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFF6F, 0x00000024, 0x00000002, 0xFE363C89, 0x00000013, 0x00000044, 0x00000001, D_80242FCC_9A761C, 0x00000008, 0x00000001, 0x00000009, 0x00000024, 0x00000002, 0xFE363C87, 0x00000033, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFFA1, 0x00000024, 0x00000002, 0xFE363C89, 0x0000000F, 0x00000044, 0x00000001, D_80242FCC_9A761C, 0x00000008, 0x00000001, 0x00000009, 0x00000024, 0x00000002, 0xFE363C87, 0x00000032, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFFA1, 0x00000024, 0x00000002, 0xFE363C89, 0x0000000E, 0x00000044, 0x00000001, D_80242FCC_9A761C, 0x00000008, 0x00000001, 0x00000009, 0x00000024, 0x00000002, 0xFE363C87, 0x0000003B, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFF6F, 0x00000024, 0x00000002, 0xFE363C89, 0x00000012, 0x00000044, 0x00000001, D_80242FCC_9A761C, 0x00000008, 0x00000001, 0x00000009, 0x00000024, 0x00000002, 0xFD050F80, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8480, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/nonmatchings/7bb60_len_41b0/phys_should_player_be_sliding.s b/ver/us/asm/nonmatchings/7bb60_len_41b0/phys_should_player_be_sliding.s deleted file mode 100644 index 1bc65a7fed..0000000000 --- a/ver/us/asm/nonmatchings/7bb60_len_41b0/phys_should_player_be_sliding.s +++ /dev/null @@ -1,73 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_8010BEE0 -.double 180.0 - -.section .text - -glabel phys_should_player_be_sliding -/* 7DA90 800E45E0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 7DA94 800E45E4 AFB00010 */ sw $s0, 0x10($sp) -/* 7DA98 800E45E8 3C108011 */ lui $s0, %hi(gPlayerStatus) -/* 7DA9C 800E45EC 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) -/* 7DAA0 800E45F0 AFBF0014 */ sw $ra, 0x14($sp) -/* 7DAA4 800E45F4 0C044181 */ jal get_shadow_by_index -/* 7DAA8 800E45F8 8E0400CC */ lw $a0, 0xcc($s0) -/* 7DAAC 800E45FC 3C068007 */ lui $a2, %hi(gGameStatusPtr) -/* 7DAB0 800E4600 8CC6419C */ lw $a2, %lo(gGameStatusPtr)($a2) -/* 7DAB4 800E4604 0040202D */ daddu $a0, $v0, $zero -/* 7DAB8 800E4608 84C30086 */ lh $v1, 0x86($a2) -/* 7DABC 800E460C 24020008 */ addiu $v0, $zero, 8 -/* 7DAC0 800E4610 14620028 */ bne $v1, $v0, .L800E46B4 -/* 7DAC4 800E4614 0000282D */ daddu $a1, $zero, $zero -/* 7DAC8 800E4618 C4800030 */ lwc1 $f0, 0x30($a0) -/* 7DACC 800E461C 3C018011 */ lui $at, %hi(D_8010BEE0) -/* 7DAD0 800E4620 D422BEE0 */ ldc1 $f2, %lo(D_8010BEE0)($at) -/* 7DAD4 800E4624 46000021 */ cvt.d.s $f0, $f0 -/* 7DAD8 800E4628 46220000 */ add.d $f0, $f0, $f2 -/* 7DADC 800E462C 44801000 */ mtc1 $zero, $f2 -/* 7DAE0 800E4630 46200020 */ cvt.s.d $f0, $f0 -/* 7DAE4 800E4634 46020032 */ c.eq.s $f0, $f2 -/* 7DAE8 800E4638 00000000 */ nop -/* 7DAEC 800E463C 4501001D */ bc1t .L800E46B4 -/* 7DAF0 800E4640 00000000 */ nop -/* 7DAF4 800E4644 84C2008C */ lh $v0, 0x8c($a2) -/* 7DAF8 800E4648 10400005 */ beqz $v0, .L800E4660 -/* 7DAFC 800E464C 24050001 */ addiu $a1, $zero, 1 -/* 7DB00 800E4650 10450009 */ beq $v0, $a1, .L800E4678 -/* 7DB04 800E4654 00000000 */ nop -/* 7DB08 800E4658 080391AD */ j .L800E46B4 -/* 7DB0C 800E465C 00000000 */ nop -.L800E4660: -/* 7DB10 800E4660 3C0141A0 */ lui $at, 0x41a0 -/* 7DB14 800E4664 44811000 */ mtc1 $at, $f2 -/* 7DB18 800E4668 46000005 */ abs.s $f0, $f0 -/* 7DB1C 800E466C 4602003C */ c.lt.s $f0, $f2 -/* 7DB20 800E4670 080391AB */ j .L800E46AC -/* 7DB24 800E4674 00000000 */ nop -.L800E4678: -/* 7DB28 800E4678 C6020028 */ lwc1 $f2, 0x28($s0) -/* 7DB2C 800E467C 3C01C396 */ lui $at, 0xc396 -/* 7DB30 800E4680 44810000 */ mtc1 $at, $f0 -/* 7DB34 800E4684 00000000 */ nop -/* 7DB38 800E4688 4602003E */ c.le.s $f0, $f2 -/* 7DB3C 800E468C 00000000 */ nop -/* 7DB40 800E4690 45000008 */ bc1f .L800E46B4 -/* 7DB44 800E4694 00000000 */ nop -/* 7DB48 800E4698 3C01C30C */ lui $at, 0xc30c -/* 7DB4C 800E469C 44810000 */ mtc1 $at, $f0 -/* 7DB50 800E46A0 00000000 */ nop -/* 7DB54 800E46A4 4600103E */ c.le.s $f2, $f0 -/* 7DB58 800E46A8 00000000 */ nop -.L800E46AC: -/* 7DB5C 800E46AC 45030001 */ bc1tl .L800E46B4 -/* 7DB60 800E46B0 0000282D */ daddu $a1, $zero, $zero -.L800E46B4: -/* 7DB64 800E46B4 8FBF0014 */ lw $ra, 0x14($sp) -/* 7DB68 800E46B8 8FB00010 */ lw $s0, 0x10($sp) -/* 7DB6C 800E46BC 00A0102D */ daddu $v0, $a1, $zero -/* 7DB70 800E46C0 03E00008 */ jr $ra -/* 7DB74 800E46C4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/battle/partner/goombario/func_80238BCC_6F1CAC.s b/ver/us/asm/nonmatchings/battle/partner/goombario/func_80238BCC_6F1CAC.s deleted file mode 100644 index 4fdf352909..0000000000 --- a/ver/us/asm/nonmatchings/battle/partner/goombario/func_80238BCC_6F1CAC.s +++ /dev/null @@ -1,150 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80238BCC_6F1CAC -/* 6F1CAC 80238BCC 3C02800E */ lui $v0, %hi(gBattleStatus+0xDC) -/* 6F1CB0 80238BD0 8C42C14C */ lw $v0, %lo(gBattleStatus+0xDC)($v0) -/* 6F1CB4 80238BD4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 6F1CB8 80238BD8 AFB00010 */ sw $s0, 0x10($sp) -/* 6F1CBC 80238BDC 0080802D */ daddu $s0, $a0, $zero -/* 6F1CC0 80238BE0 AFBF0014 */ sw $ra, 0x14($sp) -/* 6F1CC4 80238BE4 0C09A75B */ jal get_actor -/* 6F1CC8 80238BE8 84440428 */ lh $a0, 0x428($v0) -/* 6F1CCC 80238BEC 0040202D */ daddu $a0, $v0, $zero -/* 6F1CD0 80238BF0 8C820000 */ lw $v0, ($a0) -/* 6F1CD4 80238BF4 30420800 */ andi $v0, $v0, 0x800 -/* 6F1CD8 80238BF8 14400022 */ bnez $v0, .L80238C84 -/* 6F1CDC 80238BFC 00000000 */ nop -/* 6F1CE0 80238C00 90830191 */ lbu $v1, 0x191($a0) -/* 6F1CE4 80238C04 3C02AAAA */ lui $v0, 0xaaaa -/* 6F1CE8 80238C08 3442AAAB */ ori $v0, $v0, 0xaaab -/* 6F1CEC 80238C0C 00620019 */ multu $v1, $v0 -/* 6F1CF0 80238C10 C4800188 */ lwc1 $f0, 0x188($a0) -/* 6F1CF4 80238C14 00003010 */ mfhi $a2 -/* 6F1CF8 80238C18 00061042 */ srl $v0, $a2, 1 -/* 6F1CFC 80238C1C 304200FF */ andi $v0, $v0, 0xff -/* 6F1D00 80238C20 44821000 */ mtc1 $v0, $f2 -/* 6F1D04 80238C24 00000000 */ nop -/* 6F1D08 80238C28 468010A0 */ cvt.s.w $f2, $f2 -/* 6F1D0C 80238C2C 46001082 */ mul.s $f2, $f2, $f0 -/* 6F1D10 80238C30 00000000 */ nop -/* 6F1D14 80238C34 C6000088 */ lwc1 $f0, 0x88($s0) -/* 6F1D18 80238C38 46800020 */ cvt.s.w $f0, $f0 -/* 6F1D1C 80238C3C 46020000 */ add.s $f0, $f0, $f2 -/* 6F1D20 80238C40 4600010D */ trunc.w.s $f4, $f0 -/* 6F1D24 80238C44 44032000 */ mfc1 $v1, $f4 -/* 6F1D28 80238C48 00000000 */ nop -/* 6F1D2C 80238C4C AE030088 */ sw $v1, 0x88($s0) -/* 6F1D30 80238C50 90820191 */ lbu $v0, 0x191($a0) -/* 6F1D34 80238C54 C4800188 */ lwc1 $f0, 0x188($a0) -/* 6F1D38 80238C58 00021082 */ srl $v0, $v0, 2 -/* 6F1D3C 80238C5C 44821000 */ mtc1 $v0, $f2 -/* 6F1D40 80238C60 00000000 */ nop -/* 6F1D44 80238C64 468010A0 */ cvt.s.w $f2, $f2 -/* 6F1D48 80238C68 46001082 */ mul.s $f2, $f2, $f0 -/* 6F1D4C 80238C6C 00000000 */ nop -/* 6F1D50 80238C70 44830000 */ mtc1 $v1, $f0 -/* 6F1D54 80238C74 00000000 */ nop -/* 6F1D58 80238C78 46800020 */ cvt.s.w $f0, $f0 -/* 6F1D5C 80238C7C 0808E341 */ j .L80238D04 -/* 6F1D60 80238C80 46020000 */ add.s $f0, $f0, $f2 -.L80238C84: -/* 6F1D64 80238C84 90830191 */ lbu $v1, 0x191($a0) -/* 6F1D68 80238C88 3C02AAAA */ lui $v0, 0xaaaa -/* 6F1D6C 80238C8C 3442AAAB */ ori $v0, $v0, 0xaaab -/* 6F1D70 80238C90 00620019 */ multu $v1, $v0 -/* 6F1D74 80238C94 C4800188 */ lwc1 $f0, 0x188($a0) -/* 6F1D78 80238C98 00003010 */ mfhi $a2 -/* 6F1D7C 80238C9C 00061042 */ srl $v0, $a2, 1 -/* 6F1D80 80238CA0 304200FF */ andi $v0, $v0, 0xff -/* 6F1D84 80238CA4 44821000 */ mtc1 $v0, $f2 -/* 6F1D88 80238CA8 00000000 */ nop -/* 6F1D8C 80238CAC 468010A0 */ cvt.s.w $f2, $f2 -/* 6F1D90 80238CB0 46001082 */ mul.s $f2, $f2, $f0 -/* 6F1D94 80238CB4 00000000 */ nop -/* 6F1D98 80238CB8 C6000088 */ lwc1 $f0, 0x88($s0) -/* 6F1D9C 80238CBC 46800020 */ cvt.s.w $f0, $f0 -/* 6F1DA0 80238CC0 46020001 */ sub.s $f0, $f0, $f2 -/* 6F1DA4 80238CC4 4600010D */ trunc.w.s $f4, $f0 -/* 6F1DA8 80238CC8 44032000 */ mfc1 $v1, $f4 -/* 6F1DAC 80238CCC 00000000 */ nop -/* 6F1DB0 80238CD0 AE030088 */ sw $v1, 0x88($s0) -/* 6F1DB4 80238CD4 90820191 */ lbu $v0, 0x191($a0) -/* 6F1DB8 80238CD8 C4800188 */ lwc1 $f0, 0x188($a0) -/* 6F1DBC 80238CDC 00021082 */ srl $v0, $v0, 2 -/* 6F1DC0 80238CE0 44821000 */ mtc1 $v0, $f2 -/* 6F1DC4 80238CE4 00000000 */ nop -/* 6F1DC8 80238CE8 468010A0 */ cvt.s.w $f2, $f2 -/* 6F1DCC 80238CEC 46001082 */ mul.s $f2, $f2, $f0 -/* 6F1DD0 80238CF0 00000000 */ nop -/* 6F1DD4 80238CF4 44830000 */ mtc1 $v1, $f0 -/* 6F1DD8 80238CF8 00000000 */ nop -/* 6F1DDC 80238CFC 46800020 */ cvt.s.w $f0, $f0 -/* 6F1DE0 80238D00 46020001 */ sub.s $f0, $f0, $f2 -.L80238D04: -/* 6F1DE4 80238D04 4600010D */ trunc.w.s $f4, $f0 -/* 6F1DE8 80238D08 E6040088 */ swc1 $f4, 0x88($s0) -/* 6F1DEC 80238D0C 8C820000 */ lw $v0, ($a0) -/* 6F1DF0 80238D10 30428000 */ andi $v0, $v0, 0x8000 -/* 6F1DF4 80238D14 1040000E */ beqz $v0, .L80238D50 -/* 6F1DF8 80238D18 00000000 */ nop -/* 6F1DFC 80238D1C 90820191 */ lbu $v0, 0x191($a0) -/* 6F1E00 80238D20 C4800188 */ lwc1 $f0, 0x188($a0) -/* 6F1E04 80238D24 00021042 */ srl $v0, $v0, 1 -/* 6F1E08 80238D28 44821000 */ mtc1 $v0, $f2 -/* 6F1E0C 80238D2C 00000000 */ nop -/* 6F1E10 80238D30 468010A0 */ cvt.s.w $f2, $f2 -/* 6F1E14 80238D34 46001082 */ mul.s $f2, $f2, $f0 -/* 6F1E18 80238D38 00000000 */ nop -/* 6F1E1C 80238D3C C6000088 */ lwc1 $f0, 0x88($s0) -/* 6F1E20 80238D40 46800020 */ cvt.s.w $f0, $f0 -/* 6F1E24 80238D44 46020001 */ sub.s $f0, $f0, $f2 -/* 6F1E28 80238D48 4600010D */ trunc.w.s $f4, $f0 -/* 6F1E2C 80238D4C E6040088 */ swc1 $f4, 0x88($s0) -.L80238D50: -/* 6F1E30 80238D50 90820191 */ lbu $v0, 0x191($a0) -/* 6F1E34 80238D54 C4820188 */ lwc1 $f2, 0x188($a0) -/* 6F1E38 80238D58 44820000 */ mtc1 $v0, $f0 -/* 6F1E3C 80238D5C 00000000 */ nop -/* 6F1E40 80238D60 46800020 */ cvt.s.w $f0, $f0 -/* 6F1E44 80238D64 46020002 */ mul.s $f0, $f0, $f2 -/* 6F1E48 80238D68 00000000 */ nop -/* 6F1E4C 80238D6C 90850190 */ lbu $a1, 0x190($a0) -/* 6F1E50 80238D70 4600010D */ trunc.w.s $f4, $f0 -/* 6F1E54 80238D74 44032000 */ mfc1 $v1, $f4 -/* 6F1E58 80238D78 00000000 */ nop -/* 6F1E5C 80238D7C 0065102A */ slt $v0, $v1, $a1 -/* 6F1E60 80238D80 54400001 */ bnel $v0, $zero, .L80238D88 -/* 6F1E64 80238D84 00A0182D */ daddu $v1, $a1, $zero -.L80238D88: -/* 6F1E68 80238D88 2462004C */ addiu $v0, $v1, 0x4c -/* 6F1E6C 80238D8C AE020090 */ sw $v0, 0x90($s0) -/* 6F1E70 80238D90 90820136 */ lbu $v0, 0x136($a0) -/* 6F1E74 80238D94 00021080 */ sll $v0, $v0, 2 -/* 6F1E78 80238D98 3C038028 */ lui $v1, %hi(bActorOffsets) -/* 6F1E7C 80238D9C 00621821 */ addu $v1, $v1, $v0 -/* 6F1E80 80238DA0 80632EE8 */ lb $v1, %lo(bActorOffsets)($v1) -/* 6F1E84 80238DA4 8E020084 */ lw $v0, 0x84($s0) -/* 6F1E88 80238DA8 00431021 */ addu $v0, $v0, $v1 -/* 6F1E8C 80238DAC AE020084 */ sw $v0, 0x84($s0) -/* 6F1E90 80238DB0 90820136 */ lbu $v0, 0x136($a0) -/* 6F1E94 80238DB4 00021080 */ sll $v0, $v0, 2 -/* 6F1E98 80238DB8 3C038028 */ lui $v1, %hi(bActorOffsets + 0x1) -/* 6F1E9C 80238DBC 00621821 */ addu $v1, $v1, $v0 -/* 6F1EA0 80238DC0 80632EE9 */ lb $v1, %lo(bActorOffsets + 0x1)($v1) -/* 6F1EA4 80238DC4 8E020088 */ lw $v0, 0x88($s0) -/* 6F1EA8 80238DC8 00431021 */ addu $v0, $v0, $v1 -/* 6F1EAC 80238DCC AE020088 */ sw $v0, 0x88($s0) -/* 6F1EB0 80238DD0 90820136 */ lbu $v0, 0x136($a0) -/* 6F1EB4 80238DD4 8E030090 */ lw $v1, 0x90($s0) -/* 6F1EB8 80238DD8 00021080 */ sll $v0, $v0, 2 -/* 6F1EBC 80238DDC 3C048028 */ lui $a0, %hi(bActorOffsets + 0x2) -/* 6F1EC0 80238DE0 00822021 */ addu $a0, $a0, $v0 -/* 6F1EC4 80238DE4 80842EEA */ lb $a0, %lo(bActorOffsets + 0x2)($a0) -/* 6F1EC8 80238DE8 00641821 */ addu $v1, $v1, $a0 -/* 6F1ECC 80238DEC AE030090 */ sw $v1, 0x90($s0) -/* 6F1ED0 80238DF0 8FBF0014 */ lw $ra, 0x14($sp) -/* 6F1ED4 80238DF4 8FB00010 */ lw $s0, 0x10($sp) -/* 6F1ED8 80238DF8 24020002 */ addiu $v0, $zero, 2 -/* 6F1EDC 80238DFC 03E00008 */ jr $ra -/* 6F1EE0 80238E00 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/battle/partner/goombario/func_80238EDC_6F1FBC.s b/ver/us/asm/nonmatchings/battle/partner/goombario/func_80238EDC_6F1FBC.s deleted file mode 100644 index 21c03bffb8..0000000000 --- a/ver/us/asm/nonmatchings/battle/partner/goombario/func_80238EDC_6F1FBC.s +++ /dev/null @@ -1,96 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80238EDC_6F1FBC -/* 6F1FBC 80238EDC 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 6F1FC0 80238EE0 AFB30024 */ sw $s3, 0x24($sp) -/* 6F1FC4 80238EE4 0080982D */ daddu $s3, $a0, $zero -/* 6F1FC8 80238EE8 3C03800E */ lui $v1, %hi(gBattleStatus) -/* 6F1FCC 80238EEC 2463C070 */ addiu $v1, $v1, %lo(gBattleStatus) -/* 6F1FD0 80238EF0 AFBF0028 */ sw $ra, 0x28($sp) -/* 6F1FD4 80238EF4 AFB20020 */ sw $s2, 0x20($sp) -/* 6F1FD8 80238EF8 AFB1001C */ sw $s1, 0x1c($sp) -/* 6F1FDC 80238EFC AFB00018 */ sw $s0, 0x18($sp) -/* 6F1FE0 80238F00 8E71000C */ lw $s1, 0xc($s3) -/* 6F1FE4 80238F04 8C6400DC */ lw $a0, 0xdc($v1) -/* 6F1FE8 80238F08 3C058024 */ lui $a1, %hi(D_8023CDA4) -/* 6F1FEC 80238F0C 24A5CDA4 */ addiu $a1, $a1, %lo(D_8023CDA4) -/* 6F1FF0 80238F10 ACA00000 */ sw $zero, ($a1) -/* 6F1FF4 80238F14 80820220 */ lb $v0, 0x220($a0) -/* 6F1FF8 80238F18 18400002 */ blez $v0, .L80238F24 -/* 6F1FFC 80238F1C 24020001 */ addiu $v0, $zero, 1 -/* 6F2000 80238F20 ACA20000 */ sw $v0, ($a1) -.L80238F24: -/* 6F2004 80238F24 8463017C */ lh $v1, 0x17c($v1) -/* 6F2008 80238F28 24020087 */ addiu $v0, $zero, 0x87 -/* 6F200C 80238F2C 1062000B */ beq $v1, $v0, .L80238F5C -/* 6F2010 80238F30 0000902D */ daddu $s2, $zero, $zero -/* 6F2014 80238F34 28620088 */ slti $v0, $v1, 0x88 -/* 6F2018 80238F38 10400005 */ beqz $v0, .L80238F50 -/* 6F201C 80238F3C 24020086 */ addiu $v0, $zero, 0x86 -/* 6F2020 80238F40 10620006 */ beq $v1, $v0, .L80238F5C -/* 6F2024 80238F44 00000000 */ nop -/* 6F2028 80238F48 0808E3E1 */ j .L80238F84 -/* 6F202C 80238F4C 00000000 */ nop -.L80238F50: -/* 6F2030 80238F50 24020088 */ addiu $v0, $zero, 0x88 -/* 6F2034 80238F54 1462000B */ bne $v1, $v0, .L80238F84 -/* 6F2038 80238F58 00000000 */ nop -.L80238F5C: -/* 6F203C 80238F5C 90820220 */ lbu $v0, 0x220($a0) -/* 6F2040 80238F60 24420002 */ addiu $v0, $v0, 2 -/* 6F2044 80238F64 A0820220 */ sb $v0, 0x220($a0) -/* 6F2048 80238F68 00021600 */ sll $v0, $v0, 0x18 -/* 6F204C 80238F6C 00021603 */ sra $v0, $v0, 0x18 -/* 6F2050 80238F70 28420063 */ slti $v0, $v0, 0x63 -/* 6F2054 80238F74 14400003 */ bnez $v0, .L80238F84 -/* 6F2058 80238F78 24120001 */ addiu $s2, $zero, 1 -/* 6F205C 80238F7C 24020063 */ addiu $v0, $zero, 0x63 -/* 6F2060 80238F80 A0820220 */ sb $v0, 0x220($a0) -.L80238F84: -/* 6F2064 80238F84 8E250000 */ lw $a1, ($s1) -/* 6F2068 80238F88 26310004 */ addiu $s1, $s1, 4 -/* 6F206C 80238F8C 0C0B1EAF */ jal evt_get_variable -/* 6F2070 80238F90 0260202D */ daddu $a0, $s3, $zero -/* 6F2074 80238F94 8E250000 */ lw $a1, ($s1) -/* 6F2078 80238F98 26310004 */ addiu $s1, $s1, 4 -/* 6F207C 80238F9C 0260202D */ daddu $a0, $s3, $zero -/* 6F2080 80238FA0 0C0B1EAF */ jal evt_get_variable -/* 6F2084 80238FA4 0040802D */ daddu $s0, $v0, $zero -/* 6F2088 80238FA8 0260202D */ daddu $a0, $s3, $zero -/* 6F208C 80238FAC 8E250000 */ lw $a1, ($s1) -/* 6F2090 80238FB0 0C0B1EAF */ jal evt_get_variable -/* 6F2094 80238FB4 0040882D */ daddu $s1, $v0, $zero -/* 6F2098 80238FB8 0240202D */ daddu $a0, $s2, $zero -/* 6F209C 80238FBC 44901000 */ mtc1 $s0, $f2 -/* 6F20A0 80238FC0 00000000 */ nop -/* 6F20A4 80238FC4 468010A0 */ cvt.s.w $f2, $f2 -/* 6F20A8 80238FC8 44051000 */ mfc1 $a1, $f2 -/* 6F20AC 80238FCC 44911000 */ mtc1 $s1, $f2 -/* 6F20B0 80238FD0 00000000 */ nop -/* 6F20B4 80238FD4 468010A0 */ cvt.s.w $f2, $f2 -/* 6F20B8 80238FD8 44061000 */ mfc1 $a2, $f2 -/* 6F20BC 80238FDC 44821000 */ mtc1 $v0, $f2 -/* 6F20C0 80238FE0 00000000 */ nop -/* 6F20C4 80238FE4 468010A0 */ cvt.s.w $f2, $f2 -/* 6F20C8 80238FE8 3C013F80 */ lui $at, 0x3f80 -/* 6F20CC 80238FEC 44810000 */ mtc1 $at, $f0 -/* 6F20D0 80238FF0 44071000 */ mfc1 $a3, $f2 -/* 6F20D4 80238FF4 2403003C */ addiu $v1, $zero, 0x3c -/* 6F20D8 80238FF8 AFA30014 */ sw $v1, 0x14($sp) -/* 6F20DC 80238FFC 0C01C634 */ jal fx_stat_change -/* 6F20E0 80239000 E7A00010 */ swc1 $f0, 0x10($sp) -/* 6F20E4 80239004 3C05800E */ lui $a1, %hi(gBattleStatus) -/* 6F20E8 80239008 24A5C070 */ addiu $a1, $a1, %lo(gBattleStatus) -/* 6F20EC 8023900C 8CA30000 */ lw $v1, ($a1) -/* 6F20F0 80239010 3C044000 */ lui $a0, 0x4000 -/* 6F20F4 80239014 00641825 */ or $v1, $v1, $a0 -/* 6F20F8 80239018 ACA30000 */ sw $v1, ($a1) -/* 6F20FC 8023901C 8FBF0028 */ lw $ra, 0x28($sp) -/* 6F2100 80239020 8FB30024 */ lw $s3, 0x24($sp) -/* 6F2104 80239024 8FB20020 */ lw $s2, 0x20($sp) -/* 6F2108 80239028 8FB1001C */ lw $s1, 0x1c($sp) -/* 6F210C 8023902C 8FB00018 */ lw $s0, 0x18($sp) -/* 6F2110 80239030 24020002 */ addiu $v0, $zero, 2 -/* 6F2114 80239034 03E00008 */ jr $ra -/* 6F2118 80239038 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/battle/partner/kooper/func_80238114_6F5F94.s b/ver/us/asm/nonmatchings/battle/partner/kooper/func_80238114_6F5F94.s deleted file mode 100644 index fb81095ff0..0000000000 --- a/ver/us/asm/nonmatchings/battle/partner/kooper/func_80238114_6F5F94.s +++ /dev/null @@ -1,110 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80238114_6F5F94 -/* 6F5F94 80238114 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* 6F5F98 80238118 AFB3001C */ sw $s3, 0x1c($sp) -/* 6F5F9C 8023811C 3C13800E */ lui $s3, %hi(gBattleStatus+0xDC) -/* 6F5FA0 80238120 8E73C14C */ lw $s3, %lo(gBattleStatus+0xDC)($s3) -/* 6F5FA4 80238124 AFBF0020 */ sw $ra, 0x20($sp) -/* 6F5FA8 80238128 AFB20018 */ sw $s2, 0x18($sp) -/* 6F5FAC 8023812C AFB10014 */ sw $s1, 0x14($sp) -/* 6F5FB0 80238130 AFB00010 */ sw $s0, 0x10($sp) -/* 6F5FB4 80238134 F7B80038 */ sdc1 $f24, 0x38($sp) -/* 6F5FB8 80238138 F7B60030 */ sdc1 $f22, 0x30($sp) -/* 6F5FBC 8023813C 10A00003 */ beqz $a1, .L8023814C -/* 6F5FC0 80238140 F7B40028 */ sdc1 $f20, 0x28($sp) -/* 6F5FC4 80238144 AC800070 */ sw $zero, 0x70($a0) -/* 6F5FC8 80238148 A2600425 */ sb $zero, 0x425($s3) -.L8023814C: -/* 6F5FCC 8023814C 8C820070 */ lw $v0, 0x70($a0) -/* 6F5FD0 80238150 14400047 */ bnez $v0, .L80238270 -/* 6F5FD4 80238154 0000102D */ daddu $v0, $zero, $zero -/* 6F5FD8 80238158 8262040C */ lb $v0, 0x40c($s3) -/* 6F5FDC 8023815C 1840002D */ blez $v0, .L80238214 -/* 6F5FE0 80238160 0000902D */ daddu $s2, $zero, $zero -/* 6F5FE4 80238164 3C014204 */ lui $at, 0x4204 -/* 6F5FE8 80238168 4481C000 */ mtc1 $at, $f24 -/* 6F5FEC 8023816C 02721021 */ addu $v0, $s3, $s2 -.L80238170: -/* 6F5FF0 80238170 8043040D */ lb $v1, 0x40d($v0) -/* 6F5FF4 80238174 C6740144 */ lwc1 $f20, 0x144($s3) -/* 6F5FF8 80238178 00031080 */ sll $v0, $v1, 2 -/* 6F5FFC 8023817C 00431021 */ addu $v0, $v0, $v1 -/* 6F6000 80238180 00021080 */ sll $v0, $v0, 2 -/* 6F6004 80238184 2442022C */ addiu $v0, $v0, 0x22c -/* 6F6008 80238188 02628821 */ addu $s1, $s3, $v0 -/* 6F600C 8023818C 86220004 */ lh $v0, 4($s1) -/* 6F6010 80238190 86240000 */ lh $a0, ($s1) -/* 6F6014 80238194 4482B000 */ mtc1 $v0, $f22 -/* 6F6018 80238198 00000000 */ nop -/* 6F601C 8023819C 0C09A75B */ jal get_actor -/* 6F6020 802381A0 4680B5A0 */ cvt.s.w $f22, $f22 -/* 6F6024 802381A4 0040802D */ daddu $s0, $v0, $zero -/* 6F6028 802381A8 12000015 */ beqz $s0, .L80238200 -/* 6F602C 802381AC 00000000 */ nop -/* 6F6030 802381B0 86250002 */ lh $a1, 2($s1) -/* 6F6034 802381B4 0C099117 */ jal get_actor_part -/* 6F6038 802381B8 0200202D */ daddu $a0, $s0, $zero -/* 6F603C 802381BC 82030218 */ lb $v1, 0x218($s0) -/* 6F6040 802381C0 1460000F */ bnez $v1, .L80238200 -/* 6F6044 802381C4 00000000 */ nop -/* 6F6048 802381C8 8C42007C */ lw $v0, 0x7c($v0) -/* 6F604C 802381CC 30420020 */ andi $v0, $v0, 0x20 -/* 6F6050 802381D0 1440000B */ bnez $v0, .L80238200 -/* 6F6054 802381D4 00000000 */ nop -/* 6F6058 802381D8 4614B03C */ c.lt.s $f22, $f20 -/* 6F605C 802381DC 00000000 */ nop -/* 6F6060 802381E0 45020004 */ bc1fl .L802381F4 -/* 6F6064 802381E4 AE00018C */ sw $zero, 0x18c($s0) -/* 6F6068 802381E8 C600018C */ lwc1 $f0, 0x18c($s0) -/* 6F606C 802381EC 46180000 */ add.s $f0, $f0, $f24 -/* 6F6070 802381F0 E600018C */ swc1 $f0, 0x18c($s0) -.L802381F4: -/* 6F6074 802381F4 0C00A6C9 */ jal clamp_angle -/* 6F6078 802381F8 C60C018C */ lwc1 $f12, 0x18c($s0) -/* 6F607C 802381FC E600018C */ swc1 $f0, 0x18c($s0) -.L80238200: -/* 6F6080 80238200 8262040C */ lb $v0, 0x40c($s3) -/* 6F6084 80238204 26520001 */ addiu $s2, $s2, 1 -/* 6F6088 80238208 0242102A */ slt $v0, $s2, $v0 -/* 6F608C 8023820C 1440FFD8 */ bnez $v0, .L80238170 -/* 6F6090 80238210 02721021 */ addu $v0, $s3, $s2 -.L80238214: -/* 6F6094 80238214 8E620088 */ lw $v0, 0x88($s3) -/* 6F6098 80238218 10400015 */ beqz $v0, .L80238270 -/* 6F609C 8023821C 0000102D */ daddu $v0, $zero, $zero -/* 6F60A0 80238220 8262040C */ lb $v0, 0x40c($s3) -/* 6F60A4 80238224 18400011 */ blez $v0, .L8023826C -/* 6F60A8 80238228 0000902D */ daddu $s2, $zero, $zero -/* 6F60AC 8023822C 02721021 */ addu $v0, $s3, $s2 -.L80238230: -/* 6F60B0 80238230 8043040D */ lb $v1, 0x40d($v0) -/* 6F60B4 80238234 00031080 */ sll $v0, $v1, 2 -/* 6F60B8 80238238 00431021 */ addu $v0, $v0, $v1 -/* 6F60BC 8023823C 00021080 */ sll $v0, $v0, 2 -/* 6F60C0 80238240 00538821 */ addu $s1, $v0, $s3 -/* 6F60C4 80238244 0C09A75B */ jal get_actor -/* 6F60C8 80238248 8624022C */ lh $a0, 0x22c($s1) -/* 6F60CC 8023824C 0040802D */ daddu $s0, $v0, $zero -/* 6F60D0 80238250 56000001 */ bnel $s0, $zero, .L80238258 -/* 6F60D4 80238254 AE00018C */ sw $zero, 0x18c($s0) -.L80238258: -/* 6F60D8 80238258 8262040C */ lb $v0, 0x40c($s3) -/* 6F60DC 8023825C 26520001 */ addiu $s2, $s2, 1 -/* 6F60E0 80238260 0242102A */ slt $v0, $s2, $v0 -/* 6F60E4 80238264 1440FFF2 */ bnez $v0, .L80238230 -/* 6F60E8 80238268 02721021 */ addu $v0, $s3, $s2 -.L8023826C: -/* 6F60EC 8023826C 24020002 */ addiu $v0, $zero, 2 -.L80238270: -/* 6F60F0 80238270 8FBF0020 */ lw $ra, 0x20($sp) -/* 6F60F4 80238274 8FB3001C */ lw $s3, 0x1c($sp) -/* 6F60F8 80238278 8FB20018 */ lw $s2, 0x18($sp) -/* 6F60FC 8023827C 8FB10014 */ lw $s1, 0x14($sp) -/* 6F6100 80238280 8FB00010 */ lw $s0, 0x10($sp) -/* 6F6104 80238284 D7B80038 */ ldc1 $f24, 0x38($sp) -/* 6F6108 80238288 D7B60030 */ ldc1 $f22, 0x30($sp) -/* 6F610C 8023828C D7B40028 */ ldc1 $f20, 0x28($sp) -/* 6F6110 80238290 03E00008 */ jr $ra -/* 6F6114 80238294 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/ver/us/asm/nonmatchings/battle/partner/lakilester/func_8023803C_70BD4C.s b/ver/us/asm/nonmatchings/battle/partner/lakilester/func_8023803C_70BD4C.s index e3148d3d1e..0f9107579a 100644 --- a/ver/us/asm/nonmatchings/battle/partner/lakilester/func_8023803C_70BD4C.s +++ b/ver/us/asm/nonmatchings/battle/partner/lakilester/func_8023803C_70BD4C.s @@ -1,6 +1,13 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches +.section .rodata + +dlabel D_8023D1B0_710EC0 +.double 6.7 + +.section .text + glabel func_8023803C_70BD4C /* 70BD4C 8023803C 27BDFF98 */ addiu $sp, $sp, -0x68 /* 70BD50 80238040 AFB00030 */ sw $s0, 0x30($sp) diff --git a/ver/us/asm/nonmatchings/battle/partner/lakilester/func_80238C58_70C968.s b/ver/us/asm/nonmatchings/battle/partner/lakilester/func_80238C58_70C968.s deleted file mode 100644 index a192e76ffb..0000000000 --- a/ver/us/asm/nonmatchings/battle/partner/lakilester/func_80238C58_70C968.s +++ /dev/null @@ -1,69 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80238C58_70C968 -/* 70C968 80238C58 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 70C96C 80238C5C AFB00018 */ sw $s0, 0x18($sp) -/* 70C970 80238C60 0080802D */ daddu $s0, $a0, $zero -/* 70C974 80238C64 3C06800E */ lui $a2, %hi(gBattleStatus) -/* 70C978 80238C68 24C6C070 */ addiu $a2, $a2, %lo(gBattleStatus) -/* 70C97C 80238C6C AFBF001C */ sw $ra, 0x1c($sp) -/* 70C980 80238C70 8CC400D8 */ lw $a0, 0xd8($a2) -/* 70C984 80238C74 54A00001 */ bnel $a1, $zero, .L80238C7C -/* 70C988 80238C78 AE000070 */ sw $zero, 0x70($s0) -.L80238C7C: -/* 70C98C 80238C7C 8E030070 */ lw $v1, 0x70($s0) -/* 70C990 80238C80 10600005 */ beqz $v1, .L80238C98 -/* 70C994 80238C84 24020001 */ addiu $v0, $zero, 1 -/* 70C998 80238C88 10620013 */ beq $v1, $v0, .L80238CD8 -/* 70C99C 80238C8C 0000102D */ daddu $v0, $zero, $zero -/* 70C9A0 80238C90 0808E34E */ j .L80238D38 -/* 70C9A4 80238C94 00000000 */ nop -.L80238C98: -/* 70C9A8 80238C98 3C013DCC */ lui $at, 0x3dcc -/* 70C9AC 80238C9C 3421CCCD */ ori $at, $at, 0xcccd -/* 70C9B0 80238CA0 44810000 */ mtc1 $at, $f0 -/* 70C9B4 80238CA4 24C200A8 */ addiu $v0, $a2, 0xa8 -/* 70C9B8 80238CA8 AFA20014 */ sw $v0, 0x14($sp) -/* 70C9BC 80238CAC E7A00010 */ swc1 $f0, 0x10($sp) -/* 70C9C0 80238CB0 8C850144 */ lw $a1, 0x144($a0) -/* 70C9C4 80238CB4 8C860148 */ lw $a2, 0x148($a0) -/* 70C9C8 80238CB8 8C87014C */ lw $a3, 0x14c($a0) -/* 70C9CC 80238CBC 3C018024 */ lui $at, %hi(D_8023D1E0) -/* 70C9D0 80238CC0 E420D1E0 */ swc1 $f0, %lo(D_8023D1E0)($at) -/* 70C9D4 80238CC4 0C01C304 */ jal fx_ending_decals -/* 70C9D8 80238CC8 0000202D */ daddu $a0, $zero, $zero -/* 70C9DC 80238CCC 24020001 */ addiu $v0, $zero, 1 -/* 70C9E0 80238CD0 0808E34D */ j .L80238D34 -/* 70C9E4 80238CD4 AE020070 */ sw $v0, 0x70($s0) -.L80238CD8: -/* 70C9E8 80238CD8 3C038024 */ lui $v1, %hi(D_8023D1E0) -/* 70C9EC 80238CDC 2463D1E0 */ addiu $v1, $v1, %lo(D_8023D1E0) -/* 70C9F0 80238CE0 C4620000 */ lwc1 $f2, ($v1) -/* 70C9F4 80238CE4 3C013FF0 */ lui $at, 0x3ff0 -/* 70C9F8 80238CE8 44810800 */ mtc1 $at, $f1 -/* 70C9FC 80238CEC 44800000 */ mtc1 $zero, $f0 -/* 70CA00 80238CF0 460010A1 */ cvt.d.s $f2, $f2 -/* 70CA04 80238CF4 4622003E */ c.le.d $f0, $f2 -/* 70CA08 80238CF8 00000000 */ nop -/* 70CA0C 80238CFC 4501000E */ bc1t .L80238D38 -/* 70CA10 80238D00 24020002 */ addiu $v0, $zero, 2 -/* 70CA14 80238D04 8CC200A8 */ lw $v0, 0xa8($a2) -/* 70CA18 80238D08 3C018024 */ lui $at, %hi(D_8023D1B8_710EC8) -/* 70CA1C 80238D0C D424D1B8 */ ldc1 $f4, %lo(D_8023D1B8_710EC8)($at) -/* 70CA20 80238D10 8C42000C */ lw $v0, 0xc($v0) -/* 70CA24 80238D14 46241080 */ add.d $f2, $f2, $f4 -/* 70CA28 80238D18 C4400010 */ lwc1 $f0, 0x10($v0) -/* 70CA2C 80238D1C 46000021 */ cvt.d.s $f0, $f0 -/* 70CA30 80238D20 46240000 */ add.d $f0, $f0, $f4 -/* 70CA34 80238D24 462010A0 */ cvt.s.d $f2, $f2 -/* 70CA38 80238D28 E4620000 */ swc1 $f2, ($v1) -/* 70CA3C 80238D2C 46200020 */ cvt.s.d $f0, $f0 -/* 70CA40 80238D30 E4400010 */ swc1 $f0, 0x10($v0) -.L80238D34: -/* 70CA44 80238D34 0000102D */ daddu $v0, $zero, $zero -.L80238D38: -/* 70CA48 80238D38 8FBF001C */ lw $ra, 0x1c($sp) -/* 70CA4C 80238D3C 8FB00018 */ lw $s0, 0x18($sp) -/* 70CA50 80238D40 03E00008 */ jr $ra -/* 70CA54 80238D44 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/battle/partner/lakilester/func_80239140_70CE50.s b/ver/us/asm/nonmatchings/battle/partner/lakilester/func_80239140_70CE50.s index 381f911798..d29fabdea3 100644 --- a/ver/us/asm/nonmatchings/battle/partner/lakilester/func_80239140_70CE50.s +++ b/ver/us/asm/nonmatchings/battle/partner/lakilester/func_80239140_70CE50.s @@ -1,6 +1,16 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches +.section .rodata + +dlabel D_8023D1C0_710ED0 +.double 0.1 + +dlabel D_8023D1C8_710ED8 +.double 2.8 + +.section .text + glabel func_80239140_70CE50 /* 70CE50 80239140 27BDFF90 */ addiu $sp, $sp, -0x70 /* 70CE54 80239144 AFB20038 */ sw $s2, 0x38($sp) diff --git a/ver/us/asm/nonmatchings/battle/partner/lakilester/func_80239F84_70DC94.s b/ver/us/asm/nonmatchings/battle/partner/lakilester/func_80239F84_70DC94.s index 96f16967f0..cc31c6130f 100644 --- a/ver/us/asm/nonmatchings/battle/partner/lakilester/func_80239F84_70DC94.s +++ b/ver/us/asm/nonmatchings/battle/partner/lakilester/func_80239F84_70DC94.s @@ -1,6 +1,13 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches +.section .rodata + +dlabel D_8023D1D0_710EE0 +.double 1.4, 0.0 + +.section .text + glabel func_80239F84_70DC94 /* 70DC94 80239F84 27BDFFD8 */ addiu $sp, $sp, -0x28 /* 70DC98 80239F88 AFB10014 */ sw $s1, 0x14($sp) diff --git a/ver/us/asm/nonmatchings/world/area_isk/isk_04/97BF60/func_8024095C_97BF8C.s b/ver/us/asm/nonmatchings/world/area_isk/isk_04/97BF60/func_8024095C_97BF8C.s deleted file mode 100644 index 1793f03d84..0000000000 --- a/ver/us/asm/nonmatchings/world/area_isk/isk_04/97BF60/func_8024095C_97BF8C.s +++ /dev/null @@ -1,79 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024095C_97BF8C -/* 97BF8C 8024095C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 97BF90 80240960 3C048024 */ lui $a0, %hi(D_80242288_97D8B8) -/* 97BF94 80240964 24842288 */ addiu $a0, $a0, %lo(D_80242288_97D8B8) -/* 97BF98 80240968 AFBF0018 */ sw $ra, 0x18($sp) -/* 97BF9C 8024096C AFB10014 */ sw $s1, 0x14($sp) -/* 97BFA0 80240970 AFB00010 */ sw $s0, 0x10($sp) -/* 97BFA4 80240974 F7B40020 */ sdc1 $f20, 0x20($sp) -/* 97BFA8 80240978 8C830000 */ lw $v1, ($a0) -/* 97BFAC 8024097C 3C118011 */ lui $s1, %hi(gPlayerStatus) -/* 97BFB0 80240980 2631EFC8 */ addiu $s1, $s1, %lo(gPlayerStatus) -/* 97BFB4 80240984 28620003 */ slti $v0, $v1, 3 -/* 97BFB8 80240988 50400007 */ beql $v0, $zero, .L802409A8 -/* 97BFBC 8024098C 24020003 */ addiu $v0, $zero, 3 -/* 97BFC0 80240990 1C60000C */ bgtz $v1, .L802409C4 -/* 97BFC4 80240994 24620001 */ addiu $v0, $v1, 1 -/* 97BFC8 80240998 10600007 */ beqz $v1, .L802409B8 -/* 97BFCC 8024099C 0000102D */ daddu $v0, $zero, $zero -/* 97BFD0 802409A0 08090295 */ j .L80240A54 -/* 97BFD4 802409A4 00000000 */ nop -.L802409A8: -/* 97BFD8 802409A8 10620008 */ beq $v1, $v0, .L802409CC -/* 97BFDC 802409AC 0000102D */ daddu $v0, $zero, $zero -/* 97BFE0 802409B0 08090295 */ j .L80240A54 -/* 97BFE4 802409B4 00000000 */ nop -.L802409B8: -/* 97BFE8 802409B8 24020001 */ addiu $v0, $zero, 1 -/* 97BFEC 802409BC 08090294 */ j .L80240A50 -/* 97BFF0 802409C0 AC820000 */ sw $v0, ($a0) -.L802409C4: -/* 97BFF4 802409C4 08090294 */ j .L80240A50 -/* 97BFF8 802409C8 AC820000 */ sw $v0, ($a0) -.L802409CC: -/* 97BFFC 802409CC C6200028 */ lwc1 $f0, 0x28($s1) -/* 97C000 802409D0 3C0141F0 */ lui $at, 0x41f0 -/* 97C004 802409D4 44811000 */ mtc1 $at, $f2 -/* 97C008 802409D8 3C108011 */ lui $s0, %hi(wPartnerNpc) -/* 97C00C 802409DC 2610C930 */ addiu $s0, $s0, %lo(wPartnerNpc) -/* 97C010 802409E0 46020001 */ sub.s $f0, $f0, $f2 -/* 97C014 802409E4 8E040000 */ lw $a0, ($s0) -/* 97C018 802409E8 E4800038 */ swc1 $f0, 0x38($a0) -/* 97C01C 802409EC C6200030 */ lwc1 $f0, 0x30($s1) -/* 97C020 802409F0 46020000 */ add.s $f0, $f0, $f2 -/* 97C024 802409F4 0C03BD17 */ jal partner_clear_player_tracking -/* 97C028 802409F8 E4800040 */ swc1 $f0, 0x40($a0) -/* 97C02C 802409FC C6200028 */ lwc1 $f0, 0x28($s1) -/* 97C030 80240A00 C6220030 */ lwc1 $f2, 0x30($s1) -/* 97C034 80240A04 4600010D */ trunc.w.s $f4, $f0 -/* 97C038 80240A08 44042000 */ mfc1 $a0, $f4 -/* 97C03C 80240A0C 4600110D */ trunc.w.s $f4, $f2 -/* 97C040 80240A10 44052000 */ mfc1 $a1, $f4 -/* 97C044 80240A14 0C03BCF0 */ jal partner_set_goal_pos -/* 97C048 80240A18 00000000 */ nop -/* 97C04C 80240A1C 0C03BCF5 */ jal func_800EF3D4 -/* 97C050 80240A20 0000202D */ daddu $a0, $zero, $zero -/* 97C054 80240A24 3C0142B4 */ lui $at, 0x42b4 -/* 97C058 80240A28 4481A000 */ mtc1 $at, $f20 -/* 97C05C 80240A2C 8E040000 */ lw $a0, ($s0) -/* 97C060 80240A30 4405A000 */ mfc1 $a1, $f20 -/* 97C064 80240A34 0C00ECD0 */ jal set_npc_yaw -/* 97C068 80240A38 00000000 */ nop -/* 97C06C 80240A3C 24020002 */ addiu $v0, $zero, 2 -/* 97C070 80240A40 E6340080 */ swc1 $f20, 0x80($s1) -/* 97C074 80240A44 E6340084 */ swc1 $f20, 0x84($s1) -/* 97C078 80240A48 08090295 */ j .L80240A54 -/* 97C07C 80240A4C AE2000A8 */ sw $zero, 0xa8($s1) -.L80240A50: -/* 97C080 80240A50 0000102D */ daddu $v0, $zero, $zero -.L80240A54: -/* 97C084 80240A54 8FBF0018 */ lw $ra, 0x18($sp) -/* 97C088 80240A58 8FB10014 */ lw $s1, 0x14($sp) -/* 97C08C 80240A5C 8FB00010 */ lw $s0, 0x10($sp) -/* 97C090 80240A60 D7B40020 */ ldc1 $f20, 0x20($sp) -/* 97C094 80240A64 03E00008 */ jr $ra -/* 97C098 80240A68 27BD0028 */ addiu $sp, $sp, 0x28 -/* 97C09C 80240A6C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_11/B71010/func_802407DC_B7103C.s b/ver/us/asm/nonmatchings/world/area_jan/jan_11/B71010/func_802407DC_B7103C.s deleted file mode 100644 index 29085f36dc..0000000000 --- a/ver/us/asm/nonmatchings/world/area_jan/jan_11/B71010/func_802407DC_B7103C.s +++ /dev/null @@ -1,14 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802407DC_B7103C -/* B7103C 802407DC 3C038011 */ lui $v1, %hi(gPartnerActionStatus+0x3) -/* B71040 802407E0 8063EBB3 */ lb $v1, %lo(gPartnerActionStatus+0x3)($v1) -/* B71044 802407E4 24020006 */ addiu $v0, $zero, 6 -/* B71048 802407E8 54620003 */ bnel $v1, $v0, .L802407F8 -/* B7104C 802407EC AC8000A8 */ sw $zero, 0xa8($a0) -/* B71050 802407F0 24020001 */ addiu $v0, $zero, 1 -/* B71054 802407F4 AC8200A8 */ sw $v0, 0xa8($a0) -.L802407F8: -/* B71058 802407F8 03E00008 */ jr $ra -/* B7105C 802407FC 24020002 */ addiu $v0, $zero, 2 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_12/A54CA0/func_80240444_A54D94.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_12/A54CA0/func_80240444_A54D94.s deleted file mode 100644 index 0d9f39d0a8..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_12/A54CA0/func_80240444_A54D94.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240444_A54D94 -/* A54D94 80240444 3C038011 */ lui $v1, %hi(gPartnerActionStatus+0x3) -/* A54D98 80240448 8063EBB3 */ lb $v1, %lo(gPartnerActionStatus+0x3)($v1) -/* A54D9C 8024044C 24020008 */ addiu $v0, $zero, 8 -/* A54DA0 80240450 54620003 */ bnel $v1, $v0, .L80240460 -/* A54DA4 80240454 AC8000A8 */ sw $zero, 0xa8($a0) -/* A54DA8 80240458 24020001 */ addiu $v0, $zero, 1 -/* A54DAC 8024045C AC8200A8 */ sw $v0, 0xa8($a0) -.L80240460: -/* A54DB0 80240460 03E00008 */ jr $ra -/* A54DB4 80240464 24020002 */ addiu $v0, $zero, 2 -/* A54DB8 80240468 00000000 */ nop -/* A54DBC 8024046C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_13/A56270/func_80240444_A56364.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_13/A56270/func_80240444_A56364.s deleted file mode 100644 index 701d1480a8..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_13/A56270/func_80240444_A56364.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240444_A56364 -/* A56364 80240444 3C038011 */ lui $v1, %hi(gPartnerActionStatus+0x3) -/* A56368 80240448 8063EBB3 */ lb $v1, %lo(gPartnerActionStatus+0x3)($v1) -/* A5636C 8024044C 24020008 */ addiu $v0, $zero, 8 -/* A56370 80240450 54620003 */ bnel $v1, $v0, .L80240460 -/* A56374 80240454 AC8000A8 */ sw $zero, 0xa8($a0) -/* A56378 80240458 24020001 */ addiu $v0, $zero, 1 -/* A5637C 8024045C AC8200A8 */ sw $v0, 0xa8($a0) -.L80240460: -/* A56380 80240460 03E00008 */ jr $ra -/* A56384 80240464 24020002 */ addiu $v0, $zero, 2 -/* A56388 80240468 00000000 */ nop -/* A5638C 8024046C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_14/A57830/func_80240840_A57CF0.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_14/A57830/func_80240840_A57CF0.s deleted file mode 100644 index 8dc67b3b4c..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_14/A57830/func_80240840_A57CF0.s +++ /dev/null @@ -1,17 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240840_A57CF0 -/* A57CF0 80240840 3C038011 */ lui $v1, %hi(gPartnerActionStatus+0x3) -/* A57CF4 80240844 8063EBB3 */ lb $v1, %lo(gPartnerActionStatus+0x3)($v1) -/* A57CF8 80240848 24020008 */ addiu $v0, $zero, 8 -/* A57CFC 8024084C 54620003 */ bnel $v1, $v0, .L8024085C -/* A57D00 80240850 AC8000A8 */ sw $zero, 0xa8($a0) -/* A57D04 80240854 24020001 */ addiu $v0, $zero, 1 -/* A57D08 80240858 AC8200A8 */ sw $v0, 0xa8($a0) -.L8024085C: -/* A57D0C 8024085C 03E00008 */ jr $ra -/* A57D10 80240860 24020002 */ addiu $v0, $zero, 2 -/* A57D14 80240864 00000000 */ nop -/* A57D18 80240868 00000000 */ nop -/* A57D1C 8024086C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_11/C804B0/func_80240434_C805D4.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_11/C804B0/func_80240434_C805D4.s deleted file mode 100644 index fbc45afc6c..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_11/C804B0/func_80240434_C805D4.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240434_C805D4 -/* C805D4 80240434 3C038011 */ lui $v1, %hi(gPartnerActionStatus+0x3) -/* C805D8 80240438 8063EBB3 */ lb $v1, %lo(gPartnerActionStatus+0x3)($v1) -/* C805DC 8024043C 24020008 */ addiu $v0, $zero, 8 -/* C805E0 80240440 54620003 */ bnel $v1, $v0, .L80240450 -/* C805E4 80240444 AC8000A8 */ sw $zero, 0xa8($a0) -/* C805E8 80240448 24020001 */ addiu $v0, $zero, 1 -/* C805EC 8024044C AC8200A8 */ sw $v0, 0xa8($a0) -.L80240450: -/* C805F0 80240450 03E00008 */ jr $ra -/* C805F4 80240454 24020002 */ addiu $v0, $zero, 2 -/* C805F8 80240458 00000000 */ nop -/* C805FC 8024045C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_04/843030/func_802419AC_84457C.s b/ver/us/asm/nonmatchings/world/area_mac/mac_04/843030/func_802419AC_84457C.s deleted file mode 100644 index 7ea43a4067..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mac/mac_04/843030/func_802419AC_84457C.s +++ /dev/null @@ -1,14 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802419AC_84457C -/* 84457C 802419AC 3C038011 */ lui $v1, %hi(gPartnerActionStatus+0x3) -/* 844580 802419B0 8063EBB3 */ lb $v1, %lo(gPartnerActionStatus+0x3)($v1) -/* 844584 802419B4 24020009 */ addiu $v0, $zero, 9 -/* 844588 802419B8 54620003 */ bnel $v1, $v0, .L802419C8 -/* 84458C 802419BC AC800084 */ sw $zero, 0x84($a0) -/* 844590 802419C0 24020001 */ addiu $v0, $zero, 1 -/* 844594 802419C4 AC820084 */ sw $v0, 0x84($a0) -.L802419C8: -/* 844598 802419C8 03E00008 */ jr $ra -/* 84459C 802419CC 24020002 */ addiu $v0, $zero, 2 diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_8024243C_9C781C.s b/ver/us/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_8024243C_9C781C.s deleted file mode 100644 index de0d90f74d..0000000000 --- a/ver/us/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_8024243C_9C781C.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024243C_9C781C -/* 9C781C 8024243C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 9C7820 80242440 AFB10014 */ sw $s1, 0x14($sp) -/* 9C7824 80242444 0080882D */ daddu $s1, $a0, $zero -/* 9C7828 80242448 AFBF0018 */ sw $ra, 0x18($sp) -/* 9C782C 8024244C AFB00010 */ sw $s0, 0x10($sp) -/* 9C7830 80242450 8E30000C */ lw $s0, 0xc($s1) -/* 9C7834 80242454 8E050000 */ lw $a1, ($s0) -/* 9C7838 80242458 0C0B1EAF */ jal evt_get_variable -/* 9C783C 8024245C 26100004 */ addiu $s0, $s0, 4 -/* 9C7840 80242460 8E100000 */ lw $s0, ($s0) -/* 9C7844 80242464 0C00EAD2 */ jal get_npc_safe -/* 9C7848 80242468 0040202D */ daddu $a0, $v0, $zero -/* 9C784C 8024246C 3C048007 */ lui $a0, %hi(gCurrentCameraID) -/* 9C7850 80242470 8C847410 */ lw $a0, %lo(gCurrentCameraID)($a0) -/* 9C7854 80242474 C440000C */ lwc1 $f0, 0xc($v0) -/* 9C7858 80242478 3C014334 */ lui $at, 0x4334 -/* 9C785C 8024247C 44811000 */ mtc1 $at, $f2 -/* 9C7860 80242480 00041880 */ sll $v1, $a0, 2 -/* 9C7864 80242484 00641821 */ addu $v1, $v1, $a0 -/* 9C7868 80242488 00031880 */ sll $v1, $v1, 2 -/* 9C786C 8024248C 00641823 */ subu $v1, $v1, $a0 -/* 9C7870 80242490 000320C0 */ sll $a0, $v1, 3 -/* 9C7874 80242494 00641821 */ addu $v1, $v1, $a0 -/* 9C7878 80242498 000318C0 */ sll $v1, $v1, 3 -/* 9C787C 8024249C 46020000 */ add.s $f0, $f0, $f2 -/* 9C7880 802424A0 3C01800B */ lui $at, %hi(gCameras+0x6C) -/* 9C7884 802424A4 00230821 */ addu $at, $at, $v1 -/* 9C7888 802424A8 C42C1DEC */ lwc1 $f12, %lo(gCameras+0x6C)($at) -/* 9C788C 802424AC 0C00A6C9 */ jal clamp_angle -/* 9C7890 802424B0 460C0301 */ sub.s $f12, $f0, $f12 -/* 9C7894 802424B4 3C014387 */ lui $at, 0x4387 -/* 9C7898 802424B8 44811000 */ mtc1 $at, $f2 -/* 9C789C 802424BC 46000106 */ mov.s $f4, $f0 -/* 9C78A0 802424C0 4604103C */ c.lt.s $f2, $f4 -/* 9C78A4 802424C4 00000000 */ nop -/* 9C78A8 802424C8 45010008 */ bc1t .L802424EC -/* 9C78AC 802424CC 0000302D */ daddu $a2, $zero, $zero -/* 9C78B0 802424D0 3C0142B4 */ lui $at, 0x42b4 -/* 9C78B4 802424D4 44810000 */ mtc1 $at, $f0 -/* 9C78B8 802424D8 00000000 */ nop -/* 9C78BC 802424DC 4600203C */ c.lt.s $f4, $f0 -/* 9C78C0 802424E0 00000000 */ nop -/* 9C78C4 802424E4 45000003 */ bc1f .L802424F4 -/* 9C78C8 802424E8 0220202D */ daddu $a0, $s1, $zero -.L802424EC: -/* 9C78CC 802424EC 24060001 */ addiu $a2, $zero, 1 -/* 9C78D0 802424F0 0220202D */ daddu $a0, $s1, $zero -.L802424F4: -/* 9C78D4 802424F4 0C0B2026 */ jal evt_set_variable -/* 9C78D8 802424F8 0200282D */ daddu $a1, $s0, $zero -/* 9C78DC 802424FC 8FBF0018 */ lw $ra, 0x18($sp) -/* 9C78E0 80242500 8FB10014 */ lw $s1, 0x14($sp) -/* 9C78E4 80242504 8FB00010 */ lw $s0, 0x10($sp) -/* 9C78E8 80242508 24020002 */ addiu $v0, $zero, 2 -/* 9C78EC 8024250C 03E00008 */ jr $ra -/* 9C78F0 80242510 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802426A4_9C7A84.s b/ver/us/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802426A4_9C7A84.s deleted file mode 100644 index e1fd348335..0000000000 --- a/ver/us/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802426A4_9C7A84.s +++ /dev/null @@ -1,51 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802426A4_9C7A84 -/* 9C7A84 802426A4 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 9C7A88 802426A8 AFB10014 */ sw $s1, 0x14($sp) -/* 9C7A8C 802426AC 0080882D */ daddu $s1, $a0, $zero -/* 9C7A90 802426B0 AFBF0018 */ sw $ra, 0x18($sp) -/* 9C7A94 802426B4 AFB00010 */ sw $s0, 0x10($sp) -/* 9C7A98 802426B8 F7B60028 */ sdc1 $f22, 0x28($sp) -/* 9C7A9C 802426BC F7B40020 */ sdc1 $f20, 0x20($sp) -/* 9C7AA0 802426C0 8E30000C */ lw $s0, 0xc($s1) -/* 9C7AA4 802426C4 8E050000 */ lw $a1, ($s0) -/* 9C7AA8 802426C8 0C0B1EAF */ jal evt_get_variable -/* 9C7AAC 802426CC 26100004 */ addiu $s0, $s0, 4 -/* 9C7AB0 802426D0 8E050000 */ lw $a1, ($s0) -/* 9C7AB4 802426D4 26100004 */ addiu $s0, $s0, 4 -/* 9C7AB8 802426D8 4482B000 */ mtc1 $v0, $f22 -/* 9C7ABC 802426DC 00000000 */ nop -/* 9C7AC0 802426E0 4680B5A0 */ cvt.s.w $f22, $f22 -/* 9C7AC4 802426E4 0C0B1EAF */ jal evt_get_variable -/* 9C7AC8 802426E8 0220202D */ daddu $a0, $s1, $zero -/* 9C7ACC 802426EC 8E050000 */ lw $a1, ($s0) -/* 9C7AD0 802426F0 4482A000 */ mtc1 $v0, $f20 -/* 9C7AD4 802426F4 00000000 */ nop -/* 9C7AD8 802426F8 4680A520 */ cvt.s.w $f20, $f20 -/* 9C7ADC 802426FC 0C0B1EAF */ jal evt_get_variable -/* 9C7AE0 80242700 0220202D */ daddu $a0, $s1, $zero -/* 9C7AE4 80242704 3C014170 */ lui $at, 0x4170 -/* 9C7AE8 80242708 44810000 */ mtc1 $at, $f0 -/* 9C7AEC 8024270C 44821000 */ mtc1 $v0, $f2 -/* 9C7AF0 80242710 00000000 */ nop -/* 9C7AF4 80242714 468010A0 */ cvt.s.w $f2, $f2 -/* 9C7AF8 80242718 4600A500 */ add.s $f20, $f20, $f0 -/* 9C7AFC 8024271C 4405B000 */ mfc1 $a1, $f22 -/* 9C7B00 80242720 44071000 */ mfc1 $a3, $f2 -/* 9C7B04 80242724 4406A000 */ mfc1 $a2, $f20 -/* 9C7B08 80242728 0C01C07C */ jal fx_explosion -/* 9C7B0C 8024272C 0000202D */ daddu $a0, $zero, $zero -/* 9C7B10 80242730 0000202D */ daddu $a0, $zero, $zero -/* 9C7B14 80242734 0080282D */ daddu $a1, $a0, $zero -/* 9C7B18 80242738 0C0B2D5B */ jal exec_ShakeCam1 -/* 9C7B1C 8024273C 24060014 */ addiu $a2, $zero, 0x14 -/* 9C7B20 80242740 8FBF0018 */ lw $ra, 0x18($sp) -/* 9C7B24 80242744 8FB10014 */ lw $s1, 0x14($sp) -/* 9C7B28 80242748 8FB00010 */ lw $s0, 0x10($sp) -/* 9C7B2C 8024274C D7B60028 */ ldc1 $f22, 0x28($sp) -/* 9C7B30 80242750 D7B40020 */ ldc1 $f20, 0x20($sp) -/* 9C7B34 80242754 24020002 */ addiu $v0, $zero, 2 -/* 9C7B38 80242758 03E00008 */ jr $ra -/* 9C7B3C 8024275C 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80242760_9C7B40.s b/ver/us/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80242760_9C7B40.s deleted file mode 100644 index f2693acbe1..0000000000 --- a/ver/us/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80242760_9C7B40.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242760_9C7B40 -/* 9C7B40 80242760 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9C7B44 80242764 AFBF0010 */ sw $ra, 0x10($sp) -/* 9C7B48 80242768 0C03A63B */ jal func_800E98EC -/* 9C7B4C 8024276C 00000000 */ nop -/* 9C7B50 80242770 0C03A625 */ jal func_800E9894 -/* 9C7B54 80242774 00000000 */ nop -/* 9C7B58 80242778 0C03A5D8 */ jal open_status_menu_long -/* 9C7B5C 8024277C 00000000 */ nop -/* 9C7B60 80242780 8FBF0010 */ lw $ra, 0x10($sp) -/* 9C7B64 80242784 24020002 */ addiu $v0, $zero, 2 -/* 9C7B68 80242788 03E00008 */ jr $ra -/* 9C7B6C 8024278C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80242790_9C7B70.s b/ver/us/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80242790_9C7B70.s deleted file mode 100644 index 6e65f4f2ab..0000000000 --- a/ver/us/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80242790_9C7B70.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242790_9C7B70 -/* 9C7B70 80242790 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9C7B74 80242794 AFBF0010 */ sw $ra, 0x10($sp) -/* 9C7B78 80242798 0C03A640 */ jal func_800E9900 -/* 9C7B7C 8024279C 00000000 */ nop -/* 9C7B80 802427A0 0C03A631 */ jal func_800E98C4 -/* 9C7B84 802427A4 00000000 */ nop -/* 9C7B88 802427A8 0C03A5EE */ jal close_status_menu -/* 9C7B8C 802427AC 00000000 */ nop -/* 9C7B90 802427B0 8FBF0010 */ lw $ra, 0x10($sp) -/* 9C7B94 802427B4 24020002 */ addiu $v0, $zero, 2 -/* 9C7B98 802427B8 03E00008 */ jr $ra -/* 9C7B9C 802427BC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802427C0_9C7BA0.s b/ver/us/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802427C0_9C7BA0.s deleted file mode 100644 index ae06af2b69..0000000000 --- a/ver/us/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802427C0_9C7BA0.s +++ /dev/null @@ -1,21 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802427C0_9C7BA0 -/* 9C7BA0 802427C0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9C7BA4 802427C4 AFBF0010 */ sw $ra, 0x10($sp) -/* 9C7BA8 802427C8 8C82000C */ lw $v0, 0xc($a0) -/* 9C7BAC 802427CC 0C0B1EAF */ jal evt_get_variable -/* 9C7BB0 802427D0 8C450000 */ lw $a1, ($v0) -/* 9C7BB4 802427D4 0C015512 */ jal func_80055448 -/* 9C7BB8 802427D8 24040010 */ addiu $a0, $zero, 0x10 -/* 9C7BBC 802427DC 0C0155D8 */ jal func_80055760 -/* 9C7BC0 802427E0 24040004 */ addiu $a0, $zero, 4 -/* 9C7BC4 802427E4 0000202D */ daddu $a0, $zero, $zero -/* 9C7BC8 802427E8 240500FA */ addiu $a1, $zero, 0xfa -/* 9C7BCC 802427EC 0C01559B */ jal func_8005566C -/* 9C7BD0 802427F0 24060001 */ addiu $a2, $zero, 1 -/* 9C7BD4 802427F4 8FBF0010 */ lw $ra, 0x10($sp) -/* 9C7BD8 802427F8 24020002 */ addiu $v0, $zero, 2 -/* 9C7BDC 802427FC 03E00008 */ jr $ra -/* 9C7BE0 80242800 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80242898_9C7C78.s b/ver/us/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80242898_9C7C78.s deleted file mode 100644 index 1a0c482b5b..0000000000 --- a/ver/us/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80242898_9C7C78.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242898_9C7C78 -/* 9C7C78 80242898 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9C7C7C 8024289C AFBF0010 */ sw $ra, 0x10($sp) -/* 9C7C80 802428A0 0C015612 */ jal func_80055848 -/* 9C7C84 802428A4 24040004 */ addiu $a0, $zero, 4 -/* 9C7C88 802428A8 8FBF0010 */ lw $ra, 0x10($sp) -/* 9C7C8C 802428AC 24020002 */ addiu $v0, $zero, 2 -/* 9C7C90 802428B0 03E00008 */ jr $ra -/* 9C7C94 802428B4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802428B8_9C7C98.s b/ver/us/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802428B8_9C7C98.s deleted file mode 100644 index e9dc2a2306..0000000000 --- a/ver/us/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802428B8_9C7C98.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802428B8_9C7C98 -/* 9C7C98 802428B8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9C7C9C 802428BC AFBF0010 */ sw $ra, 0x10($sp) -/* 9C7CA0 802428C0 0C0155F3 */ jal func_800557CC -/* 9C7CA4 802428C4 24040064 */ addiu $a0, $zero, 0x64 -/* 9C7CA8 802428C8 8FBF0010 */ lw $ra, 0x10($sp) -/* 9C7CAC 802428CC 24020002 */ addiu $v0, $zero, 2 -/* 9C7CB0 802428D0 03E00008 */ jr $ra -/* 9C7CB4 802428D4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80242910_9C7CF0.s b/ver/us/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80242910_9C7CF0.s deleted file mode 100644 index ed81dc440d..0000000000 --- a/ver/us/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80242910_9C7CF0.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242910_9C7CF0 -/* 9C7CF0 80242910 3C038011 */ lui $v1, %hi(gPlayerData) -/* 9C7CF4 80242914 2463F290 */ addiu $v1, $v1, %lo(gPlayerData) -/* 9C7CF8 80242918 8C6202BC */ lw $v0, 0x2bc($v1) -/* 9C7CFC 8024291C AC620324 */ sw $v0, 0x324($v1) -/* 9C7D00 80242920 03E00008 */ jr $ra -/* 9C7D04 80242924 24020002 */ addiu $v0, $zero, 2 -/* 9C7D08 80242928 00000000 */ nop -/* 9C7D0C 8024292C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_02/9D7990/func_80240970_9D7990.s b/ver/us/asm/nonmatchings/world/area_nok/nok_02/9D7990/func_80240970_9D7990.s deleted file mode 100644 index a0433bacd0..0000000000 --- a/ver/us/asm/nonmatchings/world/area_nok/nok_02/9D7990/func_80240970_9D7990.s +++ /dev/null @@ -1,72 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240970_9D7990 -/* 9D7990 80240970 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 9D7994 80240974 AFBF0018 */ sw $ra, 0x18($sp) -/* 9D7998 80240978 F7B60028 */ sdc1 $f22, 0x28($sp) -/* 9D799C 8024097C F7B40020 */ sdc1 $f20, 0x20($sp) -/* 9D79A0 80240980 0C00A67F */ jal rand_int -/* 9D79A4 80240984 240400C8 */ addiu $a0, $zero, 0xc8 -/* 9D79A8 80240988 2442FF9C */ addiu $v0, $v0, -0x64 -/* 9D79AC 8024098C 4482A000 */ mtc1 $v0, $f20 -/* 9D79B0 80240990 00000000 */ nop -/* 9D79B4 80240994 4680A520 */ cvt.s.w $f20, $f20 -/* 9D79B8 80240998 0C00A67F */ jal rand_int -/* 9D79BC 8024099C 24040096 */ addiu $a0, $zero, 0x96 -/* 9D79C0 802409A0 44820000 */ mtc1 $v0, $f0 -/* 9D79C4 802409A4 00000000 */ nop -/* 9D79C8 802409A8 46800020 */ cvt.s.w $f0, $f0 -/* 9D79CC 802409AC 3C01C334 */ lui $at, 0xc334 -/* 9D79D0 802409B0 4481B000 */ mtc1 $at, $f22 -/* 9D79D4 802409B4 4405A000 */ mfc1 $a1, $f20 -/* 9D79D8 802409B8 44060000 */ mfc1 $a2, $f0 -/* 9D79DC 802409BC 4407B000 */ mfc1 $a3, $f22 -/* 9D79E0 802409C0 24040002 */ addiu $a0, $zero, 2 -/* 9D79E4 802409C4 AFA00010 */ sw $zero, 0x10($sp) -/* 9D79E8 802409C8 0C01BECC */ jal fx_walking_dust -/* 9D79EC 802409CC AFA00014 */ sw $zero, 0x14($sp) -/* 9D79F0 802409D0 0C00A67F */ jal rand_int -/* 9D79F4 802409D4 240400C8 */ addiu $a0, $zero, 0xc8 -/* 9D79F8 802409D8 2442FF9C */ addiu $v0, $v0, -0x64 -/* 9D79FC 802409DC 4482A000 */ mtc1 $v0, $f20 -/* 9D7A00 802409E0 00000000 */ nop -/* 9D7A04 802409E4 4680A520 */ cvt.s.w $f20, $f20 -/* 9D7A08 802409E8 0C00A67F */ jal rand_int -/* 9D7A0C 802409EC 24040096 */ addiu $a0, $zero, 0x96 -/* 9D7A10 802409F0 44820000 */ mtc1 $v0, $f0 -/* 9D7A14 802409F4 00000000 */ nop -/* 9D7A18 802409F8 46800020 */ cvt.s.w $f0, $f0 -/* 9D7A1C 802409FC 4405A000 */ mfc1 $a1, $f20 -/* 9D7A20 80240A00 4407B000 */ mfc1 $a3, $f22 -/* 9D7A24 80240A04 44060000 */ mfc1 $a2, $f0 -/* 9D7A28 80240A08 24040002 */ addiu $a0, $zero, 2 -/* 9D7A2C 80240A0C AFA00010 */ sw $zero, 0x10($sp) -/* 9D7A30 80240A10 0C01BECC */ jal fx_walking_dust -/* 9D7A34 80240A14 AFA00014 */ sw $zero, 0x14($sp) -/* 9D7A38 80240A18 0C00A67F */ jal rand_int -/* 9D7A3C 80240A1C 240400C8 */ addiu $a0, $zero, 0xc8 -/* 9D7A40 80240A20 2442FF9C */ addiu $v0, $v0, -0x64 -/* 9D7A44 80240A24 4482A000 */ mtc1 $v0, $f20 -/* 9D7A48 80240A28 00000000 */ nop -/* 9D7A4C 80240A2C 4680A520 */ cvt.s.w $f20, $f20 -/* 9D7A50 80240A30 0C00A67F */ jal rand_int -/* 9D7A54 80240A34 24040096 */ addiu $a0, $zero, 0x96 -/* 9D7A58 80240A38 44820000 */ mtc1 $v0, $f0 -/* 9D7A5C 80240A3C 00000000 */ nop -/* 9D7A60 80240A40 46800020 */ cvt.s.w $f0, $f0 -/* 9D7A64 80240A44 4405A000 */ mfc1 $a1, $f20 -/* 9D7A68 80240A48 4407B000 */ mfc1 $a3, $f22 -/* 9D7A6C 80240A4C 44060000 */ mfc1 $a2, $f0 -/* 9D7A70 80240A50 24040002 */ addiu $a0, $zero, 2 -/* 9D7A74 80240A54 AFA00010 */ sw $zero, 0x10($sp) -/* 9D7A78 80240A58 0C01BECC */ jal fx_walking_dust -/* 9D7A7C 80240A5C AFA00014 */ sw $zero, 0x14($sp) -/* 9D7A80 80240A60 8FBF0018 */ lw $ra, 0x18($sp) -/* 9D7A84 80240A64 D7B60028 */ ldc1 $f22, 0x28($sp) -/* 9D7A88 80240A68 D7B40020 */ ldc1 $f20, 0x20($sp) -/* 9D7A8C 80240A6C 24020002 */ addiu $v0, $zero, 2 -/* 9D7A90 80240A70 03E00008 */ jr $ra -/* 9D7A94 80240A74 27BD0030 */ addiu $sp, $sp, 0x30 -/* 9D7A98 80240A78 00000000 */ nop -/* 9D7A9C 80240A7C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80243010_9DA030.s b/ver/us/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80243010_9DA030.s deleted file mode 100644 index 1aa60a4790..0000000000 --- a/ver/us/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80243010_9DA030.s +++ /dev/null @@ -1,51 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243010_9DA030 -/* 9DA030 80243010 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 9DA034 80243014 AFB10014 */ sw $s1, 0x14($sp) -/* 9DA038 80243018 0080882D */ daddu $s1, $a0, $zero -/* 9DA03C 8024301C AFBF0018 */ sw $ra, 0x18($sp) -/* 9DA040 80243020 AFB00010 */ sw $s0, 0x10($sp) -/* 9DA044 80243024 F7B60028 */ sdc1 $f22, 0x28($sp) -/* 9DA048 80243028 F7B40020 */ sdc1 $f20, 0x20($sp) -/* 9DA04C 8024302C 8E30000C */ lw $s0, 0xc($s1) -/* 9DA050 80243030 8E050000 */ lw $a1, ($s0) -/* 9DA054 80243034 0C0B1EAF */ jal evt_get_variable -/* 9DA058 80243038 26100004 */ addiu $s0, $s0, 4 -/* 9DA05C 8024303C 8E050000 */ lw $a1, ($s0) -/* 9DA060 80243040 26100004 */ addiu $s0, $s0, 4 -/* 9DA064 80243044 4482B000 */ mtc1 $v0, $f22 -/* 9DA068 80243048 00000000 */ nop -/* 9DA06C 8024304C 4680B5A0 */ cvt.s.w $f22, $f22 -/* 9DA070 80243050 0C0B1EAF */ jal evt_get_variable -/* 9DA074 80243054 0220202D */ daddu $a0, $s1, $zero -/* 9DA078 80243058 8E050000 */ lw $a1, ($s0) -/* 9DA07C 8024305C 4482A000 */ mtc1 $v0, $f20 -/* 9DA080 80243060 00000000 */ nop -/* 9DA084 80243064 4680A520 */ cvt.s.w $f20, $f20 -/* 9DA088 80243068 0C0B1EAF */ jal evt_get_variable -/* 9DA08C 8024306C 0220202D */ daddu $a0, $s1, $zero -/* 9DA090 80243070 3C014170 */ lui $at, 0x4170 -/* 9DA094 80243074 44810000 */ mtc1 $at, $f0 -/* 9DA098 80243078 44821000 */ mtc1 $v0, $f2 -/* 9DA09C 8024307C 00000000 */ nop -/* 9DA0A0 80243080 468010A0 */ cvt.s.w $f2, $f2 -/* 9DA0A4 80243084 4600A500 */ add.s $f20, $f20, $f0 -/* 9DA0A8 80243088 4405B000 */ mfc1 $a1, $f22 -/* 9DA0AC 8024308C 44071000 */ mfc1 $a3, $f2 -/* 9DA0B0 80243090 4406A000 */ mfc1 $a2, $f20 -/* 9DA0B4 80243094 0C01C07C */ jal fx_explosion -/* 9DA0B8 80243098 0000202D */ daddu $a0, $zero, $zero -/* 9DA0BC 8024309C 0000202D */ daddu $a0, $zero, $zero -/* 9DA0C0 802430A0 0080282D */ daddu $a1, $a0, $zero -/* 9DA0C4 802430A4 0C0B2D5B */ jal exec_ShakeCam1 -/* 9DA0C8 802430A8 24060014 */ addiu $a2, $zero, 0x14 -/* 9DA0CC 802430AC 8FBF0018 */ lw $ra, 0x18($sp) -/* 9DA0D0 802430B0 8FB10014 */ lw $s1, 0x14($sp) -/* 9DA0D4 802430B4 8FB00010 */ lw $s0, 0x10($sp) -/* 9DA0D8 802430B8 D7B60028 */ ldc1 $f22, 0x28($sp) -/* 9DA0DC 802430BC D7B40020 */ ldc1 $f20, 0x20($sp) -/* 9DA0E0 802430C0 24020002 */ addiu $v0, $zero, 2 -/* 9DA0E4 802430C4 03E00008 */ jr $ra -/* 9DA0E8 802430C8 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80243214_9DA234.s b/ver/us/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80243214_9DA234.s deleted file mode 100644 index db803ea209..0000000000 --- a/ver/us/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80243214_9DA234.s +++ /dev/null @@ -1,39 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243214_9DA234 -/* 9DA234 80243214 3C058011 */ lui $a1, %hi(gPlayerStatus) -/* 9DA238 80243218 24A5EFC8 */ addiu $a1, $a1, %lo(gPlayerStatus) -/* 9DA23C 8024321C C4A20054 */ lwc1 $f2, 0x54($a1) -/* 9DA240 80243220 3C014080 */ lui $at, 0x4080 -/* 9DA244 80243224 44810000 */ mtc1 $at, $f0 -/* 9DA248 80243228 00000000 */ nop -/* 9DA24C 8024322C 4602003E */ c.le.s $f0, $f2 -/* 9DA250 80243230 00000000 */ nop -/* 9DA254 80243234 45020008 */ bc1fl .L80243258 -/* 9DA258 80243238 AC80008C */ sw $zero, 0x8c($a0) -/* 9DA25C 8024323C 8C82008C */ lw $v0, 0x8c($a0) -/* 9DA260 80243240 24420001 */ addiu $v0, $v0, 1 -/* 9DA264 80243244 AC82008C */ sw $v0, 0x8c($a0) -/* 9DA268 80243248 28420003 */ slti $v0, $v0, 3 -/* 9DA26C 8024324C 14400002 */ bnez $v0, .L80243258 -/* 9DA270 80243250 24020002 */ addiu $v0, $zero, 2 -/* 9DA274 80243254 AC82008C */ sw $v0, 0x8c($a0) -.L80243258: -/* 9DA278 80243258 8C82008C */ lw $v0, 0x8c($a0) -/* 9DA27C 8024325C 24030001 */ addiu $v1, $zero, 1 -/* 9DA280 80243260 28420002 */ slti $v0, $v0, 2 -/* 9DA284 80243264 14400002 */ bnez $v0, .L80243270 -/* 9DA288 80243268 AC830084 */ sw $v1, 0x84($a0) -/* 9DA28C 8024326C AC800084 */ sw $zero, 0x84($a0) -.L80243270: -/* 9DA290 80243270 C4A20054 */ lwc1 $f2, 0x54($a1) -/* 9DA294 80243274 44800000 */ mtc1 $zero, $f0 -/* 9DA298 80243278 00000000 */ nop -/* 9DA29C 8024327C 46001032 */ c.eq.s $f2, $f0 -/* 9DA2A0 80243280 00000000 */ nop -/* 9DA2A4 80243284 45030001 */ bc1tl .L8024328C -/* 9DA2A8 80243288 AC800084 */ sw $zero, 0x84($a0) -.L8024328C: -/* 9DA2AC 8024328C 03E00008 */ jr $ra -/* 9DA2B0 80243290 24020002 */ addiu $v0, $zero, 2 diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80243294_9DA2B4.s b/ver/us/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80243294_9DA2B4.s deleted file mode 100644 index de6d6b0dbe..0000000000 --- a/ver/us/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80243294_9DA2B4.s +++ /dev/null @@ -1,171 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243294_9DA2B4 -/* 9DA2B4 80243294 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* 9DA2B8 80243298 AFB50024 */ sw $s5, 0x24($sp) -/* 9DA2BC 8024329C 0080A82D */ daddu $s5, $a0, $zero -/* 9DA2C0 802432A0 AFB60028 */ sw $s6, 0x28($sp) -/* 9DA2C4 802432A4 3C168011 */ lui $s6, %hi(gPlayerStatus) -/* 9DA2C8 802432A8 26D6EFC8 */ addiu $s6, $s6, %lo(gPlayerStatus) -/* 9DA2CC 802432AC AFB10014 */ sw $s1, 0x14($sp) -/* 9DA2D0 802432B0 24112710 */ addiu $s1, $zero, 0x2710 -/* 9DA2D4 802432B4 AFB40020 */ sw $s4, 0x20($sp) -/* 9DA2D8 802432B8 3C1451EB */ lui $s4, 0x51eb -/* 9DA2DC 802432BC AFBF002C */ sw $ra, 0x2c($sp) -/* 9DA2E0 802432C0 AFB3001C */ sw $s3, 0x1c($sp) -/* 9DA2E4 802432C4 AFB20018 */ sw $s2, 0x18($sp) -/* 9DA2E8 802432C8 AFB00010 */ sw $s0, 0x10($sp) -/* 9DA2EC 802432CC F7B60038 */ sdc1 $f22, 0x38($sp) -/* 9DA2F0 802432D0 F7B40030 */ sdc1 $f20, 0x30($sp) -/* 9DA2F4 802432D4 8EB0000C */ lw $s0, 0xc($s5) -/* 9DA2F8 802432D8 3694851F */ ori $s4, $s4, 0x851f -/* 9DA2FC 802432DC 8E050000 */ lw $a1, ($s0) -/* 9DA300 802432E0 0C0B1EAF */ jal evt_get_variable -/* 9DA304 802432E4 26100004 */ addiu $s0, $s0, 4 -/* 9DA308 802432E8 02A0202D */ daddu $a0, $s5, $zero -/* 9DA30C 802432EC 8E050000 */ lw $a1, ($s0) -/* 9DA310 802432F0 0C0B1EAF */ jal evt_get_variable -/* 9DA314 802432F4 0040902D */ daddu $s2, $v0, $zero -/* 9DA318 802432F8 0040982D */ daddu $s3, $v0, $zero -.L802432FC: -/* 9DA31C 802432FC 0C00A67F */ jal rand_int -/* 9DA320 80243300 0220202D */ daddu $a0, $s1, $zero -/* 9DA324 80243304 001187C2 */ srl $s0, $s1, 0x1f -/* 9DA328 80243308 02308021 */ addu $s0, $s1, $s0 -/* 9DA32C 8024330C 00108043 */ sra $s0, $s0, 1 -/* 9DA330 80243310 00501023 */ subu $v0, $v0, $s0 -/* 9DA334 80243314 00540018 */ mult $v0, $s4 -/* 9DA338 80243318 0220202D */ daddu $a0, $s1, $zero -/* 9DA33C 8024331C 000217C3 */ sra $v0, $v0, 0x1f -/* 9DA340 80243320 C6420038 */ lwc1 $f2, 0x38($s2) -/* 9DA344 80243324 00003010 */ mfhi $a2 -/* 9DA348 80243328 00061943 */ sra $v1, $a2, 5 -/* 9DA34C 8024332C 00621823 */ subu $v1, $v1, $v0 -/* 9DA350 80243330 44830000 */ mtc1 $v1, $f0 -/* 9DA354 80243334 00000000 */ nop -/* 9DA358 80243338 46800020 */ cvt.s.w $f0, $f0 -/* 9DA35C 8024333C 0C00A67F */ jal rand_int -/* 9DA360 80243340 46020580 */ add.s $f22, $f0, $f2 -/* 9DA364 80243344 00501023 */ subu $v0, $v0, $s0 -/* 9DA368 80243348 00540018 */ mult $v0, $s4 -/* 9DA36C 8024334C 3C01C316 */ lui $at, 0xc316 -/* 9DA370 80243350 44810000 */ mtc1 $at, $f0 -/* 9DA374 80243354 00000000 */ nop -/* 9DA378 80243358 4600B081 */ sub.s $f2, $f22, $f0 -/* 9DA37C 8024335C 00003010 */ mfhi $a2 -/* 9DA380 80243360 000217C3 */ sra $v0, $v0, 0x1f -/* 9DA384 80243364 46021102 */ mul.s $f4, $f2, $f2 -/* 9DA388 80243368 00000000 */ nop -/* 9DA38C 8024336C 00061943 */ sra $v1, $a2, 5 -/* 9DA390 80243370 00621823 */ subu $v1, $v1, $v0 -/* 9DA394 80243374 C6420040 */ lwc1 $f2, 0x40($s2) -/* 9DA398 80243378 44830000 */ mtc1 $v1, $f0 -/* 9DA39C 8024337C 00000000 */ nop -/* 9DA3A0 80243380 46800020 */ cvt.s.w $f0, $f0 -/* 9DA3A4 80243384 46020500 */ add.s $f20, $f0, $f2 -/* 9DA3A8 80243388 3C01437A */ lui $at, 0x437a -/* 9DA3AC 8024338C 44810000 */ mtc1 $at, $f0 -/* 9DA3B0 80243390 00000000 */ nop -/* 9DA3B4 80243394 4600A001 */ sub.s $f0, $f20, $f0 -/* 9DA3B8 80243398 46000002 */ mul.s $f0, $f0, $f0 -/* 9DA3BC 8024339C 00000000 */ nop -/* 9DA3C0 802433A0 46002100 */ add.s $f4, $f4, $f0 -/* 9DA3C4 802433A4 3C0146AF */ lui $at, 0x46af -/* 9DA3C8 802433A8 3421C800 */ ori $at, $at, 0xc800 -/* 9DA3CC 802433AC 44810000 */ mtc1 $at, $f0 -/* 9DA3D0 802433B0 00000000 */ nop -/* 9DA3D4 802433B4 4600203C */ c.lt.s $f4, $f0 -/* 9DA3D8 802433B8 00000000 */ nop -/* 9DA3DC 802433BC 45000021 */ bc1f .L80243444 -/* 9DA3E0 802433C0 26311388 */ addiu $s1, $s1, 0x1388 -/* 9DA3E4 802433C4 C6C00028 */ lwc1 $f0, 0x28($s6) -/* 9DA3E8 802433C8 4600B081 */ sub.s $f2, $f22, $f0 -/* 9DA3EC 802433CC 46021082 */ mul.s $f2, $f2, $f2 -/* 9DA3F0 802433D0 00000000 */ nop -/* 9DA3F4 802433D4 C6C00030 */ lwc1 $f0, 0x30($s6) -/* 9DA3F8 802433D8 4600A001 */ sub.s $f0, $f20, $f0 -/* 9DA3FC 802433DC 46000002 */ mul.s $f0, $f0, $f0 -/* 9DA400 802433E0 00000000 */ nop -/* 9DA404 802433E4 46001080 */ add.s $f2, $f2, $f0 -/* 9DA408 802433E8 3C0145C8 */ lui $at, 0x45c8 -/* 9DA40C 802433EC 44810000 */ mtc1 $at, $f0 -/* 9DA410 802433F0 00000000 */ nop -/* 9DA414 802433F4 4602003C */ c.lt.s $f0, $f2 -/* 9DA418 802433F8 00000000 */ nop -/* 9DA41C 802433FC 45000011 */ bc1f .L80243444 -/* 9DA420 80243400 00000000 */ nop -/* 9DA424 80243404 C6600038 */ lwc1 $f0, 0x38($s3) -/* 9DA428 80243408 4600B081 */ sub.s $f2, $f22, $f0 -/* 9DA42C 8024340C 46021082 */ mul.s $f2, $f2, $f2 -/* 9DA430 80243410 00000000 */ nop -/* 9DA434 80243414 C6600040 */ lwc1 $f0, 0x40($s3) -/* 9DA438 80243418 4600A001 */ sub.s $f0, $f20, $f0 -/* 9DA43C 8024341C 46000002 */ mul.s $f0, $f0, $f0 -/* 9DA440 80243420 00000000 */ nop -/* 9DA444 80243424 46001080 */ add.s $f2, $f2, $f0 -/* 9DA448 80243428 3C0144C8 */ lui $at, 0x44c8 -/* 9DA44C 8024342C 44810000 */ mtc1 $at, $f0 -/* 9DA450 80243430 00000000 */ nop -/* 9DA454 80243434 4602003C */ c.lt.s $f0, $f2 -/* 9DA458 80243438 00000000 */ nop -/* 9DA45C 8024343C 45010006 */ bc1t .L80243458 -/* 9DA460 80243440 00000000 */ nop -.L80243444: -/* 9DA464 80243444 2A227531 */ slti $v0, $s1, 0x7531 -/* 9DA468 80243448 5040FFAC */ beql $v0, $zero, .L802432FC -/* 9DA46C 8024344C 24117530 */ addiu $s1, $zero, 0x7530 -/* 9DA470 80243450 08090CBF */ j .L802432FC -/* 9DA474 80243454 00000000 */ nop -.L80243458: -/* 9DA478 80243458 C6400038 */ lwc1 $f0, 0x38($s2) -/* 9DA47C 8024345C 4600B081 */ sub.s $f2, $f22, $f0 -/* 9DA480 80243460 46021082 */ mul.s $f2, $f2, $f2 -/* 9DA484 80243464 00000000 */ nop -/* 9DA488 80243468 C6400040 */ lwc1 $f0, 0x40($s2) -/* 9DA48C 8024346C 4600A001 */ sub.s $f0, $f20, $f0 -/* 9DA490 80243470 46000002 */ mul.s $f0, $f0, $f0 -/* 9DA494 80243474 00000000 */ nop -/* 9DA498 80243478 46001300 */ add.s $f12, $f2, $f0 -/* 9DA49C 8024347C 44800000 */ mtc1 $zero, $f0 -/* 9DA4A0 80243480 00000000 */ nop -/* 9DA4A4 80243484 46006032 */ c.eq.s $f12, $f0 -/* 9DA4A8 80243488 00000000 */ nop -/* 9DA4AC 8024348C 4501000D */ bc1t .L802434C4 -/* 9DA4B0 80243490 00000000 */ nop -/* 9DA4B4 80243494 46006104 */ sqrt.s $f4, $f12 -/* 9DA4B8 80243498 46042032 */ c.eq.s $f4, $f4 -/* 9DA4BC 8024349C 00000000 */ nop -/* 9DA4C0 802434A0 45010004 */ bc1t .L802434B4 -/* 9DA4C4 802434A4 00000000 */ nop -/* 9DA4C8 802434A8 0C0187BC */ jal sqrtf -/* 9DA4CC 802434AC 00000000 */ nop -/* 9DA4D0 802434B0 46000106 */ mov.s $f4, $f0 -.L802434B4: -/* 9DA4D4 802434B4 3C014120 */ lui $at, 0x4120 -/* 9DA4D8 802434B8 44810000 */ mtc1 $at, $f0 -/* 9DA4DC 802434BC 00000000 */ nop -/* 9DA4E0 802434C0 46002303 */ div.s $f12, $f4, $f0 -.L802434C4: -/* 9DA4E4 802434C4 4600B18D */ trunc.w.s $f6, $f22 -/* 9DA4E8 802434C8 E6A600AC */ swc1 $f6, 0xac($s5) -/* 9DA4EC 802434CC 4600A18D */ trunc.w.s $f6, $f20 -/* 9DA4F0 802434D0 E6A600B0 */ swc1 $f6, 0xb0($s5) -/* 9DA4F4 802434D4 4600618D */ trunc.w.s $f6, $f12 -/* 9DA4F8 802434D8 44023000 */ mfc1 $v0, $f6 -/* 9DA4FC 802434DC 00000000 */ nop -/* 9DA500 802434E0 24420001 */ addiu $v0, $v0, 1 -/* 9DA504 802434E4 AEA200B4 */ sw $v0, 0xb4($s5) -/* 9DA508 802434E8 8FBF002C */ lw $ra, 0x2c($sp) -/* 9DA50C 802434EC 8FB60028 */ lw $s6, 0x28($sp) -/* 9DA510 802434F0 8FB50024 */ lw $s5, 0x24($sp) -/* 9DA514 802434F4 8FB40020 */ lw $s4, 0x20($sp) -/* 9DA518 802434F8 8FB3001C */ lw $s3, 0x1c($sp) -/* 9DA51C 802434FC 8FB20018 */ lw $s2, 0x18($sp) -/* 9DA520 80243500 8FB10014 */ lw $s1, 0x14($sp) -/* 9DA524 80243504 8FB00010 */ lw $s0, 0x10($sp) -/* 9DA528 80243508 D7B60038 */ ldc1 $f22, 0x38($sp) -/* 9DA52C 8024350C D7B40030 */ ldc1 $f20, 0x30($sp) -/* 9DA530 80243510 24020002 */ addiu $v0, $zero, 2 -/* 9DA534 80243514 03E00008 */ jr $ra -/* 9DA538 80243518 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_8024351C_9DA53C.s b/ver/us/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_8024351C_9DA53C.s deleted file mode 100644 index 7d02d5d746..0000000000 --- a/ver/us/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_8024351C_9DA53C.s +++ /dev/null @@ -1,151 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024351C_9DA53C -/* 9DA53C 8024351C 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* 9DA540 80243520 AFB50024 */ sw $s5, 0x24($sp) -/* 9DA544 80243524 0080A82D */ daddu $s5, $a0, $zero -/* 9DA548 80243528 AFB40020 */ sw $s4, 0x20($sp) -/* 9DA54C 8024352C 3C148011 */ lui $s4, %hi(gPlayerStatus) -/* 9DA550 80243530 2694EFC8 */ addiu $s4, $s4, %lo(gPlayerStatus) -/* 9DA554 80243534 AFB10014 */ sw $s1, 0x14($sp) -/* 9DA558 80243538 24112710 */ addiu $s1, $zero, 0x2710 -/* 9DA55C 8024353C AFB3001C */ sw $s3, 0x1c($sp) -/* 9DA560 80243540 3C1351EB */ lui $s3, 0x51eb -/* 9DA564 80243544 F7BC0050 */ sdc1 $f28, 0x50($sp) -/* 9DA568 80243548 3C01C316 */ lui $at, 0xc316 -/* 9DA56C 8024354C 4481E000 */ mtc1 $at, $f28 -/* 9DA570 80243550 AFBF0028 */ sw $ra, 0x28($sp) -/* 9DA574 80243554 AFB20018 */ sw $s2, 0x18($sp) -/* 9DA578 80243558 AFB00010 */ sw $s0, 0x10($sp) -/* 9DA57C 8024355C F7BA0048 */ sdc1 $f26, 0x48($sp) -/* 9DA580 80243560 F7B80040 */ sdc1 $f24, 0x40($sp) -/* 9DA584 80243564 F7B60038 */ sdc1 $f22, 0x38($sp) -/* 9DA588 80243568 F7B40030 */ sdc1 $f20, 0x30($sp) -/* 9DA58C 8024356C 8EA2000C */ lw $v0, 0xc($s5) -/* 9DA590 80243570 3C01437A */ lui $at, 0x437a -/* 9DA594 80243574 4481D000 */ mtc1 $at, $f26 -/* 9DA598 80243578 8C450000 */ lw $a1, ($v0) -/* 9DA59C 8024357C 3C0146AF */ lui $at, 0x46af -/* 9DA5A0 80243580 3421C800 */ ori $at, $at, 0xc800 -/* 9DA5A4 80243584 4481C000 */ mtc1 $at, $f24 -/* 9DA5A8 80243588 0C0B1EAF */ jal evt_get_variable -/* 9DA5AC 8024358C 3673851F */ ori $s3, $s3, 0x851f -/* 9DA5B0 80243590 0040902D */ daddu $s2, $v0, $zero -.L80243594: -/* 9DA5B4 80243594 0C00A67F */ jal rand_int -/* 9DA5B8 80243598 0220202D */ daddu $a0, $s1, $zero -/* 9DA5BC 8024359C 001187C2 */ srl $s0, $s1, 0x1f -/* 9DA5C0 802435A0 02308021 */ addu $s0, $s1, $s0 -/* 9DA5C4 802435A4 00108043 */ sra $s0, $s0, 1 -/* 9DA5C8 802435A8 00501023 */ subu $v0, $v0, $s0 -/* 9DA5CC 802435AC 00530018 */ mult $v0, $s3 -/* 9DA5D0 802435B0 0220202D */ daddu $a0, $s1, $zero -/* 9DA5D4 802435B4 000217C3 */ sra $v0, $v0, 0x1f -/* 9DA5D8 802435B8 C6420038 */ lwc1 $f2, 0x38($s2) -/* 9DA5DC 802435BC 00003010 */ mfhi $a2 -/* 9DA5E0 802435C0 00061943 */ sra $v1, $a2, 5 -/* 9DA5E4 802435C4 00621823 */ subu $v1, $v1, $v0 -/* 9DA5E8 802435C8 44830000 */ mtc1 $v1, $f0 -/* 9DA5EC 802435CC 00000000 */ nop -/* 9DA5F0 802435D0 46800020 */ cvt.s.w $f0, $f0 -/* 9DA5F4 802435D4 0C00A67F */ jal rand_int -/* 9DA5F8 802435D8 46020580 */ add.s $f22, $f0, $f2 -/* 9DA5FC 802435DC 00501023 */ subu $v0, $v0, $s0 -/* 9DA600 802435E0 00530018 */ mult $v0, $s3 -/* 9DA604 802435E4 461CB081 */ sub.s $f2, $f22, $f28 -/* 9DA608 802435E8 00003010 */ mfhi $a2 -/* 9DA60C 802435EC 000217C3 */ sra $v0, $v0, 0x1f -/* 9DA610 802435F0 46021102 */ mul.s $f4, $f2, $f2 -/* 9DA614 802435F4 00000000 */ nop -/* 9DA618 802435F8 00061943 */ sra $v1, $a2, 5 -/* 9DA61C 802435FC 00621823 */ subu $v1, $v1, $v0 -/* 9DA620 80243600 C6420040 */ lwc1 $f2, 0x40($s2) -/* 9DA624 80243604 44830000 */ mtc1 $v1, $f0 -/* 9DA628 80243608 00000000 */ nop -/* 9DA62C 8024360C 46800020 */ cvt.s.w $f0, $f0 -/* 9DA630 80243610 46020500 */ add.s $f20, $f0, $f2 -/* 9DA634 80243614 461AA001 */ sub.s $f0, $f20, $f26 -/* 9DA638 80243618 46000002 */ mul.s $f0, $f0, $f0 -/* 9DA63C 8024361C 00000000 */ nop -/* 9DA640 80243620 46002100 */ add.s $f4, $f4, $f0 -/* 9DA644 80243624 4618203C */ c.lt.s $f4, $f24 -/* 9DA648 80243628 00000000 */ nop -/* 9DA64C 8024362C 45000011 */ bc1f .L80243674 -/* 9DA650 80243630 26311388 */ addiu $s1, $s1, 0x1388 -/* 9DA654 80243634 C6800028 */ lwc1 $f0, 0x28($s4) -/* 9DA658 80243638 4600B081 */ sub.s $f2, $f22, $f0 -/* 9DA65C 8024363C 46021082 */ mul.s $f2, $f2, $f2 -/* 9DA660 80243640 00000000 */ nop -/* 9DA664 80243644 C6800030 */ lwc1 $f0, 0x30($s4) -/* 9DA668 80243648 4600A001 */ sub.s $f0, $f20, $f0 -/* 9DA66C 8024364C 46000002 */ mul.s $f0, $f0, $f0 -/* 9DA670 80243650 00000000 */ nop -/* 9DA674 80243654 46001080 */ add.s $f2, $f2, $f0 -/* 9DA678 80243658 3C0145C8 */ lui $at, 0x45c8 -/* 9DA67C 8024365C 44810000 */ mtc1 $at, $f0 -/* 9DA680 80243660 00000000 */ nop -/* 9DA684 80243664 4602003C */ c.lt.s $f0, $f2 -/* 9DA688 80243668 00000000 */ nop -/* 9DA68C 8024366C 45010006 */ bc1t .L80243688 -/* 9DA690 80243670 00000000 */ nop -.L80243674: -/* 9DA694 80243674 2A227531 */ slti $v0, $s1, 0x7531 -/* 9DA698 80243678 5040FFC6 */ beql $v0, $zero, .L80243594 -/* 9DA69C 8024367C 24117530 */ addiu $s1, $zero, 0x7530 -/* 9DA6A0 80243680 08090D65 */ j .L80243594 -/* 9DA6A4 80243684 00000000 */ nop -.L80243688: -/* 9DA6A8 80243688 C6400038 */ lwc1 $f0, 0x38($s2) -/* 9DA6AC 8024368C 4600B081 */ sub.s $f2, $f22, $f0 -/* 9DA6B0 80243690 46021082 */ mul.s $f2, $f2, $f2 -/* 9DA6B4 80243694 00000000 */ nop -/* 9DA6B8 80243698 C6400040 */ lwc1 $f0, 0x40($s2) -/* 9DA6BC 8024369C 4600A001 */ sub.s $f0, $f20, $f0 -/* 9DA6C0 802436A0 46000002 */ mul.s $f0, $f0, $f0 -/* 9DA6C4 802436A4 00000000 */ nop -/* 9DA6C8 802436A8 46001300 */ add.s $f12, $f2, $f0 -/* 9DA6CC 802436AC 44800000 */ mtc1 $zero, $f0 -/* 9DA6D0 802436B0 00000000 */ nop -/* 9DA6D4 802436B4 46006032 */ c.eq.s $f12, $f0 -/* 9DA6D8 802436B8 00000000 */ nop -/* 9DA6DC 802436BC 4501000D */ bc1t .L802436F4 -/* 9DA6E0 802436C0 00000000 */ nop -/* 9DA6E4 802436C4 46006104 */ sqrt.s $f4, $f12 -/* 9DA6E8 802436C8 46042032 */ c.eq.s $f4, $f4 -/* 9DA6EC 802436CC 00000000 */ nop -/* 9DA6F0 802436D0 45010004 */ bc1t .L802436E4 -/* 9DA6F4 802436D4 00000000 */ nop -/* 9DA6F8 802436D8 0C0187BC */ jal sqrtf -/* 9DA6FC 802436DC 00000000 */ nop -/* 9DA700 802436E0 46000106 */ mov.s $f4, $f0 -.L802436E4: -/* 9DA704 802436E4 3C014120 */ lui $at, 0x4120 -/* 9DA708 802436E8 44810000 */ mtc1 $at, $f0 -/* 9DA70C 802436EC 00000000 */ nop -/* 9DA710 802436F0 46002303 */ div.s $f12, $f4, $f0 -.L802436F4: -/* 9DA714 802436F4 4600B18D */ trunc.w.s $f6, $f22 -/* 9DA718 802436F8 E6A600AC */ swc1 $f6, 0xac($s5) -/* 9DA71C 802436FC 4600A18D */ trunc.w.s $f6, $f20 -/* 9DA720 80243700 E6A600B0 */ swc1 $f6, 0xb0($s5) -/* 9DA724 80243704 4600618D */ trunc.w.s $f6, $f12 -/* 9DA728 80243708 44023000 */ mfc1 $v0, $f6 -/* 9DA72C 8024370C 00000000 */ nop -/* 9DA730 80243710 24420001 */ addiu $v0, $v0, 1 -/* 9DA734 80243714 AEA200B4 */ sw $v0, 0xb4($s5) -/* 9DA738 80243718 8FBF0028 */ lw $ra, 0x28($sp) -/* 9DA73C 8024371C 8FB50024 */ lw $s5, 0x24($sp) -/* 9DA740 80243720 8FB40020 */ lw $s4, 0x20($sp) -/* 9DA744 80243724 8FB3001C */ lw $s3, 0x1c($sp) -/* 9DA748 80243728 8FB20018 */ lw $s2, 0x18($sp) -/* 9DA74C 8024372C 8FB10014 */ lw $s1, 0x14($sp) -/* 9DA750 80243730 8FB00010 */ lw $s0, 0x10($sp) -/* 9DA754 80243734 D7BC0050 */ ldc1 $f28, 0x50($sp) -/* 9DA758 80243738 D7BA0048 */ ldc1 $f26, 0x48($sp) -/* 9DA75C 8024373C D7B80040 */ ldc1 $f24, 0x40($sp) -/* 9DA760 80243740 D7B60038 */ ldc1 $f22, 0x38($sp) -/* 9DA764 80243744 D7B40030 */ ldc1 $f20, 0x30($sp) -/* 9DA768 80243748 24020002 */ addiu $v0, $zero, 2 -/* 9DA76C 8024374C 03E00008 */ jr $ra -/* 9DA770 80243750 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80243754_9DA774.s b/ver/us/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80243754_9DA774.s deleted file mode 100644 index 1747031da8..0000000000 --- a/ver/us/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80243754_9DA774.s +++ /dev/null @@ -1,101 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243754_9DA774 -/* 9DA774 80243754 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 9DA778 80243758 AFB20018 */ sw $s2, 0x18($sp) -/* 9DA77C 8024375C 0080902D */ daddu $s2, $a0, $zero -/* 9DA780 80243760 AFBF001C */ sw $ra, 0x1c($sp) -/* 9DA784 80243764 AFB10014 */ sw $s1, 0x14($sp) -/* 9DA788 80243768 AFB00010 */ sw $s0, 0x10($sp) -/* 9DA78C 8024376C F7B40020 */ sdc1 $f20, 0x20($sp) -/* 9DA790 80243770 10A0002D */ beqz $a1, .L80243828 -/* 9DA794 80243774 8E51000C */ lw $s1, 0xc($s2) -/* 9DA798 80243778 8E250000 */ lw $a1, ($s1) -/* 9DA79C 8024377C 0C0B1EAF */ jal evt_get_variable -/* 9DA7A0 80243780 26310004 */ addiu $s1, $s1, 4 -/* 9DA7A4 80243784 0040802D */ daddu $s0, $v0, $zero -/* 9DA7A8 80243788 AE500074 */ sw $s0, 0x74($s2) -/* 9DA7AC 8024378C 8E250000 */ lw $a1, ($s1) -/* 9DA7B0 80243790 0C0B1EAF */ jal evt_get_variable -/* 9DA7B4 80243794 0240202D */ daddu $a0, $s2, $zero -/* 9DA7B8 80243798 C6020038 */ lwc1 $f2, 0x38($s0) -/* 9DA7BC 8024379C 44820000 */ mtc1 $v0, $f0 -/* 9DA7C0 802437A0 00000000 */ nop -/* 9DA7C4 802437A4 46800020 */ cvt.s.w $f0, $f0 -/* 9DA7C8 802437A8 46020000 */ add.s $f0, $f0, $f2 -/* 9DA7CC 802437AC 3C013F00 */ lui $at, 0x3f00 -/* 9DA7D0 802437B0 4481A000 */ mtc1 $at, $f20 -/* 9DA7D4 802437B4 00000000 */ nop -/* 9DA7D8 802437B8 46140002 */ mul.s $f0, $f0, $f20 -/* 9DA7DC 802437BC 00000000 */ nop -/* 9DA7E0 802437C0 26310004 */ addiu $s1, $s1, 4 -/* 9DA7E4 802437C4 E6000060 */ swc1 $f0, 0x60($s0) -/* 9DA7E8 802437C8 8E250000 */ lw $a1, ($s1) -/* 9DA7EC 802437CC 0C0B1EAF */ jal evt_get_variable -/* 9DA7F0 802437D0 0240202D */ daddu $a0, $s2, $zero -/* 9DA7F4 802437D4 C6000040 */ lwc1 $f0, 0x40($s0) -/* 9DA7F8 802437D8 44827000 */ mtc1 $v0, $f14 -/* 9DA7FC 802437DC 00000000 */ nop -/* 9DA800 802437E0 468073A0 */ cvt.s.w $f14, $f14 -/* 9DA804 802437E4 46007380 */ add.s $f14, $f14, $f0 -/* 9DA808 802437E8 46147382 */ mul.s $f14, $f14, $f20 -/* 9DA80C 802437EC 00000000 */ nop -/* 9DA810 802437F0 C60C0060 */ lwc1 $f12, 0x60($s0) -/* 9DA814 802437F4 8E060038 */ lw $a2, 0x38($s0) -/* 9DA818 802437F8 44070000 */ mfc1 $a3, $f0 -/* 9DA81C 802437FC 0C00A7B5 */ jal dist2D -/* 9DA820 80243800 E60E0068 */ swc1 $f14, 0x68($s0) -/* 9DA824 80243804 C60C0060 */ lwc1 $f12, 0x60($s0) -/* 9DA828 80243808 C60E0068 */ lwc1 $f14, 0x68($s0) -/* 9DA82C 8024380C 8E060038 */ lw $a2, 0x38($s0) -/* 9DA830 80243810 8E070040 */ lw $a3, 0x40($s0) -/* 9DA834 80243814 0C00A720 */ jal atan2 -/* 9DA838 80243818 E6000064 */ swc1 $f0, 0x64($s0) -/* 9DA83C 8024381C 4600010D */ trunc.w.s $f4, $f0 -/* 9DA840 80243820 E6440078 */ swc1 $f4, 0x78($s2) -/* 9DA844 80243824 A600008E */ sh $zero, 0x8e($s0) -.L80243828: -/* 9DA848 80243828 8E500074 */ lw $s0, 0x74($s2) -/* 9DA84C 8024382C C6000060 */ lwc1 $f0, 0x60($s0) -/* 9DA850 80243830 9602008E */ lhu $v0, 0x8e($s0) -/* 9DA854 80243834 C6020068 */ lwc1 $f2, 0x68($s0) -/* 9DA858 80243838 24420009 */ addiu $v0, $v0, 9 -/* 9DA85C 8024383C A602008E */ sh $v0, 0x8e($s0) -/* 9DA860 80243840 00021400 */ sll $v0, $v0, 0x10 -/* 9DA864 80243844 00021403 */ sra $v0, $v0, 0x10 -/* 9DA868 80243848 28420168 */ slti $v0, $v0, 0x168 -/* 9DA86C 8024384C E6000038 */ swc1 $f0, 0x38($s0) -/* 9DA870 80243850 14400003 */ bnez $v0, .L80243860 -/* 9DA874 80243854 E6020040 */ swc1 $f2, 0x40($s0) -/* 9DA878 80243858 24020168 */ addiu $v0, $zero, 0x168 -/* 9DA87C 8024385C A602008E */ sh $v0, 0x8e($s0) -.L80243860: -/* 9DA880 80243860 8603008E */ lh $v1, 0x8e($s0) -/* 9DA884 80243864 8E420078 */ lw $v0, 0x78($s2) -/* 9DA888 80243868 3C0142B4 */ lui $at, 0x42b4 -/* 9DA88C 8024386C 44816000 */ mtc1 $at, $f12 -/* 9DA890 80243870 00431021 */ addu $v0, $v0, $v1 -/* 9DA894 80243874 4482A000 */ mtc1 $v0, $f20 -/* 9DA898 80243878 00000000 */ nop -/* 9DA89C 8024387C 4680A520 */ cvt.s.w $f20, $f20 -/* 9DA8A0 80243880 0C00A6C9 */ jal clamp_angle -/* 9DA8A4 80243884 460CA300 */ add.s $f12, $f20, $f12 -/* 9DA8A8 80243888 8E050064 */ lw $a1, 0x64($s0) -/* 9DA8AC 8024388C 4406A000 */ mfc1 $a2, $f20 -/* 9DA8B0 80243890 0200202D */ daddu $a0, $s0, $zero -/* 9DA8B4 80243894 0C00EA95 */ jal npc_move_heading -/* 9DA8B8 80243898 E600000C */ swc1 $f0, 0xc($s0) -/* 9DA8BC 8024389C 8602008E */ lh $v0, 0x8e($s0) -/* 9DA8C0 802438A0 8FBF001C */ lw $ra, 0x1c($sp) -/* 9DA8C4 802438A4 8FB20018 */ lw $s2, 0x18($sp) -/* 9DA8C8 802438A8 8FB10014 */ lw $s1, 0x14($sp) -/* 9DA8CC 802438AC 8FB00010 */ lw $s0, 0x10($sp) -/* 9DA8D0 802438B0 D7B40020 */ ldc1 $f20, 0x20($sp) -/* 9DA8D4 802438B4 38420168 */ xori $v0, $v0, 0x168 -/* 9DA8D8 802438B8 2C420001 */ sltiu $v0, $v0, 1 -/* 9DA8DC 802438BC 00021040 */ sll $v0, $v0, 1 -/* 9DA8E0 802438C0 03E00008 */ jr $ra -/* 9DA8E4 802438C4 27BD0028 */ addiu $sp, $sp, 0x28 -/* 9DA8E8 802438C8 00000000 */ nop -/* 9DA8EC 802438CC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80241F08_9F6948.s b/ver/us/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80241F08_9F6948.s deleted file mode 100644 index edc2d8a84b..0000000000 --- a/ver/us/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80241F08_9F6948.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241F08_9F6948 -/* 9F6948 80241F08 3C028011 */ lui $v0, %hi(gPlayerData+0xC) -/* 9F694C 80241F0C 8442F29C */ lh $v0, %lo(gPlayerData+0xC)($v0) -/* 9F6950 80241F10 28420064 */ slti $v0, $v0, 0x64 -/* 9F6954 80241F14 14400003 */ bnez $v0, .L80241F24 -/* 9F6958 80241F18 24020001 */ addiu $v0, $zero, 1 -/* 9F695C 80241F1C 080907CA */ j .L80241F28 -/* 9F6960 80241F20 AC800084 */ sw $zero, 0x84($a0) -.L80241F24: -/* 9F6964 80241F24 AC820084 */ sw $v0, 0x84($a0) -.L80241F28: -/* 9F6968 80241F28 03E00008 */ jr $ra -/* 9F696C 80241F2C 24020002 */ addiu $v0, $zero, 2 diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_12/9FA7F0/func_80240000_9FA7F0.s b/ver/us/asm/nonmatchings/world/area_nok/nok_12/9FA7F0/func_80240000_9FA7F0.s deleted file mode 100644 index c30d674e55..0000000000 --- a/ver/us/asm/nonmatchings/world/area_nok/nok_12/9FA7F0/func_80240000_9FA7F0.s +++ /dev/null @@ -1,103 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_9FA7F0 -/* 9FA7F0 80240000 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 9FA7F4 80240004 AFB10014 */ sw $s1, 0x14($sp) -/* 9FA7F8 80240008 0080882D */ daddu $s1, $a0, $zero -/* 9FA7FC 8024000C AFBF002C */ sw $ra, 0x2c($sp) -/* 9FA800 80240010 AFB60028 */ sw $s6, 0x28($sp) -/* 9FA804 80240014 AFB50024 */ sw $s5, 0x24($sp) -/* 9FA808 80240018 AFB40020 */ sw $s4, 0x20($sp) -/* 9FA80C 8024001C AFB3001C */ sw $s3, 0x1c($sp) -/* 9FA810 80240020 AFB20018 */ sw $s2, 0x18($sp) -/* 9FA814 80240024 AFB00010 */ sw $s0, 0x10($sp) -/* 9FA818 80240028 8E30000C */ lw $s0, 0xc($s1) -/* 9FA81C 8024002C 8E050000 */ lw $a1, ($s0) -/* 9FA820 80240030 0C0B1EAF */ jal evt_get_variable -/* 9FA824 80240034 26100004 */ addiu $s0, $s0, 4 -/* 9FA828 80240038 8E050000 */ lw $a1, ($s0) -/* 9FA82C 8024003C 26100004 */ addiu $s0, $s0, 4 -/* 9FA830 80240040 0220202D */ daddu $a0, $s1, $zero -/* 9FA834 80240044 0C0B1EAF */ jal evt_get_variable -/* 9FA838 80240048 0040902D */ daddu $s2, $v0, $zero -/* 9FA83C 8024004C 8E050000 */ lw $a1, ($s0) -/* 9FA840 80240050 26100004 */ addiu $s0, $s0, 4 -/* 9FA844 80240054 0220202D */ daddu $a0, $s1, $zero -/* 9FA848 80240058 0C0B1EAF */ jal evt_get_variable -/* 9FA84C 8024005C 0040B02D */ daddu $s6, $v0, $zero -/* 9FA850 80240060 8E050000 */ lw $a1, ($s0) -/* 9FA854 80240064 26100004 */ addiu $s0, $s0, 4 -/* 9FA858 80240068 0220202D */ daddu $a0, $s1, $zero -/* 9FA85C 8024006C 0C0B1EAF */ jal evt_get_variable -/* 9FA860 80240070 0040A82D */ daddu $s5, $v0, $zero -/* 9FA864 80240074 8E050000 */ lw $a1, ($s0) -/* 9FA868 80240078 26100004 */ addiu $s0, $s0, 4 -/* 9FA86C 8024007C 0220202D */ daddu $a0, $s1, $zero -/* 9FA870 80240080 0C0B1EAF */ jal evt_get_variable -/* 9FA874 80240084 0040A02D */ daddu $s4, $v0, $zero -/* 9FA878 80240088 0220202D */ daddu $a0, $s1, $zero -/* 9FA87C 8024008C 8E050000 */ lw $a1, ($s0) -/* 9FA880 80240090 0C0B1EAF */ jal evt_get_variable -/* 9FA884 80240094 0040802D */ daddu $s0, $v0, $zero -/* 9FA888 80240098 3C138011 */ lui $s3, %hi(gPlayerStatus) -/* 9FA88C 8024009C 2673EFC8 */ addiu $s3, $s3, %lo(gPlayerStatus) -/* 9FA890 802400A0 44920000 */ mtc1 $s2, $f0 -/* 9FA894 802400A4 00000000 */ nop -/* 9FA898 802400A8 46800020 */ cvt.s.w $f0, $f0 -/* 9FA89C 802400AC C6620028 */ lwc1 $f2, 0x28($s3) -/* 9FA8A0 802400B0 3C11800B */ lui $s1, %hi(gCurrentEncounter) -/* 9FA8A4 802400B4 26310F10 */ addiu $s1, $s1, %lo(gCurrentEncounter) -/* 9FA8A8 802400B8 4602003E */ c.le.s $f0, $f2 -/* 9FA8AC 802400BC 00000000 */ nop -/* 9FA8B0 802400C0 45000017 */ bc1f .L80240120 -/* 9FA8B4 802400C4 00000000 */ nop -/* 9FA8B8 802400C8 44960000 */ mtc1 $s6, $f0 -/* 9FA8BC 802400CC 00000000 */ nop -/* 9FA8C0 802400D0 46800020 */ cvt.s.w $f0, $f0 -/* 9FA8C4 802400D4 4600103E */ c.le.s $f2, $f0 -/* 9FA8C8 802400D8 00000000 */ nop -/* 9FA8CC 802400DC 45000010 */ bc1f .L80240120 -/* 9FA8D0 802400E0 00000000 */ nop -/* 9FA8D4 802400E4 C6620030 */ lwc1 $f2, 0x30($s3) -/* 9FA8D8 802400E8 44950000 */ mtc1 $s5, $f0 -/* 9FA8DC 802400EC 00000000 */ nop -/* 9FA8E0 802400F0 46800020 */ cvt.s.w $f0, $f0 -/* 9FA8E4 802400F4 4602003E */ c.le.s $f0, $f2 -/* 9FA8E8 802400F8 00000000 */ nop -/* 9FA8EC 802400FC 45000008 */ bc1f .L80240120 -/* 9FA8F0 80240100 00000000 */ nop -/* 9FA8F4 80240104 44940000 */ mtc1 $s4, $f0 -/* 9FA8F8 80240108 00000000 */ nop -/* 9FA8FC 8024010C 46800020 */ cvt.s.w $f0, $f0 -/* 9FA900 80240110 4600103E */ c.le.s $f2, $f0 -/* 9FA904 80240114 00000000 */ nop -/* 9FA908 80240118 45030001 */ bc1tl .L80240120 -/* 9FA90C 8024011C 0040802D */ daddu $s0, $v0, $zero -.L80240120: -/* 9FA910 80240120 8222001C */ lb $v0, 0x1c($s1) -/* 9FA914 80240124 18400009 */ blez $v0, .L8024014C -/* 9FA918 80240128 0000182D */ daddu $v1, $zero, $zero -/* 9FA91C 8024012C 0220202D */ daddu $a0, $s1, $zero -.L80240130: -/* 9FA920 80240130 8C820028 */ lw $v0, 0x28($a0) -/* 9FA924 80240134 A4500046 */ sh $s0, 0x46($v0) -/* 9FA928 80240138 8222001C */ lb $v0, 0x1c($s1) -/* 9FA92C 8024013C 24630001 */ addiu $v1, $v1, 1 -/* 9FA930 80240140 0062102A */ slt $v0, $v1, $v0 -/* 9FA934 80240144 1440FFFA */ bnez $v0, .L80240130 -/* 9FA938 80240148 24840004 */ addiu $a0, $a0, 4 -.L8024014C: -/* 9FA93C 8024014C 8FBF002C */ lw $ra, 0x2c($sp) -/* 9FA940 80240150 8FB60028 */ lw $s6, 0x28($sp) -/* 9FA944 80240154 8FB50024 */ lw $s5, 0x24($sp) -/* 9FA948 80240158 8FB40020 */ lw $s4, 0x20($sp) -/* 9FA94C 8024015C 8FB3001C */ lw $s3, 0x1c($sp) -/* 9FA950 80240160 8FB20018 */ lw $s2, 0x18($sp) -/* 9FA954 80240164 8FB10014 */ lw $s1, 0x14($sp) -/* 9FA958 80240168 8FB00010 */ lw $s0, 0x10($sp) -/* 9FA95C 8024016C 24020002 */ addiu $v0, $zero, 2 -/* 9FA960 80240170 03E00008 */ jr $ra -/* 9FA964 80240174 27BD0030 */ addiu $sp, $sp, 0x30 -/* 9FA968 80240178 00000000 */ nop -/* 9FA96C 8024017C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_12/9FA970/func_80240180_9FA970.s b/ver/us/asm/nonmatchings/world/area_nok/nok_12/9FA970/func_80240180_9FA970.s deleted file mode 100644 index 024be39963..0000000000 --- a/ver/us/asm/nonmatchings/world/area_nok/nok_12/9FA970/func_80240180_9FA970.s +++ /dev/null @@ -1,47 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240180_9FA970 -/* 9FA970 80240180 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 9FA974 80240184 AFB10014 */ sw $s1, 0x14($sp) -/* 9FA978 80240188 0080882D */ daddu $s1, $a0, $zero -/* 9FA97C 8024018C AFBF0020 */ sw $ra, 0x20($sp) -/* 9FA980 80240190 AFB3001C */ sw $s3, 0x1c($sp) -/* 9FA984 80240194 AFB20018 */ sw $s2, 0x18($sp) -/* 9FA988 80240198 AFB00010 */ sw $s0, 0x10($sp) -/* 9FA98C 8024019C 8E30000C */ lw $s0, 0xc($s1) -/* 9FA990 802401A0 8E330148 */ lw $s3, 0x148($s1) -/* 9FA994 802401A4 8E050000 */ lw $a1, ($s0) -/* 9FA998 802401A8 0C0B1EAF */ jal evt_get_variable -/* 9FA99C 802401AC 26100004 */ addiu $s0, $s0, 4 -/* 9FA9A0 802401B0 0040902D */ daddu $s2, $v0, $zero -/* 9FA9A4 802401B4 8E050000 */ lw $a1, ($s0) -/* 9FA9A8 802401B8 26100004 */ addiu $s0, $s0, 4 -/* 9FA9AC 802401BC 0C0B1EAF */ jal evt_get_variable -/* 9FA9B0 802401C0 0220202D */ daddu $a0, $s1, $zero -/* 9FA9B4 802401C4 0220202D */ daddu $a0, $s1, $zero -/* 9FA9B8 802401C8 8E050000 */ lw $a1, ($s0) -/* 9FA9BC 802401CC 0C0B1EAF */ jal evt_get_variable -/* 9FA9C0 802401D0 0040802D */ daddu $s0, $v0, $zero -/* 9FA9C4 802401D4 0040882D */ daddu $s1, $v0, $zero -/* 9FA9C8 802401D8 2402FFFF */ addiu $v0, $zero, -1 -/* 9FA9CC 802401DC 16420002 */ bne $s2, $v0, .L802401E8 -/* 9FA9D0 802401E0 00000000 */ nop -/* 9FA9D4 802401E4 86720008 */ lh $s2, 8($s3) -.L802401E8: -/* 9FA9D8 802401E8 0C00FB5A */ jal get_enemy_safe -/* 9FA9DC 802401EC 0240202D */ daddu $a0, $s2, $zero -/* 9FA9E0 802401F0 0040982D */ daddu $s3, $v0, $zero -/* 9FA9E4 802401F4 12600003 */ beqz $s3, .L80240204 -/* 9FA9E8 802401F8 00101080 */ sll $v0, $s0, 2 -/* 9FA9EC 802401FC 02621021 */ addu $v0, $s3, $v0 -/* 9FA9F0 80240200 AC51006C */ sw $s1, 0x6c($v0) -.L80240204: -/* 9FA9F4 80240204 8FBF0020 */ lw $ra, 0x20($sp) -/* 9FA9F8 80240208 8FB3001C */ lw $s3, 0x1c($sp) -/* 9FA9FC 8024020C 8FB20018 */ lw $s2, 0x18($sp) -/* 9FAA00 80240210 8FB10014 */ lw $s1, 0x14($sp) -/* 9FAA04 80240214 8FB00010 */ lw $s0, 0x10($sp) -/* 9FAA08 80240218 24020002 */ addiu $v0, $zero, 2 -/* 9FAA0C 8024021C 03E00008 */ jr $ra -/* 9FAA10 80240220 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_13/A01420/func_80241360_A01960.s b/ver/us/asm/nonmatchings/world/area_nok/nok_13/A01420/func_80241360_A01960.s deleted file mode 100644 index a79a9e0f91..0000000000 --- a/ver/us/asm/nonmatchings/world/area_nok/nok_13/A01420/func_80241360_A01960.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241360_A01960 -/* A01960 80241360 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A01964 80241364 AFB10014 */ sw $s1, 0x14($sp) -/* A01968 80241368 0080882D */ daddu $s1, $a0, $zero -/* A0196C 8024136C 3C028011 */ lui $v0, %hi(gPlayerStatus) -/* A01970 80241370 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) -/* A01974 80241374 AFBF0018 */ sw $ra, 0x18($sp) -/* A01978 80241378 AFB00010 */ sw $s0, 0x10($sp) -/* A0197C 8024137C 8C460028 */ lw $a2, 0x28($v0) -/* A01980 80241380 8E23000C */ lw $v1, 0xc($s1) -/* A01984 80241384 3C01C3B6 */ lui $at, 0xc3b6 -/* A01988 80241388 44816000 */ mtc1 $at, $f12 -/* A0198C 8024138C 3C01C307 */ lui $at, 0xc307 -/* A01990 80241390 44817000 */ mtc1 $at, $f14 -/* A01994 80241394 8C470030 */ lw $a3, 0x30($v0) -/* A01998 80241398 0C00A720 */ jal atan2 -/* A0199C 8024139C 8C700000 */ lw $s0, ($v1) -/* A019A0 802413A0 4600008D */ trunc.w.s $f2, $f0 -/* A019A4 802413A4 44061000 */ mfc1 $a2, $f2 -/* A019A8 802413A8 0220202D */ daddu $a0, $s1, $zero -/* A019AC 802413AC 0C0B2026 */ jal evt_set_variable -/* A019B0 802413B0 0200282D */ daddu $a1, $s0, $zero -/* A019B4 802413B4 8FBF0018 */ lw $ra, 0x18($sp) -/* A019B8 802413B8 8FB10014 */ lw $s1, 0x14($sp) -/* A019BC 802413BC 8FB00010 */ lw $s0, 0x10($sp) -/* A019C0 802413C0 24020002 */ addiu $v0, $zero, 2 -/* A019C4 802413C4 03E00008 */ jr $ra -/* A019C8 802413C8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_14/A02840/func_80240000_A02840.s b/ver/us/asm/nonmatchings/world/area_nok/nok_14/A02840/func_80240000_A02840.s deleted file mode 100644 index a7668f4633..0000000000 --- a/ver/us/asm/nonmatchings/world/area_nok/nok_14/A02840/func_80240000_A02840.s +++ /dev/null @@ -1,103 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_A02840 -/* A02840 80240000 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* A02844 80240004 AFB10014 */ sw $s1, 0x14($sp) -/* A02848 80240008 0080882D */ daddu $s1, $a0, $zero -/* A0284C 8024000C AFBF002C */ sw $ra, 0x2c($sp) -/* A02850 80240010 AFB60028 */ sw $s6, 0x28($sp) -/* A02854 80240014 AFB50024 */ sw $s5, 0x24($sp) -/* A02858 80240018 AFB40020 */ sw $s4, 0x20($sp) -/* A0285C 8024001C AFB3001C */ sw $s3, 0x1c($sp) -/* A02860 80240020 AFB20018 */ sw $s2, 0x18($sp) -/* A02864 80240024 AFB00010 */ sw $s0, 0x10($sp) -/* A02868 80240028 8E30000C */ lw $s0, 0xc($s1) -/* A0286C 8024002C 8E050000 */ lw $a1, ($s0) -/* A02870 80240030 0C0B1EAF */ jal evt_get_variable -/* A02874 80240034 26100004 */ addiu $s0, $s0, 4 -/* A02878 80240038 8E050000 */ lw $a1, ($s0) -/* A0287C 8024003C 26100004 */ addiu $s0, $s0, 4 -/* A02880 80240040 0220202D */ daddu $a0, $s1, $zero -/* A02884 80240044 0C0B1EAF */ jal evt_get_variable -/* A02888 80240048 0040902D */ daddu $s2, $v0, $zero -/* A0288C 8024004C 8E050000 */ lw $a1, ($s0) -/* A02890 80240050 26100004 */ addiu $s0, $s0, 4 -/* A02894 80240054 0220202D */ daddu $a0, $s1, $zero -/* A02898 80240058 0C0B1EAF */ jal evt_get_variable -/* A0289C 8024005C 0040B02D */ daddu $s6, $v0, $zero -/* A028A0 80240060 8E050000 */ lw $a1, ($s0) -/* A028A4 80240064 26100004 */ addiu $s0, $s0, 4 -/* A028A8 80240068 0220202D */ daddu $a0, $s1, $zero -/* A028AC 8024006C 0C0B1EAF */ jal evt_get_variable -/* A028B0 80240070 0040A82D */ daddu $s5, $v0, $zero -/* A028B4 80240074 8E050000 */ lw $a1, ($s0) -/* A028B8 80240078 26100004 */ addiu $s0, $s0, 4 -/* A028BC 8024007C 0220202D */ daddu $a0, $s1, $zero -/* A028C0 80240080 0C0B1EAF */ jal evt_get_variable -/* A028C4 80240084 0040A02D */ daddu $s4, $v0, $zero -/* A028C8 80240088 0220202D */ daddu $a0, $s1, $zero -/* A028CC 8024008C 8E050000 */ lw $a1, ($s0) -/* A028D0 80240090 0C0B1EAF */ jal evt_get_variable -/* A028D4 80240094 0040802D */ daddu $s0, $v0, $zero -/* A028D8 80240098 3C138011 */ lui $s3, %hi(gPlayerStatus) -/* A028DC 8024009C 2673EFC8 */ addiu $s3, $s3, %lo(gPlayerStatus) -/* A028E0 802400A0 44920000 */ mtc1 $s2, $f0 -/* A028E4 802400A4 00000000 */ nop -/* A028E8 802400A8 46800020 */ cvt.s.w $f0, $f0 -/* A028EC 802400AC C6620028 */ lwc1 $f2, 0x28($s3) -/* A028F0 802400B0 3C11800B */ lui $s1, %hi(gCurrentEncounter) -/* A028F4 802400B4 26310F10 */ addiu $s1, $s1, %lo(gCurrentEncounter) -/* A028F8 802400B8 4602003E */ c.le.s $f0, $f2 -/* A028FC 802400BC 00000000 */ nop -/* A02900 802400C0 45000017 */ bc1f .L80240120 -/* A02904 802400C4 00000000 */ nop -/* A02908 802400C8 44960000 */ mtc1 $s6, $f0 -/* A0290C 802400CC 00000000 */ nop -/* A02910 802400D0 46800020 */ cvt.s.w $f0, $f0 -/* A02914 802400D4 4600103E */ c.le.s $f2, $f0 -/* A02918 802400D8 00000000 */ nop -/* A0291C 802400DC 45000010 */ bc1f .L80240120 -/* A02920 802400E0 00000000 */ nop -/* A02924 802400E4 C6620030 */ lwc1 $f2, 0x30($s3) -/* A02928 802400E8 44950000 */ mtc1 $s5, $f0 -/* A0292C 802400EC 00000000 */ nop -/* A02930 802400F0 46800020 */ cvt.s.w $f0, $f0 -/* A02934 802400F4 4602003E */ c.le.s $f0, $f2 -/* A02938 802400F8 00000000 */ nop -/* A0293C 802400FC 45000008 */ bc1f .L80240120 -/* A02940 80240100 00000000 */ nop -/* A02944 80240104 44940000 */ mtc1 $s4, $f0 -/* A02948 80240108 00000000 */ nop -/* A0294C 8024010C 46800020 */ cvt.s.w $f0, $f0 -/* A02950 80240110 4600103E */ c.le.s $f2, $f0 -/* A02954 80240114 00000000 */ nop -/* A02958 80240118 45030001 */ bc1tl .L80240120 -/* A0295C 8024011C 0040802D */ daddu $s0, $v0, $zero -.L80240120: -/* A02960 80240120 8222001C */ lb $v0, 0x1c($s1) -/* A02964 80240124 18400009 */ blez $v0, .L8024014C -/* A02968 80240128 0000182D */ daddu $v1, $zero, $zero -/* A0296C 8024012C 0220202D */ daddu $a0, $s1, $zero -.L80240130: -/* A02970 80240130 8C820028 */ lw $v0, 0x28($a0) -/* A02974 80240134 A4500046 */ sh $s0, 0x46($v0) -/* A02978 80240138 8222001C */ lb $v0, 0x1c($s1) -/* A0297C 8024013C 24630001 */ addiu $v1, $v1, 1 -/* A02980 80240140 0062102A */ slt $v0, $v1, $v0 -/* A02984 80240144 1440FFFA */ bnez $v0, .L80240130 -/* A02988 80240148 24840004 */ addiu $a0, $a0, 4 -.L8024014C: -/* A0298C 8024014C 8FBF002C */ lw $ra, 0x2c($sp) -/* A02990 80240150 8FB60028 */ lw $s6, 0x28($sp) -/* A02994 80240154 8FB50024 */ lw $s5, 0x24($sp) -/* A02998 80240158 8FB40020 */ lw $s4, 0x20($sp) -/* A0299C 8024015C 8FB3001C */ lw $s3, 0x1c($sp) -/* A029A0 80240160 8FB20018 */ lw $s2, 0x18($sp) -/* A029A4 80240164 8FB10014 */ lw $s1, 0x14($sp) -/* A029A8 80240168 8FB00010 */ lw $s0, 0x10($sp) -/* A029AC 8024016C 24020002 */ addiu $v0, $zero, 2 -/* A029B0 80240170 03E00008 */ jr $ra -/* A029B4 80240174 27BD0030 */ addiu $sp, $sp, 0x30 -/* A029B8 80240178 00000000 */ nop -/* A029BC 8024017C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_14/DE5810/func_80240590_DE5C40.s b/ver/us/asm/nonmatchings/world/area_omo/omo_14/DE5810/func_80240590_DE5C40.s deleted file mode 100644 index 1140e3b564..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_14/DE5810/func_80240590_DE5C40.s +++ /dev/null @@ -1,17 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240590_DE5C40 -/* DE5C40 80240590 3C038011 */ lui $v1, %hi(gPartnerActionStatus+0x3) -/* DE5C44 80240594 8063EBB3 */ lb $v1, %lo(gPartnerActionStatus+0x3)($v1) -/* DE5C48 80240598 24020006 */ addiu $v0, $zero, 6 -/* DE5C4C 8024059C 54620003 */ bnel $v1, $v0, .L802405AC -/* DE5C50 802405A0 AC800088 */ sw $zero, 0x88($a0) -/* DE5C54 802405A4 24020001 */ addiu $v0, $zero, 1 -/* DE5C58 802405A8 AC820088 */ sw $v0, 0x88($a0) -.L802405AC: -/* DE5C5C 802405AC 03E00008 */ jr $ra -/* DE5C60 802405B0 24020002 */ addiu $v0, $zero, 2 -/* DE5C64 802405B4 00000000 */ nop -/* DE5C68 802405B8 00000000 */ nop -/* DE5C6C 802405BC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241B20_CF9690.s b/ver/us/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241B20_CF9690.s deleted file mode 100644 index 8aa35dcbee..0000000000 --- a/ver/us/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241B20_CF9690.s +++ /dev/null @@ -1,96 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241B20_CF9690 -/* CF9690 80241B20 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* CF9694 80241B24 AFB10014 */ sw $s1, 0x14($sp) -/* CF9698 80241B28 0080882D */ daddu $s1, $a0, $zero -/* CF969C 80241B2C AFBF0020 */ sw $ra, 0x20($sp) -/* CF96A0 80241B30 AFB3001C */ sw $s3, 0x1c($sp) -/* CF96A4 80241B34 AFB20018 */ sw $s2, 0x18($sp) -/* CF96A8 80241B38 AFB00010 */ sw $s0, 0x10($sp) -/* CF96AC 80241B3C F7BC0048 */ sdc1 $f28, 0x48($sp) -/* CF96B0 80241B40 F7BA0040 */ sdc1 $f26, 0x40($sp) -/* CF96B4 80241B44 F7B80038 */ sdc1 $f24, 0x38($sp) -/* CF96B8 80241B48 F7B60030 */ sdc1 $f22, 0x30($sp) -/* CF96BC 80241B4C F7B40028 */ sdc1 $f20, 0x28($sp) -/* CF96C0 80241B50 8E30000C */ lw $s0, 0xc($s1) -/* CF96C4 80241B54 8E050000 */ lw $a1, ($s0) -/* CF96C8 80241B58 0C0B1EAF */ jal evt_get_variable -/* CF96CC 80241B5C 26100004 */ addiu $s0, $s0, 4 -/* CF96D0 80241B60 8E050000 */ lw $a1, ($s0) -/* CF96D4 80241B64 26100004 */ addiu $s0, $s0, 4 -/* CF96D8 80241B68 0220202D */ daddu $a0, $s1, $zero -/* CF96DC 80241B6C 0C0B1EAF */ jal evt_get_variable -/* CF96E0 80241B70 0040902D */ daddu $s2, $v0, $zero -/* CF96E4 80241B74 0220202D */ daddu $a0, $s1, $zero -/* CF96E8 80241B78 8E050000 */ lw $a1, ($s0) -/* CF96EC 80241B7C 0C0B1EAF */ jal evt_get_variable -/* CF96F0 80241B80 0040982D */ daddu $s3, $v0, $zero -/* CF96F4 80241B84 3C10800B */ lui $s0, %hi(gCameras) -/* CF96F8 80241B88 26101D80 */ addiu $s0, $s0, %lo(gCameras) -/* CF96FC 80241B8C C60C006C */ lwc1 $f12, 0x6c($s0) -/* CF9700 80241B90 3C014387 */ lui $at, 0x4387 -/* CF9704 80241B94 4481B000 */ mtc1 $at, $f22 -/* CF9708 80241B98 00000000 */ nop -/* CF970C 80241B9C 46166300 */ add.s $f12, $f12, $f22 -/* CF9710 80241BA0 4482C000 */ mtc1 $v0, $f24 -/* CF9714 80241BA4 00000000 */ nop -/* CF9718 80241BA8 4680C620 */ cvt.s.w $f24, $f24 -/* CF971C 80241BAC 3C0142C8 */ lui $at, 0x42c8 -/* CF9720 80241BB0 4481D000 */ mtc1 $at, $f26 -/* CF9724 80241BB4 0C00A8BB */ jal sin_deg -/* CF9728 80241BB8 46186300 */ add.s $f12, $f12, $f24 -/* CF972C 80241BBC 461A0002 */ mul.s $f0, $f0, $f26 -/* CF9730 80241BC0 00000000 */ nop -/* CF9734 80241BC4 4492A000 */ mtc1 $s2, $f20 -/* CF9738 80241BC8 00000000 */ nop -/* CF973C 80241BCC 4680A520 */ cvt.s.w $f20, $f20 -/* CF9740 80241BD0 4600A000 */ add.s $f0, $f20, $f0 -/* CF9744 80241BD4 4600008D */ trunc.w.s $f2, $f0 -/* CF9748 80241BD8 E6220084 */ swc1 $f2, 0x84($s1) -/* CF974C 80241BDC C60C006C */ lwc1 $f12, 0x6c($s0) -/* CF9750 80241BE0 46166300 */ add.s $f12, $f12, $f22 -/* CF9754 80241BE4 0C00A8D4 */ jal cos_deg -/* CF9758 80241BE8 46186300 */ add.s $f12, $f12, $f24 -/* CF975C 80241BEC 461A0002 */ mul.s $f0, $f0, $f26 -/* CF9760 80241BF0 00000000 */ nop -/* CF9764 80241BF4 4493B000 */ mtc1 $s3, $f22 -/* CF9768 80241BF8 00000000 */ nop -/* CF976C 80241BFC 4680B5A0 */ cvt.s.w $f22, $f22 -/* CF9770 80241C00 4600B001 */ sub.s $f0, $f22, $f0 -/* CF9774 80241C04 3C0142B4 */ lui $at, 0x42b4 -/* CF9778 80241C08 4481E000 */ mtc1 $at, $f28 -/* CF977C 80241C0C 4600008D */ trunc.w.s $f2, $f0 -/* CF9780 80241C10 E6220088 */ swc1 $f2, 0x88($s1) -/* CF9784 80241C14 C60C006C */ lwc1 $f12, 0x6c($s0) -/* CF9788 80241C18 461C6300 */ add.s $f12, $f12, $f28 -/* CF978C 80241C1C 0C00A8BB */ jal sin_deg -/* CF9790 80241C20 46186300 */ add.s $f12, $f12, $f24 -/* CF9794 80241C24 461A0002 */ mul.s $f0, $f0, $f26 -/* CF9798 80241C28 00000000 */ nop -/* CF979C 80241C2C 4600A500 */ add.s $f20, $f20, $f0 -/* CF97A0 80241C30 4600A08D */ trunc.w.s $f2, $f20 -/* CF97A4 80241C34 E622008C */ swc1 $f2, 0x8c($s1) -/* CF97A8 80241C38 C60C006C */ lwc1 $f12, 0x6c($s0) -/* CF97AC 80241C3C 461C6300 */ add.s $f12, $f12, $f28 -/* CF97B0 80241C40 0C00A8D4 */ jal cos_deg -/* CF97B4 80241C44 46186300 */ add.s $f12, $f12, $f24 -/* CF97B8 80241C48 461A0002 */ mul.s $f0, $f0, $f26 -/* CF97BC 80241C4C 00000000 */ nop -/* CF97C0 80241C50 4600B581 */ sub.s $f22, $f22, $f0 -/* CF97C4 80241C54 4600B08D */ trunc.w.s $f2, $f22 -/* CF97C8 80241C58 E6220090 */ swc1 $f2, 0x90($s1) -/* CF97CC 80241C5C 8FBF0020 */ lw $ra, 0x20($sp) -/* CF97D0 80241C60 8FB3001C */ lw $s3, 0x1c($sp) -/* CF97D4 80241C64 8FB20018 */ lw $s2, 0x18($sp) -/* CF97D8 80241C68 8FB10014 */ lw $s1, 0x14($sp) -/* CF97DC 80241C6C 8FB00010 */ lw $s0, 0x10($sp) -/* CF97E0 80241C70 D7BC0048 */ ldc1 $f28, 0x48($sp) -/* CF97E4 80241C74 D7BA0040 */ ldc1 $f26, 0x40($sp) -/* CF97E8 80241C78 D7B80038 */ ldc1 $f24, 0x38($sp) -/* CF97EC 80241C7C D7B60030 */ ldc1 $f22, 0x30($sp) -/* CF97F0 80241C80 D7B40028 */ ldc1 $f20, 0x28($sp) -/* CF97F4 80241C84 24020002 */ addiu $v0, $zero, 2 -/* CF97F8 80241C88 03E00008 */ jr $ra -/* CF97FC 80241C8C 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/ver/us/asm/nonmatchings/world/area_trd/trd_03/9A4ED0/func_80240880_9A4ED0.s b/ver/us/asm/nonmatchings/world/area_trd/trd_03/9A4ED0/func_80240880_9A4ED0.s deleted file mode 100644 index 6476e0f2be..0000000000 --- a/ver/us/asm/nonmatchings/world/area_trd/trd_03/9A4ED0/func_80240880_9A4ED0.s +++ /dev/null @@ -1,96 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240880_9A4ED0 -/* 9A4ED0 80240880 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* 9A4ED4 80240884 AFB10014 */ sw $s1, 0x14($sp) -/* 9A4ED8 80240888 0080882D */ daddu $s1, $a0, $zero -/* 9A4EDC 8024088C AFBF0020 */ sw $ra, 0x20($sp) -/* 9A4EE0 80240890 AFB3001C */ sw $s3, 0x1c($sp) -/* 9A4EE4 80240894 AFB20018 */ sw $s2, 0x18($sp) -/* 9A4EE8 80240898 AFB00010 */ sw $s0, 0x10($sp) -/* 9A4EEC 8024089C F7BC0048 */ sdc1 $f28, 0x48($sp) -/* 9A4EF0 802408A0 F7BA0040 */ sdc1 $f26, 0x40($sp) -/* 9A4EF4 802408A4 F7B80038 */ sdc1 $f24, 0x38($sp) -/* 9A4EF8 802408A8 F7B60030 */ sdc1 $f22, 0x30($sp) -/* 9A4EFC 802408AC F7B40028 */ sdc1 $f20, 0x28($sp) -/* 9A4F00 802408B0 8E30000C */ lw $s0, 0xc($s1) -/* 9A4F04 802408B4 8E050000 */ lw $a1, ($s0) -/* 9A4F08 802408B8 0C0B1EAF */ jal evt_get_variable -/* 9A4F0C 802408BC 26100004 */ addiu $s0, $s0, 4 -/* 9A4F10 802408C0 8E050000 */ lw $a1, ($s0) -/* 9A4F14 802408C4 26100004 */ addiu $s0, $s0, 4 -/* 9A4F18 802408C8 0220202D */ daddu $a0, $s1, $zero -/* 9A4F1C 802408CC 0C0B1EAF */ jal evt_get_variable -/* 9A4F20 802408D0 0040902D */ daddu $s2, $v0, $zero -/* 9A4F24 802408D4 0220202D */ daddu $a0, $s1, $zero -/* 9A4F28 802408D8 8E050000 */ lw $a1, ($s0) -/* 9A4F2C 802408DC 0C0B1EAF */ jal evt_get_variable -/* 9A4F30 802408E0 0040982D */ daddu $s3, $v0, $zero -/* 9A4F34 802408E4 3C10800B */ lui $s0, %hi(gCameras) -/* 9A4F38 802408E8 26101D80 */ addiu $s0, $s0, %lo(gCameras) -/* 9A4F3C 802408EC C60C006C */ lwc1 $f12, 0x6c($s0) -/* 9A4F40 802408F0 3C014387 */ lui $at, 0x4387 -/* 9A4F44 802408F4 4481B000 */ mtc1 $at, $f22 -/* 9A4F48 802408F8 00000000 */ nop -/* 9A4F4C 802408FC 46166300 */ add.s $f12, $f12, $f22 -/* 9A4F50 80240900 4482C000 */ mtc1 $v0, $f24 -/* 9A4F54 80240904 00000000 */ nop -/* 9A4F58 80240908 4680C620 */ cvt.s.w $f24, $f24 -/* 9A4F5C 8024090C 3C0142C8 */ lui $at, 0x42c8 -/* 9A4F60 80240910 4481D000 */ mtc1 $at, $f26 -/* 9A4F64 80240914 0C00A8BB */ jal sin_deg -/* 9A4F68 80240918 46186300 */ add.s $f12, $f12, $f24 -/* 9A4F6C 8024091C 461A0002 */ mul.s $f0, $f0, $f26 -/* 9A4F70 80240920 00000000 */ nop -/* 9A4F74 80240924 4492A000 */ mtc1 $s2, $f20 -/* 9A4F78 80240928 00000000 */ nop -/* 9A4F7C 8024092C 4680A520 */ cvt.s.w $f20, $f20 -/* 9A4F80 80240930 4600A000 */ add.s $f0, $f20, $f0 -/* 9A4F84 80240934 4600008D */ trunc.w.s $f2, $f0 -/* 9A4F88 80240938 E6220084 */ swc1 $f2, 0x84($s1) -/* 9A4F8C 8024093C C60C006C */ lwc1 $f12, 0x6c($s0) -/* 9A4F90 80240940 46166300 */ add.s $f12, $f12, $f22 -/* 9A4F94 80240944 0C00A8D4 */ jal cos_deg -/* 9A4F98 80240948 46186300 */ add.s $f12, $f12, $f24 -/* 9A4F9C 8024094C 461A0002 */ mul.s $f0, $f0, $f26 -/* 9A4FA0 80240950 00000000 */ nop -/* 9A4FA4 80240954 4493B000 */ mtc1 $s3, $f22 -/* 9A4FA8 80240958 00000000 */ nop -/* 9A4FAC 8024095C 4680B5A0 */ cvt.s.w $f22, $f22 -/* 9A4FB0 80240960 4600B001 */ sub.s $f0, $f22, $f0 -/* 9A4FB4 80240964 3C0142B4 */ lui $at, 0x42b4 -/* 9A4FB8 80240968 4481E000 */ mtc1 $at, $f28 -/* 9A4FBC 8024096C 4600008D */ trunc.w.s $f2, $f0 -/* 9A4FC0 80240970 E6220088 */ swc1 $f2, 0x88($s1) -/* 9A4FC4 80240974 C60C006C */ lwc1 $f12, 0x6c($s0) -/* 9A4FC8 80240978 461C6300 */ add.s $f12, $f12, $f28 -/* 9A4FCC 8024097C 0C00A8BB */ jal sin_deg -/* 9A4FD0 80240980 46186300 */ add.s $f12, $f12, $f24 -/* 9A4FD4 80240984 461A0002 */ mul.s $f0, $f0, $f26 -/* 9A4FD8 80240988 00000000 */ nop -/* 9A4FDC 8024098C 4600A500 */ add.s $f20, $f20, $f0 -/* 9A4FE0 80240990 4600A08D */ trunc.w.s $f2, $f20 -/* 9A4FE4 80240994 E622008C */ swc1 $f2, 0x8c($s1) -/* 9A4FE8 80240998 C60C006C */ lwc1 $f12, 0x6c($s0) -/* 9A4FEC 8024099C 461C6300 */ add.s $f12, $f12, $f28 -/* 9A4FF0 802409A0 0C00A8D4 */ jal cos_deg -/* 9A4FF4 802409A4 46186300 */ add.s $f12, $f12, $f24 -/* 9A4FF8 802409A8 461A0002 */ mul.s $f0, $f0, $f26 -/* 9A4FFC 802409AC 00000000 */ nop -/* 9A5000 802409B0 4600B581 */ sub.s $f22, $f22, $f0 -/* 9A5004 802409B4 4600B08D */ trunc.w.s $f2, $f22 -/* 9A5008 802409B8 E6220090 */ swc1 $f2, 0x90($s1) -/* 9A500C 802409BC 8FBF0020 */ lw $ra, 0x20($sp) -/* 9A5010 802409C0 8FB3001C */ lw $s3, 0x1c($sp) -/* 9A5014 802409C4 8FB20018 */ lw $s2, 0x18($sp) -/* 9A5018 802409C8 8FB10014 */ lw $s1, 0x14($sp) -/* 9A501C 802409CC 8FB00010 */ lw $s0, 0x10($sp) -/* 9A5020 802409D0 D7BC0048 */ ldc1 $f28, 0x48($sp) -/* 9A5024 802409D4 D7BA0040 */ ldc1 $f26, 0x40($sp) -/* 9A5028 802409D8 D7B80038 */ ldc1 $f24, 0x38($sp) -/* 9A502C 802409DC D7B60030 */ ldc1 $f22, 0x30($sp) -/* 9A5030 802409E0 D7B40028 */ ldc1 $f20, 0x28($sp) -/* 9A5034 802409E4 24020002 */ addiu $v0, $zero, 2 -/* 9A5038 802409E8 03E00008 */ jr $ra -/* 9A503C 802409EC 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/ver/us/asm/nonmatchings/world/area_trd/trd_05/9AE700/func_80240020_9AE720.s b/ver/us/asm/nonmatchings/world/area_trd/trd_05/9AE700/func_80240020_9AE720.s deleted file mode 100644 index 03d225be08..0000000000 --- a/ver/us/asm/nonmatchings/world/area_trd/trd_05/9AE700/func_80240020_9AE720.s +++ /dev/null @@ -1,255 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240020_9AE720 -/* 9AE720 80240020 27BDFF10 */ addiu $sp, $sp, -0xf0 -/* 9AE724 80240024 3C06E300 */ lui $a2, 0xe300 -/* 9AE728 80240028 34C60A01 */ ori $a2, $a2, 0xa01 -/* 9AE72C 8024002C 3C07D9C0 */ lui $a3, 0xd9c0 -/* 9AE730 80240030 34E7F9FB */ ori $a3, $a3, 0xf9fb -/* 9AE734 80240034 3C09D9FF */ lui $t1, 0xd9ff -/* 9AE738 80240038 3529FFFF */ ori $t1, $t1, 0xffff -/* 9AE73C 8024003C 3C080020 */ lui $t0, 0x20 -/* 9AE740 80240040 35080005 */ ori $t0, $t0, 5 -/* 9AE744 80240044 3C0AD700 */ lui $t2, 0xd700 -/* 9AE748 80240048 354A0002 */ ori $t2, $t2, 2 -/* 9AE74C 8024004C 3C0BE300 */ lui $t3, 0xe300 -/* 9AE750 80240050 356B0F00 */ ori $t3, $t3, 0xf00 -/* 9AE754 80240054 3C0CE300 */ lui $t4, 0xe300 -/* 9AE758 80240058 358C0C00 */ ori $t4, $t4, 0xc00 -/* 9AE75C 8024005C 3C0DE300 */ lui $t5, 0xe300 -/* 9AE760 80240060 35AD1201 */ ori $t5, $t5, 0x1201 -/* 9AE764 80240064 3C0EE300 */ lui $t6, 0xe300 -/* 9AE768 80240068 35CE1801 */ ori $t6, $t6, 0x1801 -/* 9AE76C 8024006C 3C0FE300 */ lui $t7, 0xe300 -/* 9AE770 80240070 35EF0D01 */ ori $t7, $t7, 0xd01 -/* 9AE774 80240074 AFB000C0 */ sw $s0, 0xc0($sp) -/* 9AE778 80240078 3C10E300 */ lui $s0, 0xe300 -/* 9AE77C 8024007C 36101402 */ ori $s0, $s0, 0x1402 -/* 9AE780 80240080 AFB300CC */ sw $s3, 0xcc($sp) -/* 9AE784 80240084 3C13E300 */ lui $s3, 0xe300 -/* 9AE788 80240088 36731700 */ ori $s3, $s3, 0x1700 -/* 9AE78C 8024008C AFB400D0 */ sw $s4, 0xd0($sp) -/* 9AE790 80240090 3C14E200 */ lui $s4, 0xe200 -/* 9AE794 80240094 36941E01 */ ori $s4, $s4, 0x1e01 -/* 9AE798 80240098 AFB200C8 */ sw $s2, 0xc8($sp) -/* 9AE79C 8024009C 27B20040 */ addiu $s2, $sp, 0x40 -/* 9AE7A0 802400A0 0240202D */ daddu $a0, $s2, $zero -/* 9AE7A4 802400A4 AFB500D4 */ sw $s5, 0xd4($sp) -/* 9AE7A8 802400A8 3C150001 */ lui $s5, 1 -/* 9AE7AC 802400AC AFB100C4 */ sw $s1, 0xc4($sp) -/* 9AE7B0 802400B0 3C11800A */ lui $s1, %hi(gMasterGfxPos) -/* 9AE7B4 802400B4 2631A66C */ addiu $s1, $s1, %lo(gMasterGfxPos) -/* 9AE7B8 802400B8 36B51630 */ ori $s5, $s5, 0x1630 -/* 9AE7BC 802400BC AFBF00D8 */ sw $ra, 0xd8($sp) -/* 9AE7C0 802400C0 F7B600E8 */ sdc1 $f22, 0xe8($sp) -/* 9AE7C4 802400C4 F7B400E0 */ sdc1 $f20, 0xe0($sp) -/* 9AE7C8 802400C8 8E220000 */ lw $v0, ($s1) -/* 9AE7CC 802400CC 3C03E700 */ lui $v1, 0xe700 -/* 9AE7D0 802400D0 0040282D */ daddu $a1, $v0, $zero -/* 9AE7D4 802400D4 24420008 */ addiu $v0, $v0, 8 -/* 9AE7D8 802400D8 AE220000 */ sw $v0, ($s1) -/* 9AE7DC 802400DC ACA30000 */ sw $v1, ($a1) -/* 9AE7E0 802400E0 24430008 */ addiu $v1, $v0, 8 -/* 9AE7E4 802400E4 ACA00004 */ sw $zero, 4($a1) -/* 9AE7E8 802400E8 AE230000 */ sw $v1, ($s1) -/* 9AE7EC 802400EC 24430010 */ addiu $v1, $v0, 0x10 -/* 9AE7F0 802400F0 AC460000 */ sw $a2, ($v0) -/* 9AE7F4 802400F4 AC400004 */ sw $zero, 4($v0) -/* 9AE7F8 802400F8 AE230000 */ sw $v1, ($s1) -/* 9AE7FC 802400FC 24430018 */ addiu $v1, $v0, 0x18 -/* 9AE800 80240100 AC470008 */ sw $a3, 8($v0) -/* 9AE804 80240104 AC40000C */ sw $zero, 0xc($v0) -/* 9AE808 80240108 AE230000 */ sw $v1, ($s1) -/* 9AE80C 8024010C 24430020 */ addiu $v1, $v0, 0x20 -/* 9AE810 80240110 AC490010 */ sw $t1, 0x10($v0) -/* 9AE814 80240114 AC480014 */ sw $t0, 0x14($v0) -/* 9AE818 80240118 AE230000 */ sw $v1, ($s1) -/* 9AE81C 8024011C 2403FFFF */ addiu $v1, $zero, -1 -/* 9AE820 80240120 AC43001C */ sw $v1, 0x1c($v0) -/* 9AE824 80240124 24430028 */ addiu $v1, $v0, 0x28 -/* 9AE828 80240128 AC4A0018 */ sw $t2, 0x18($v0) -/* 9AE82C 8024012C AE230000 */ sw $v1, ($s1) -/* 9AE830 80240130 24430030 */ addiu $v1, $v0, 0x30 -/* 9AE834 80240134 AC4B0020 */ sw $t3, 0x20($v0) -/* 9AE838 80240138 AC400024 */ sw $zero, 0x24($v0) -/* 9AE83C 8024013C AE230000 */ sw $v1, ($s1) -/* 9AE840 80240140 3C030008 */ lui $v1, 8 -/* 9AE844 80240144 AC43002C */ sw $v1, 0x2c($v0) -/* 9AE848 80240148 24430038 */ addiu $v1, $v0, 0x38 -/* 9AE84C 8024014C AC4C0028 */ sw $t4, 0x28($v0) -/* 9AE850 80240150 AE230000 */ sw $v1, ($s1) -/* 9AE854 80240154 24032000 */ addiu $v1, $zero, 0x2000 -/* 9AE858 80240158 AC4D0030 */ sw $t5, 0x30($v0) -/* 9AE85C 8024015C AC430034 */ sw $v1, 0x34($v0) -/* 9AE860 80240160 24430040 */ addiu $v1, $v0, 0x40 -/* 9AE864 80240164 AE230000 */ sw $v1, ($s1) -/* 9AE868 80240168 240300C0 */ addiu $v1, $zero, 0xc0 -/* 9AE86C 8024016C AC43003C */ sw $v1, 0x3c($v0) -/* 9AE870 80240170 24430048 */ addiu $v1, $v0, 0x48 -/* 9AE874 80240174 AC4E0038 */ sw $t6, 0x38($v0) -/* 9AE878 80240178 AE230000 */ sw $v1, ($s1) -/* 9AE87C 8024017C 24430050 */ addiu $v1, $v0, 0x50 -/* 9AE880 80240180 AC4F0040 */ sw $t7, 0x40($v0) -/* 9AE884 80240184 AC400044 */ sw $zero, 0x44($v0) -/* 9AE888 80240188 AE230000 */ sw $v1, ($s1) -/* 9AE88C 8024018C 24030C00 */ addiu $v1, $zero, 0xc00 -/* 9AE890 80240190 AC500048 */ sw $s0, 0x48($v0) -/* 9AE894 80240194 AC43004C */ sw $v1, 0x4c($v0) -/* 9AE898 80240198 AC530050 */ sw $s3, 0x50($v0) -/* 9AE89C 8024019C 3C138024 */ lui $s3, %hi(D_80243090) -/* 9AE8A0 802401A0 26733090 */ addiu $s3, $s3, %lo(D_80243090) -/* 9AE8A4 802401A4 24430058 */ addiu $v1, $v0, 0x58 -/* 9AE8A8 802401A8 AC400054 */ sw $zero, 0x54($v0) -/* 9AE8AC 802401AC AC540058 */ sw $s4, 0x58($v0) -/* 9AE8B0 802401B0 AC40005C */ sw $zero, 0x5c($v0) -/* 9AE8B4 802401B4 8E650010 */ lw $a1, 0x10($s3) -/* 9AE8B8 802401B8 8E660014 */ lw $a2, 0x14($s3) -/* 9AE8BC 802401BC 8E670018 */ lw $a3, 0x18($s3) -/* 9AE8C0 802401C0 24420060 */ addiu $v0, $v0, 0x60 -/* 9AE8C4 802401C4 AE230000 */ sw $v1, ($s1) -/* 9AE8C8 802401C8 0C019E40 */ jal guTranslateF -/* 9AE8CC 802401CC AE220000 */ sw $v0, ($s1) -/* 9AE8D0 802401D0 27B00080 */ addiu $s0, $sp, 0x80 -/* 9AE8D4 802401D4 8E65001C */ lw $a1, 0x1c($s3) -/* 9AE8D8 802401D8 3C013F80 */ lui $at, 0x3f80 -/* 9AE8DC 802401DC 4481B000 */ mtc1 $at, $f22 -/* 9AE8E0 802401E0 4480A000 */ mtc1 $zero, $f20 -/* 9AE8E4 802401E4 4406B000 */ mfc1 $a2, $f22 -/* 9AE8E8 802401E8 4407A000 */ mfc1 $a3, $f20 -/* 9AE8EC 802401EC 0200202D */ daddu $a0, $s0, $zero -/* 9AE8F0 802401F0 0C019EC8 */ jal guRotateF -/* 9AE8F4 802401F4 E7B40010 */ swc1 $f20, 0x10($sp) -/* 9AE8F8 802401F8 0200202D */ daddu $a0, $s0, $zero -/* 9AE8FC 802401FC 0240282D */ daddu $a1, $s2, $zero -/* 9AE900 80240200 0C019D80 */ jal guMtxCatF -/* 9AE904 80240204 0240302D */ daddu $a2, $s2, $zero -/* 9AE908 80240208 8E650020 */ lw $a1, 0x20($s3) -/* 9AE90C 8024020C 4406A000 */ mfc1 $a2, $f20 -/* 9AE910 80240210 4407B000 */ mfc1 $a3, $f22 -/* 9AE914 80240214 0200202D */ daddu $a0, $s0, $zero -/* 9AE918 80240218 0C019EC8 */ jal guRotateF -/* 9AE91C 8024021C E7B40010 */ swc1 $f20, 0x10($sp) -/* 9AE920 80240220 0200202D */ daddu $a0, $s0, $zero -/* 9AE924 80240224 0240282D */ daddu $a1, $s2, $zero -/* 9AE928 80240228 0C019D80 */ jal guMtxCatF -/* 9AE92C 8024022C 0240302D */ daddu $a2, $s2, $zero -/* 9AE930 80240230 8E650024 */ lw $a1, 0x24($s3) -/* 9AE934 80240234 4406A000 */ mfc1 $a2, $f20 -/* 9AE938 80240238 0200202D */ daddu $a0, $s0, $zero -/* 9AE93C 8024023C E7B60010 */ swc1 $f22, 0x10($sp) -/* 9AE940 80240240 0C019EC8 */ jal guRotateF -/* 9AE944 80240244 00C0382D */ daddu $a3, $a2, $zero -/* 9AE948 80240248 0200202D */ daddu $a0, $s0, $zero -/* 9AE94C 8024024C 0240282D */ daddu $a1, $s2, $zero -/* 9AE950 80240250 0C019D80 */ jal guMtxCatF -/* 9AE954 80240254 0240302D */ daddu $a2, $s2, $zero -/* 9AE958 80240258 8E650028 */ lw $a1, 0x28($s3) -/* 9AE95C 8024025C 8E66002C */ lw $a2, 0x2c($s3) -/* 9AE960 80240260 8E670030 */ lw $a3, 0x30($s3) -/* 9AE964 80240264 0C019DF0 */ jal guScaleF -/* 9AE968 80240268 0200202D */ daddu $a0, $s0, $zero -/* 9AE96C 8024026C 0200202D */ daddu $a0, $s0, $zero -/* 9AE970 80240270 0240282D */ daddu $a1, $s2, $zero -/* 9AE974 80240274 0C019D80 */ jal guMtxCatF -/* 9AE978 80240278 0240302D */ daddu $a2, $s2, $zero -/* 9AE97C 8024027C 0240202D */ daddu $a0, $s2, $zero -/* 9AE980 80240280 3C108007 */ lui $s0, %hi(gMatrixListPos) -/* 9AE984 80240284 261041F0 */ addiu $s0, $s0, %lo(gMatrixListPos) -/* 9AE988 80240288 3C12800A */ lui $s2, %hi(gDisplayContext) -/* 9AE98C 8024028C 2652A674 */ addiu $s2, $s2, %lo(gDisplayContext) -/* 9AE990 80240290 96050000 */ lhu $a1, ($s0) -/* 9AE994 80240294 8E420000 */ lw $v0, ($s2) -/* 9AE998 80240298 00052980 */ sll $a1, $a1, 6 -/* 9AE99C 8024029C 00B52821 */ addu $a1, $a1, $s5 -/* 9AE9A0 802402A0 0C019D40 */ jal guMtxF2L -/* 9AE9A4 802402A4 00452821 */ addu $a1, $v0, $a1 -/* 9AE9A8 802402A8 3C03DA38 */ lui $v1, 0xda38 -/* 9AE9AC 802402AC 34630002 */ ori $v1, $v1, 2 -/* 9AE9B0 802402B0 8E220000 */ lw $v0, ($s1) -/* 9AE9B4 802402B4 96040000 */ lhu $a0, ($s0) -/* 9AE9B8 802402B8 0040282D */ daddu $a1, $v0, $zero -/* 9AE9BC 802402BC 24420008 */ addiu $v0, $v0, 8 -/* 9AE9C0 802402C0 AE220000 */ sw $v0, ($s1) -/* 9AE9C4 802402C4 3082FFFF */ andi $v0, $a0, 0xffff -/* 9AE9C8 802402C8 00021180 */ sll $v0, $v0, 6 -/* 9AE9CC 802402CC ACA30000 */ sw $v1, ($a1) -/* 9AE9D0 802402D0 8E430000 */ lw $v1, ($s2) -/* 9AE9D4 802402D4 00551021 */ addu $v0, $v0, $s5 -/* 9AE9D8 802402D8 00621821 */ addu $v1, $v1, $v0 -/* 9AE9DC 802402DC 3C028000 */ lui $v0, 0x8000 -/* 9AE9E0 802402E0 00621821 */ addu $v1, $v1, $v0 -/* 9AE9E4 802402E4 ACA30004 */ sw $v1, 4($a1) -/* 9AE9E8 802402E8 3C038007 */ lui $v1, %hi(gGameStatusPtr) -/* 9AE9EC 802402EC 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) -/* 9AE9F0 802402F0 24020008 */ addiu $v0, $zero, 8 -/* 9AE9F4 802402F4 AE620008 */ sw $v0, 8($s3) -/* 9AE9F8 802402F8 94620134 */ lhu $v0, 0x134($v1) -/* 9AE9FC 802402FC 24840001 */ addiu $a0, $a0, 1 -/* 9AEA00 80240300 30430003 */ andi $v1, $v0, 3 -/* 9AEA04 80240304 14600003 */ bnez $v1, .L80240314 -/* 9AEA08 80240308 A6040000 */ sh $a0, ($s0) -/* 9AEA0C 8024030C 080900CC */ j .L80240330 -/* 9AEA10 80240310 24020025 */ addiu $v0, $zero, 0x25 -.L80240314: -/* 9AEA14 80240314 2C620002 */ sltiu $v0, $v1, 2 -/* 9AEA18 80240318 14400005 */ bnez $v0, .L80240330 -/* 9AEA1C 8024031C 24020026 */ addiu $v0, $zero, 0x26 -/* 9AEA20 80240320 2C620003 */ sltiu $v0, $v1, 3 -/* 9AEA24 80240324 14400002 */ bnez $v0, .L80240330 -/* 9AEA28 80240328 24020027 */ addiu $v0, $zero, 0x27 -/* 9AEA2C 8024032C 24020024 */ addiu $v0, $zero, 0x24 -.L80240330: -/* 9AEA30 80240330 AE62000C */ sw $v0, 0xc($s3) -/* 9AEA34 80240334 8E650008 */ lw $a1, 8($s3) -/* 9AEA38 80240338 8E66000C */ lw $a2, 0xc($s3) -/* 9AEA3C 8024033C 0C0B7811 */ jal spr_get_player_raster_info -/* 9AEA40 80240340 27A40030 */ addiu $a0, $sp, 0x30 -/* 9AEA44 80240344 27A50018 */ addiu $a1, $sp, 0x18 -/* 9AEA48 80240348 0000302D */ daddu $a2, $zero, $zero -/* 9AEA4C 8024034C 27A70040 */ addiu $a3, $sp, 0x40 -/* 9AEA50 80240350 8E640000 */ lw $a0, ($s3) -/* 9AEA54 80240354 8FA80030 */ lw $t0, 0x30($sp) -/* 9AEA58 80240358 8FA90034 */ lw $t1, 0x34($sp) -/* 9AEA5C 8024035C 97AA003A */ lhu $t2, 0x3a($sp) -/* 9AEA60 80240360 97AB003E */ lhu $t3, 0x3e($sp) -/* 9AEA64 80240364 8FA30038 */ lw $v1, 0x38($sp) -/* 9AEA68 80240368 240200FF */ addiu $v0, $zero, 0xff -/* 9AEA6C 8024036C A3A20028 */ sb $v0, 0x28($sp) -/* 9AEA70 80240370 000317C2 */ srl $v0, $v1, 0x1f -/* 9AEA74 80240374 00621821 */ addu $v1, $v1, $v0 -/* 9AEA78 80240378 00031843 */ sra $v1, $v1, 1 -/* 9AEA7C 8024037C 8FA2003C */ lw $v0, 0x3c($sp) -/* 9AEA80 80240380 00031823 */ negu $v1, $v1 -/* 9AEA84 80240384 AFA80018 */ sw $t0, 0x18($sp) -/* 9AEA88 80240388 AFA9001C */ sw $t1, 0x1c($sp) -/* 9AEA8C 8024038C A7AA0020 */ sh $t2, 0x20($sp) -/* 9AEA90 80240390 A7AB0022 */ sh $t3, 0x22($sp) -/* 9AEA94 80240394 A7A30024 */ sh $v1, 0x24($sp) -/* 9AEA98 80240398 00021FC2 */ srl $v1, $v0, 0x1f -/* 9AEA9C 8024039C 00431021 */ addu $v0, $v0, $v1 -/* 9AEAA0 802403A0 00021043 */ sra $v0, $v0, 1 -/* 9AEAA4 802403A4 0C04EBDC */ jal fold_appendGfx_component -/* 9AEAA8 802403A8 A7A20026 */ sh $v0, 0x26($sp) -/* 9AEAAC 802403AC 3C05D838 */ lui $a1, 0xd838 -/* 9AEAB0 802403B0 3C03800A */ lui $v1, %hi(gMasterGfxPos) -/* 9AEAB4 802403B4 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) -/* 9AEAB8 802403B8 8C620000 */ lw $v0, ($v1) -/* 9AEABC 802403BC 34A50002 */ ori $a1, $a1, 2 -/* 9AEAC0 802403C0 0040202D */ daddu $a0, $v0, $zero -/* 9AEAC4 802403C4 24420008 */ addiu $v0, $v0, 8 -/* 9AEAC8 802403C8 AC620000 */ sw $v0, ($v1) -/* 9AEACC 802403CC 24020040 */ addiu $v0, $zero, 0x40 -/* 9AEAD0 802403D0 AC850000 */ sw $a1, ($a0) -/* 9AEAD4 802403D4 AC820004 */ sw $v0, 4($a0) -/* 9AEAD8 802403D8 8FBF00D8 */ lw $ra, 0xd8($sp) -/* 9AEADC 802403DC 8FB500D4 */ lw $s5, 0xd4($sp) -/* 9AEAE0 802403E0 8FB400D0 */ lw $s4, 0xd0($sp) -/* 9AEAE4 802403E4 8FB300CC */ lw $s3, 0xcc($sp) -/* 9AEAE8 802403E8 8FB200C8 */ lw $s2, 0xc8($sp) -/* 9AEAEC 802403EC 8FB100C4 */ lw $s1, 0xc4($sp) -/* 9AEAF0 802403F0 8FB000C0 */ lw $s0, 0xc0($sp) -/* 9AEAF4 802403F4 D7B600E8 */ ldc1 $f22, 0xe8($sp) -/* 9AEAF8 802403F8 D7B400E0 */ ldc1 $f20, 0xe0($sp) -/* 9AEAFC 802403FC 03E00008 */ jr $ra -/* 9AEB00 80240400 27BD00F0 */ addiu $sp, $sp, 0xf0 diff --git a/ver/us/asm/nonmatchings/world/area_trd/trd_05/9AE700/func_80240404_9AEB04.s b/ver/us/asm/nonmatchings/world/area_trd/trd_05/9AE700/func_80240404_9AEB04.s deleted file mode 100644 index 4050ae8195..0000000000 --- a/ver/us/asm/nonmatchings/world/area_trd/trd_05/9AE700/func_80240404_9AEB04.s +++ /dev/null @@ -1,62 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_80243070_9B1770 -.double 0.7142857142857143 - -.section .text - -glabel func_80240404_9AEB04 -/* 9AEB04 80240404 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9AEB08 80240408 3C028011 */ lui $v0, %hi(gPlayerStatus) -/* 9AEB0C 8024040C 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) -/* 9AEB10 80240410 AFBF0014 */ sw $ra, 0x14($sp) -/* 9AEB14 80240414 AFB00010 */ sw $s0, 0x10($sp) -/* 9AEB18 80240418 844300B0 */ lh $v1, 0xb0($v0) -/* 9AEB1C 8024041C 3C018024 */ lui $at, %hi(D_80243070_9B1770) -/* 9AEB20 80240420 D4203070 */ ldc1 $f0, %lo(D_80243070_9B1770)($at) -/* 9AEB24 80240424 44831000 */ mtc1 $v1, $f2 -/* 9AEB28 80240428 00000000 */ nop -/* 9AEB2C 8024042C 468010A1 */ cvt.d.w $f2, $f2 -/* 9AEB30 80240430 46201082 */ mul.d $f2, $f2, $f0 -/* 9AEB34 80240434 00000000 */ nop -/* 9AEB38 80240438 24040001 */ addiu $a0, $zero, 1 -/* 9AEB3C 8024043C 3C108024 */ lui $s0, %hi(D_80243090) -/* 9AEB40 80240440 26103090 */ addiu $s0, $s0, %lo(D_80243090) -/* 9AEB44 80240444 C44A0028 */ lwc1 $f10, 0x28($v0) -/* 9AEB48 80240448 3C013FE0 */ lui $at, 0x3fe0 -/* 9AEB4C 8024044C 44812800 */ mtc1 $at, $f5 -/* 9AEB50 80240450 44802000 */ mtc1 $zero, $f4 -/* 9AEB54 80240454 C4480030 */ lwc1 $f8, 0x30($v0) -/* 9AEB58 80240458 3C013F36 */ lui $at, 0x3f36 -/* 9AEB5C 8024045C 3421DB6E */ ori $at, $at, 0xdb6e -/* 9AEB60 80240460 44813000 */ mtc1 $at, $f6 -/* 9AEB64 80240464 C440002C */ lwc1 $f0, 0x2c($v0) -/* 9AEB68 80240468 46241082 */ mul.d $f2, $f2, $f4 -/* 9AEB6C 8024046C 00000000 */ nop -/* 9AEB70 80240470 AE00001C */ sw $zero, 0x1c($s0) -/* 9AEB74 80240474 AE000020 */ sw $zero, 0x20($s0) -/* 9AEB78 80240478 AE000024 */ sw $zero, 0x24($s0) -/* 9AEB7C 8024047C E60A0010 */ swc1 $f10, 0x10($s0) -/* 9AEB80 80240480 E6080018 */ swc1 $f8, 0x18($s0) -/* 9AEB84 80240484 E6060028 */ swc1 $f6, 0x28($s0) -/* 9AEB88 80240488 46000021 */ cvt.d.s $f0, $f0 -/* 9AEB8C 8024048C 46220000 */ add.d $f0, $f0, $f2 -/* 9AEB90 80240490 E606002C */ swc1 $f6, 0x2c($s0) -/* 9AEB94 80240494 E6060030 */ swc1 $f6, 0x30($s0) -/* 9AEB98 80240498 46200020 */ cvt.s.d $f0, $f0 -/* 9AEB9C 8024049C 0C04E9C1 */ jal func_8013A704 -/* 9AEBA0 802404A0 E6000014 */ swc1 $f0, 0x14($s0) -/* 9AEBA4 802404A4 0000202D */ daddu $a0, $zero, $zero -/* 9AEBA8 802404A8 3C058024 */ lui $a1, %hi(func_80240020_9AE720) -/* 9AEBAC 802404AC 24A50020 */ addiu $a1, $a1, %lo(func_80240020_9AE720) -/* 9AEBB0 802404B0 0C048C56 */ jal create_generic_entity_world -/* 9AEBB4 802404B4 AE020000 */ sw $v0, ($s0) -/* 9AEBB8 802404B8 AE020004 */ sw $v0, 4($s0) -/* 9AEBBC 802404BC 8FBF0014 */ lw $ra, 0x14($sp) -/* 9AEBC0 802404C0 8FB00010 */ lw $s0, 0x10($sp) -/* 9AEBC4 802404C4 24020002 */ addiu $v0, $zero, 2 -/* 9AEBC8 802404C8 03E00008 */ jr $ra -/* 9AEBCC 802404CC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_trd/trd_05/9AE700/func_802404D0_9AEBD0.s b/ver/us/asm/nonmatchings/world/area_trd/trd_05/9AE700/func_802404D0_9AEBD0.s deleted file mode 100644 index 91eca0a0ea..0000000000 --- a/ver/us/asm/nonmatchings/world/area_trd/trd_05/9AE700/func_802404D0_9AEBD0.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802404D0_9AEBD0 -/* 9AEBD0 802404D0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9AEBD4 802404D4 AFB00010 */ sw $s0, 0x10($sp) -/* 9AEBD8 802404D8 3C108024 */ lui $s0, %hi(D_80243090) -/* 9AEBDC 802404DC 26103090 */ addiu $s0, $s0, %lo(D_80243090) -/* 9AEBE0 802404E0 AFBF0014 */ sw $ra, 0x14($sp) -/* 9AEBE4 802404E4 0C04EA15 */ jal func_8013A854 -/* 9AEBE8 802404E8 8E040000 */ lw $a0, ($s0) -/* 9AEBEC 802404EC 0C048D70 */ jal free_generic_entity -/* 9AEBF0 802404F0 8E040004 */ lw $a0, 4($s0) -/* 9AEBF4 802404F4 8FBF0014 */ lw $ra, 0x14($sp) -/* 9AEBF8 802404F8 8FB00010 */ lw $s0, 0x10($sp) -/* 9AEBFC 802404FC 24020002 */ addiu $v0, $zero, 2 -/* 9AEC00 80240500 03E00008 */ jr $ra -/* 9AEC04 80240504 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_trd/trd_05/9AE700/func_80240508_9AEC08.s b/ver/us/asm/nonmatchings/world/area_trd/trd_05/9AE700/func_80240508_9AEC08.s deleted file mode 100644 index 800ef6751e..0000000000 --- a/ver/us/asm/nonmatchings/world/area_trd/trd_05/9AE700/func_80240508_9AEC08.s +++ /dev/null @@ -1,72 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_80243078_9B1778 -.double 0.7142857142857143, 8.42766302714809e+252, 0.0 - -.section .text - -glabel func_80240508_9AEC08 -/* 9AEC08 80240508 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 9AEC0C 8024050C AFB10014 */ sw $s1, 0x14($sp) -/* 9AEC10 80240510 0080882D */ daddu $s1, $a0, $zero -/* 9AEC14 80240514 AFBF001C */ sw $ra, 0x1c($sp) -/* 9AEC18 80240518 AFB20018 */ sw $s2, 0x18($sp) -/* 9AEC1C 8024051C AFB00010 */ sw $s0, 0x10($sp) -/* 9AEC20 80240520 8E30000C */ lw $s0, 0xc($s1) -/* 9AEC24 80240524 8E050000 */ lw $a1, ($s0) -/* 9AEC28 80240528 0C0B210B */ jal evt_get_float_variable -/* 9AEC2C 8024052C 26100004 */ addiu $s0, $s0, 4 -/* 9AEC30 80240530 8E050000 */ lw $a1, ($s0) -/* 9AEC34 80240534 26100004 */ addiu $s0, $s0, 4 -/* 9AEC38 80240538 4600018D */ trunc.w.s $f6, $f0 -/* 9AEC3C 8024053C 44123000 */ mfc1 $s2, $f6 -/* 9AEC40 80240540 0C0B210B */ jal evt_get_float_variable -/* 9AEC44 80240544 0220202D */ daddu $a0, $s1, $zero -/* 9AEC48 80240548 8E050000 */ lw $a1, ($s0) -/* 9AEC4C 8024054C 4600018D */ trunc.w.s $f6, $f0 -/* 9AEC50 80240550 44103000 */ mfc1 $s0, $f6 -/* 9AEC54 80240554 0C0B210B */ jal evt_get_float_variable -/* 9AEC58 80240558 0220202D */ daddu $a0, $s1, $zero -/* 9AEC5C 8024055C 3C028011 */ lui $v0, %hi(gPlayerStatus+0xB0) -/* 9AEC60 80240560 8442F078 */ lh $v0, %lo(gPlayerStatus+0xB0)($v0) -/* 9AEC64 80240564 3C018024 */ lui $at, %hi(D_80243078_9B1778) -/* 9AEC68 80240568 D4223078 */ ldc1 $f2, %lo(D_80243078_9B1778)($at) -/* 9AEC6C 8024056C 44822000 */ mtc1 $v0, $f4 -/* 9AEC70 80240570 00000000 */ nop -/* 9AEC74 80240574 46802121 */ cvt.d.w $f4, $f4 -/* 9AEC78 80240578 46222102 */ mul.d $f4, $f4, $f2 -/* 9AEC7C 8024057C 00000000 */ nop -/* 9AEC80 80240580 3C013FE0 */ lui $at, 0x3fe0 -/* 9AEC84 80240584 44811800 */ mtc1 $at, $f3 -/* 9AEC88 80240588 44801000 */ mtc1 $zero, $f2 -/* 9AEC8C 8024058C 00000000 */ nop -/* 9AEC90 80240590 46222102 */ mul.d $f4, $f4, $f2 -/* 9AEC94 80240594 00000000 */ nop -/* 9AEC98 80240598 4600018D */ trunc.w.s $f6, $f0 -/* 9AEC9C 8024059C 44033000 */ mfc1 $v1, $f6 -/* 9AECA0 802405A0 44900000 */ mtc1 $s0, $f0 -/* 9AECA4 802405A4 00000000 */ nop -/* 9AECA8 802405A8 46800021 */ cvt.d.w $f0, $f0 -/* 9AECAC 802405AC 3C028024 */ lui $v0, %hi(D_80243090) -/* 9AECB0 802405B0 24423090 */ addiu $v0, $v0, %lo(D_80243090) -/* 9AECB4 802405B4 44921000 */ mtc1 $s2, $f2 -/* 9AECB8 802405B8 00000000 */ nop -/* 9AECBC 802405BC 468010A0 */ cvt.s.w $f2, $f2 -/* 9AECC0 802405C0 E4420010 */ swc1 $f2, 0x10($v0) -/* 9AECC4 802405C4 46240000 */ add.d $f0, $f0, $f4 -/* 9AECC8 802405C8 44831000 */ mtc1 $v1, $f2 -/* 9AECCC 802405CC 00000000 */ nop -/* 9AECD0 802405D0 468010A0 */ cvt.s.w $f2, $f2 -/* 9AECD4 802405D4 E4420018 */ swc1 $f2, 0x18($v0) -/* 9AECD8 802405D8 46200020 */ cvt.s.d $f0, $f0 -/* 9AECDC 802405DC E4400014 */ swc1 $f0, 0x14($v0) -/* 9AECE0 802405E0 8FBF001C */ lw $ra, 0x1c($sp) -/* 9AECE4 802405E4 8FB20018 */ lw $s2, 0x18($sp) -/* 9AECE8 802405E8 8FB10014 */ lw $s1, 0x14($sp) -/* 9AECEC 802405EC 8FB00010 */ lw $s0, 0x10($sp) -/* 9AECF0 802405F0 24020002 */ addiu $v0, $zero, 2 -/* 9AECF4 802405F4 03E00008 */ jr $ra -/* 9AECF8 802405F8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_trd/trd_05/9AE700/func_802405FC_9AECFC.s b/ver/us/asm/nonmatchings/world/area_trd/trd_05/9AE700/func_802405FC_9AECFC.s deleted file mode 100644 index 7d34dc3445..0000000000 --- a/ver/us/asm/nonmatchings/world/area_trd/trd_05/9AE700/func_802405FC_9AECFC.s +++ /dev/null @@ -1,79 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802405FC_9AECFC -/* 9AECFC 802405FC 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 9AED00 80240600 AFB10014 */ sw $s1, 0x14($sp) -/* 9AED04 80240604 0080882D */ daddu $s1, $a0, $zero -/* 9AED08 80240608 AFBF0020 */ sw $ra, 0x20($sp) -/* 9AED0C 8024060C AFB3001C */ sw $s3, 0x1c($sp) -/* 9AED10 80240610 AFB20018 */ sw $s2, 0x18($sp) -/* 9AED14 80240614 AFB00010 */ sw $s0, 0x10($sp) -/* 9AED18 80240618 8E30000C */ lw $s0, 0xc($s1) -/* 9AED1C 8024061C 8E050000 */ lw $a1, ($s0) -/* 9AED20 80240620 0C0B1EAF */ jal evt_get_variable -/* 9AED24 80240624 26100004 */ addiu $s0, $s0, 4 -/* 9AED28 80240628 8E050000 */ lw $a1, ($s0) -/* 9AED2C 8024062C 26100004 */ addiu $s0, $s0, 4 -/* 9AED30 80240630 0220202D */ daddu $a0, $s1, $zero -/* 9AED34 80240634 0C0B210B */ jal evt_get_float_variable -/* 9AED38 80240638 0040902D */ daddu $s2, $v0, $zero -/* 9AED3C 8024063C 8E050000 */ lw $a1, ($s0) -/* 9AED40 80240640 26100004 */ addiu $s0, $s0, 4 -/* 9AED44 80240644 4600020D */ trunc.w.s $f8, $f0 -/* 9AED48 80240648 44134000 */ mfc1 $s3, $f8 -/* 9AED4C 8024064C 0C0B210B */ jal evt_get_float_variable -/* 9AED50 80240650 0220202D */ daddu $a0, $s1, $zero -/* 9AED54 80240654 8E050000 */ lw $a1, ($s0) -/* 9AED58 80240658 4600020D */ trunc.w.s $f8, $f0 -/* 9AED5C 8024065C 44104000 */ mfc1 $s0, $f8 -/* 9AED60 80240660 0C0B210B */ jal evt_get_float_variable -/* 9AED64 80240664 0220202D */ daddu $a0, $s1, $zero -/* 9AED68 80240668 4600020D */ trunc.w.s $f8, $f0 -/* 9AED6C 8024066C 44044000 */ mfc1 $a0, $f8 -/* 9AED70 80240670 3C028024 */ lui $v0, %hi(D_80243090) -/* 9AED74 80240674 24423090 */ addiu $v0, $v0, %lo(D_80243090) -/* 9AED78 80240678 1640000E */ bnez $s2, .L802406B4 -/* 9AED7C 8024067C 0040182D */ daddu $v1, $v0, $zero -/* 9AED80 80240680 44930000 */ mtc1 $s3, $f0 -/* 9AED84 80240684 00000000 */ nop -/* 9AED88 80240688 46800020 */ cvt.s.w $f0, $f0 -/* 9AED8C 8024068C E440001C */ swc1 $f0, 0x1c($v0) -/* 9AED90 80240690 44900000 */ mtc1 $s0, $f0 -/* 9AED94 80240694 00000000 */ nop -/* 9AED98 80240698 46800020 */ cvt.s.w $f0, $f0 -/* 9AED9C 8024069C E4400020 */ swc1 $f0, 0x20($v0) -/* 9AEDA0 802406A0 44840000 */ mtc1 $a0, $f0 -/* 9AEDA4 802406A4 00000000 */ nop -/* 9AEDA8 802406A8 46800020 */ cvt.s.w $f0, $f0 -/* 9AEDAC 802406AC 080901BF */ j .L802406FC -/* 9AEDB0 802406B0 E4400024 */ swc1 $f0, 0x24($v0) -.L802406B4: -/* 9AEDB4 802406B4 C466001C */ lwc1 $f6, 0x1c($v1) -/* 9AEDB8 802406B8 44930000 */ mtc1 $s3, $f0 -/* 9AEDBC 802406BC 00000000 */ nop -/* 9AEDC0 802406C0 46800020 */ cvt.s.w $f0, $f0 -/* 9AEDC4 802406C4 46003180 */ add.s $f6, $f6, $f0 -/* 9AEDC8 802406C8 C4640020 */ lwc1 $f4, 0x20($v1) -/* 9AEDCC 802406CC 44900000 */ mtc1 $s0, $f0 -/* 9AEDD0 802406D0 00000000 */ nop -/* 9AEDD4 802406D4 46800020 */ cvt.s.w $f0, $f0 -/* 9AEDD8 802406D8 46002100 */ add.s $f4, $f4, $f0 -/* 9AEDDC 802406DC C4620024 */ lwc1 $f2, 0x24($v1) -/* 9AEDE0 802406E0 44840000 */ mtc1 $a0, $f0 -/* 9AEDE4 802406E4 00000000 */ nop -/* 9AEDE8 802406E8 46800020 */ cvt.s.w $f0, $f0 -/* 9AEDEC 802406EC 46001080 */ add.s $f2, $f2, $f0 -/* 9AEDF0 802406F0 E466001C */ swc1 $f6, 0x1c($v1) -/* 9AEDF4 802406F4 E4640020 */ swc1 $f4, 0x20($v1) -/* 9AEDF8 802406F8 E4620024 */ swc1 $f2, 0x24($v1) -.L802406FC: -/* 9AEDFC 802406FC 8FBF0020 */ lw $ra, 0x20($sp) -/* 9AEE00 80240700 8FB3001C */ lw $s3, 0x1c($sp) -/* 9AEE04 80240704 8FB20018 */ lw $s2, 0x18($sp) -/* 9AEE08 80240708 8FB10014 */ lw $s1, 0x14($sp) -/* 9AEE0C 8024070C 8FB00010 */ lw $s0, 0x10($sp) -/* 9AEE10 80240710 24020002 */ addiu $v0, $zero, 2 -/* 9AEE14 80240714 03E00008 */ jr $ra -/* 9AEE18 80240718 27BD0028 */ addiu $sp, $sp, 0x28 -/* 9AEE1C 8024071C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_trd/trd_09/9BD660/func_80240000_9BD660.s b/ver/us/asm/nonmatchings/world/area_trd/trd_09/9BD660/func_80240000_9BD660.s deleted file mode 100644 index 706ab47d5d..0000000000 --- a/ver/us/asm/nonmatchings/world/area_trd/trd_09/9BD660/func_80240000_9BD660.s +++ /dev/null @@ -1,55 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_9BD660 -/* 9BD660 80240000 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 9BD664 80240004 AFB3001C */ sw $s3, 0x1c($sp) -/* 9BD668 80240008 0080982D */ daddu $s3, $a0, $zero -/* 9BD66C 8024000C AFBF0024 */ sw $ra, 0x24($sp) -/* 9BD670 80240010 AFB40020 */ sw $s4, 0x20($sp) -/* 9BD674 80240014 AFB20018 */ sw $s2, 0x18($sp) -/* 9BD678 80240018 AFB10014 */ sw $s1, 0x14($sp) -/* 9BD67C 8024001C AFB00010 */ sw $s0, 0x10($sp) -/* 9BD680 80240020 8E70000C */ lw $s0, 0xc($s3) -/* 9BD684 80240024 8E720148 */ lw $s2, 0x148($s3) -/* 9BD688 80240028 8E050000 */ lw $a1, ($s0) -/* 9BD68C 8024002C 0C0B1EAF */ jal evt_get_variable -/* 9BD690 80240030 26100004 */ addiu $s0, $s0, 4 -/* 9BD694 80240034 0040882D */ daddu $s1, $v0, $zero -/* 9BD698 80240038 8E050000 */ lw $a1, ($s0) -/* 9BD69C 8024003C 26100004 */ addiu $s0, $s0, 4 -/* 9BD6A0 80240040 0C0B1EAF */ jal evt_get_variable -/* 9BD6A4 80240044 0260202D */ daddu $a0, $s3, $zero -/* 9BD6A8 80240048 0040A02D */ daddu $s4, $v0, $zero -/* 9BD6AC 8024004C 2402FFFF */ addiu $v0, $zero, -1 -/* 9BD6B0 80240050 16220002 */ bne $s1, $v0, .L8024005C -/* 9BD6B4 80240054 8E100000 */ lw $s0, ($s0) -/* 9BD6B8 80240058 86510008 */ lh $s1, 8($s2) -.L8024005C: -/* 9BD6BC 8024005C 0C00FB3A */ jal get_enemy -/* 9BD6C0 80240060 0220202D */ daddu $a0, $s1, $zero -/* 9BD6C4 80240064 0040902D */ daddu $s2, $v0, $zero -/* 9BD6C8 80240068 12400006 */ beqz $s2, .L80240084 -/* 9BD6CC 8024006C 0260202D */ daddu $a0, $s3, $zero -/* 9BD6D0 80240070 00141080 */ sll $v0, $s4, 2 -/* 9BD6D4 80240074 02421021 */ addu $v0, $s2, $v0 -/* 9BD6D8 80240078 8C46006C */ lw $a2, 0x6c($v0) -/* 9BD6DC 8024007C 08090023 */ j .L8024008C -/* 9BD6E0 80240080 0200282D */ daddu $a1, $s0, $zero -.L80240084: -/* 9BD6E4 80240084 0200282D */ daddu $a1, $s0, $zero -/* 9BD6E8 80240088 2406FFFF */ addiu $a2, $zero, -1 -.L8024008C: -/* 9BD6EC 8024008C 0C0B2026 */ jal evt_set_variable -/* 9BD6F0 80240090 00000000 */ nop -/* 9BD6F4 80240094 8FBF0024 */ lw $ra, 0x24($sp) -/* 9BD6F8 80240098 8FB40020 */ lw $s4, 0x20($sp) -/* 9BD6FC 8024009C 8FB3001C */ lw $s3, 0x1c($sp) -/* 9BD700 802400A0 8FB20018 */ lw $s2, 0x18($sp) -/* 9BD704 802400A4 8FB10014 */ lw $s1, 0x14($sp) -/* 9BD708 802400A8 8FB00010 */ lw $s0, 0x10($sp) -/* 9BD70C 802400AC 24020002 */ addiu $v0, $zero, 2 -/* 9BD710 802400B0 03E00008 */ jr $ra -/* 9BD714 802400B4 27BD0028 */ addiu $sp, $sp, 0x28 -/* 9BD718 802400B8 00000000 */ nop -/* 9BD71C 802400BC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_trd/trd_09/9BD720/func_802400C0_9BD720.s b/ver/us/asm/nonmatchings/world/area_trd/trd_09/9BD720/func_802400C0_9BD720.s deleted file mode 100644 index 0f05c072b9..0000000000 --- a/ver/us/asm/nonmatchings/world/area_trd/trd_09/9BD720/func_802400C0_9BD720.s +++ /dev/null @@ -1,78 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400C0_9BD720 -/* 9BD720 802400C0 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 9BD724 802400C4 3C048024 */ lui $a0, %hi(D_80245234_9C2894) -/* 9BD728 802400C8 24845234 */ addiu $a0, $a0, %lo(D_80245234_9C2894) -/* 9BD72C 802400CC AFBF0018 */ sw $ra, 0x18($sp) -/* 9BD730 802400D0 AFB10014 */ sw $s1, 0x14($sp) -/* 9BD734 802400D4 AFB00010 */ sw $s0, 0x10($sp) -/* 9BD738 802400D8 F7B40020 */ sdc1 $f20, 0x20($sp) -/* 9BD73C 802400DC 8C830000 */ lw $v1, ($a0) -/* 9BD740 802400E0 3C118011 */ lui $s1, %hi(gPlayerStatus) -/* 9BD744 802400E4 2631EFC8 */ addiu $s1, $s1, %lo(gPlayerStatus) -/* 9BD748 802400E8 28620003 */ slti $v0, $v1, 3 -/* 9BD74C 802400EC 50400007 */ beql $v0, $zero, .L8024010C -/* 9BD750 802400F0 24020003 */ addiu $v0, $zero, 3 -/* 9BD754 802400F4 1C60000C */ bgtz $v1, .L80240128 -/* 9BD758 802400F8 24620001 */ addiu $v0, $v1, 1 -/* 9BD75C 802400FC 10600007 */ beqz $v1, .L8024011C -/* 9BD760 80240100 0000102D */ daddu $v0, $zero, $zero -/* 9BD764 80240104 0809006E */ j .L802401B8 -/* 9BD768 80240108 00000000 */ nop -.L8024010C: -/* 9BD76C 8024010C 10620008 */ beq $v1, $v0, .L80240130 -/* 9BD770 80240110 0000102D */ daddu $v0, $zero, $zero -/* 9BD774 80240114 0809006E */ j .L802401B8 -/* 9BD778 80240118 00000000 */ nop -.L8024011C: -/* 9BD77C 8024011C 24020001 */ addiu $v0, $zero, 1 -/* 9BD780 80240120 0809006D */ j .L802401B4 -/* 9BD784 80240124 AC820000 */ sw $v0, ($a0) -.L80240128: -/* 9BD788 80240128 0809006D */ j .L802401B4 -/* 9BD78C 8024012C AC820000 */ sw $v0, ($a0) -.L80240130: -/* 9BD790 80240130 C6200028 */ lwc1 $f0, 0x28($s1) -/* 9BD794 80240134 3C0141F0 */ lui $at, 0x41f0 -/* 9BD798 80240138 44811000 */ mtc1 $at, $f2 -/* 9BD79C 8024013C 3C108011 */ lui $s0, %hi(wPartnerNpc) -/* 9BD7A0 80240140 2610C930 */ addiu $s0, $s0, %lo(wPartnerNpc) -/* 9BD7A4 80240144 46020001 */ sub.s $f0, $f0, $f2 -/* 9BD7A8 80240148 8E040000 */ lw $a0, ($s0) -/* 9BD7AC 8024014C E4800038 */ swc1 $f0, 0x38($a0) -/* 9BD7B0 80240150 C6200030 */ lwc1 $f0, 0x30($s1) -/* 9BD7B4 80240154 46020000 */ add.s $f0, $f0, $f2 -/* 9BD7B8 80240158 0C03BD17 */ jal partner_clear_player_tracking -/* 9BD7BC 8024015C E4800040 */ swc1 $f0, 0x40($a0) -/* 9BD7C0 80240160 C6200028 */ lwc1 $f0, 0x28($s1) -/* 9BD7C4 80240164 C6220030 */ lwc1 $f2, 0x30($s1) -/* 9BD7C8 80240168 4600010D */ trunc.w.s $f4, $f0 -/* 9BD7CC 8024016C 44042000 */ mfc1 $a0, $f4 -/* 9BD7D0 80240170 4600110D */ trunc.w.s $f4, $f2 -/* 9BD7D4 80240174 44052000 */ mfc1 $a1, $f4 -/* 9BD7D8 80240178 0C03BCF0 */ jal partner_set_goal_pos -/* 9BD7DC 8024017C 00000000 */ nop -/* 9BD7E0 80240180 0C03BCF5 */ jal func_800EF3D4 -/* 9BD7E4 80240184 0000202D */ daddu $a0, $zero, $zero -/* 9BD7E8 80240188 3C0142B4 */ lui $at, 0x42b4 -/* 9BD7EC 8024018C 4481A000 */ mtc1 $at, $f20 -/* 9BD7F0 80240190 8E040000 */ lw $a0, ($s0) -/* 9BD7F4 80240194 4405A000 */ mfc1 $a1, $f20 -/* 9BD7F8 80240198 0C00ECD0 */ jal set_npc_yaw -/* 9BD7FC 8024019C 00000000 */ nop -/* 9BD800 802401A0 24020002 */ addiu $v0, $zero, 2 -/* 9BD804 802401A4 E6340080 */ swc1 $f20, 0x80($s1) -/* 9BD808 802401A8 E6340084 */ swc1 $f20, 0x84($s1) -/* 9BD80C 802401AC 0809006E */ j .L802401B8 -/* 9BD810 802401B0 AE2000A8 */ sw $zero, 0xa8($s1) -.L802401B4: -/* 9BD814 802401B4 0000102D */ daddu $v0, $zero, $zero -.L802401B8: -/* 9BD818 802401B8 8FBF0018 */ lw $ra, 0x18($sp) -/* 9BD81C 802401BC 8FB10014 */ lw $s1, 0x14($sp) -/* 9BD820 802401C0 8FB00010 */ lw $s0, 0x10($sp) -/* 9BD824 802401C4 D7B40020 */ ldc1 $f20, 0x20($sp) -/* 9BD828 802401C8 03E00008 */ jr $ra -/* 9BD82C 802401CC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/world/area_trd/trd_10/9C2910/func_802407F4_9C3104.s b/ver/us/asm/nonmatchings/world/area_trd/trd_10/9C2910/func_802407F4_9C3104.s deleted file mode 100644 index f78f71c881..0000000000 --- a/ver/us/asm/nonmatchings/world/area_trd/trd_10/9C2910/func_802407F4_9C3104.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802407F4_9C3104 -/* 9C3104 802407F4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9C3108 802407F8 AFBF0010 */ sw $ra, 0x10($sp) -/* 9C310C 802407FC 0C00D77C */ jal func_80035DF0 -/* 9C3110 80240800 2404000A */ addiu $a0, $zero, 0xa -/* 9C3114 80240804 8FBF0010 */ lw $ra, 0x10($sp) -/* 9C3118 80240808 24020002 */ addiu $v0, $zero, 2 -/* 9C311C 8024080C 03E00008 */ jr $ra -/* 9C3120 80240810 27BD0018 */ addiu $sp, $sp, 0x18 -/* 9C3124 80240814 00000000 */ nop -/* 9C3128 80240818 00000000 */ nop -/* 9C312C 8024081C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_trd/trd_10/9C3130/func_80240820_9C3130.s b/ver/us/asm/nonmatchings/world/area_trd/trd_10/9C3130/func_80240820_9C3130.s deleted file mode 100644 index 855e7462e9..0000000000 --- a/ver/us/asm/nonmatchings/world/area_trd/trd_10/9C3130/func_80240820_9C3130.s +++ /dev/null @@ -1,17 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240820_9C3130 -/* 9C3130 80240820 3C038011 */ lui $v1, %hi(gPlayerData+0x12) -/* 9C3134 80240824 8063F2A2 */ lb $v1, %lo(gPlayerData+0x12)($v1) -/* 9C3138 80240828 24020003 */ addiu $v0, $zero, 3 -/* 9C313C 8024082C 54620003 */ bnel $v1, $v0, .L8024083C -/* 9C3140 80240830 AC800084 */ sw $zero, 0x84($a0) -/* 9C3144 80240834 24020001 */ addiu $v0, $zero, 1 -/* 9C3148 80240838 AC820084 */ sw $v0, 0x84($a0) -.L8024083C: -/* 9C314C 8024083C 03E00008 */ jr $ra -/* 9C3150 80240840 24020002 */ addiu $v0, $zero, 2 -/* 9C3154 80240844 00000000 */ nop -/* 9C3158 80240848 00000000 */ nop -/* 9C315C 8024084C 00000000 */ nop diff --git a/ver/us/splat.yaml b/ver/us/splat.yaml index f0ec8571b8..8ba4b5438f 100644 --- a/ver/us/splat.yaml +++ b/ver/us/splat.yaml @@ -5153,6 +5153,7 @@ segments: subsegments: - [0x70BD10, c, lakilester] - [0x70DEE0, data, 70DED0] + - [0x710EC0] - name: battle_partner_bow dir: battle/partner type: code diff --git a/ver/us/symbol_addrs.txt b/ver/us/symbol_addrs.txt index 8259d933fa..1e5b4041d2 100644 --- a/ver/us/symbol_addrs.txt +++ b/ver/us/symbol_addrs.txt @@ -5587,7 +5587,7 @@ InterpMotionBlurParams = 0x802D7BA4; // type:func rom:0xFC554 SetMotionBlurParams = 0x802D7CF8; // type:func rom:0xFC6A8 ShowSweat = 0x802D7E08; // type:func rom:0xFC7B8 ShowSleepBubble = 0x802D8028; // type:func rom:0xFC9D8 -SetSleepBubbleUnk1C = 0x802D8248; // type:func rom:0xFCBF8 +SetSleepBubbleTimeLeft = 0x802D8248; // type:func rom:0xFCBF8 PlayEffect = 0x802D829C; // type:func rom:0xFCC4C SetSpriteShading = 0x802D9700; // type:func rom:0xFE0B0 EnableSpriteShading = 0x802D9A3C; // type:func rom:0xFE3EC @@ -17377,7 +17377,7 @@ trd_03_UnkDistFunc = 0x8024011C; // type:func rom:0x9A476C trd_03_UnkNpcAIFunc12 = 0x80240250; // type:func rom:0x9A48A0 trd_03_set_script_owner_npc_col_height = 0x802403B4; // type:func rom:0x9A4A04 trd_03_TackleAI_Main = 0x80240434; // type:func rom:0x9A4A84 -func_80240880_9A4ED0 = 0x80240880; // type:func rom:0x9A4ED0 +trd_03_UnkTrigFunc001 = 0x80240880; // type:func rom:0x9A4ED0 D_80243D40_9A8390 = 0x80243D40; // type:data rom:0x9A8390 trd_04_UpdateTexturePanSmooth = 0x80240000; // type:func rom:0x9A83F0 trd_04_UpdateTexturePanStepped = 0x80240124; // type:func rom:0x9A8514 @@ -23533,7 +23533,7 @@ sam_01_LetterDelivery_CalcLetterPos = 0x80241884; // type:func rom:0xCF93F4 sam_01_LetterDelivery_SaveNpcAnim = 0x80241A10; // type:func rom:0xCF9580 sam_01_LetterDelivery_RestoreNpcAnim = 0x80241A54; // type:func rom:0xCF95C4 sam_01_GetItemEntityPosition = 0x80241A80; // type:func rom:0xCF95F0 -func_80241B20_CF9690 = 0x80241B20; // type:func rom:0xCF9690 +sam_01_UnkTrigFunc001 = 0x80241B20; // type:func rom:0xCF9690 dup_sam_01_StashVars = 0x80241C90; // type:func rom:0xCF9800 dup_sam_01_GetItemName = 0x80241D44; // type:func rom:0xCF98B4 sam_01_SomeItemEntityFunc = 0x80241DA8; // type:func rom:0xCF9918 @@ -26198,7 +26198,6 @@ flo_14_pad_2BF4 = 0x80242BF4; // type:data D_80242C00 = 0x80242C00; // type:data flo_08_pad_2EA8 = 0x80242EA8; // type:data D_80242FB0 = 0x80242FB0; // type:data -D_80243090 = 0x80243090; // type:data dgb_03_pad_30D8 = 0x802430D8; // type:data flo_11_pad_30EC = 0x802430EC; // type:data D_80243178 = 0x80243178; // type:data diff --git a/ver/us/undefined_syms.txt b/ver/us/undefined_syms.txt index 269e982641..7c28cfaf49 100644 --- a/ver/us/undefined_syms.txt +++ b/ver/us/undefined_syms.txt @@ -420,7 +420,6 @@ D_80242A00 = 0x80242A00; D_802429E0 = 0x802429E0; D_80242C00 = 0x80242C00; D_80242FB0 = 0x80242FB0; -D_80243090 = 0x80243090; D_80243190 = 0x80243190; D_80243374 = 0x80243374; D_80243720 = 0x80243720;