From 3c887e6ac3aeed5f61c642cf96a311ec81690952 Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Sat, 14 Aug 2021 02:27:57 +0900 Subject: [PATCH] curtains.c data work, assorted funcs, new file, etc and cleanup: misc decomp (#360) * PlayEffect progress, two insane funcs * PartnerActionStatus struct and some cleanup * file split * physics funcs * data migration, some decomp * curtains data, etc * git subrepo pull (merge) --force tools/splat subrepo: subdir: "tools/splat" merged: "b8bf80cd07" upstream: origin: "https://github.com/ethteck/splat.git" branch: "master" commit: "b8bf80cd07" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" * git subrepo pull tools/splat subrepo: subdir: "tools/splat" merged: "265b837554" upstream: origin: "https://github.com/ethteck/splat.git" branch: "master" commit: "265b837554" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" * PR comments --- .vscode/c_cpp_properties.json | 3 +- include/common_structs.h | 37 +- include/effects.h | 24 +- include/functions.h | 4 + include/mips.h | 14 + include/variables.h | 3 +- src/316C00.c | 52 ++- src/316d90.c | 53 ++- src/316f30.c | 2 +- src/362a0_len_2f70.c | 111 ++++- src/759b0_len_61b0.c | 137 +++++- src/77480.c | 9 +- src/7E9D0.c | 317 ++++++++++++++ src/7bb60_len_41b0.c | 404 ++++------------- src/7fd10_len_b40.c | 20 +- src/E21870.c | 4 +- src/curtains.c | 173 +++++++- src/encounter_api.c | 2 +- src/entity/Switch.c | 4 +- src/evt/fx_api.c | 414 +++++++++--------- src/evt/player_api.c | 2 +- src/npc.c | 2 +- src/world/action/encounter.c | 4 +- src/world/action/jump.c | 85 ++-- src/world/area_arn/arn_02/events.c | 2 +- src/world/area_arn/arn_04/events.c | 2 +- src/world/area_dgb/dgb_01/BFD9A0.c | 4 +- src/world/area_dgb/dgb_02/C2EBA0.c | 6 +- src/world/area_dgb/dgb_03/C31730.c | 6 +- src/world/area_dgb/dgb_04/C36530.c | 4 +- src/world/area_dgb/dgb_05/C3AA10.c | 6 +- src/world/area_dgb/dgb_07/C3DBF0.c | 6 +- src/world/area_dgb/dgb_08/C3FDB0.c | 4 +- src/world/area_dgb/dgb_09/C46BE0.c | 10 +- src/world/area_dgb/dgb_16/C52540.c | 6 +- src/world/area_flo/flo_21/CE6700.c | 2 +- src/world/common/UnkFunc24.inc.c | 2 +- src/world/common/UnkFunc40.inc.c | 2 +- src/world/common/UnkNpcAIFunc26.inc.c | 4 +- src/world/partner/bombette.c | 2 +- src/world/partner/goombario.c | 12 +- src/world/partners.c | 58 +-- src/world/script_api/7E4690.c | 2 +- tools/build/configure.py | 4 +- tools/splat/.gitrepo | 4 +- tools/splat/segtypes/n64/c.py | 17 +- tools/splat/segtypes/n64/vtx.py | 72 +++ tools/splat/segtypes/segment.py | 16 +- tools/splat/util/options.py | 3 + ver/us/asm/data/6e40_beginning_data.data.s | 72 --- ver/us/asm/data/fio.data.s | 72 --- .../check_conversation_trigger.s | 4 +- .../update_encounters_neutral.s | 4 +- .../update_encounters_post_battle.s | 4 +- ver/us/asm/nonmatchings/23680/func_800490B4.s | 4 +- .../316C00/func_802AE000_316C00.s | 110 ----- .../asm/nonmatchings/316d90/func_802AE000.s | 115 ----- .../362a0_len_2f70/_add_hit_vert_to_buffer.s | 28 -- .../362a0_len_2f70/func_8005DB00.s | 4 +- .../362a0_len_2f70/func_8005DD54.s | 45 -- .../362a0_len_2f70/get_collider_center.s | 33 -- .../362a0_len_2f70/get_collider_type_by_id.s | 17 - .../362a0_len_2f70/get_flat_collider_normal.s | 18 - .../npc_test_move_simple_with_slipping.s | 46 -- .../npc_test_move_simple_without_slipping.s | 46 -- .../npc_test_move_taller_with_slipping.s | 94 ---- .../npc_test_move_without_slipping.s | 127 ------ .../77480/get_overriding_player_anim.s | 4 +- .../nonmatchings/77480/update_player_blink.s | 4 +- .../7bb60_len_41b0/func_800E315C.s | 4 +- .../7bb60_len_41b0/gravity_use_fall_parms.s | 42 -- .../phys_adjust_cam_on_landing.s | 4 +- .../7bb60_len_41b0/phys_can_player_interact.s | 26 -- .../7bb60_len_41b0/phys_clear_spin_history.s | 23 - .../7bb60_len_41b0/phys_get_spin_history.s | 31 -- .../7bb60_len_41b0/phys_is_on_sloped_ground.s | 43 -- .../phys_main_collision_below.s | 4 +- .../7bb60_len_41b0/phys_reset_spin_history.s | 40 -- .../7bb60_len_41b0/phys_update_action_state.s | 4 +- .../nonmatchings/7fd10_len_b40/can_pause.s | 4 +- .../7fd10_len_b40/check_input_open_menus.s | 4 +- .../7fd10_len_b40/func_800E6904.s | 4 +- .../C50A0/test_item_player_collision.s | 4 +- .../E225B0/func_802B735C_E2290C.s | 4 +- .../asm/nonmatchings/camera/func_80032970.s | 4 +- .../jan_iwa/E2D730/func_802BB9E0_E2E310.s | 4 +- .../sbk_omo/E2F750/func_802BBA60_E303B0.s | 4 +- ver/us/asm/nonmatchings/npc/func_8003D660.s | 4 +- .../npc/npc_do_other_npc_collision.s | 8 +- .../action/encounter/func_802B6000_E28A30.s | 4 +- .../world/action/spin/func_802B6000_E25D60.s | 24 +- .../action/ultra_boots/func_802B6000_E26710.s | 16 +- .../iwa_01/90FBD0/func_80240520_90FBD0.s | 4 +- .../iwa_01/90FBD0/func_80241414_910AC4.s | 4 +- .../iwa_01/90FBD0/func_802422C4_911974.s | 4 +- .../iwa_02/915D70/func_80240000_915D70.s | 4 +- .../iwa_03/918EF0/func_80240340_918EF0.s | 4 +- .../iwa_04/91B8E0/func_80240080_91B960.s | 4 +- .../jan_11/B70860/func_80240000_B70860.s | 4 +- .../jan_11/B71010/func_802407DC_B7103C.s | 4 +- .../kgr_01/8A9A10/func_80240000_8A9A10.s | 4 +- .../kgr_02/8AA450/func_80240000_8AA450.s | 4 +- .../kgr_02/8AAB80/func_80240730_8AAB80.s | 4 +- .../kgr_02/8AAB80/func_80240748_8AAB98.s | 4 +- .../kpa_01/A46F60/func_80240000_A46F60.s | 4 +- .../kpa_03/A485C0/func_80240000_A485C0.s | 4 +- .../kpa_03/A48720/func_80240A48_A49008.s | 4 +- .../kpa_08/A4CAC0/func_802400A0_A4CAC0.s | 4 +- .../kpa_09/A4F0A0/func_802400A0_A4F0A0.s | 4 +- .../kpa_102/A93A50/func_80240310_A93A50.s | 4 +- .../kpa_102/A93A50/func_80241D30_A95470.s | 4 +- .../kpa_111/A99590/func_80240170_A99700.s | 4 +- .../kpa_115/A9ED40/func_80240170_A9EEB0.s | 4 +- .../kpa_12/A54CA0/func_80240444_A54D94.s | 4 +- .../kpa_13/A56270/func_80240444_A56364.s | 4 +- .../kpa_14/A574F0/func_8024034C_A577FC.s | 4 +- .../kpa_14/A57830/func_80240840_A57CF0.s | 4 +- .../kpa_50/A609D0/func_80240000_A609D0.s | 4 +- .../kpa_51/A640E0/func_80240050_A640E0.s | 4 +- .../kpa_52/A671E0/func_802400E0_A671E0.s | 4 +- .../kpa_61/A6E6F0/func_80240AE4_A6EEC4.s | 4 +- .../kzn_02/C5AA50/func_802403B0_C5AAF0.s | 4 +- .../kzn_04/C69180/func_80241050_C69180.s | 4 +- .../kzn_08/C71ED0/func_80243EE0_C75360.s | 4 +- .../kzn_10/C7E4B0/func_80240350_C7E4D0.s | 4 +- .../kzn_11/C804B0/func_80240434_C805D4.s | 4 +- .../kzn_11/C80600/func_80241F4C_C820EC.s | 4 +- .../kzn_17/C887B0/func_80242D20_C887D0.s | 4 +- .../mac_04/843030/func_802419AC_84457C.s | 4 +- .../omo_02/D9D510/func_80241948_D9EE18.s | 4 +- .../omo_09/DCCCD0/func_80240000_DCCCD0.s | 4 +- .../omo_09/DCCCD0/func_80240078_DCCD48.s | 4 +- .../omo_09/DCD6B0/func_80242358_DCF028.s | 4 +- .../omo_12/DDF310/func_80240184_DDF494.s | 4 +- .../omo_14/DE56B0/func_80240000_DE56B0.s | 4 +- .../omo_14/DE5810/func_80240564_DE5C14.s | 4 +- .../omo_14/DE5810/func_80240590_DE5C40.s | 4 +- .../omo_17/DEF400/func_802424AC_DF134C.s | 4 +- .../trd_08/9BB5B0/func_80240310_9BB5B0.s | 4 +- .../partner/bombette/func_802BD720_318470.s | 4 +- .../partner/bombette/func_802BD758_3184A8.s | 4 +- .../partner/bombette/func_802BE6E8_319438.s | 4 +- .../world/partner/bow/func_802BD694_323FE4.s | 4 +- .../world/partner/bow/func_802BDDF0_324740.s | 4 +- .../world/partner/bow/func_802BDF64_3248B4.s | 4 +- .../partner/goombario/func_802BD5D8_3174F8.s | 4 +- .../partner/goombario/func_802BDB30_317A50.s | 4 +- .../partner/kooper/func_802BD638_31B658.s | 4 +- .../partner/kooper/func_802BEA24_31CA44.s | 4 +- .../partner/lakilester/func_802BD6BC_32120C.s | 4 +- .../partner/lakilester/func_802BDDD8_321928.s | 4 +- .../partner/lakilester/func_802BE724_322274.s | 4 +- .../partner/lakilester/func_802BF4F0_323040.s | 4 +- .../partner/lakilester/func_802BFA00_323550.s | 4 +- .../partner/lakilester/func_802BFAA8_3235F8.s | 4 +- .../partner/lakilester/func_802BFBA0_3236F0.s | 4 +- .../partner/parakarry/func_802BD660_319BD0.s | 4 +- .../partner/parakarry/func_802BE90C_31AE7C.s | 4 +- .../partner/parakarry/func_802BE9D0_31AF40.s | 4 +- .../partner/sushie/func_802BD20C_31DF7C.s | 4 +- .../partner/sushie/func_802BD414_31E184.s | 4 +- .../partner/sushie/func_802BE3A4_31F114.s | 4 +- .../partner/sushie/func_802BF9B8_320728.s | 4 +- .../partner/sushie/func_802BFA58_3207C8.s | 4 +- .../world/partner/watt/func_802BD2B4_31CE24.s | 4 +- .../world/partner/watt/func_802BD754_31D2C4.s | 4 +- .../world/partner/watt/func_802BDD0C_31D87C.s | 4 +- .../world/partner/watt/func_802BDD9C_31D90C.s | 4 +- .../world/partner/watt/func_802BDE10_31D980.s | 4 +- .../world/partner/watt/func_802BDE88_31D9F8.s | 4 +- .../world/partner/watt/func_802BE070_31DBE0.s | 4 +- .../world/partners/_use_partner_ability.s | 4 +- .../partners/partner_flying_update_motion.s | 4 +- ver/us/main_bss_syms.txt | 12 +- ver/us/splat.yaml | 26 +- ver/us/symbol_addrs.txt | 12 +- ver/us/undefined_syms.txt | 2 + 177 files changed, 1679 insertions(+), 1993 deletions(-) create mode 100644 include/mips.h create mode 100644 src/7E9D0.c create mode 100644 tools/splat/segtypes/n64/vtx.py delete mode 100644 ver/us/asm/data/6e40_beginning_data.data.s delete mode 100644 ver/us/asm/data/fio.data.s delete mode 100644 ver/us/asm/nonmatchings/316C00/func_802AE000_316C00.s delete mode 100644 ver/us/asm/nonmatchings/316d90/func_802AE000.s delete mode 100644 ver/us/asm/nonmatchings/362a0_len_2f70/_add_hit_vert_to_buffer.s delete mode 100644 ver/us/asm/nonmatchings/362a0_len_2f70/func_8005DD54.s delete mode 100644 ver/us/asm/nonmatchings/362a0_len_2f70/get_collider_center.s delete mode 100644 ver/us/asm/nonmatchings/362a0_len_2f70/get_collider_type_by_id.s delete mode 100644 ver/us/asm/nonmatchings/362a0_len_2f70/get_flat_collider_normal.s delete mode 100644 ver/us/asm/nonmatchings/759b0_len_61b0/npc_test_move_simple_with_slipping.s delete mode 100644 ver/us/asm/nonmatchings/759b0_len_61b0/npc_test_move_simple_without_slipping.s delete mode 100644 ver/us/asm/nonmatchings/759b0_len_61b0/npc_test_move_taller_with_slipping.s delete mode 100644 ver/us/asm/nonmatchings/759b0_len_61b0/npc_test_move_without_slipping.s delete mode 100644 ver/us/asm/nonmatchings/7bb60_len_41b0/gravity_use_fall_parms.s delete mode 100644 ver/us/asm/nonmatchings/7bb60_len_41b0/phys_can_player_interact.s delete mode 100644 ver/us/asm/nonmatchings/7bb60_len_41b0/phys_clear_spin_history.s delete mode 100644 ver/us/asm/nonmatchings/7bb60_len_41b0/phys_get_spin_history.s delete mode 100644 ver/us/asm/nonmatchings/7bb60_len_41b0/phys_is_on_sloped_ground.s delete mode 100644 ver/us/asm/nonmatchings/7bb60_len_41b0/phys_reset_spin_history.s diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json index 447f50302c..3b1c4227bc 100644 --- a/.vscode/c_cpp_properties.json +++ b/.vscode/c_cpp_properties.json @@ -13,7 +13,8 @@ "includePath": [ "${workspaceFolder}/include", "${workspaceFolder}/ver/us/build/include", - "${workspaceFolder}/src" + "${workspaceFolder}/src", + "${workspaceFolder}/assets/us", ], "defines": [ "F3DEX_GBI_2", diff --git a/include/common_structs.h b/include/common_structs.h index 7a86bd6d8c..65462fd58a 100644 --- a/include/common_structs.h +++ b/include/common_structs.h @@ -1442,13 +1442,13 @@ typedef struct ActorPart { } ActorPart; // size = 0xC4 typedef struct ColliderTriangle { - /* 0x00 */ f32* v1[3]; /* note: the order of v1,2,3 is reversed from the ijk in the hit file */ - /* 0x04 */ f32* v2[3]; - /* 0x08 */ f32* v3[3]; - /* 0x0C */ f32 e13[3]; /* = v3 - v1 */ - /* 0x18 */ f32 e21[3]; /* = v1 - v2 */ - /* 0x24 */ f32 e32[3]; /* = v2 - v3 */ - /* 0x30 */ f32 normal[3]; + /* 0x00 */ Vec3f* v1; /* note: the order of v1,2,3 is reversed from the ijk in the hit file */ + /* 0x04 */ Vec3f* v2; + /* 0x08 */ Vec3f* v3; + /* 0x0C */ Vec3f e13; /* = v3 - v1 */ + /* 0x18 */ Vec3f e21; /* = v1 - v2 */ + /* 0x24 */ Vec3f e32; /* = v2 - v3 */ + /* 0x30 */ Vec3f normal; /* 0x3C */ s16 oneSided; /* 1 = yes, 0 = no */ /* 0x3E */ char unk_3E[2]; } ColliderTriangle; // size = 0x40 @@ -2147,20 +2147,21 @@ typedef struct Temp8010F250 { /* 0x30 */ SoundID unk_30; } Temp8010F250; // size = 0x34 -typedef struct Temp8010EBB0 { - /* 0x000 */ s8 unk_00; - /* 0x001 */ s8 unk_01; - /* 0x002 */ s8 unk_02; - /* 0x003 */ s8 unk_03; - /* 0x004 */ char unk_04[0x4]; - /* 0x008 */ s32 unk_08; - /* 0x009 */ s32 unk_0C; - /* 0x010 */ char unk_10[0x4]; - /* 0x014 */ s8 unk_14; +typedef struct PartnerActionStatus { + /* 0x000 */ union { + /* */ s32 i; + /* */ s8 b[4]; + } actionState; + /* 0x004 */ s16 stickX; + /* 0x006 */ s16 stickY; + /* 0x008 */ s32 currentButtons; + /* 0x00C */ s32 pressedButtons; + /* 0x010 */ s32 heldButtons; + /* 0x014 */ s8 inputDisabled; /* 0x015 */ char unk_15[0x343]; /* 0x358 */ s32 unk_358; /* 0x35C */ char unk_35C[0x4]; -} Temp8010EBB0; // size = 0x360 +} PartnerActionStatus; // size = 0x360 typedef struct Temp8025D160 { /* 0x00 */ s32 unk_00; diff --git a/include/effects.h b/include/effects.h index 68927c7315..a86e4a4dee 100644 --- a/include/effects.h +++ b/include/effects.h @@ -16,11 +16,11 @@ void fx_land(s32, f32, f32, f32, f32); void fx_walk(s32, f32, f32, f32, f32, f32); void playFX_08(f32, f32, f32, f32); void playFX_09(s32, f32, f32, f32, f32, f32); -EffectInstance* playFX_0A(f32, f32, s32, s32, f32, f32); +EffectInstance* playFX_0A(f32, f32, f32, f32); EffectInstance* playFX_0B(s32, f32, f32, f32); EffectInstance* playFX_0C(f32, f32, f32, f32, f32); EffectInstance* playFX_0D(s32, f32, f32, f32, s32); -EffectInstance* playFX_0E(f32, f32, s32, s32, f32, s32); +EffectInstance* playFX_0E(f32, f32, f32, s32); void playFX_0F(s32, f32, f32, f32, f32, f32, f32, f32); void fx_emote(s32, Npc*, f32, f32, f32, f32, f32, s32, s32*); void playFX_11(s32, f32, f32, f32, f32); @@ -33,12 +33,12 @@ void playFX_17(s32, f32, f32, f32); void playFX_18(s32, f32, f32, f32, f32, f32, f32, s32); void playFX_19(s32, f32, f32, f32); EffectInstance* playFX_1A(s32, f32, f32, f32, s32); -EffectInstance* playFX_1B(s32, f32, f32, f32, f32, EffectInstanceData**); +EffectInstance* playFX_1B(s32, f32, f32, f32, f32, s32); EffectInstance* playFX_1C(s32, f32, f32, f32, s32); void playFX_1D(s32, f32, f32, f32, f32, s32, f32, s32); EffectInstance* playFX_1E(s32, f32, f32, f32, f32, f32, s32, s32*); EffectInstance* playFX_1F(s32, f32, f32, f32, f32, f32, f32, f32); -EffectInstance* playFX_20(s32, f32, f32, f32, f32, EffectInstanceData**); +EffectInstance* playFX_20(s32, f32, f32, f32, f32, s32); EffectInstance* playFX_21(s32, f32, f32, f32, f32, f32, s32); void playFX_22(s32, f32, f32, f32, f32, f32, s32, s32); EffectInstance* playFX_23(u32, f32, f32, f32, f32); @@ -47,26 +47,26 @@ EffectInstance* playFX_25(s32, f32, f32, f32); void playFX_26(s32, f32, f32, f32); EffectInstance* playFX_27(s32, f32, f32, f32, f32, s32); void fx_sweat(s32, f32 x, f32 y, f32 z, f32, f32, s32); -void fx_sleep_bubble(s32, f32, f32, f32, f32, f32, EffectInstanceData**); +void fx_sleep_bubble(s32, f32, f32, f32, f32, f32, s32); EffectInstance* playFX_2A(s32, f32, f32, f32); EffectInstance* playFX_2B(s32, f32, f32, f32); EffectInstance* playFX_2C(s32, f32, f32, f32); void playFX_2D(s32, f32, f32, f32, s32, s32); void playFX_2E(s32, f32, f32, f32, f32, s32); -void playFX_2F(s32, f32, f32, f32, f32, s32, EffectInstanceData**); +void playFX_2F(s32, f32, f32, f32, f32, s32, s32); void playFX_30(s32, f32, f32, f32); void playFX_31(s32, f32, f32, f32); void playFX_32(s32, f32, f32, f32, f32); EffectInstance* playFX_33(s32, f32, f32, f32, f32, s32); -EffectInstance* playFX_34(s32, f32, f32, f32, f32, EffectInstanceData**); -EffectInstance* playFX_35(s32, f32, f32, f32, f32, EffectInstanceData**); +EffectInstance* playFX_34(s32, f32, f32, f32, f32, s32); +EffectInstance* playFX_35(s32, f32, f32, f32, f32, s32); EffectInstance* playFX_36(s32, f32, f32, f32, f32, f32); EffectInstance* playFX_37(s32, f32, f32, f32, f32, f32, f32, s32, s32, s32); EffectInstance* playFX_38(s32, f32, f32, f32, f32, s32); EffectInstance* playFX_39(s32, f32, f32, f32, f32, s32); EffectInstance* playFX_3A(s32, f32, f32, f32, f32, f32, s32, s32); -void playFX_3B(s32, f32, f32, f32, f32, EffectInstanceData**); -EffectInstance* playFX_3C(s32, f32, f32, f32, f32, EffectInstanceData**); +void playFX_3B(s32, f32, f32, f32, f32, s32); +EffectInstance* playFX_3C(s32, f32, f32, f32, f32, s32); void playFX_3D(s32, f32, f32, f32, f32, f32, f32, s32, s32*); EffectInstance* playFX_3E(s32, f32, f32, f32, f32, s32); EffectInstance* playFX_3F(s32, f32, f32, f32, s32); @@ -101,7 +101,7 @@ EffectInstance* playFX_5B(s32, f32, f32, f32, f32, s32); EffectInstance* playFX_5C(s32, f32, f32, f32, f32, s32); EffectInstance* playFX_5D(s32, f32, f32, f32, f32, s32); EffectInstance* playFX_5E(s32, f32, f32, f32, f32, f32, f32, f32, s32); -void playFX_5F(s32, f32 x, f32 y, f32 z, f32 scale /* maybe */, s32); +EffectInstance* playFX_5F(s32, f32 x, f32 y, f32 z, f32 scale /* maybe */, s32); EffectInstance* playFX_60(s32, f32, f32, f32, f32, s32); EffectInstance* playFX_61(s32, f32, f32, f32, f32, s32); EffectInstance* playFX_62(s32, f32, f32, f32, f32, s32); @@ -136,7 +136,7 @@ EffectInstance* playFX_7E(s32, f32, f32, f32, f32, s32); EffectInstance* playFX_7F(s32, f32, f32, f32, f32, s32); EffectInstance* playFX_80(s32, f32, f32, f32, f32, s32); EffectInstance* playFX_81(s32, f32 x, f32 y, f32 z, f32, s32); -void playFX_82(s32, f32, f32, f32, f32, s32 time); +EffectInstance* playFX_82(s32, f32, f32, f32, f32, s32 time); EffectInstance* playFX_83(s32, f32, f32, f32, f32, s32); EffectInstance* playFX_84(s32, f32, f32, f32, f32, f32); EffectInstance* playFX_85(s32, f32, f32, f32, f32, s32); diff --git a/include/functions.h b/include/functions.h index 805ee9ed2c..68941ce6ba 100644 --- a/include/functions.h +++ b/include/functions.h @@ -194,6 +194,10 @@ s32 battle_heap_create(void); void filemenu_init(s32); s32 test_ray_zones(f32, f32, f32, f32*, f32*, f32*, f32*, f32*, f32*, f32*); +s32 test_ray_colliders(s32 ignoreFlags, f32 startX, f32 startY, f32 startZ, f32 dirX, f32 dirY, f32 dirZ, f32* hitX, + f32* hitY, f32* hitZ, f32* hitDepth, f32* hitNx, f32* hitNy, f32* hitNz); +s32 test_ray_entities(f32 startX, f32 startY, f32 startZ, f32 dirX, f32 dirY, f32 dirZ, f32* hitX, f32* hitY, f32* hitZ, + f32* hitDepth, f32* hitNx, f32* hitNy, f32* hitNz); void mem_clear(s8* data, s32 numBytes); diff --git a/include/mips.h b/include/mips.h new file mode 100644 index 0000000000..1132ecb259 --- /dev/null +++ b/include/mips.h @@ -0,0 +1,14 @@ +#ifndef _MIPS_H_ +#define _MIPS_H_ + +#define JAL 0x03 +#define ADDIU 0x09 +#define LUI 0x0F +#define LW 0x23 +#define LOWER(x) ((x) & 0xFFFF) +#define UPPER(x) ((x) >> 16) +#define OPCODE(x) ((x) >> 26) +#define GET_RS(x) ((x >> 0x15) & 0x1F) +#define GET_RT(x) (UPPER(x) & 0x1F) + +#endif diff --git a/include/variables.h b/include/variables.h index 2bd9cacec1..5e7f674e3c 100644 --- a/include/variables.h +++ b/include/variables.h @@ -288,8 +288,9 @@ extern f32 D_800F7B40; extern s32 D_800F7B44; extern f32 D_8010C938; extern f32 D_8010C990; +extern s32 D_8010C978; -extern Temp8010EBB0 D_8010EBB0; // something with partners +extern PartnerActionStatus gPartnerActionStatus; // something with partners extern Temp8010F250 D_8010F250; // sfx_play_sound state struct? // Effects diff --git a/src/316C00.c b/src/316C00.c index b1bc3b0f0e..1cc729b3ac 100644 --- a/src/316C00.c +++ b/src/316C00.c @@ -1,3 +1,53 @@ #include "common.h" +#include "nu/nusys.h" +#include "ld_addrs.h" +#include "mips.h" -INCLUDE_ASM(s32, "316C00", func_802AE000_316C00); +extern s32 D_7012BC11[]; + +void func_802AE000_316C00(void) { + s32(*readFunc)(OSPiHandle*, u32, u32*); + UNK_FUN_PTR(generalHeapCreate); + u32 thisInsn; + u32* it; + u32 prevInsn; + s32 seed; + u32 blah; + u32 hash; + + readFunc = osEPiReadIo; + seed = 0x4BF15BF6; // 0x3C016C07 + 0xFEFEFEF; + generalHeapCreate = D_7012BC11; // 0x8002AC00 - 0xFEFEFEF (the former address being that of general_heap_create) + hash = 0; + + readFunc(nuPiCartHandle, 0xB0000574, &thisInsn); + seed -= thisInsn; // thisInsn = 0x3C016C07 here + + prevInsn = 0; + + for (it = _316A70_ROM_START; it < _316A70_ROM_END; it++) { + readFunc(nuPiCartHandle, it, &thisInsn); + hash += LOWER(thisInsn) + UPPER(thisInsn); + + if (OPCODE(prevInsn) == LUI && (OPCODE(thisInsn) == ADDIU || OPCODE(thisInsn) == LW)) { + if (GET_RS(thisInsn) == GET_RT(prevInsn) && GET_RS(thisInsn) == GET_RT(thisInsn)) { + hash -= LOWER(thisInsn); + hash -= LOWER(prevInsn); + } + } + + if (OPCODE(thisInsn) == JAL) { + hash -= LOWER(thisInsn) + (UPPER(thisInsn) & 0xFC00); + } + + prevInsn = thisInsn; + } + + generalHeapCreate += seed + 0x2499BF - hash; + + // If the function's address is 0x8XXXXXXX + if (((u32)generalHeapCreate >> 0x1C) == 8) { + // Call the function that ends up being generalHeapCreate + (generalHeapCreate)(); + } +} diff --git a/src/316d90.c b/src/316d90.c index 88ba19bf96..ee45990cd6 100644 --- a/src/316d90.c +++ b/src/316d90.c @@ -1,3 +1,54 @@ #include "common.h" +#include "nu/nusys.h" +#include "ld_addrs.h" +#include "mips.h" -INCLUDE_ASM(s32, "316d90", func_802AE000); +extern s32 D_7012ACA1[]; + +void func_802AE000(void) { + s32(*readFunc)(OSPiHandle*, u32, u32*); + UNK_FUN_PTR(aFunction); + u32 thisInsn; + u32* it; + u32 prevInsn; + s32 seed; + u32 blah; + u32 hash; + + readFunc = osEPiReadIo; + seed = 0x33F50000; + aFunction = D_7012ACA1; + hash = 0; + + readFunc(nuPiCartHandle, 0xB0000800, &thisInsn); + seed -= thisInsn; + + prevInsn = 0; + + for (it = _316C00_ROM_START; it < _316C00_ROM_END; it++) { + readFunc(nuPiCartHandle, it, &thisInsn); + hash += LOWER(thisInsn) + UPPER(thisInsn); + + if (OPCODE(prevInsn) == LUI && (OPCODE(thisInsn) == ADDIU || OPCODE(thisInsn) == LW)) { + if (GET_RS(thisInsn) == GET_RT(prevInsn) && GET_RS(thisInsn) == GET_RT(thisInsn)) { + hash -= LOWER(thisInsn); + hash -= LOWER(prevInsn); + } + } + + if (OPCODE(thisInsn) == JAL) { + hash -= LOWER(thisInsn) + (UPPER(thisInsn) & 0xFC00); + } + + prevInsn = thisInsn; + } + + aFunction += seed + 0x291993 - hash; + + // If the function's address is 0x8XXXXXXX + if (((u32)aFunction >> 0x1C) == 8) { + (aFunction)(); + } else { + _heap_create(&D_803DA800, 0x10000); + } +} diff --git a/src/316f30.c b/src/316f30.c index 9d3d136d37..0e1a72c8be 100644 --- a/src/316f30.c +++ b/src/316f30.c @@ -17,7 +17,7 @@ void func_802B203C(void) { void func_802B2078(void) { dma_copy(_316C00_ROM_START, _316C00_ROM_END, _316C00_VRAM); - func_802AE000(); + func_802AE000_316C00(); } void func_802B20B4(void) { diff --git a/src/362a0_len_2f70.c b/src/362a0_len_2f70.c index 64517d4208..b79e30d146 100644 --- a/src/362a0_len_2f70.c +++ b/src/362a0_len_2f70.c @@ -67,7 +67,20 @@ INCLUDE_ASM(void, "362a0_len_2f70", load_hit_data, s32 idx, HitAsset* hit); INCLUDE_ASM(void, "362a0_len_2f70", parent_collider_to_model, s32 colliderID, s16 modelIndex); -INCLUDE_ASM(s32, "362a0_len_2f70", _add_hit_vert_to_buffer); +void _add_hit_vert_to_buffer(f32** buf, f32* vert, s32* bufSize) { + s32 i; + + for (i = 0; i < *bufSize; i++) { + if (buf[i] == vert) { + break; + } + } + + if (i == *bufSize) { + buf[i] = vert; + (*bufSize)++; + } +} s32 _get_hit_vert_index_from_buffer(f32** buffer, f32* vert, s32* bufferSize) { s32 i; @@ -84,40 +97,110 @@ s32 _get_hit_vert_index_from_buffer(f32** buffer, f32* vert, s32* bufferSize) { INCLUDE_ASM(void, "362a0_len_2f70", update_collider_transform, s16 colliderID); -// Simon says there's a struct size issue here which is causing the subu/addu issue -#ifdef NON_MATCHING s32 get_collider_type_by_id(s32 colliderID) { if (colliderID & 0x4000) { return 0; } else { - return gCollisionData.collider_list[colliderID].flags; + return gCollisionData.colliderList[colliderID].flags; } } -#else -INCLUDE_ASM(s32, "362a0_len_2f70", get_collider_type_by_id); -#endif -INCLUDE_ASM(s32, "362a0_len_2f70", get_flat_collider_normal); +void get_flat_collider_normal(s32 colliderID, f32* x, f32* y, f32* z) { + ColliderTriangle* triangle = &gCollisionData.colliderList[colliderID].triangleTable[0]; -INCLUDE_ASM(void, "362a0_len_2f70", get_collider_center, s32 colliderID, f32* x, f32* y, f32* z); + *x = triangle->normal.x; + *y = triangle->normal.y; + *z = triangle->normal.z; +} + +void get_collider_center(s32 colliderID, f32* x, f32* y, f32* z) { + ColliderBoundingBox* aabb = gCollisionData.colliderList[colliderID].aabb; + + *x = (aabb->min[0] + aabb->max[0]) * 0.5f; + *y = (aabb->min[1] + aabb->max[1]) * 0.5f; + *z = (aabb->min[2] + aabb->max[2]) * 0.5f; +} INCLUDE_ASM(s32, "362a0_len_2f70", test_ray_triangle_general); INCLUDE_ASM(s32, "362a0_len_2f70", test_down_ray_triangle); -INCLUDE_ASM(s32, "362a0_len_2f70", test_up_ray_triangle); +s32 test_up_ray_triangle(ColliderTriangle* triangle, f32* vertices); +INCLUDE_ASM(s32, "362a0_len_2f70", test_up_ray_triangle, ColliderTriangle* triangle, f32* vertices); -INCLUDE_ASM(s32, "362a0_len_2f70", test_ray_colliders); +INCLUDE_ASM(s32, "362a0_len_2f70", test_ray_colliders, s32 ignoreFlags, f32 startX, f32 startY, f32 startZ, f32 dirX, + f32 dirY, f32 dirZ, f32* hitX, f32* hitY, f32* hitZ, f32* hitDepth, f32* hitNx, f32* hitNy, f32* hitNz); INCLUDE_ASM(s32, "362a0_len_2f70", test_ray_zones, f32 arg0, f32 arg1, f32 arg2, f32* arg3, f32* arg4, f32* arg5, f32* arg6, f32* arg7, f32* arg8, f32* arg9); -INCLUDE_ASM(s32, "362a0_len_2f70", test_up_ray_collider); +//s32 test_up_ray_collider(s32 ignoreFlags, s32 colliderID, f32 x, f32 y, f32 z, f32 length, f32 yaw); +// Close, but no cigar +extern f32 D_800A4230; +extern f32 D_800A4234; +extern f32 D_800A4238; +extern f32 D_800A423C; +extern s32 D_800A4240; +extern f32 D_800A4244; +extern f32 D_800A4254; -INCLUDE_ASM(s32, "362a0_len_2f70", test_ray_entities); +#ifdef NON_MATCHING +f32 test_up_ray_collider(s32 ignoreFlags, s32 colliderID, f32 x, f32 y, f32 z, f32 length, f32 yaw) { + CollisionData* collisionData = &gCollisionData; + f32 cosTheta; + f32 sinTheta; + Collider* collider; + ColliderTriangle* triangleTable; + s32 i; + f32 ret; + + sin_cos_rad(yaw * TAU / 360.0f, &sinTheta, &cosTheta); + collider = &collisionData->colliderList[colliderID]; + + D_800A4240 = 0; + D_800A4230 = x; + D_800A4234 = y; + D_800A4238 = z; + D_800A4254 = length; + D_800A423C = sinTheta; + D_800A4244 = -cosTheta; + ret = -1.0f; + + + if (!(collider->flags & ignoreFlags)) { + if (collider->numTriangles != 0) { + triangleTable = collider->triangleTable; + + for (i = 0; i < collider->numTriangles; i++) { + if (test_up_ray_triangle(&triangleTable[i], collisionData->vertices)) { + ret = D_800A4254; + } + } + } + } + return ret; +} +#else +INCLUDE_ASM(s32, "362a0_len_2f70", test_up_ray_collider, s32 ignoreFlags, s32 colliderID, f32 x, f32 y, f32 z, f32 length, f32 yaw); +#endif + +INCLUDE_ASM(s32, "362a0_len_2f70", test_ray_entities, f32 startX, f32 startY, f32 startZ, f32 dirX, f32 dirY, f32 dirZ, + f32* hitX, f32* hitY, f32* hitZ, f32* hitDepth, f32* hitNx, f32* hitNy, f32* hitNz); INCLUDE_ASM(s32, "362a0_len_2f70", func_8005DB00); -INCLUDE_ASM(s32, "362a0_len_2f70", func_8005DD54); +ApiStatus func_8005DD54(ScriptInstance* script, s32 isInitialCall) { + f32 angle = clamp_angle(script->varTable[0]); + + script->varTable[0] = angle; + if (angle >= 180.0f) { + angle -= 180.0f; + } + if (angle >= 90.0f) { + angle = 180.0f - angle; + } + script->varTable[2] = (s32) (((90.0f - angle) * 95.0f) / 90.0f) + 160; + return ApiStatus_DONE2; +} s32 func_8005DDF0(void) { return ~gCurrentEncounter.unk_08 != 0; diff --git a/src/759b0_len_61b0.c b/src/759b0_len_61b0.c index 0c6d47d885..dd0f353610 100644 --- a/src/759b0_len_61b0.c +++ b/src/759b0_len_61b0.c @@ -10,28 +10,141 @@ INCLUDE_ASM(s32, "759b0_len_61b0", npc_raycast_down_sides, s32 arg0, f32* arg1, INCLUDE_ASM(s32, "759b0_len_61b0", npc_raycast_up); -INCLUDE_ASM(s32, "759b0_len_61b0", npc_raycast_up_corner); +s32 npc_raycast_up_corner(s32 ignoreFlags, f32* x, f32* y, f32* z, f32* length); +INCLUDE_ASM(s32, "759b0_len_61b0", npc_raycast_up_corner, s32 ignoreFlags, f32* x, f32* y, f32* z, f32* length); INCLUDE_ASM(s32, "759b0_len_61b0", npc_raycast_up_corners); -INCLUDE_ASM(s32, "759b0_len_61b0", npc_raycast_general); +s32 npc_raycast_general(s32 ignoreFlags, f32 startX, f32 startY, f32 startZ, f32 dirX, f32 dirY, f32 dirZ, f32* hitX, + f32* hitY, f32* hitZ, f32* outDepth, f32* hitNx, f32* hitNy, f32* hitNz); +// Dumb float regalloc +#ifdef NON_MATCHING +s32 npc_raycast_general(s32 flags, f32 startX, f32 startY, f32 startZ, f32 dirX, f32 dirY, f32 dirZ, f32* hitX, + f32* hitY, f32* hitZ, f32* outDepth, f32* hitNx, f32* hitNy, f32* hitNz) { + s32 entityID; + s32 ret; -void npc_get_slip_vector(f32* arg0, f32* arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5) { - f32 temp = (arg2 * arg4) + (arg3 * arg5); + ret = -1; + if (flags & 0x100000) { + entityID = test_ray_entities(startX, startY, startZ, dirX, dirY, dirZ, hitX, hitY, hitZ, outDepth, hitNx, hitNy, + hitNz); + if (entityID >= 0) { + ret = entityID | 0x4000; + } + } else { + ret = test_ray_colliders(flags, startX, startY, startZ, dirX, dirY, dirZ, hitX, hitY, hitZ, outDepth, hitNx, + hitNy, hitNz); + if (flags & 0x40000) { + return ret; + } - *arg0 = (arg2 - (temp * arg4)) * 0.5f; - *arg1 = (arg3 - (temp * arg5)) * 0.5f; + entityID = test_ray_entities(startX, startY, startZ, dirX, dirY, dirZ, hitX, hitY, hitZ, outDepth, hitNx, + hitNy, hitNz); + if (entityID >= 0) { + ret = entityID | 0x4000; + } + } + return ret; +} +#else +INCLUDE_ASM(s32, "759b0_len_61b0", npc_raycast_general, s32 ignoreFlags, f32 startX, f32 startY, f32 startZ, f32 dirX, + f32 dirY, f32 dirZ, f32* hitX, f32* hitY, f32* hitZ, f32* outDepth, f32* hitNx, f32* hitNy, f32* hitNz); +#endif + +void npc_get_slip_vector(f32* outX, f32* outZ, f32 aX, f32 aZ, f32 bX, f32 bZ) { + f32 dotProduct = (aX * bX) + (aZ * bZ); + + *outX = (aX - (dotProduct * bX)) * 0.5f; + *outZ = (aZ - (dotProduct * bZ)) * 0.5f; } -INCLUDE_ASM(s32, "759b0_len_61b0", npc_test_move_with_slipping); +s32 npc_test_move_with_slipping(s32 ignoreFlags, f32* x, f32* y, f32* z, f32 length, f32 yaw, f32 radius); +INCLUDE_ASM(s32, "759b0_len_61b0", npc_test_move_with_slipping, s32 ignoreFlags, f32* x, f32* y, f32* z, f32 length, f32 yaw, f32 radius); -INCLUDE_ASM(s32, "759b0_len_61b0", npc_test_move_without_slipping); +s32 npc_test_move_without_slipping(s32 ignoreFlags, f32* x, f32* y, f32* z, f32 length, f32 yaw, f32 radius) { + s32 ret = -1; + f32 depth; + f32 originalDepth; + f32 dirY; + f32 cosTheta; + f32 hitNx, hitNy, hitNz; + f32 hitX, hitY, hitZ; + s32 hitID; + f32 temp1; + f32 temp2; -INCLUDE_ASM(s32, "759b0_len_61b0", npc_test_move_taller_with_slipping); + sin_cos_rad(yaw * TAU / 360.0f, &dirY, &cosTheta); + cosTheta = -cosTheta; + originalDepth = length + radius + (radius * 0.5f); + depth = originalDepth; + temp1 = length * dirY; + temp2 = length * cosTheta; -INCLUDE_ASM(s32, "759b0_len_61b0", npc_test_move_simple_with_slipping, s32 arg0, f32* arg1, f32* arg2, f32* arg3, f32 arg4, f32 arg5, - f32 arg6, f32 arg7); + hitID = npc_raycast_general(ignoreFlags, *x - (radius * dirY * 0.5f), *y, *z - (radius * cosTheta * 0.5f), dirY, + 0.0f, cosTheta, &hitX, &hitY, &hitZ, &depth, &hitNx, &hitNy, &hitNz); + + if (hitID >= 0 && depth <= originalDepth) { + f32 depthDiff = depth - originalDepth; + f32 cosThetaTemp = cosTheta; // needed to match + + *x += depthDiff * dirY; + *z += depthDiff * cosThetaTemp; + D_8010C978 = hitID; + ret = hitID; + } + *x += temp1; + *z += temp2; + return ret; +} + +s32 npc_test_move_taller_with_slipping(s32 ignoreFlags, f32* x, f32* y, f32* z, f32 length, f32 yaw, f32 height, + f32 radius) { + f32 xTemp = *x; + f32 yTemp = *y + height - 1.0f; + f32 zTemp = *z; + s32 ret; + + radius *= 0.5f; + if (npc_test_move_with_slipping(ignoreFlags, &xTemp, &yTemp, &zTemp, fabsf(length), yaw, radius) < 0) { + xTemp = *x; + yTemp = *y + 10.01f; + zTemp = *z; + ret = npc_test_move_with_slipping(ignoreFlags, &xTemp, &yTemp, &zTemp, fabsf(length), yaw, radius) >= 0; + *x = xTemp; + *z = zTemp; + } else { + ret = 1; + *x = xTemp; + *z = zTemp; + } + return ret; +} + +s32 npc_test_move_simple_with_slipping(s32 ignoreFlags, f32* x, f32* y, f32* z, f32 length, f32 yaw, f32 height, + f32 radius) { + f32 tempX = *x; + f32 tempY = *y + 10.01f; + f32 tempZ = *z; + s32 hitID = npc_test_move_with_slipping(ignoreFlags, &tempX, &tempY, &tempZ, fabsf(length), yaw, radius * 0.5f); + + *x = tempX; + *z = tempZ; + + return hitID >= 0; +} + +s32 npc_test_move_simple_without_slipping(s32 ignoreFlags, f32* x, f32* y, f32* z, f32 length, f32 yaw, f32 height, + f32 radius) { + f32 tempX = *x; + f32 tempY = *y + 10.01f; + f32 tempZ = *z; + s32 hitID = npc_test_move_without_slipping(ignoreFlags, &tempX, &tempY, &tempZ, fabsf(length), yaw, radius * 0.5f); + + *x = tempX; + *z = tempZ; + + return hitID >= 0; +} -INCLUDE_ASM(s32, "759b0_len_61b0", npc_test_move_simple_without_slipping); INCLUDE_ASM(s32, "759b0_len_61b0", npc_test_move_complex_with_slipping); diff --git a/src/77480.c b/src/77480.c index 5f3d924c06..0f336af9de 100644 --- a/src/77480.c +++ b/src/77480.c @@ -350,9 +350,10 @@ void player_reset_data(void) { } s32 func_800DFCF4(void) { - if (D_8010EBB0.unk_00 == 1 && - (D_8010EBB0.unk_03 == 6 || D_8010EBB0.unk_03 == 9 || D_8010EBB0.unk_03 == 7 || D_8010EBB0.unk_03 == 4 || - D_8010EBB0.unk_03 == 8)) { + if (gPartnerActionStatus.actionState.b[0] == 1 && + (gPartnerActionStatus.actionState.b[3] == 6 || gPartnerActionStatus.actionState.b[3] == 9 || + gPartnerActionStatus.actionState.b[3] == 7 || gPartnerActionStatus.actionState.b[3] == 4 || + gPartnerActionStatus.actionState.b[3] == 8)) { return 0; } return 1; @@ -455,7 +456,7 @@ s32 func_800E0208(void) { s32 ret = 0; if (gGameStatusPtr->disableScripts && (gGameStatusPtr->currentButtons & 0x10)) { - if (D_8010EBB0.unk_00 == 0) { + if (gPartnerActionStatus.actionState.b[0] == 0) { set_action_state(ACTION_STATE_IDLE); } ret = 1; diff --git a/src/7E9D0.c b/src/7E9D0.c new file mode 100644 index 0000000000..1e813267ab --- /dev/null +++ b/src/7E9D0.c @@ -0,0 +1,317 @@ +#include "common.h" +#include "world/partners.h" + +extern s32 D_8010C924; +extern s32 D_8010C964; +extern s32 D_8010C96C; // npc list index +extern s32 gSpinHistoryBufferPos; +extern s16 D_8010C9B0; +extern s32 gSpinHistoryPosY[5]; +extern s32 gSpinHistoryPosX[5]; +extern s32 gSpinHistoryPosZ[5]; +extern s16 gSpinHistoryPosAngle[5]; + +void func_800E5520(void) { + D_8010C9B0 = 0; +} + +INCLUDE_ASM(void, "7bb60_len_41b0", phys_adjust_cam_on_landing); + +void phys_clear_spin_history(void) { + s32 i; + + gSpinHistoryBufferPos = 0; + + for (i = 0; i < ARRAY_COUNT(gSpinHistoryPosY); i++) { + gSpinHistoryPosAngle[i] = 180; + gSpinHistoryPosY[i] = 0x80000000; + } +} + +f32 phys_get_spin_history(s32 lag, s32* x, s32* y, s32* z) { + s32 idx = gSpinHistoryBufferPos; + + // Can't get this if/else to match otherwise... + if (idx - lag >= 0) { + idx -= lag; + } else { + idx = gSpinHistoryBufferPos - lag + 5; + } + + *x = gSpinHistoryPosX[idx]; + *y = gSpinHistoryPosY[idx]; + *z = gSpinHistoryPosZ[idx]; + return gSpinHistoryPosAngle[idx]; +} + +void phys_reset_spin_history(void) { + s32 i; + + mem_clear(&D_8010F250, sizeof(Temp8010F250)); + gSpinHistoryBufferPos = 0; + + for (i = 0; i < ARRAY_COUNT(gSpinHistoryPosAngle); i++) { + gSpinHistoryPosAngle[i] = 0; + gSpinHistoryPosX[i] = 0; + gSpinHistoryPosY[i] = 0; + gSpinHistoryPosZ[i] = 0; + } + + D_8010C964 = 0; + D_8010C924 = 0; +} + +INCLUDE_ASM(s32, "7bb60_len_41b0", phys_update_action_state); + +INCLUDE_ASM(s32, "7bb60_len_41b0", phys_peach_update); + +void set_action_state(s32 actionState) { + PlayerStatus* playerStatus = &gPlayerStatus; + PlayerData* playerData = &gPlayerData; + UNK_TYPE* unknownStruct = &D_8010F250; + + if (playerStatus->flags & 0x200) { + playerStatus->flags &= ~0x200; + enable_player_input(); + } + + if (playerStatus->animFlags & 0x4000) { + // TODO figure this out +#ifdef NON_MATCHING + if ( + actionState == ACTION_STATE_IDLE || actionState == ACTION_STATE_WALK || + actionState == ACTION_STATE_RUN || actionState == ACTION_STATE_JUMP || + actionState == ACTION_STATE_BOUNCE || actionState == ACTION_STATE_HOP || + actionState == ACTION_STATE_LAUNCH || actionState == ACTION_STATE_LAND_ON_SWITCH || + actionState == ACTION_STATE_FALLING || actionState == ACTION_STATE_STEP_DOWN || + actionState == ACTION_STATE_LAND || actionState == ACTION_STATE_STEP_DOWN_LAND + ) { +#else + if (actionState < ACTION_STATE_TALK) + if (actionState >= 0) { +#endif + playerStatus->prevActionState = playerStatus->actionState; + playerStatus->actionState = actionState; + playerStatus->flags |= 0x80000000; + } + return; + } + + if (actionState == ACTION_STATE_HIT_FIRE || actionState == ACTION_STATE_HIT_LAVA) { + PartnerID partner; + + if (playerStatus->unk_BF == 3) { + actionState = ACTION_STATE_HIT_FIRE; + } + + // Whilst Sushie, Lakilester, Parakarry's ability is active, hazards have no effect. + partner = playerData->currentPartner; + + if (partner == PARTNER_SUSHIE || partner == PARTNER_LAKILESTER || partner == PARTNER_PARAKARRY) { + if (gPartnerActionStatus.actionState.b[0] != 0) { + playerStatus->animFlags |= 0x4; + playerStatus->flags |= 0x800; + return; + } + } + } + + if (actionState == ACTION_STATE_SLIDE) { + playerStatus->flags |= 0x10; + playerStatus->moveFrames = 0; + playerStatus->flags &= ~0x4000; + } + + playerStatus->prevActionState = playerStatus->actionState; + if (actionState == ACTION_STATE_USE_TWEESTER) { + playerStatus->prevActionState = ACTION_STATE_IDLE; + } + + if (actionState == ACTION_STATE_ENEMY_FIRST_STRIKE) { + playerStatus->animFlags |= 4; + } + playerStatus->actionState = actionState; + playerStatus->flags |= 0x80000000; + + if (playerStatus->actionState == ACTION_STATE_SPIN) { + return; + } + + playerStatus->flags &= ~0x20000; + playerStatus->animFlags &= ~0x10000; + + if (unknownStruct[0xC]) { + sfx_stop_sound(unknownStruct[0xC]); + } + + if (playerStatus->unk_D8) { + playerStatus->unk_D8[3][9] = 0xA; + playerStatus->unk_D8 = NULL; + } +} + +void update_locomotion_state(void) { + PlayerStatus* playerStatus = &gPlayerStatus; + do { } while (0); // required to match + + set_action_state((!is_ability_active(ABILITY_SLOW_GO) + && (SQ(playerStatus->stickAxis[0]) + SQ(playerStatus->stickAxis[1]) >= 0xBD2)) ? ACTION_STATE_RUN : ACTION_STATE_WALK); +} + +void start_falling(void) { + PlayerStatus* playerStatus = &gPlayerStatus; + + set_action_state(ACTION_STATE_FALLING); + playerStatus->gravityIntegrator[0] = 0.1143f; + playerStatus->gravityIntegrator[1] = -0.2871f; + playerStatus->gravityIntegrator[2] = -0.1823f; + playerStatus->gravityIntegrator[3] = 0.01152f; +} + +void start_bounce_a(void) { + PlayerStatus* playerStatus = &gPlayerStatus; + + set_action_state(ACTION_STATE_BOUNCE); + playerStatus->gravityIntegrator[0] = 10.0f; + playerStatus->gravityIntegrator[1] = -2.0f; + playerStatus->gravityIntegrator[2] = 0.8f; + playerStatus->gravityIntegrator[3] = -0.75f; +} + +void start_bounce_b(void) { + PlayerStatus* playerStatus = &gPlayerStatus; + + set_action_state(ACTION_STATE_BOUNCE); + playerStatus->gravityIntegrator[0] = 8.0f; + playerStatus->gravityIntegrator[1] = -1.0f; + playerStatus->gravityIntegrator[2] = 0; + playerStatus->gravityIntegrator[3] = 0; + playerStatus->flags |= 0x800000; +} + +// TODO playerData isn't used +s32 check_input_hammer(void) { + PlayerData* playerData = &gPlayerData; + + if (gPlayerStatus.pressedButtons & BUTTON_B) { + if (!(gPlayerStatus.flags & 4)) { + if (gPartnerActionStatus.actionState.b[0] != 1 || gPlayerData.currentPartner != PARTNER_WATT) { + if (gPlayerData.hammerLevel != -1) { + set_action_state(ACTION_STATE_HAMMER); + return TRUE; + } + } + } + } + + return FALSE; +} + +INCLUDE_ASM(s32, "7bb60_len_41b0", check_input_jump); + +void check_input_spin(void) { + PlayerStatus* playerStatus = &gPlayerStatus; + Temp8010F250* temp_8010F250 = &D_8010F250; + Temp8010F250* temp2 = temp_8010F250; + + if (!(playerStatus->flags & (PLAYER_ANIM_FLAG_8BIT_MARIO | PLAYER_ANIM_FLAG_PEACH_PHYSICS)) && + !(playerStatus->animFlags & 1) && + !(playerStatus->currentButtons & D_CBUTTONS) && + !is_ability_active(ABILITY_SLOW_GO)) { + + s32 actionState = playerStatus->actionState; + s32 btnPressed = playerStatus->pressedButtons & Z_TRIG; + + // TODO + if (actionState != 0x21) { + if (actionState < 0x22) { + if (actionState < 3) { + if (actionState >= 0 && !(playerStatus->animFlags & 0x10000)) { + if (btnPressed || temp_8010F250->unk_01) { + set_action_state(ACTION_STATE_SPIN); + if (temp_8010F250->unk_01 != 0) { + if (temp_8010F250->unk_08 != 0 || temp_8010F250->unk_0C != 0) { + playerStatus->prevActionState = temp2->unk_07; + } else { + playerStatus->prevActionState = ACTION_STATE_IDLE; + } + } + } + } + } + } + } + } +} + +void peach_set_disguise_anim(s32 arg0) { + s32 listIndex = D_8010C96C; + + if (listIndex >= 0) { + get_npc_by_index(listIndex)->currentAnim.w = arg0; + } +} + +void func_800E63A4(s32 arg0) { + PlayerStatus* playerStatus = &gPlayerStatus; + + if (arg0 != 0) { + set_action_state(ACTION_STATE_SNEAKY_PARASOL); + } else { + playerStatus->animFlags &= ~PLAYER_ANIM_FLAG_IN_DISGUISE; + gGameStatusPtr->peachFlags &= ~0x2; + playerStatus->peachDisguise = 0; + free_npc_by_index(D_8010C96C); + set_action_state(ACTION_STATE_IDLE); + playerStatus->colliderHeight = 55; + playerStatus->colliderDiameter = 38; + } +} + +void peach_check_for_parasol_input(void) { + PlayerStatus* playerStatus = &gPlayerStatus; + s32 actionState = playerStatus->actionState; + Npc* disguiseNpc; + + if (actionState == ACTION_STATE_IDLE || actionState == ACTION_STATE_WALK || actionState == ACTION_STATE_RUN) { + if (D_8010C92C != 0) { + D_8010C92C--; + if (D_8010C92C == 0) { + if (gGameStatusPtr->peachFlags & 2) { + playerStatus->animFlags |= PLAYER_ANIM_FLAG_IN_DISGUISE; + gGameStatusPtr->peachFlags |= 2; + + disguiseNpc = peach_make_disguise_npc(gGameStatusPtr->peachDisguise); + if (disguiseNpc != NULL) { + disguiseNpc->flags &= ~NPC_FLAG_40000; + } + } + } + } else if (gGameStatusPtr->peachFlags & 4 && playerStatus->pressedButtons & B_BUTTON) { + set_action_state(ACTION_STATE_SNEAKY_PARASOL); + } + } +} + +void peach_sync_disguise_npc(void) { + PlayerStatus* playerStatus = &gPlayerStatus; + + if (D_8010C96C >= 0) { + Npc* npc = get_npc_by_index(D_8010C96C); + + if (npc->flags & NPC_FLAG_40000) { + npc->renderYaw = playerStatus->spriteFacingAngle; + } else { + npc->yaw = playerStatus->targetYaw; + } + + npc->pos.x = playerStatus->position.x; + npc->pos.y = playerStatus->position.y; + npc->pos.z = playerStatus->position.z; + } +} + +INCLUDE_ASM(Npc*, "7bb60_len_41b0", peach_make_disguise_npc, s32 peachDisguise); + +INCLUDE_ASM(s32, "7bb60_len_41b0", peach_disguise_check_overlaps); + diff --git a/src/7bb60_len_41b0.c b/src/7bb60_len_41b0.c index b9a1e222f9..85e0c344d1 100644 --- a/src/7bb60_len_41b0.c +++ b/src/7bb60_len_41b0.c @@ -1,9 +1,6 @@ #include "common.h" #include "world/partners.h" -extern s32 D_8010C96C; // npc list index -extern s16 D_8010C9B0; - void record_jump_apex(void) { gPlayerStatus.jumpApexHeight = gPlayerStatus.position.y; } @@ -11,7 +8,7 @@ void record_jump_apex(void) { s32 can_trigger_loading_zone(void) { PlayerData* playerData = &gPlayerData; s32 actionState = gPlayerStatusPtr->actionState; - Temp8010EBB0* temp_8010EBB0 = &D_8010EBB0; + PartnerActionStatus* partnerActionStatus = &gPartnerActionStatus; if (actionState == ACTION_STATE_IDLE || actionState == ACTION_STATE_WALK || @@ -24,17 +21,17 @@ s32 can_trigger_loading_zone(void) { if (actionState == ACTION_STATE_RIDE) { if (playerData->currentPartner == PARTNER_LAKILESTER || playerData->currentPartner == PARTNER_BOW) { - if (temp_8010EBB0->unk_00 != 0) { + if (partnerActionStatus->actionState.b[0] != 0) { return TRUE; } else { gPlayerStatusPtr->animFlags |= 4; return FALSE; } } else { - if (temp_8010EBB0->unk_03 == 6 || temp_8010EBB0->unk_03 == 7) { - return temp_8010EBB0->unk_00 != 0; + if (partnerActionStatus->actionState.b[3] == 6 || partnerActionStatus->actionState.b[3] == 7) { + return partnerActionStatus->actionState.b[0] != 0; } - if (temp_8010EBB0->unk_03 == 4) { + if (partnerActionStatus->actionState.b[3] == 4) { gPlayerStatusPtr->animFlags |= 4; return FALSE; } @@ -43,8 +40,6 @@ s32 can_trigger_loading_zone(void) { return FALSE; } -void set_action_state(s32 actionState); - void move_player(s32 duration, f32 heading, f32 speed) { gPlayerStatus.flags |= 0x4000; gPlayerStatus.heading = heading; @@ -94,7 +89,7 @@ void phys_init_integrator_for_current_state() { playerStatus->gravityIntegrator[0] = *temp_a0++; playerStatus->gravityIntegrator[1] = *temp_a0++; playerStatus->gravityIntegrator[2] = *temp_a0++; - playerStatus->gravityIntegrator[3] = *temp_a0; + playerStatus->gravityIntegrator[3] = *temp_a0++; return; } @@ -110,42 +105,25 @@ void phys_init_integrator_for_current_state() { INCLUDE_ASM(void, "7bb60_len_41b0", phys_init_integrator_for_current_state); #endif // NON_MATCHING -#ifdef NON_MATCHING -// void gravity_use_fall_parms(void) { -// f32* floats = D_800F7B60; -// do { } while (0); -// if (gPlayerStatus.flags & 0x40000) { -// gPlayerStatus.gravityIntegrator[0] = *floats++ / 12.0f; -// gPlayerStatus.gravityIntegrator[1] = *floats++ / 12.0f; -// gPlayerStatus.gravityIntegrator[2] = *floats++ / 12.0f; -// gPlayerStatus.gravityIntegrator[3] = *floats++ / 12.0f; -// } else { -// gPlayerStatus.gravityIntegrator[0] = *floats++; -// gPlayerStatus.gravityIntegrator[1] = *floats++; -// gPlayerStatus.gravityIntegrator[2] = *floats++; -// gPlayerStatus.gravityIntegrator[3] = *floats++; -// } -// } +// This function is wack. This weird stuff is needed to match void gravity_use_fall_parms(void) { - PlayerStatus* playerStatus; f32* floats = D_800F7B60; + PlayerStatus* playerStatus; do {} while (0); playerStatus = &gPlayerStatus; + if (playerStatus->flags & 0x40000) { - playerStatus->gravityIntegrator[0] = (*(floats++)) / 12.0f; - playerStatus->gravityIntegrator[1] = (*(floats++)) / 12.0f; - playerStatus->gravityIntegrator[2] = (*(floats++)) / 12.0f; - playerStatus->gravityIntegrator[3] = (*(floats++)) / 12.0f; + playerStatus->gravityIntegrator[0] = *floats++ / 12.0f; + playerStatus->gravityIntegrator[1] = *floats++ / 12.0f; + playerStatus->gravityIntegrator[2] = *floats++ / 12.0f; + playerStatus->gravityIntegrator[3] = *floats++ / 12.0f; } else { - playerStatus->gravityIntegrator[0] = *(floats++); - playerStatus->gravityIntegrator[1] = *(floats++); - playerStatus->gravityIntegrator[2] = *(floats++); - playerStatus->gravityIntegrator[3] = *(floats++); + playerStatus->gravityIntegrator[0] = *floats++; + playerStatus->gravityIntegrator[1] = *floats++; + playerStatus->gravityIntegrator[2] = *floats++; + playerStatus->gravityIntegrator[3] = *floats++; } } -#else -INCLUDE_ASM(s32, "7bb60_len_41b0", gravity_use_fall_parms); -#endif void phys_update_falling(void) { if (gPlayerStatus.actionState != ACTION_STATE_LAND_ON_SWITCH && gPlayerStatus.actionState != ACTION_STATE_BOUNCE) { @@ -157,7 +135,54 @@ void phys_update_falling(void) { } } +// Matches but we need to decomp collision_main_lateral since there's a rodata padding issue +#ifdef NON_MATCHING +void func_800E315C(s32 colliderID) { + PlayerStatus* playerStatus = &gPlayerStatus; + PartnerActionStatus* partnerActionStatus = &gPartnerActionStatus; + + if (colliderID >= 0) { + u8 colliderType = get_collider_type_by_id(colliderID); + + switch (colliderType) { + case 1: + case 4: + case 5: + set_action_state(ACTION_STATE_LAND); + break; + case 3: + if ((partnerActionStatus->actionState.i & 0xFF0000FF) != 0x01000009) { + if (playerStatus->unk_10 == 0) { + if (playerStatus->actionState != ACTION_STATE_HIT_LAVA) { + playerStatus->unk_BF = 1; + set_action_state(ACTION_STATE_HIT_LAVA); + } + } else { + set_action_state(ACTION_STATE_UNKNOWN_16); + } + } + break; + case 2: + if ((partnerActionStatus->actionState.i & 0xFF0000FF) != 0x01000009) { + if (playerStatus->unk_10 == 0) { + if (playerStatus->actionState != ACTION_STATE_HIT_FIRE) { + playerStatus->unk_BF = 2; + set_action_state(ACTION_STATE_HIT_LAVA); + } + break; + } + set_action_state(ACTION_STATE_UNKNOWN_16); + } + break; + default: + phys_player_land(); + break; + } + } +} +#else INCLUDE_ASM(s32, "7bb60_len_41b0", func_800E315C); +#endif INCLUDE_ASM(s32, "7bb60_len_41b0", phys_player_land); @@ -266,7 +291,18 @@ void collision_check_player_overlaps(void) { INCLUDE_ASM(s32, "7bb60_len_41b0", phys_should_player_be_sliding); -INCLUDE_ASM(s32, "7bb60_len_41b0", phys_is_on_sloped_ground); +s32 phys_is_on_sloped_ground(void) { + Shadow* playerShadow = get_shadow_by_index(gPlayerStatus.shadowID); + f32 rotZ = playerShadow->rotation.z + 180.0; + f32 rotX = playerShadow->rotation.x + 180.0; + s32 ret = TRUE; + + if (fabsf(rotZ) < 20.0f && fabsf(rotX) < 20.0f) { + ret = FALSE; + } + + return ret; +} INCLUDE_ASM(s32, "7bb60_len_41b0", phys_main_collision_below); @@ -356,7 +392,26 @@ void phys_update_interact_collider(void) { INCLUDE_ASM(s32, "7bb60_len_41b0", phys_check_interactable_collision); -INCLUDE_ASM(s32, "7bb60_len_41b0", phys_can_player_interact); +s32 phys_can_player_interact(void) { + PartnerActionStatus* partnerActionStatus = &gPartnerActionStatus; + PlayerStatus* playerStatus = &gPlayerStatus; + s32 ret = TRUE; + + if (gPartnerActionStatus.actionState.b[0] != 0) { + if (gPartnerActionStatus.actionState.b[3] == 3) { + if (gPartnerActionStatus.actionState.b[0] < 3) { + ret = FALSE; + } + } else { + ret = FALSE; + } + } else if (!(gPlayerStatus.actionState == ACTION_STATE_IDLE || + gPlayerStatus.actionState == ACTION_STATE_WALK || + gPlayerStatus.actionState == ACTION_STATE_RUN)) { + ret = FALSE; + } + return ret; +} INCLUDE_ASM(f32, "7bb60_len_41b0", func_800E5348, void); @@ -379,270 +434,3 @@ void phys_save_ground_pos(void) { playerStatus->lastGoodPosition.y = playerStatus->position.y; playerStatus->lastGoodPosition.z = playerStatus->position.z; } - -void func_800E5520(void) { - D_8010C9B0 = 0; -} - -INCLUDE_ASM(void, "7bb60_len_41b0", phys_adjust_cam_on_landing); - -INCLUDE_ASM(s32, "7bb60_len_41b0", phys_clear_spin_history); - -INCLUDE_ASM(f32, "7bb60_len_41b0", phys_get_spin_history, s32 lag, s32* x, s32* y, s32* z); - -INCLUDE_ASM(s32, "7bb60_len_41b0", phys_reset_spin_history); - -INCLUDE_ASM(s32, "7bb60_len_41b0", phys_update_action_state); - -INCLUDE_ASM(s32, "7bb60_len_41b0", phys_peach_update); - -void set_action_state(s32 actionState) { - PlayerStatus* playerStatus = &gPlayerStatus; - PlayerData* playerData = &gPlayerData; - UNK_TYPE* unknownStruct = &D_8010F250; - - if (playerStatus->flags & 0x200) { - playerStatus->flags &= ~0x200; - enable_player_input(); - } - - if (playerStatus->animFlags & 0x4000) { - // TODO figure this out -#ifdef NON_MATCHING - if ( - actionState == ACTION_STATE_IDLE || actionState == ACTION_STATE_WALK || - actionState == ACTION_STATE_RUN || actionState == ACTION_STATE_JUMP || - actionState == ACTION_STATE_BOUNCE || actionState == ACTION_STATE_HOP || - actionState == ACTION_STATE_LAUNCH || actionState == ACTION_STATE_LAND_ON_SWITCH || - actionState == ACTION_STATE_FALLING || actionState == ACTION_STATE_STEP_DOWN || - actionState == ACTION_STATE_LAND || actionState == ACTION_STATE_STEP_DOWN_LAND - ) { -#else - if (actionState < ACTION_STATE_TALK) - if (actionState >= 0) { -#endif - playerStatus->prevActionState = playerStatus->actionState; - playerStatus->actionState = actionState; - playerStatus->flags |= 0x80000000; - } - return; - } - - if (actionState == ACTION_STATE_HIT_FIRE || actionState == ACTION_STATE_HIT_LAVA) { - PartnerID partner; - - if (playerStatus->unk_BF == 3) { - actionState = ACTION_STATE_HIT_FIRE; - } - - // Whilst Sushie, Lakilester, Parakarry's ability is active, hazards have no effect. - partner = playerData->currentPartner; - - if (partner == PARTNER_SUSHIE || partner == PARTNER_LAKILESTER || partner == PARTNER_PARAKARRY) { - if (D_8010EBB0.unk_00 != 0) { - playerStatus->animFlags |= 0x4; - playerStatus->flags |= 0x800; - return; - } - } - } - - if (actionState == ACTION_STATE_SLIDE) { - playerStatus->flags |= 0x10; - playerStatus->moveFrames = 0; - playerStatus->flags &= ~0x4000; - } - - playerStatus->prevActionState = playerStatus->actionState; - if (actionState == ACTION_STATE_USE_TWEESTER) { - playerStatus->prevActionState = ACTION_STATE_IDLE; - } - - if (actionState == ACTION_STATE_ENEMY_FIRST_STRIKE) { - playerStatus->animFlags |= 4; - } - playerStatus->actionState = actionState; - playerStatus->flags |= 0x80000000; - - if (playerStatus->actionState == ACTION_STATE_SPIN) { - return; - } - - playerStatus->flags &= ~0x20000; - playerStatus->animFlags &= ~0x10000; - - if (unknownStruct[0xC]) { - sfx_stop_sound(unknownStruct[0xC]); - } - - if (playerStatus->unk_D8) { - playerStatus->unk_D8[3][9] = 0xA; - playerStatus->unk_D8 = NULL; - } -} - -void update_locomotion_state(void) { - PlayerStatus* playerStatus = &gPlayerStatus; - do { } while (0); // required to match - - set_action_state((!is_ability_active(ABILITY_SLOW_GO) - && (SQ(playerStatus->stickAxis[0]) + SQ(playerStatus->stickAxis[1]) >= 0xBD2)) ? ACTION_STATE_RUN : ACTION_STATE_WALK); -} - -void start_falling(void) { - PlayerStatus* playerStatus = &gPlayerStatus; - - set_action_state(ACTION_STATE_FALLING); - playerStatus->gravityIntegrator[0] = 0.1143f; - playerStatus->gravityIntegrator[1] = -0.2871f; - playerStatus->gravityIntegrator[2] = -0.1823f; - playerStatus->gravityIntegrator[3] = 0.01152f; -} - -void start_bounce_a(void) { - PlayerStatus* playerStatus = &gPlayerStatus; - - set_action_state(ACTION_STATE_BOUNCE); - playerStatus->gravityIntegrator[0] = 10.0f; - playerStatus->gravityIntegrator[1] = -2.0f; - playerStatus->gravityIntegrator[2] = 0.8f; - playerStatus->gravityIntegrator[3] = -0.75f; -} - -void start_bounce_b(void) { - PlayerStatus* playerStatus = &gPlayerStatus; - - set_action_state(ACTION_STATE_BOUNCE); - playerStatus->gravityIntegrator[0] = 8.0f; - playerStatus->gravityIntegrator[1] = -1.0f; - playerStatus->gravityIntegrator[2] = 0; - playerStatus->gravityIntegrator[3] = 0; - playerStatus->flags |= 0x800000; -} - -// TODO playerData isn't used -s32 check_input_hammer(void) { - PlayerData* playerData = &gPlayerData; - - if (gPlayerStatus.pressedButtons & BUTTON_B) { - if (!(gPlayerStatus.flags & 4)) { - if (D_8010EBB0.unk_00 != 1 || gPlayerData.currentPartner != PARTNER_WATT) { - if (gPlayerData.hammerLevel != -1) { - set_action_state(ACTION_STATE_HAMMER); - return TRUE; - } - } - } - } - - return FALSE; -} - -INCLUDE_ASM(s32, "7bb60_len_41b0", check_input_jump); - -void check_input_spin(void) { - PlayerStatus* playerStatus = &gPlayerStatus; - Temp8010F250* temp_8010F250 = &D_8010F250; - Temp8010F250* temp2 = temp_8010F250; - - if (!(playerStatus->flags & (PLAYER_ANIM_FLAG_8BIT_MARIO | PLAYER_ANIM_FLAG_PEACH_PHYSICS)) && - !(playerStatus->animFlags & 1) && - !(playerStatus->currentButtons & D_CBUTTONS) && - !is_ability_active(ABILITY_SLOW_GO)) { - - s32 actionState = playerStatus->actionState; - s32 btnPressed = playerStatus->pressedButtons & Z_TRIG; - - // TODO - if (actionState != 0x21) { - if (actionState < 0x22) { - if (actionState < 3) { - if (actionState >= 0 && !(playerStatus->animFlags & 0x10000)) { - if (btnPressed || temp_8010F250->unk_01) { - set_action_state(ACTION_STATE_SPIN); - if (temp_8010F250->unk_01 != 0) { - if (temp_8010F250->unk_08 != 0 || temp_8010F250->unk_0C != 0) { - playerStatus->prevActionState = temp2->unk_07; - } else { - playerStatus->prevActionState = ACTION_STATE_IDLE; - } - } - } - } - } - } - } - } -} - -void peach_set_disguise_anim(s32 arg0) { - s32 listIndex = D_8010C96C; - - if (listIndex >= 0) { - get_npc_by_index(listIndex)->currentAnim.w = arg0; - } -} - -void func_800E63A4(s32 arg0) { - PlayerStatus* playerStatus = &gPlayerStatus; - - if (arg0 != 0) { - set_action_state(ACTION_STATE_SNEAKY_PARASOL); - } else { - playerStatus->animFlags &= ~PLAYER_ANIM_FLAG_IN_DISGUISE; - gGameStatusPtr->peachFlags &= ~0x2; - playerStatus->peachDisguise = 0; - free_npc_by_index(D_8010C96C); - set_action_state(ACTION_STATE_IDLE); - playerStatus->colliderHeight = 55; - playerStatus->colliderDiameter = 38; - } -} - -void peach_check_for_parasol_input(void) { - PlayerStatus* playerStatus = &gPlayerStatus; - s32 actionState = playerStatus->actionState; - Npc* disguiseNpc; - - if (actionState == ACTION_STATE_IDLE || actionState == ACTION_STATE_WALK || actionState == ACTION_STATE_RUN) { - if (D_8010C92C != 0) { - D_8010C92C--; - if (D_8010C92C == 0) { - if (gGameStatusPtr->peachFlags & 2) { - playerStatus->animFlags |= PLAYER_ANIM_FLAG_IN_DISGUISE; - gGameStatusPtr->peachFlags |= 2; - - disguiseNpc = peach_make_disguise_npc(gGameStatusPtr->peachDisguise); - if (disguiseNpc != NULL) { - disguiseNpc->flags &= ~NPC_FLAG_40000; - } - } - } - } else if (gGameStatusPtr->peachFlags & 4 && playerStatus->pressedButtons & B_BUTTON) { - set_action_state(ACTION_STATE_SNEAKY_PARASOL); - } - } -} - -void peach_sync_disguise_npc(void) { - PlayerStatus* playerStatus = &gPlayerStatus; - - if (D_8010C96C >= 0) { - Npc* npc = get_npc_by_index(D_8010C96C); - - if (npc->flags & NPC_FLAG_40000) { - npc->renderYaw = playerStatus->spriteFacingAngle; - } else { - npc->yaw = playerStatus->targetYaw; - } - - npc->pos.x = playerStatus->position.x; - npc->pos.y = playerStatus->position.y; - npc->pos.z = playerStatus->position.z; - } -} - -INCLUDE_ASM(Npc*, "7bb60_len_41b0", peach_make_disguise_npc, s32 peachDisguise); - -INCLUDE_ASM(s32, "7bb60_len_41b0", peach_disguise_check_overlaps); - diff --git a/src/7fd10_len_b40.c b/src/7fd10_len_b40.c index 76a4b18eda..2ca0919d42 100644 --- a/src/7fd10_len_b40.c +++ b/src/7fd10_len_b40.c @@ -3,7 +3,7 @@ void func_800E6860(void) { PlayerStatus* playerStatus = &gPlayerStatus; - if (D_8010EBB0.unk_00 != 0 && D_8010EBB0.unk_03 == 9) { + if (gPartnerActionStatus.actionState.b[0] != 0 && gPartnerActionStatus.actionState.b[3] == 9) { Npc* partner = get_npc_unsafe(NPC_PARTNER); func_802DDEE4(0, -1, 7, 0, 0, 0, playerStatus->alpha1, 0); @@ -15,25 +15,25 @@ void func_800E6860(void) { // playerStatus getting coppied to a0 - how? inlining? #ifdef NON_MATCHING s32 func_800E6904(void) { - Temp8010EBB0* temp_8010EBB0 = &D_8010EBB0; - PlayerStatus* playerStatus = &gPlayerStatus; - s32 actionState = playerStatus->actionState; + PartnerActionStatus* partnerActionStatus = &gPartnerActionStatus; + //PlayerStatus* playerStatus = &gPlayerStatus; // doesn't change codegen to use it, so commented out for now + s32 actionState = gPlayerStatus.actionState; - if (!(playerStatus->animFlags & 0x100000)) { - if (temp_8010EBB0->unk_00 == 0) { - if (!(playerStatus->flags & 0x1000)) { + if (!(gPlayerStatus.animFlags & 0x100000)) { + if (partnerActionStatus->actionState.b[0] == 0) { + if (!(gPlayerStatus.flags & 0x1000)) { if (actionState == ACTION_STATE_IDLE || actionState == ACTION_STATE_WALK || actionState == ACTION_STATE_RUN) { return 1; } } } else if (partner_player_can_pause()) { - if (temp_8010EBB0->unk_03 == 6) { + if (partnerActionStatus->actionState.b[3] == 6) { return 1; - } else if (temp_8010EBB0->unk_03 == 9) { + } else if (partnerActionStatus->actionState.b[3] == 9) { if (actionState == ACTION_STATE_RIDE) { return 1; } - } else if (temp_8010EBB0->unk_03 == 8) { + } else if (partnerActionStatus->actionState.b[3] == 8) { if (actionState != ACTION_STATE_RIDE) { sfx_play_sound(0x21D); } else { diff --git a/src/E21870.c b/src/E21870.c index 2d44b10bfa..7486fe1681 100644 --- a/src/E21870.c +++ b/src/E21870.c @@ -1,11 +1,11 @@ #include "common.h" s32 func_802B7000_2(void) { - Temp8010EBB0* something = &D_8010EBB0; + PartnerActionStatus* partnerActionStatus = &gPartnerActionStatus; ActionState actionState = gPlayerActionState; if (actionState != ACTION_STATE_USE_TWEESTER) { - if (something->unk_00 != 1 || (something->unk_03 != 9 && something->unk_03 != 4)) { + if (partnerActionStatus->actionState.b[0] != 1 || (partnerActionStatus->actionState.b[3] != 9 && partnerActionStatus->actionState.b[3] != 4)) { return 0; } } diff --git a/src/curtains.c b/src/curtains.c index 697c767c90..e63b48e973 100644 --- a/src/curtains.c +++ b/src/curtains.c @@ -1,14 +1,181 @@ #include "common.h" +#include "sprite/unk_checkers.png.h" +#include "sprite/curtains.png.h" +#include "sprite/checkers.png.h" #include "ui/no_controller.png.h" #include "ld_addrs.h" #include "nu/nusys.h" -extern s32 D_80076078; -extern s32 D_800760C0; +#include "sprite/unk_checkers.png.inc.c" + +Gfx D_800746E0[] = { + gsDPSetTextureLUT(G_TT_NONE), + gsSPTexture(-1, -1, 0, G_TX_RENDERTILE, G_ON), + gsDPLoadTextureBlock_4b(sprite_unk_checkers_png, G_IM_FMT_I, 16, 32, 0, G_TX_NOMIRROR | G_TX_WRAP, + G_TX_NOMIRROR | G_TX_CLAMP, 4, 5, G_TX_NOLOD, G_TX_NOLOD), + gsSPEndDisplayList(), +}; + +#include "sprite/curtains.png.inc.c" + +Gfx D_80075730[] = { + gsDPSetTextureLUT(G_TT_NONE), + gsSPTexture(-1, -1, 0, G_TX_RENDERTILE, G_ON), + gsDPLoadTextureBlock(sprite_curtains_png, G_IM_FMT_RGBA, G_IM_SIZ_32b, 32, 32, 0, G_TX_MIRROR | G_TX_WRAP, + G_TX_NOMIRROR | G_TX_CLAMP, 5, 5, G_TX_NOLOD, G_TX_NOLOD), + gsSPEndDisplayList(), +}; + +#include "sprite/checkers.png.inc.c" +#include "sprite/checkers.pal.inc.c" + +Gfx D_800758A0[] = { + gsDPSetTextureLUT(G_TT_RGBA16), + gsDPLoadTLUT_pal16(0, sprite_checkers_pal), + gsSPTexture(-1, -1, 0, G_TX_RENDERTILE, G_ON), + gsDPLoadTextureBlock_4b(sprite_checkers_png, G_IM_FMT_CI, 32, 16, 0, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | + G_TX_WRAP, 5, 4, G_TX_NOLOD, G_TX_NOLOD), + gsSPEndDisplayList(), +}; + +#include "vtx/curtains1.vtx.inc.c" +#include "vtx/curtains2.vtx.inc.c" +#include "vtx/curtains3.vtx.inc.c" +#include "vtx/curtains4.vtx.inc.c" +#include "vtx/curtains5.vtx.inc.c" +#include "vtx/curtains6.vtx.inc.c" +#include "vtx/curtains7.vtx.inc.c" + +Gfx D_80075E60[] = { + gsDPPipeSync(), + gsDPSetRenderMode(G_RM_PASS, G_RM_CLD_SURF2), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, COMBINED, 0, PRIMITIVE, 0, 0, 0, 0, COMBINED), + gsSPDisplayList(D_80075730), + gsSPVertex(vtx_curtains7, 8, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSPEndDisplayList(), +}; + +Gfx D_80075EA0[] = { + gsDPPipeSync(), + gsDPSetRenderMode(G_RM_PASS, G_RM_XLU_SURF2), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, 0, 0, 0, TEXEL0, COMBINED, 0, PRIMITIVE, 0, 0, 0, 0, COMBINED), + gsSPDisplayList(D_80075730), + gsSPVertex(vtx_curtains6, 31, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), + gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0), + gsSP2Triangles(15, 16, 17, 0, 15, 17, 18, 0), + gsSP2Triangles(19, 20, 21, 0, 19, 21, 22, 0), + gsSP2Triangles(13, 23, 24, 0, 13, 24, 14, 0), + gsSP2Triangles(23, 25, 26, 0, 23, 26, 24, 0), + gsSP2Triangles(25, 27, 28, 0, 25, 28, 26, 0), + gsSP2Triangles(27, 29, 30, 0, 27, 30, 28, 0), + gsSPEndDisplayList(), +}; + +Gfx D_80075F20[] = { + gsDPPipeSync(), + gsDPSetRenderMode(G_RM_PASS, G_RM_XLU_SURF2), + gsDPSetCombineLERP(0, 0, 0, SHADE, 0, 0, 0, SHADE, COMBINED, 0, PRIMITIVE, 0, 0, 0, 0, COMBINED), + gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), + gsSPVertex(vtx_curtains4, 4, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSPVertex(vtx_curtains5, 4, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSPEndDisplayList(), +}; + +Gfx D_80075F68[] = { + gsDPPipeSync(), + gsDPSetRenderMode(CVG_DST_FULL | ZMODE_OPA | FORCE_BL | G_RM_PASS, CVG_DST_FULL | ZMODE_OPA | FORCE_BL | + GBL_c2(G_BL_CLR_IN, G_BL_0, G_BL_CLR_IN, G_BL_1)), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, COMBINED, 0, PRIMITIVE, 0, 0, 0, 0, COMBINED), + gsSPDisplayList(D_800746E0), + gsSPVertex(vtx_curtains3, 25, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 0, 0, 4, 0, 3, 0), + gsSP2Triangles(1, 6, 7, 0, 1, 7, 2, 0), + gsSP2Triangles(3, 8, 9, 0, 3, 9, 10, 0), + gsSP2Triangles(11, 4, 3, 0, 11, 3, 10, 0), + gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0), + gsSP2Triangles(8, 12, 15, 0, 8, 15, 9, 0), + gsSP2Triangles(6, 16, 13, 0, 6, 13, 7, 0), + gsSP2Triangles(14, 17, 18, 0, 19, 14, 18, 0), + gsSP2Triangles(20, 11, 21, 0, 11, 22, 21, 0), + gsSP2Triangles(23, 19, 18, 0, 23, 18, 24, 0), + gsSP2Triangles(22, 23, 24, 0, 22, 24, 21, 0), + gsSPEndDisplayList(), +}; + +Gfx D_80075FF8[] = { + gsDPPipeSync(), + gsDPSetRenderMode(CVG_DST_FULL | ZMODE_OPA | FORCE_BL | G_RM_PASS, CVG_DST_FULL | ZMODE_OPA | FORCE_BL | + GBL_c2(G_BL_CLR_IN, G_BL_0, G_BL_CLR_IN, G_BL_1)), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, COMBINED, 0, PRIMITIVE, 0, 0, 0, 0, COMBINED), + gsSPDisplayList(D_800758A0), + gsSPVertex(vtx_curtains2, 6, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(1, 4, 5, 0, 1, 5, 2, 0), + gsSPEndDisplayList(), +}; + +Gfx D_80076038[] = { + gsDPPipeSync(), + gsDPSetRenderMode(CVG_DST_FULL | ZMODE_OPA | FORCE_BL | G_RM_PASS, CVG_DST_FULL | ZMODE_OPA | FORCE_BL | + GBL_c2(G_BL_CLR_IN, G_BL_0, G_BL_CLR_IN, G_BL_1)), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, COMBINED, 0, PRIMITIVE, 0, 0, 0, 0, COMBINED), + gsSPDisplayList(D_800758A0), + gsSPVertex(vtx_curtains1, 6, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(1, 4, 5, 0, 1, 5, 2, 0), + gsSPEndDisplayList(), +}; + +Gfx D_80076078[] ={ + gsSPDisplayList(D_80075F68), + gsSPDisplayList(D_80076038), + gsSPDisplayList(D_80075FF8), + gsSPDisplayList(D_80075F20), + gsSPDisplayList(D_80075E60), + gsSPDisplayList(D_80075EA0), + gsSPEndDisplayList(), +}; + +Vp D_800760B0 = { + { + {(SCREEN_WIDTH/2)*4, (SCREEN_HEIGHT/2)*4, 0x200 - 1, 0}, + {(SCREEN_WIDTH/2)*4, (SCREEN_HEIGHT/2)*4, 0x200 - 1, 0}, + } +}; + +Gfx D_800760C0[] = { + gsSPViewport(&D_800760B0), + gsDPSetCycleType(G_CYC_2CYCLE), + gsDPSetTextureLOD(G_TL_TILE), + gsDPSetTexturePersp(G_TP_PERSP), + gsDPSetTextureFilter(G_TF_BILERP), + gsDPSetTextureDetail(G_TD_CLAMP), + gsDPSetTextureConvert(G_TC_FILT), + gsDPSetCombineKey(G_CK_NONE), + gsDPSetAlphaCompare(G_AC_NONE), + gsDPSetScissor(G_SC_NON_INTERLACE, 0, 0, 320, 240), + gsDPSetColorDither(G_CD_MAGICSQ), + gsDPSetAlphaDither(G_AD_PATTERN), + gsSPClearGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN | + G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH | G_CLIPPING | 0x0040F9FA), + gsSPSetGeometryMode(G_SHADE | G_SHADING_SMOOTH), + gsSPPerspNormalize(0x0014), + gsSPEndDisplayList(), +}; + +#include "ui/no_controller.png.inc.c" Gfx D_80077140[] = { gsDPPipeSync(), - gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsSPTexture(-1, -1, 0, G_TX_RENDERTILE, G_ON), gsDPSetCycleType(G_CYC_1CYCLE), gsDPSetTexturePersp(G_TP_NONE), gsDPSetTextureDetail(G_TD_CLAMP), diff --git a/src/encounter_api.c b/src/encounter_api.c index 9edbe08dcc..02e0056e2d 100644 --- a/src/encounter_api.c +++ b/src/encounter_api.c @@ -476,7 +476,7 @@ ApiStatus GetSelfAnimationFromTable(ScriptInstance* script, s32 isInitialCall) { } ApiStatus func_80045798(ScriptInstance* script, s32 isInitialCall) { - D_8010EBB0.unk_358 = get_variable(script, *script->ptrReadPos); + gPartnerActionStatus.unk_358 = get_variable(script, *script->ptrReadPos); return ApiStatus_DONE2; } diff --git a/src/entity/Switch.c b/src/entity/Switch.c index a7c6a4086d..e6e8262e84 100644 --- a/src/entity/Switch.c +++ b/src/entity/Switch.c @@ -78,7 +78,7 @@ void entity_HugeBlueSwitch_idle(Entity* entity) { void entity_small_switch_idle(Entity* entity) { struct802E1400* temp = entity->dataBuf; PlayerStatus* playerStatus = &gPlayerStatus; - Temp8010EBB0* temp2 = &D_8010EBB0; + PartnerActionStatus* partnerActionStatus = &gPartnerActionStatus; entity_switch_fall_down(entity); @@ -102,7 +102,7 @@ void entity_small_switch_idle(Entity* entity) { return; } - if (temp2->unk_03 == 4 && temp2->unk_00 != 0) { + if (partnerActionStatus->actionState.b[3] == 4 && partnerActionStatus->actionState.b[0] != 0) { return; } diff --git a/src/evt/fx_api.c b/src/evt/fx_api.c index 78ec72badb..66ee12b787 100644 --- a/src/evt/fx_api.c +++ b/src/evt/fx_api.c @@ -1,4 +1,5 @@ #include "common.h" +#include "effects.h" INCLUDE_ASM(void, "evt/fx_api", func_802D7460, f32 x, f32 y, f32 z, s32 arg3); @@ -126,481 +127,496 @@ INCLUDE_ASM(ApiStatus, "evt/fx_api", ShowSleepBubble, ScriptInstance* script, s3 INCLUDE_ASM(ApiStatus, "evt/fx_api", func_802D8248, ScriptInstance* script, s32 isInitialCall); +// So close aside from regalloc at the beginning #ifdef NON_MATCHING -s32 PlayEffect(ScriptInstance* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - Bytecode* floatArgs = args; - Bytecode* intArgs = args; +ApiStatus PlayEffect(ScriptInstance* script, s32 isInitialCall) { + Bytecode* args; + Bytecode* intArgs; + Bytecode* floatArgs; s32 effectID; - s32 fxReturn = 0; - - s32 iArg1; - s32 iArg2; - s32 iArg3; - s32 iArg4; - s32 iArg5; - s32 iArg6; - s32 iArg7; - s32 iArg8; - s32 iArg9; - s32 iArg10; - - s32 a7; - f32 fArg1; - f32 fArg2; - f32 fArg3; - f32 fArg4; - f32 fArg5; - f32 fArg6; - f32 fArg7; - f32 fArg8; - f32 fArg9; - f32 fArg10; - f32 fArg11; + EffectInstance* effectRet; s32 a2; - s32* a6; - s32* a8; + s32 a6; + s32 a7; + s32 a8; s32 a9; + + s32 new_var; + s32 iVar1; + s32 iVar2; + s32 iVar3; + s32 iVar4; + s32 iVar5; + s32 iVar6; + s32 iVar7; + s32 iVar8; + s32 iVar9; + s32 iVar10; + + f32 fVar1; + f32 fVar2; + f32 fVar3; + f32 fVar4; + f32 fVar5; + f32 fVar6; + f32 fVar7; + f32 fVar8; + f32 fVar9; + f32 fVar10; + f32 fVar11; + s32 sp3C; - EffectInstanceData* sp34; s32 sp30; + s32 sp38; - effectID = get_variable(script, *args++); + args = script->ptrReadPos; + intArgs = script->ptrReadPos; + floatArgs = script->ptrReadPos; + effectID = get_variable(script, *args++); // todo maybe increment later on + + get_variable(script, *intArgs++); get_variable(script, *floatArgs++); - get_variable(script, *intArgs++); - iArg1 = get_variable(script, *intArgs++); - iArg2 = get_variable(script, *intArgs++); - iArg3 = get_variable(script, *intArgs++); - iArg4 = get_variable(script, *intArgs++); - iArg5 = get_variable(script, *intArgs++); - iArg6 = get_variable(script, *intArgs++); - iArg7 = get_variable(script, *intArgs++); - iArg8 = get_variable(script, *intArgs++); - iArg9 = get_variable(script, *intArgs++); - iArg10 = get_variable(script, *intArgs++); + new_var = get_variable(script, *intArgs++); + iVar2 = get_variable(script, *intArgs++); + iVar3 = get_variable(script, *intArgs++); + iVar4 = get_variable(script, *intArgs++); + iVar5 = get_variable(script, *intArgs++); + iVar6 = get_variable(script, *intArgs++); + iVar7 = get_variable(script, *intArgs++); + iVar8 = get_variable(script, *intArgs++); + iVar9 = get_variable(script, *intArgs++); + iVar10 = get_variable(script, *intArgs++); get_variable(script, *intArgs++); get_variable(script, *intArgs++); get_variable(script, *intArgs++); - fArg1 = get_float_variable(script, *floatArgs++); - fArg2 = get_float_variable(script, *floatArgs++); - fArg3 = get_float_variable(script, *floatArgs++); - fArg4 = get_float_variable(script, *floatArgs++); - fArg5 = get_float_variable(script, *floatArgs++); - fArg6 = get_float_variable(script, *floatArgs++); - fArg7 = get_float_variable(script, *floatArgs++); - fArg8 = get_float_variable(script, *floatArgs++); - fArg9 = get_float_variable(script, *floatArgs++); - fArg10 = get_float_variable(script, *floatArgs++); - fArg11 = get_float_variable(script, *floatArgs++); + fVar1 = get_float_variable(script, *floatArgs++); + fVar2 = get_float_variable(script, *floatArgs++); + fVar3 = get_float_variable(script, *floatArgs++); + fVar4 = get_float_variable(script, *floatArgs++); + fVar5 = get_float_variable(script, *floatArgs++); + fVar6 = get_float_variable(script, *floatArgs++); + fVar7 = get_float_variable(script, *floatArgs++); + fVar8 = get_float_variable(script, *floatArgs++); + fVar9 = get_float_variable(script, *floatArgs++); + fVar10 = get_float_variable(script, *floatArgs++); + fVar11 = get_float_variable(script, *floatArgs++); get_float_variable(script, *floatArgs++); get_float_variable(script, *floatArgs++); - args++; - a2 = *args; - args++; - args++; - args++; - args++; + args++; // 1 + a2 = *args++; + args++; // 3 + args++; // 4 + args++; // 5 a6 = *args++; a7 = *args++; a8 = *args++; a9 = *args++; + iVar1 = new_var; + + effectRet = NULL; + switch (effectID) { case 0: - playFX_3E(0, fArg1, fArg2, fArg3, 3.0f, iArg5); + playFX_3E(0, fVar1, fVar2, fVar3, 3.0f, iVar5); break; case 1: - playFX_01(fArg1, fArg2, fArg3); + playFX_01(fVar1, fVar2, fVar3); break; case 6: - fx_land(iArg1, fArg2, fArg3, fArg4, fArg5); + fx_land(iVar1, fVar2, fVar3, fVar4, fVar5); break; case 7: - fx_walk(iArg1, fArg2, fArg3, fArg4, fArg5, fArg6); + fx_walk(iVar1, fVar2, fVar3, fVar4, fVar5, fVar6); break; case 8: - playFX_08(fArg1, fArg2, fArg3, fArg4); + playFX_08(fVar1, fVar2, fVar3, fVar4); break; case 9: - playFX_09(iArg1, fArg2, fArg3, fArg4, fArg5, fArg6); + playFX_09(iVar1, fVar2, fVar3, fVar4, fVar5, fVar6); break; case 10: - playFX_0A(fArg1, fArg2, iArg1, a2, fArg3, fArg4); + playFX_0A(fVar1, fVar2, fVar3, fVar4); break; case 11: - playFX_0B(iArg1, fArg2, fArg3, fArg4); + playFX_0B(iVar1, fVar2, fVar3, fVar4); break; case 12: - playFX_0C(fArg1, fArg2, iArg1, a2, fArg3, fArg4, fArg5); + playFX_0C(fVar1, fVar2, fVar3, fVar4, fVar5); break; case 13: - playFX_0D(0, fArg1, fArg2, fArg3, iArg4); + playFX_0D(0, fVar1, fVar2, fVar3, iVar4); break; case 14: - playFX_0E(fArg1, fArg2, iArg1, a2, fArg3, iArg4); + playFX_0E(fVar1, fVar2, fVar3, iVar4); break; case 15: - playFX_0F(iArg1, fArg2, fArg3, fArg4, fArg5, fArg6, fArg7, fArg8); + playFX_0F(iVar1, fVar2, fVar3, fVar4, fVar5, fVar6, fVar7, fVar8); break; case 16: - fx_emote(iArg1, a2, fArg3, fArg4, fArg5, fArg6, fArg7, iArg8, &sp30); - set_variable(script, *a8, sp30); + fx_emote(iVar1, (Npc* ) a2, fVar3, fVar4, fVar5, fVar6, fVar7, iVar8, &sp30); + set_variable(script, a8, sp30); break; case 17: - playFX_11(iArg1, fArg2, fArg3, fArg4, fArg5); + playFX_11(iVar1, fVar2, fVar3, fVar4, fVar5); break; case 18: - playFX_12(iArg1, fArg2, fArg3, fArg4, fArg5, fArg6, fArg7, iArg8); + playFX_12(iVar1, fVar2, fVar3, fVar4, fVar5, fVar6, fVar7, iVar8); break; case 19: - playFX_13(iArg1, fArg2, fArg3, fArg4, fArg5, iArg6); + playFX_13(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6); break; case 20: - playFX_14(iArg1, fArg2, fArg3, fArg4, iArg5); + playFX_14(iVar1, fVar2, fVar3, fVar4, iVar5); break; case 21: - playFX_15(iArg1, fArg2, fArg3, fArg4, iArg5); + playFX_15(iVar1, fVar2, fVar3, fVar4, iVar5); break; case 22: - playFX_16(iArg1, fArg2, fArg3, fArg4, fArg5); + playFX_16(iVar1, fVar2, fVar3, fVar4, fVar5); break; case 23: - playFX_17(iArg1, fArg2, fArg3, fArg4); + playFX_17(iVar1, fVar2, fVar3, fVar4); break; case 24: - playFX_18(iArg1, fArg2, fArg3, fArg4, fArg5, fArg6, fArg7, iArg8); + playFX_18(iVar1, fVar2, fVar3, fVar4, fVar5, fVar6, fVar7, iVar8); break; case 25: - playFX_19(iArg1, fArg2, fArg3, fArg4); + playFX_19(iVar1, fVar2, fVar3, fVar4); break; case 26: - playFX_1A(iArg1, fArg2, fArg3, fArg4, iArg5); + playFX_1A(iVar1, fVar2, fVar3, fVar4, iVar5); break; case 27: - playFX_1B(iArg1, fArg2, fArg3, fArg4, fArg5, &sp34); - set_variable(script, *a6, sp34); + playFX_1B(iVar1, fVar2, fVar3, fVar4, fVar5, &sp38); + set_variable(script, a6, sp38); + break; case 28: - playFX_1C(iArg1, fArg2, fArg3, fArg4, iArg5); + playFX_1C(iVar1, fVar2, fVar3, fVar4, iVar5); break; case 29: - playFX_1D(iArg1, fArg2, fArg3, fArg4, fArg5, iArg6, fArg7, iArg8); + playFX_1D(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6, fVar7, iVar8); break; case 30: - playFX_1E(iArg1, fArg2, fArg3, fArg4, fArg5, fArg6, iArg7, &sp30); - set_variable(script, *a8, sp30); + playFX_1E(iVar1, fVar2, fVar3, fVar4, fVar5, fVar6, iVar7, &sp30); + set_variable(script, a8, sp30); break; case 31: - playFX_1F(iArg1, fArg2, fArg3, fArg4, fArg5, fArg6, fArg7, fArg8); + playFX_1F(iVar1, fVar2, fVar3, fVar4, fVar5, fVar6, fVar7, fVar8); break; case 33: - playFX_21(iArg1, fArg2, fArg3, fArg4, fArg5, fArg6, iArg7); + playFX_21(iVar1, fVar2, fVar3, fVar4, fVar5, fVar6, iVar7); break; case 34: - playFX_22(iArg1, fArg2, fArg3, fArg4, fArg5, fArg6, iArg7, iArg8); + playFX_22(iVar1, fVar2, fVar3, fVar4, fVar5, fVar6, iVar7, iVar8); break; case 35: - playFX_23(iArg1, fArg2, fArg3, fArg4, fArg5); + playFX_23(iVar1, fVar2, fVar3, fVar4, fVar5); break; case 36: - playFX_24(iArg1, fArg2, fArg3, fArg4, fArg5, iArg6); + playFX_24(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6); break; case 37: - playFX_25(iArg1, fArg2, fArg3, fArg4); + playFX_25(iVar1, fVar2, fVar3, fVar4); break; case 38: - playFX_26(iArg1, fArg2, fArg3, fArg4); + playFX_26(iVar1, fVar2, fVar3, fVar4); break; case 39: - playFX_27(iArg1, fArg2, fArg3, fArg4, fArg5, iArg6); + playFX_27(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6); break; case 40: - fx_sweat(iArg1, fArg2, fArg3, fArg4, fArg5, fArg6, iArg7); + fx_sweat(iVar1, fVar2, fVar3, fVar4, fVar5, fVar6, iVar7); break; case 41: - fx_sleep_bubble(iArg1, fArg2, fArg3, fArg4, fArg5, fArg6, &sp34); - set_variable(script, a7, sp34); + fx_sleep_bubble(iVar1, fVar2, fVar3, fVar4, fVar5, fVar6, &sp38); + set_variable(script, a7, sp38); break; case 43: - playFX_2B(iArg1, fArg2, fArg3, fArg4); + playFX_2B(iVar1, fVar2, fVar3, fVar4); break; case 32: - playFX_20(iArg1, fArg2, fArg3, fArg4, fArg5, &sp34); - set_variable(script, *a6, sp34); + playFX_20(iVar1, fVar2, fVar3, fVar4, fVar5, &sp38); + set_variable(script, a6, sp38); + break; case 44: - playFX_2C(iArg1, fArg2, fArg3, fArg4); + playFX_2C(iVar1, fVar2, fVar3, fVar4); break; case 45: - playFX_2D(iArg1, fArg2, fArg3, fArg4, iArg5, iArg6); + playFX_2D(iVar1, fVar2, fVar3, fVar4, iVar5, iVar6); break; case 46: - playFX_2E(iArg1, fArg2, fArg3, fArg4, fArg5, iArg6); + playFX_2E(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6); break; case 47: - playFX_2F(iArg1, fArg2, fArg3, fArg4, fArg5, iArg6, &sp34); - set_variable(script, a7, sp34); + playFX_2F(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6, &sp38); + set_variable(script, a7, sp38); break; case 48: - playFX_30(iArg1, fArg2, fArg3, fArg4); + playFX_30(iVar1, fVar2, fVar3, fVar4); break; case 49: - playFX_31(iArg1, fArg2, fArg3, fArg4); + playFX_31(iVar1, fVar2, fVar3, fVar4); break; case 50: - playFX_32(iArg1, fArg2, fArg3, fArg4, fArg5); + playFX_32(iVar1, fVar2, fVar3, fVar4, fVar5); break; case 51: - playFX_33(iArg1, fArg2, fArg3, fArg4, fArg5, iArg6); + playFX_33(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6); break; case 52: - playFX_34(iArg1, fArg2, fArg3, fArg4, fArg5, &sp34); - set_variable(script, *a6, sp34); + playFX_34(iVar1, fVar2, fVar3, fVar4, fVar5, &sp38); + set_variable(script, a6, sp38); + break; case 53: - playFX_35(iArg1, fArg2, fArg3, fArg4, fArg5, &sp34); - set_variable(script, *a6, sp34); + playFX_35(iVar1, fVar2, fVar3, fVar4, fVar5, &sp38); + set_variable(script, a6, sp38); + break; case 54: - fxReturn = playFX_36(iArg1, fArg2, fArg3, fArg4, fArg5, fArg6); + effectRet = playFX_36(iVar1, fVar2, fVar3, fVar4, fVar5, fVar6); break; case 55: - fxReturn = playFX_37(iArg1, fArg2, fArg3, fArg4, fArg5, fArg6, fArg7, iArg8, iArg9, iArg10); + effectRet = playFX_37(iVar1, fVar2, fVar3, fVar4, fVar5, fVar6, fVar7, iVar8, iVar9, iVar10); break; case 56: - playFX_38(iArg1, fArg2, fArg3, fArg4, fArg5, iArg6); + playFX_38(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6); break; case 57: - playFX_39(iArg1, fArg2, fArg3, fArg4, fArg5, iArg6); + playFX_39(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6); break; case 58: - playFX_3A(iArg1, fArg2, fArg3, fArg4, fArg5, fArg6, iArg7, iArg8); + playFX_3A(iVar1, fVar2, fVar3, fVar4, fVar5, fVar6, iVar7, iVar8); break; case 59: - playFX_3B(iArg1, fArg2, fArg3, fArg4, fArg5, &sp34); - set_variable(script, *a6, sp34); + playFX_3B(iVar1, fVar2, fVar3, fVar4, fVar5, &sp38); + set_variable(script, a6, sp38); + break; case 60: - playFX_3C(iArg1, fArg2, fArg3, fArg4, fArg5, &sp34); - set_variable(script, *a6, sp34); + playFX_3C(iVar1, fVar2, fVar3, fVar4, fVar5, &sp38); + set_variable(script, a6, sp38); break; case 61: - playFX_3D(iArg1, fArg2, fArg3, fArg4, fArg5, fArg6, fArg7, iArg8, &sp3C); + playFX_3D(iVar1, fVar2, fVar3, fVar4, fVar5, fVar6, fVar7, iVar8, &sp3C); set_variable(script, a9, sp3C); break; case 62: - playFX_3E(iArg1, fArg2, fArg3, fArg4, fArg5, iArg6); + playFX_3E(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6); break; case 63: - fxReturn = playFX_3F(iArg1, fArg2, fArg3, fArg4, iArg5); + effectRet = playFX_3F(iVar1, fVar2, fVar3, fVar4, iVar5); break; case 64: - fxReturn = playFX_40(iArg1, fArg2, fArg3, fArg4, iArg5); + effectRet = playFX_40(iVar1, fVar2, fVar3, fVar4, iVar5); break; case 65: - fxReturn = playFX_41(iArg1, fArg2, fArg3, fArg4, iArg5); + effectRet = playFX_41(iVar1, fVar2, fVar3, fVar4, iVar5); break; case 66: - fxReturn = playFX_42(iArg1, iArg2, iArg3, fArg4, iArg5, iArg6); + effectRet = playFX_42(iVar1, iVar2, iVar3, fVar4, iVar5, iVar6); break; case 67: - fxReturn = playFX_43(iArg1, fArg2, fArg3, fArg4, fArg5, iArg6); + effectRet = playFX_43(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6); break; case 68: - fxReturn = playFX_44(iArg1, fArg2, fArg3, fArg4, fArg5, iArg6); + effectRet = playFX_44(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6); break; case 69: - fxReturn = playFX_45(iArg1, iArg2); + effectRet = playFX_45(iVar1, iVar2); break; case 70: - fxReturn = playFX_46_whirlwind(iArg1, a2, fArg3, iArg4); + effectRet = playFX_46_whirlwind(iVar1, a2, fVar3, iVar4); break; case 71: - fxReturn = playFX_47(iArg1, fArg2, fArg3, fArg4, fArg5, iArg6); + effectRet = playFX_47(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6); break; case 72: - fxReturn = playFX_48(iArg1, fArg2, fArg3, fArg4, fArg5, iArg6); + effectRet = playFX_48(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6); break; case 73: - fxReturn = playFX_49(iArg1, fArg2, fArg3, fArg4, fArg5, iArg6); + effectRet = playFX_49(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6); break; case 74: - fxReturn = playFX_4A(iArg1, fArg2, fArg3, fArg4, fArg5, fArg6); + effectRet = playFX_4A(iVar1, fVar2, fVar3, fVar4, fVar5, fVar6); break; case 75: - fxReturn = playFX_4B(iArg1, fArg2, fArg3, fArg4, fArg5, iArg6); + effectRet = playFX_4B(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6); break; case 76: - fxReturn = playFX_4C(iArg1, fArg2, fArg3, fArg4, fArg5, fArg6, fArg7, fArg8, iArg9); + effectRet = playFX_4C(iVar1, fVar2, fVar3, fVar4, fVar5, fVar6, fVar7, fVar8, iVar9); break; case 77: - fxReturn = playFX_4D(iArg1, fArg2, fArg3, fArg4, fArg5, fArg6, fArg7, fArg8, fArg9, iArg10); + effectRet = playFX_4D(iVar1, fVar2, fVar3, fVar4, fVar5, fVar6, fVar7, fVar8, fVar9, iVar10); break; case 78: - fxReturn = playFX_4E(iArg1, fArg2, fArg3, fArg4); + effectRet = playFX_4E(iVar1, fVar2, fVar3, fVar4); break; case 79: - fxReturn = playFX_4F(iArg1, fArg2, fArg3, fArg4, fArg5, iArg6); + effectRet = playFX_4F(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6); break; case 82: - fxReturn = playFX_52(iArg1, fArg2, fArg3, fArg4, fArg5, iArg6); + effectRet = playFX_52(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6); break; case 83: - fxReturn = playFX_53(iArg1, fArg2, fArg3, fArg4); + effectRet = playFX_53(iVar1, fVar2, fVar3, fVar4); break; case 81: - fxReturn = playFX_51(iArg1, fArg2, fArg3, fArg4, fArg5, iArg6); + effectRet = playFX_51(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6); break; case 86: - fxReturn = playFX_56(iArg1, fArg2, fArg3, fArg4, fArg5, iArg6); + effectRet = playFX_56(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6); break; case 87: - fxReturn = playFX_57(iArg1, fArg2, fArg3, fArg4, fArg5, iArg6); + effectRet = playFX_57(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6); break; case 88: - fxReturn = playFX_58(iArg1, fArg2, fArg3, fArg4, fArg5, iArg6); + effectRet = playFX_58(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6); break; case 89: - fxReturn = playFX_59(iArg1, fArg2, fArg3, fArg4, fArg5, fArg6, fArg7, fArg8, iArg9); + effectRet = playFX_59(iVar1, fVar2, fVar3, fVar4, fVar5, fVar6, fVar7, fVar8, iVar9); break; case 90: - fxReturn = playFX_5A(iArg1, fArg2, fArg3, fArg4, fArg5, iArg6); + effectRet = playFX_5A(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6); break; case 91: - fxReturn = playFX_5B(iArg1, fArg2, fArg3, fArg4, fArg5, iArg6); + effectRet = playFX_5B(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6); break; case 92: - fxReturn = playFX_5C(iArg1, fArg2, fArg3, fArg4, fArg5, iArg6); + effectRet = playFX_5C(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6); break; case 93: - fxReturn = playFX_5D(iArg1, fArg2, fArg3, fArg4, fArg5, iArg6); + effectRet = playFX_5D(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6); break; case 94: - fxReturn = playFX_5E(iArg1, fArg2, fArg3, fArg4, fArg5, fArg6, fArg7, fArg8, iArg9); + effectRet = playFX_5E(iVar1, fVar2, fVar3, fVar4, fVar5, fVar6, fVar7, fVar8, iVar9); break; case 95: - fxReturn = playFX_5F(iArg1, fArg2, fArg3, fArg4, fArg5, iArg6); + effectRet = playFX_5F(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6); break; case 96: - fxReturn = playFX_60(iArg1, fArg2, fArg3, fArg4, fArg5, iArg6); + effectRet = playFX_60(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6); break; case 97: - fxReturn = playFX_61(iArg1, fArg2, fArg3, fArg4, fArg5, iArg6); + effectRet = playFX_61(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6); break; case 98: - fxReturn = playFX_62(iArg1, fArg2, fArg3, fArg4, fArg5, iArg6); + effectRet = playFX_62(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6); break; case 99: - fxReturn = playFX_63(iArg1, fArg2, fArg3, fArg4, fArg5, fArg6, fArg7, fArg8, iArg9, iArg10); + effectRet = playFX_63(iVar1, fVar2, fVar3, fVar4, fVar5, fVar6, fVar7, fVar8, iVar9, iVar10); break; case 100: - fxReturn = playFX_64(iArg1, fArg2, fArg3, fArg4, fArg5, fArg6, fArg7, fArg8, iArg9); + effectRet = playFX_64(iVar1, fVar2, fVar3, fVar4, fVar5, fVar6, fVar7, fVar8, iVar9); break; case 101: - fxReturn = playFX_65(iArg1, fArg2, fArg3, fArg4, fArg5, iArg6); + effectRet = playFX_65(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6); break; case 102: - fxReturn = playFX_66(iArg1, fArg2, fArg3, fArg4, fArg5, iArg6); + effectRet = playFX_66(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6); break; case 103: - fxReturn = playFX_67(iArg1, fArg2, fArg3, fArg4, fArg5, iArg6); + effectRet = playFX_67(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6); break; case 104: - fxReturn = playFX_68(iArg1, fArg2, fArg3, fArg4, fArg5, iArg6); + effectRet = playFX_68(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6); break; case 105: - fxReturn = playFX_69(iArg1, fArg2, fArg3, fArg4, fArg5, iArg6); + effectRet = playFX_69(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6); break; case 107: - fxReturn = playFX_6B(iArg1, fArg2, fArg3, fArg4, fArg5, iArg6); + effectRet = playFX_6B(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6); break; case 108: - fxReturn = playFX_6C(iArg1, fArg2, fArg3, fArg4, fArg5, iArg6); + effectRet = playFX_6C(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6); break; case 109: - fxReturn = playFX_6D(iArg1, fArg2, fArg3, fArg4, fArg5, iArg6); + effectRet = playFX_6D(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6); break; case 110: - fxReturn = playFX_6E(iArg1, fArg2, fArg3, fArg4, fArg5, fArg6, fArg7, iArg8); + effectRet = playFX_6E(iVar1, fVar2, fVar3, fVar4, fVar5, fVar6, fVar7, iVar8); break; case 111: - fxReturn = playFX_6F(iArg1, fArg2, fArg3, fArg4, fArg5, iArg6); + effectRet = playFX_6F(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6); break; case 112: - fxReturn = playFX_70(iArg1, fArg2, fArg3, fArg4, fArg5, fArg6, fArg7, iArg8, iArg9, fArg10, fArg11); + effectRet = playFX_70(iVar1, fVar2, fVar3, fVar4, fVar5, fVar6, fVar7, iVar8, iVar9, fVar10, fVar11); break; case 113: - fxReturn = playFX_71(iArg1, fArg2, fArg3, fArg4, fArg5, iArg6); + effectRet = playFX_71(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6); break; case 114: - fxReturn = playFX_72(iArg1, fArg2, fArg3, fArg4, fArg5, fArg6, fArg7, iArg8, iArg9); + effectRet = playFX_72(iVar1, fVar2, fVar3, fVar4, fVar5, fVar6, fVar7, iVar8, iVar9); break; case 115: - fxReturn = playFX_73(iArg1, fArg2, fArg3, fArg4, fArg5, iArg6, iArg7); + effectRet = playFX_73(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6, iVar7); break; case 116: - fxReturn = playFX_74(iArg1, fArg2, fArg3, fArg4, fArg5, fArg6, fArg7, fArg8, fArg9); + effectRet = playFX_74(iVar1, fVar2, fVar3, fVar4, fVar5, fVar6, fVar7, fVar8, fVar9); break; case 117: - fxReturn = playFX_75(iArg1, fArg2, fArg3, fArg4, fArg5, iArg6); + effectRet = playFX_75(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6); break; case 119: - fxReturn = playFX_77(iArg1, fArg2, fArg3, fArg4, fArg5, fArg6, fArg7, fArg8, iArg9); + effectRet = playFX_77(iVar1, fVar2, fVar3, fVar4, fVar5, fVar6, fVar7, fVar8, iVar9); break; case 120: - fxReturn = playFX_78(iArg1, fArg2, fArg3, fArg4, fArg5, iArg6); + effectRet = playFX_78(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6); break; case 85: - fxReturn = playFX_55(iArg1, fArg2, fArg3, fArg4); + effectRet = playFX_55(iVar1, fVar2, fVar3, fVar4); break; case 121: - fxReturn = playFX_79(iArg1, fArg2, fArg3, fArg4, fArg5, iArg6); + effectRet = playFX_79(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6); break; case 122: - fxReturn = playFX_7A(iArg1, fArg2, fArg3, fArg4, fArg5, iArg6); + effectRet = playFX_7A(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6); break; case 123: - fxReturn = playFX_7B(iArg1, fArg2, fArg3, fArg4, fArg5, iArg6); + effectRet = playFX_7B(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6); break; case 124: - fxReturn = playFX_7C(iArg1, fArg2, fArg3, fArg4, fArg5, iArg6); + effectRet = playFX_7C(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6); break; case 125: - fxReturn = playFX_7D(iArg1, fArg2, fArg3, fArg4, fArg5, iArg6); + effectRet = playFX_7D(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6); break; case 126: - fxReturn = playFX_7E(iArg1, fArg2, fArg3, fArg4, fArg5, iArg6); + effectRet = playFX_7E(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6); break; case 127: - fxReturn = playFX_7F(iArg1, fArg2, fArg3, fArg4, fArg5, iArg6); + effectRet = playFX_7F(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6); break; case 128: - fxReturn = playFX_80(iArg1, fArg2, fArg3, fArg4, fArg5, iArg6); + effectRet = playFX_80(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6); break; case 129: - fxReturn = playFX_81(iArg1, fArg2, fArg3, fArg4, fArg5, iArg6); + effectRet = playFX_81(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6); break; case 130: - fxReturn = playFX_82(iArg1, fArg2, fArg3, fArg4, fArg5, iArg6); + effectRet = playFX_82(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6); break; case 131: - fxReturn = playFX_83(iArg1, fArg2, fArg3, fArg4, fArg5, iArg6); + effectRet = playFX_83(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6); break; case 132: - fxReturn = playFX_84(iArg1, fArg2, fArg3, fArg4, fArg5, iArg6); + effectRet = playFX_84(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6); break; case 133: - fxReturn = playFX_85(iArg1, fArg2, fArg3, fArg4, fArg5, iArg6); + effectRet = playFX_85(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6); break; case 134: - fxReturn = playFX_86(iArg1, fArg2, fArg3, fArg4, fArg5, iArg6); + effectRet = playFX_86(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6); break; default: PANIC(); } - if (fxReturn != 0) { - set_variable(script, SI_VAR(15), fxReturn); + if (effectRet != NULL) { + set_variable(script, SI_VAR(15), effectRet); } return ApiStatus_DONE2; diff --git a/src/evt/player_api.c b/src/evt/player_api.c index 3f1e8dbfd2..3de1eb3161 100644 --- a/src/evt/player_api.c +++ b/src/evt/player_api.c @@ -760,7 +760,7 @@ ApiStatus GetCurrentPartner(ScriptInstance* script, s32 isInitialCall) { PlayerData* playerData = &gPlayerData; s32 currentPartner = 0; - if (D_8010EBB0.unk_00 != 0) { + if (gPartnerActionStatus.actionState.b[0] != 0) { currentPartner = playerData->currentPartner; } diff --git a/src/npc.c b/src/npc.c index 8f188409b9..e7ea324b88 100644 --- a/src/npc.c +++ b/src/npc.c @@ -1295,7 +1295,7 @@ void func_8003D624(Npc* npc, s32 arg1, s32 arg2, s32 arg3, s32 arg4, s32 arg5, s #ifdef NON_MATCHING // Rodata padding issue. Most likely belongs to a separate TU than the function above with the switch. void func_8003D660(Npc* npc, s32 arg1) { - Temp8010EBB0* temp = &D_8010EBB0; + Temp8010EBB0* temp = &gPartnerActionStatus; if ((npc->flags & (NPC_FLAG_400000 | NPC_FLAG_2)) == NPC_FLAG_400000) { if (npc->moveSpeed != 0.0f) { diff --git a/src/world/action/encounter.c b/src/world/action/encounter.c index e095b394af..ffd9cde73c 100644 --- a/src/world/action/encounter.c +++ b/src/world/action/encounter.c @@ -19,9 +19,9 @@ void func_802B6000_E28A30(void) { } if (playerStatus->animFlags & 0x400000) { - if (D_8010EBB0.unk_03 == 8) { + if (gPartnerActionStatus.actionState.b[3] == 8) { func_802BD100_317020(playerStatus->flags); - } else if (D_8010EBB0.unk_03 == 7) { + } else if (gPartnerActionStatus.actionState.b[3] == 7) { func_802BD100_317020(playerStatus->flags); } } diff --git a/src/world/action/jump.c b/src/world/action/jump.c index f135e05001..8602b0a255 100644 --- a/src/world/action/jump.c +++ b/src/world/action/jump.c @@ -5,32 +5,29 @@ extern f32 D_8010C97C; void func_802B6000_E24040() { PlayerStatus* playerStatus = &gPlayerStatus; - CollisionStatus* collisionStatus; + CollisionStatus* collisionStatus = &gCollisionStatus; s32 temp_v1; playerStatus->fallState = 0; playerStatus->decorationList = 0; playerStatus->unk_C2 = 0; - playerStatus->flags &= 0x7FFFFFF7; + playerStatus->flags &= ~0x80000008; playerStatus->flags |= 2; playerStatus->unk_3C = playerStatus->position.x; playerStatus->unk_40 = playerStatus->position.z; playerStatus->unk_4C = playerStatus->position.y; phys_init_integrator_for_current_state(); - collisionStatus = &gCollisionStatus; if (playerStatus->animFlags & PLAYER_ANIM_FLAG_8BIT_MARIO) { temp_v1 = 0x90005; - } - else { - if (!(playerStatus->animFlags & (PLAYER_ANIM_FLAG_HOLDING_ITEM | PLAYER_ANIM_FLAG_2))) { - temp_v1 = 0x10007; - } else { - temp_v1 = 0x60009; - } + } else if (!(playerStatus->animFlags & (PLAYER_ANIM_FLAG_HOLDING_ITEM | PLAYER_ANIM_FLAG_2))) { + temp_v1 = 0x10007; + } else { + temp_v1 = 0x60009; } suggest_player_anim_clearUnkFlag(temp_v1); + collisionStatus->lastTouchedFloor = collisionStatus->currentFloor; collisionStatus->currentFloor = -1; } @@ -61,29 +58,27 @@ void func_802B60B4_E240F4() { if (playerStatus->animFlags & PLAYER_ANIM_FLAG_8BIT_MARIO) { phi_a0 = 0x90005; + } else if (!(playerStatus->animFlags & (PLAYER_ANIM_FLAG_HOLDING_ITEM | PLAYER_ANIM_FLAG_2))) { + phi_a0 = 0x10007; } else { - if (!(playerStatus->animFlags & (PLAYER_ANIM_FLAG_HOLDING_ITEM | PLAYER_ANIM_FLAG_2))) { - phi_a0 = 0x10007; - } - else { - phi_a0 = 0x60009; - } + phi_a0 = 0x60009; } - suggest_player_anim_clearUnkFlag(phi_a0); + playerStatus->decorationList++; } void func_802B6198_E241D8() { PlayerStatus* playerStatus = &gPlayerStatus; CollisionStatus* collisionStatus = &gCollisionStatus; - Entity* entity; s32 temp_s1; s32 phi_a0; - temp_s1 = 0x80000000; + temp_s1 = 0x80000000; // weirdness with this - fake match + if (playerStatus->flags < 0) { - entity = get_entity_by_index(collisionStatus->currentFloor); + Entity* entity = get_entity_by_index(collisionStatus->currentFloor); + D_8010C960 = entity->position.x; D_8010C97C = entity->position.z; func_802B6000_E24040(); @@ -92,31 +87,32 @@ void func_802B6198_E241D8() { } playerStatus->decorationList++; - if (playerStatus->fallState == 1) { - if (playerStatus->flags & 0x80000000) { - playerStatus->flags &= 0x7FFFFFF5; - playerStatus->flags |= 4; - - phi_a0 = 0x6000A; - - if (!(playerStatus->animFlags & (PLAYER_ANIM_FLAG_HOLDING_ITEM | PLAYER_ANIM_FLAG_2))) { - phi_a0 = 0x10008; - } - - temp_s1 = phi_a0; - suggest_player_anim_clearUnkFlag(temp_s1); - gCameras[0].moveFlags |= 1; - } - } else { + if (playerStatus->fallState != 1) { return; } + + if (playerStatus->flags & 0x80000000) { + playerStatus->flags &= ~0x8000000A; + playerStatus->flags |= 4; + + + if (!(playerStatus->animFlags & (PLAYER_ANIM_FLAG_HOLDING_ITEM | PLAYER_ANIM_FLAG_2))) { + phi_a0 = 0x10008; + } else { + phi_a0 = 0x6000A; + } + + temp_s1 = phi_a0; + suggest_player_anim_clearUnkFlag(temp_s1); + gCameras[0].moveFlags |= 1; + } + playerStatus->fallState++; } void func_802B6294_E242D4() { PlayerStatus* playerStatus = &gPlayerStatus; - s32 phi_a0; if (playerStatus->animFlags & PLAYER_ANIM_FLAG_PEACH_PHYSICS) { func_802B647C_E244BC(); @@ -124,18 +120,17 @@ void func_802B6294_E242D4() { } if (playerStatus->flags < 0) { - playerStatus->flags &= 0x7FFFFFF5; + s32 phi_a0; + + playerStatus->flags &= ~0x8000000A; playerStatus->flags |= 4; if (playerStatus->animFlags & PLAYER_ANIM_FLAG_8BIT_MARIO) { phi_a0 = 0x90005; + } else if (!(playerStatus->animFlags & (PLAYER_ANIM_FLAG_HOLDING_ITEM | PLAYER_ANIM_FLAG_2))) { + phi_a0 = 0x10008; } else { - if (!(playerStatus->animFlags & (PLAYER_ANIM_FLAG_HOLDING_ITEM | PLAYER_ANIM_FLAG_2))) { - phi_a0 = 0x10008; - } - else { - phi_a0 = 0x6000A; - } + phi_a0 = 0x6000A; } suggest_player_anim_clearUnkFlag(phi_a0); gCameras[0].moveFlags |= 1; @@ -176,7 +171,7 @@ void func_802B6348_E24388() { &sub_arg5, &sub_arg6, &sub_arg7, &sub_arg8)) & 0xFF) - 2 >= 2U) && check_input_jump()) { set_action_state(ACTION_STATE_JUMP); - playerStatus->flags &= -0xF; + playerStatus->flags &= ~0xE; func_802B60B4_E240F4(); } } diff --git a/src/world/area_arn/arn_02/events.c b/src/world/area_arn/arn_02/events.c index 37a7320d15..9de39f676f 100644 --- a/src/world/area_arn/arn_02/events.c +++ b/src/world/area_arn/arn_02/events.c @@ -224,7 +224,7 @@ s32 N(func_80240000_BDD1B0)(ScriptInstance* script, NpcAISettings* aiSettings, E if (fabsf(npc->pos.y - gPlayerStatusPtr->position.y) >= 40.0f) { ret = FALSE; } - if (D_8010EBB0.unk_03 == 9) { + if (gPartnerActionStatus.actionState.b[3] == 9) { ret = FALSE; } return ret; diff --git a/src/world/area_arn/arn_04/events.c b/src/world/area_arn/arn_04/events.c index 39ae035d88..9b5aae0fe3 100644 --- a/src/world/area_arn/arn_04/events.c +++ b/src/world/area_arn/arn_04/events.c @@ -671,7 +671,7 @@ s32 N(func_80242388_BE5B38)(ScriptInstance* script, NpcAISettings* aiSettings, E if (fabsf(npc->pos.y - gPlayerStatusPtr->position.y) >= 40.0f) { ret = FALSE; } - if (D_8010EBB0.unk_03 == 9) { + if (gPartnerActionStatus.actionState.b[3] == 9) { ret = FALSE; } return ret; diff --git a/src/world/area_dgb/dgb_01/BFD9A0.c b/src/world/area_dgb/dgb_01/BFD9A0.c index 7c4e314b28..e31f818bd7 100644 --- a/src/world/area_dgb/dgb_01/BFD9A0.c +++ b/src/world/area_dgb/dgb_01/BFD9A0.c @@ -822,7 +822,7 @@ void N(func_80241954_BFF1D4)(ScriptInstance* script, NpcAISettings* aiSettings, } else { npc->rotation.y = 0.0f; npc->flags &= ~0x00200000; - if (D_8010EBB0.unk_03 != 9) { + if (gPartnerActionStatus.actionState.b[3] != 9) { disable_player_input(); partner_disable_input(); npc->duration = 0; @@ -888,7 +888,7 @@ void N(func_80241E70_BFF6F0)(ScriptInstance* script, NpcAISettings* aiSettings, npc->duration++; if (npc->duration >= 3) { - if (D_8010EBB0.unk_03 != 9) { + if (gPartnerActionStatus.actionState.b[3] != 9) { npc->duration = 0; script->functionTemp[0] = 100; } else { diff --git a/src/world/area_dgb/dgb_02/C2EBA0.c b/src/world/area_dgb/dgb_02/C2EBA0.c index 5228cd4be1..0b905ebdc2 100644 --- a/src/world/area_dgb/dgb_02/C2EBA0.c +++ b/src/world/area_dgb/dgb_02/C2EBA0.c @@ -544,14 +544,14 @@ void N(func_80240958_C2F4F8)(ScriptInstance* script, NpcAISettings* aiSettings, } if (playerData->currentPartner == 2) { - if (D_8010EBB0.unk_00 == playerData->currentPartner) { + if (gPartnerActionStatus.actionState.b[0] == playerData->currentPartner) { phi_s2 = TRUE; } } } - if (((playerData->currentPartner == 1) && (D_8010EBB0.unk_00 != 0)) || - ((playerData->currentPartner == 3) && (D_8010EBB0.unk_00 == 2))) { + if (((playerData->currentPartner == 1) && (gPartnerActionStatus.actionState.b[0] != 0)) || + ((playerData->currentPartner == 3) && (gPartnerActionStatus.actionState.b[0] == 2))) { posX = npc->pos.x; posZ = npc->pos.z; add_vec2D_polar(&posX, &posZ, 0.0f, npc->yaw); diff --git a/src/world/area_dgb/dgb_03/C31730.c b/src/world/area_dgb/dgb_03/C31730.c index d97d355623..036a3d209c 100644 --- a/src/world/area_dgb/dgb_03/C31730.c +++ b/src/world/area_dgb/dgb_03/C31730.c @@ -1060,14 +1060,14 @@ void N(func_80241D04_C331E4)(ScriptInstance* script, NpcAISettings* aiSettings, } if (playerData->currentPartner == 2) { - if (D_8010EBB0.unk_00 == playerData->currentPartner) { + if (gPartnerActionStatus.actionState.b[0] == playerData->currentPartner) { phi_s2 = TRUE; } } } - if (((playerData->currentPartner == 1) && (D_8010EBB0.unk_00 != 0)) || - ((playerData->currentPartner == 3) && (D_8010EBB0.unk_00 == 2))) { + if (((playerData->currentPartner == 1) && (gPartnerActionStatus.actionState.b[0] != 0)) || + ((playerData->currentPartner == 3) && (gPartnerActionStatus.actionState.b[0] == 2))) { posX = npc->pos.x; posZ = npc->pos.z; add_vec2D_polar(&posX, &posZ, 0.0f, npc->yaw); diff --git a/src/world/area_dgb/dgb_04/C36530.c b/src/world/area_dgb/dgb_04/C36530.c index 797c570da8..72c86d1c58 100644 --- a/src/world/area_dgb/dgb_04/C36530.c +++ b/src/world/area_dgb/dgb_04/C36530.c @@ -721,7 +721,7 @@ void N(func_802417F8_C37D28)(ScriptInstance* script, NpcAISettings* aiSettings, } else { npc->rotation.y = 0.0f; npc->flags &= ~0x00200000; - if (D_8010EBB0.unk_03 != 9) { + if (gPartnerActionStatus.actionState.b[3] != 9) { disable_player_input(); partner_disable_input(); npc->duration = 0; @@ -787,7 +787,7 @@ void N(func_80241D14_C38244)(ScriptInstance* script, NpcAISettings* aiSettings, npc->duration++; if (npc->duration >= 3) { - if (D_8010EBB0.unk_03 != 9) { + if (gPartnerActionStatus.actionState.b[3] != 9) { npc->duration = 0; script->functionTemp[0] = 100; } else { diff --git a/src/world/area_dgb/dgb_05/C3AA10.c b/src/world/area_dgb/dgb_05/C3AA10.c index 782ea1e059..a14c329659 100644 --- a/src/world/area_dgb/dgb_05/C3AA10.c +++ b/src/world/area_dgb/dgb_05/C3AA10.c @@ -394,14 +394,14 @@ void N(func_80240704_C3B114)(ScriptInstance* script, NpcAISettings* aiSettings, } if (playerData->currentPartner == 2) { - if (D_8010EBB0.unk_00 == playerData->currentPartner) { + if (gPartnerActionStatus.actionState.b[0] == playerData->currentPartner) { phi_s2 = TRUE; } } } - if (((playerData->currentPartner == 1) && (D_8010EBB0.unk_00 != 0)) || - ((playerData->currentPartner == 3) && (D_8010EBB0.unk_00 == 2))) { + if (((playerData->currentPartner == 1) && (gPartnerActionStatus.actionState.b[0] != 0)) || + ((playerData->currentPartner == 3) && (gPartnerActionStatus.actionState.b[0] == 2))) { posX = npc->pos.x; posZ = npc->pos.z; add_vec2D_polar(&posX, &posZ, 0.0f, npc->yaw); diff --git a/src/world/area_dgb/dgb_07/C3DBF0.c b/src/world/area_dgb/dgb_07/C3DBF0.c index e4ab07ecb2..0bdf403de1 100644 --- a/src/world/area_dgb/dgb_07/C3DBF0.c +++ b/src/world/area_dgb/dgb_07/C3DBF0.c @@ -303,14 +303,14 @@ void N(func_802406A4_C3E294)(ScriptInstance* script, NpcAISettings* aiSettings, } if (playerData->currentPartner == 2) { - if (D_8010EBB0.unk_00 == playerData->currentPartner) { + if (gPartnerActionStatus.actionState.b[0] == playerData->currentPartner) { phi_s2 = TRUE; } } } - if (((playerData->currentPartner == 1) && (D_8010EBB0.unk_00 != 0)) || - ((playerData->currentPartner == 3) && (D_8010EBB0.unk_00 == 2))) { + if (((playerData->currentPartner == 1) && (gPartnerActionStatus.actionState.b[0] != 0)) || + ((playerData->currentPartner == 3) && (gPartnerActionStatus.actionState.b[0] == 2))) { posX = npc->pos.x; posZ = npc->pos.z; add_vec2D_polar(&posX, &posZ, 0.0f, npc->yaw); diff --git a/src/world/area_dgb/dgb_08/C3FDB0.c b/src/world/area_dgb/dgb_08/C3FDB0.c index d2fd409150..3afce62784 100644 --- a/src/world/area_dgb/dgb_08/C3FDB0.c +++ b/src/world/area_dgb/dgb_08/C3FDB0.c @@ -1494,7 +1494,7 @@ void N(func_80242F94_C42D44)(ScriptInstance* script, NpcAISettings* aiSettings, } else { npc->rotation.y = 0.0f; npc->flags &= ~0x00200000; - if (D_8010EBB0.unk_03 != 9) { + if (gPartnerActionStatus.actionState.b[3] != 9) { disable_player_input(); partner_disable_input(); npc->duration = 0; @@ -1560,7 +1560,7 @@ void N(func_802434B0_C43260)(ScriptInstance* script, NpcAISettings* aiSettings, npc->duration++; if (npc->duration >= 3) { - if (D_8010EBB0.unk_03 != 9) { + if (gPartnerActionStatus.actionState.b[3] != 9) { npc->duration = 0; script->functionTemp[0] = 100; } else { diff --git a/src/world/area_dgb/dgb_09/C46BE0.c b/src/world/area_dgb/dgb_09/C46BE0.c index 07dc937d29..ab970c8281 100644 --- a/src/world/area_dgb/dgb_09/C46BE0.c +++ b/src/world/area_dgb/dgb_09/C46BE0.c @@ -727,14 +727,14 @@ void N(func_80240958_C47538)(ScriptInstance* script, NpcAISettings* aiSettings, } if (playerData->currentPartner == 2) { - if (D_8010EBB0.unk_00 == playerData->currentPartner) { + if (gPartnerActionStatus.actionState.b[0] == playerData->currentPartner) { phi_s2 = TRUE; } } } - if (((playerData->currentPartner == 1) && (D_8010EBB0.unk_00 != 0)) || - ((playerData->currentPartner == 3) && (D_8010EBB0.unk_00 == 2))) { + if (((playerData->currentPartner == 1) && (gPartnerActionStatus.actionState.b[0] != 0)) || + ((playerData->currentPartner == 3) && (gPartnerActionStatus.actionState.b[0] == 2))) { posX = npc->pos.x; posZ = npc->pos.z; add_vec2D_polar(&posX, &posZ, 0.0f, npc->yaw); @@ -1303,7 +1303,7 @@ void N(func_80242C1C_C497FC)(ScriptInstance* script, NpcAISettings* aiSettings, } else { npc->rotation.y = 0.0f; npc->flags &= ~0x00200000; - if (D_8010EBB0.unk_03 != 9) { + if (gPartnerActionStatus.actionState.b[3] != 9) { disable_player_input(); partner_disable_input(); npc->duration = 0; @@ -1369,7 +1369,7 @@ void N(func_80243138_C49D18)(ScriptInstance* script, NpcAISettings* aiSettings, npc->duration++; if (npc->duration >= 3) { - if (D_8010EBB0.unk_03 != 9) { + if (gPartnerActionStatus.actionState.b[3] != 9) { npc->duration = 0; script->functionTemp[0] = 100; } else { diff --git a/src/world/area_dgb/dgb_16/C52540.c b/src/world/area_dgb/dgb_16/C52540.c index 8fd81e5249..ad6366c6be 100644 --- a/src/world/area_dgb/dgb_16/C52540.c +++ b/src/world/area_dgb/dgb_16/C52540.c @@ -660,14 +660,14 @@ void N(func_802406A4_C52BE4)(ScriptInstance* script, NpcAISettings* aiSettings, } if (playerData->currentPartner == 2) { - if (D_8010EBB0.unk_00 == playerData->currentPartner) { + if (gPartnerActionStatus.actionState.b[0] == playerData->currentPartner) { phi_s2 = TRUE; } } } - if (((playerData->currentPartner == 1) && (D_8010EBB0.unk_00 != 0)) || - ((playerData->currentPartner == 3) && (D_8010EBB0.unk_00 == 2))) { + if (((playerData->currentPartner == 1) && (gPartnerActionStatus.actionState.b[0] != 0)) || + ((playerData->currentPartner == 3) && (gPartnerActionStatus.actionState.b[0] == 2))) { posX = npc->pos.x; posZ = npc->pos.z; add_vec2D_polar(&posX, &posZ, 0.0f, npc->yaw); diff --git a/src/world/area_flo/flo_21/CE6700.c b/src/world/area_flo/flo_21/CE6700.c index 180f589b8b..a92d9f4889 100644 --- a/src/world/area_flo/flo_21/CE6700.c +++ b/src/world/area_flo/flo_21/CE6700.c @@ -1575,7 +1575,7 @@ NpcGroupList N(npcGroupList_80245AEC) = { #include "world/common/UnkTexturePanFunc2.inc.c" -void playFX_82(); +EffectInstance* playFX_82(); ApiStatus N(func_80240B00_CE7200)(ScriptInstance* script, s32 isInitialCall) { playFX_82(1, 0, 0, 0, 0, 0); diff --git a/src/world/common/UnkFunc24.inc.c b/src/world/common/UnkFunc24.inc.c index 99d6450dd7..abf06e5205 100644 --- a/src/world/common/UnkFunc24.inc.c +++ b/src/world/common/UnkFunc24.inc.c @@ -3,7 +3,7 @@ ApiStatus N(UnkFunc24)(ScriptInstance* script, s32 isInitialCall) { script->varTable[0] = 0; - if ((D_8010EBB0.unk_00 != 0) && (D_8010EBB0.unk_03 == 3)) { + if ((gPartnerActionStatus.actionState.b[0] != 0) && (gPartnerActionStatus.actionState.b[3] == 3)) { script->varTable[0] = 1; } diff --git a/src/world/common/UnkFunc40.inc.c b/src/world/common/UnkFunc40.inc.c index df11b725e1..a108485855 100644 --- a/src/world/common/UnkFunc40.inc.c +++ b/src/world/common/UnkFunc40.inc.c @@ -3,7 +3,7 @@ ApiStatus N(UnkFunc40)(ScriptInstance* script, s32 isInitialCall) { script->varTable[0] = 0; - if ((D_8010EBB0.unk_00 != 0) && (D_8010EBB0.unk_03 == 3)) { + if ((gPartnerActionStatus.actionState.b[0] != 0) && (gPartnerActionStatus.actionState.b[3] == 3)) { script->varTable[0] = 1; } return ApiStatus_DONE2; diff --git a/src/world/common/UnkNpcAIFunc26.inc.c b/src/world/common/UnkNpcAIFunc26.inc.c index fb26486c16..0ff8663cd2 100644 --- a/src/world/common/UnkNpcAIFunc26.inc.c +++ b/src/world/common/UnkNpcAIFunc26.inc.c @@ -28,11 +28,11 @@ s32 N(UnkNpcAIFunc26)(ScriptInstance* script) { ret = FALSE; } - if (D_8010EBB0.unk_03 == 9) { + if (gPartnerActionStatus.actionState.b[3] == 9) { ret = FALSE; } - if (D_8010EBB0.unk_03 == 7) { + if (gPartnerActionStatus.actionState.b[3] == 7) { ret = FALSE; } diff --git a/src/world/partner/bombette.c b/src/world/partner/bombette.c index c0822aecec..73b105219c 100644 --- a/src/world/partner/bombette.c +++ b/src/world/partner/bombette.c @@ -20,7 +20,7 @@ INCLUDE_ASM(s32, "world/partner/bombette", func_802BD6DC_31842C); INCLUDE_ASM(s32, "world/partner/bombette", func_802BD720_318470); s32 func_802BD748(void) { - return D_8010EBB0.unk_00 == 0; + return gPartnerActionStatus.actionState.b[0] == 0; } INCLUDE_ASM(s32, "world/partner/bombette", func_802BD758_3184A8); diff --git a/src/world/partner/goombario.c b/src/world/partner/goombario.c index 74a7aa4251..dfe37b1e75 100644 --- a/src/world/partner/goombario.c +++ b/src/world/partner/goombario.c @@ -29,7 +29,7 @@ INCLUDE_ASM(s32, "world/partner/goombario", func_802BD564_317484); s32 world_goombario_can_pause(Npc* partner) { s32 new_var; - if (D_8010EBB0.unk_00) { + if (gPartnerActionStatus.actionState.b[0] != 0) { return FALSE; } @@ -58,18 +58,18 @@ ApiStatus func_802BDB84(ScriptInstance* script, s32 isInitialCall) { } void world_goombario_pre_battle(Npc* partner) { - Temp8010EBB0* temp = &D_8010EBB0; + PartnerActionStatus* actionStatus = &gPartnerActionStatus; - if (temp->unk_00 != 0) { + if (actionStatus->actionState.b[0] != 0) { set_time_freeze_mode(TIME_FREEZE_NORMAL); enable_player_input(); CancelMessageAndBlock(); partner_clear_player_tracking(partner); - temp->unk_00 = 0; - temp->unk_03 = 0; + actionStatus->actionState.b[0] = 0; + actionStatus->actionState.b[3] = 0; disable_npc_blur(partner); } - temp->unk_03 = 1; + actionStatus->actionState.b[3] = 1; } s32 D_802BDC40_317B60[] = { diff --git a/src/world/partners.c b/src/world/partners.c index fb4b713586..d3e4731b3d 100644 --- a/src/world/partners.c +++ b/src/world/partners.c @@ -292,7 +292,7 @@ void remove_consumable(void) { INCLUDE_ASM(s32, "world/partners", func_800EA4B0); s32 partner_is_idle(Npc* partner) { - return D_8010EBB0.unk_00 == 0; + return gPartnerActionStatus.actionState.b[0] == 0; } s32 world_partner_can_player_pause_default(Npc* partner) { @@ -377,13 +377,13 @@ void switch_to_partner(s32 arg0) { void partner_init_after_battle(s32 arg0) { PlayerStatus* playerStatus = &gPlayerStatus; - Temp8010EBB0* temp8010EBB0 = &D_8010EBB0; + PartnerActionStatus* actionStatus = &gPartnerActionStatus; if (D_8010CFD8 != arg0) { D_8010CFE0 = 1; D_8010CFE4 = arg0; - temp8010EBB0->unk_00 = 0; - temp8010EBB0->unk_01 = 0; + actionStatus->actionState.b[0] = 0; + actionStatus->actionState.b[1] = 0; if (D_8010CFD8 != 0 && arg0 != 0) { D_8010CFE8 = 2; @@ -414,12 +414,12 @@ void func_800EB2A4(s32 arg0) { } s32 partner_use_ability(void) { - Temp8010EBB0* temp8010EBB0 = &D_8010EBB0; + PartnerActionStatus* actionStatus = &gPartnerActionStatus; if (!is_starting_conversation() && wPartner != NULL && (wPartner->canUseAbility == NULL || wPartner->canUseAbility(wPartnerNpc))) { - if ((gGameStatusPtr->unk_81 != 0) && (temp8010EBB0->unk_08 & 0x4000)) { + if ((gGameStatusPtr->unk_81 != 0) && (actionStatus->currentButtons & 0x4000)) { sfx_play_sound(0x21D); } else if (D_8010CFD8 != 0) { D_8010CFE0 = 1; @@ -449,7 +449,7 @@ void partner_reset_data(void) { PlayerStatus* playerStatus = &gPlayerStatus; s32 currentPartner = gPlayerData.currentPartner; - mem_clear(&D_8010EBB0, sizeof(D_8010EBB0)); + mem_clear(&gPartnerActionStatus, sizeof(gPartnerActionStatus)); get_generic_entity(create_generic_entity_frontUI(_use_partner_ability, NULL)); D_8010CFE0 = 1; @@ -457,7 +457,7 @@ void partner_reset_data(void) { D_8010CFD8 = currentPartner; if (gGameStatusPtr->unk_7D != 0) { - D_8010EBB0.unk_00 = 1; + gPartnerActionStatus.actionState.b[0] = 1; gGameStatusPtr->unk_7D = 0; } @@ -478,18 +478,18 @@ void partner_reset_data(void) { } void partner_initialize_data(void) { - Temp8010EBB0* unk8010EBB0 = &D_8010EBB0; + PartnerActionStatus* actionStatus = &gPartnerActionStatus; D_8010CFD8 = 0; D_8010CFE0 = 0; D_8010CFE8 = 0; D_8010CFC4 = 0; - unk8010EBB0->unk_03 = 0; - unk8010EBB0->unk_14 = 0; - unk8010EBB0->unk_01 = 0; - unk8010EBB0->unk_00 = 0; - unk8010EBB0->unk_358 = 0; - unk8010EBB0->unk_02 = 0; + actionStatus->actionState.b[3] = 0; + actionStatus->inputDisabled = 0; + actionStatus->actionState.b[1] = 0; + actionStatus->actionState.b[0] = 0; + actionStatus->unk_358 = 0; + actionStatus->actionState.b[2] = 0; wPartner = NULL; D_800F833C = 0; D_800F8340 = 0; @@ -527,7 +527,7 @@ void partner_handle_before_battle(void) { } void partner_handle_after_battle(void) { - Temp8010EBB0* temp8010EBB0 = &D_8010EBB0; + PartnerActionStatus* actionStatus = &gPartnerActionStatus; PlayerData* playerData = &gPlayerData; if (D_8010CFD8 != 0) { @@ -542,10 +542,10 @@ void partner_handle_after_battle(void) { D_8010CFE8 = 1; - if (playerData->currentPartner != PARTNER_WATT && temp8010EBB0->unk_03 == 6) { + if (playerData->currentPartner != PARTNER_WATT && actionStatus->actionState.b[3] == 6) { gPlayerStatusPtr->animFlags &= ~1; gPlayerStatusPtr->animFlags &= ~2; - temp8010EBB0->unk_03 = 0; + actionStatus->actionState.b[3] = 0; } if (wPartner->postBattle != NULL) { @@ -589,15 +589,15 @@ INCLUDE_ASM(void, "world/partners", partner_walking_update_player_tracking, Npc* void partner_walking_update_motion(Npc* partner) { PlayerStatus* playerStatus = &gPlayerStatus; - Temp8010EBB0* temp8010EBB0 = &D_8010EBB0; + PartnerActionStatus* actionStatus = &gPartnerActionStatus; - if (gGameStatusPtr->unk_81 == 0 || playerStatus->flags & 0x3000 || temp8010EBB0->unk_14 != 0 - || temp8010EBB0->unk_02 != 0) { + if (gGameStatusPtr->unk_81 == 0 || playerStatus->flags & 0x3000 || actionStatus->inputDisabled != 0 + || actionStatus->actionState.b[2] != 0) { if (!(playerStatus->animFlags & 0x800)) { partner_walking_follow_player(partner); } - if (temp8010EBB0->unk_0C & 0x6006) { - temp8010EBB0->unk_02 = 0; + if (actionStatus->pressedButtons & 0x6006) { + actionStatus->actionState.b[2] = 0; } } @@ -733,18 +733,18 @@ INCLUDE_ASM(s32, "world/partners", func_800EF4E0); #endif void partner_enable_input(void) { - Temp8010EBB0* temp_8010EBB0 = &D_8010EBB0; + PartnerActionStatus* actionStatus = &gPartnerActionStatus; - temp_8010EBB0->unk_14--; - if (temp_8010EBB0->unk_14 < 0) { - temp_8010EBB0->unk_14 = 0; + actionStatus->inputDisabled--; + if (actionStatus->inputDisabled < 0) { + actionStatus->inputDisabled = 0; } } void partner_disable_input(void) { - Temp8010EBB0* temp_8010EBB0 = &D_8010EBB0; + PartnerActionStatus* actionStatus = &gPartnerActionStatus; - temp_8010EBB0->unk_14++; + actionStatus->inputDisabled++; } INCLUDE_ASM(void, "world/partners", partner_do_player_collision, Npc* partner); diff --git a/src/world/script_api/7E4690.c b/src/world/script_api/7E4690.c index 5a27431cab..b0a6d64189 100644 --- a/src/world/script_api/7E4690.c +++ b/src/world/script_api/7E4690.c @@ -6,7 +6,7 @@ ApiStatus CheckRideScriptForEnterExit(ScriptInstance* script, s32 isInitialCall) script->varTable[10] = 0; if (partner_get_ride_script() != NULL) { - if (D_8010EBB0.unk_00 == 0) { + if (gPartnerActionStatus.actionState.b[0] == ACTION_STATE_IDLE) { script->varTable[10] = 0; } else { script->varTable[10] = 1; diff --git a/tools/build/configure.py b/tools/build/configure.py index 58e2290ebc..66359b5177 100755 --- a/tools/build/configure.py +++ b/tools/build/configure.py @@ -10,7 +10,7 @@ from glob import glob VERSIONS = ["us", "jp"] DO_SHA1_CHECK = True -CPPFLAGS = "-w -Iver/$version/build/include -Iinclude -Isrc -D _LANGUAGE_C -D _FINALROM -D VERSION=$version " \ +CPPFLAGS = "-w -Iver/$version/build/include -Iinclude -Isrc -Iassets/$version -D _LANGUAGE_C -D _FINALROM -D VERSION=$version " \ "-ffreestanding -DF3DEX_GBI_2 -D_MIPS_SZLONG=32 -MD -MF $out.d" ASFLAGS = "-EB -G 0" @@ -183,7 +183,7 @@ class Configure: modes = ["ld"] if assets: - modes.extend(["bin", "Yay0", "img", "pm_map_data", "pm_msg", "pm_npc_sprites", "pm_charset", + modes.extend(["bin", "Yay0", "img", "vtx", "pm_map_data", "pm_msg", "pm_npc_sprites", "pm_charset", "pm_charset_palettes", "pm_effect_loads", "pm_effect_shims"]) if code: modes.extend(["code", "c", "data", "rodata"]) diff --git a/tools/splat/.gitrepo b/tools/splat/.gitrepo index 76d6a0d479..1ebe270ffc 100644 --- a/tools/splat/.gitrepo +++ b/tools/splat/.gitrepo @@ -6,7 +6,7 @@ [subrepo] remote = https://github.com/ethteck/splat.git branch = master - commit = 2fbdbb9df826da4252cdd1dab25311dd0a07d4ef - parent = 7a8229616c4e8dabbd31366b5dc0a3b6256cd88f + commit = 265b837554469fddfdd8155c872298a7b3244183 + parent = 99ddf7cb0eb0611d29fd8038e45b17e4512a1722 method = merge cmdver = 0.4.3 diff --git a/tools/splat/segtypes/n64/c.py b/tools/splat/segtypes/n64/c.py index f613d6497d..c60f3463dd 100644 --- a/tools/splat/segtypes/n64/c.py +++ b/tools/splat/segtypes/n64/c.py @@ -10,6 +10,7 @@ from util import options class N64SegC(N64SegCodeSubsegment): defined_funcs: Set[str] = set() + global_asm_funcs: Set[str] = set() STRIP_C_COMMENTS_RE = re.compile( r'//.*?$|/\*.*?\*/|\'(?:\\.|[^\\\'])*\'|"(?:\\.|[^\\"])*"', @@ -21,6 +22,11 @@ class N64SegC(N64SegCodeSubsegment): re.MULTILINE ) + C_GLOBAL_ASM_RE = re.compile( + r"(INCLUDE|GLOBAL)_ASM\(\"(\w+\/)*(\w+)\.s\"\)", + re.MULTILINE + ) + @staticmethod def strip_c_comments(text): def replacer(match): @@ -38,6 +44,12 @@ class N64SegC(N64SegCodeSubsegment): return set(m.group(2) for m in N64SegC.C_FUNC_RE.finditer(text)) + @staticmethod + def get_global_asm_funcs(c_file): + with open(c_file, "r") as f: + text = N64SegC.strip_c_comments(f.read()) + return set(m.group(3) for m in N64SegC.C_GLOBAL_ASM_RE.finditer(text)) + def out_path(self) -> Optional[Path]: return options.get_src_path() / self.dir / f"{self.name}.c" @@ -49,6 +61,7 @@ class N64SegC(N64SegCodeSubsegment): # TODO run cpp? self.defined_funcs = self.get_funcs_defined_in_c(path) self.mark_c_funcs_as_defined(self.defined_funcs) + self.global_asm_funcs = self.get_global_asm_funcs(path) self.funcs_text = self.disassemble_code(rom_bytes) @@ -60,7 +73,7 @@ class N64SegC(N64SegCodeSubsegment): for func in self.funcs_text: func_name = self.parent.get_symbol(func, type="func", local_only=True).name - if func_name not in self.defined_funcs: + if func_name in self.global_asm_funcs: self.create_c_asm_file(self.funcs_text, func, asm_out_dir, func_name) c_path = self.out_path() @@ -79,7 +92,7 @@ class N64SegC(N64SegCodeSubsegment): def get_c_preamble(self): ret = [] - preamble = options.get("generated_c_preamble", "#include \"common.h\"") + preamble = options.get_generated_c_premble() ret.append(preamble) ret.append("") diff --git a/tools/splat/segtypes/n64/vtx.py b/tools/splat/segtypes/n64/vtx.py new file mode 100644 index 0000000000..4ecc5d4780 --- /dev/null +++ b/tools/splat/segtypes/n64/vtx.py @@ -0,0 +1,72 @@ +""" +N64 Vtx struct splitter +Dumps out Vtx as a .inc.c file. + +Originally written by Mark Street (https://github.com/mkst) +""" + +import re +import struct +from typing import Optional +from pathlib import Path +from util.log import error + +from util import options +from segtypes.n64.codesubsegment import N64SegCodeSubsegment + +class N64SegVtx(N64SegCodeSubsegment): + def __init__(self, rom_start, rom_end, type, name, vram_start, extract, + given_subalign, given_is_overlay, given_dir, args = [], yaml = {}): + super().__init__(rom_start, rom_end, type, name, vram_start, extract, + given_subalign, given_is_overlay, given_dir, args, yaml) + self.file_text = None + + def get_linker_section(self) -> str: + return '.data' + + def out_path(self) -> Path: + return options.get_asset_path() / self.dir / f"{self.name}.vtx.inc.c" + + def scan(self, rom_bytes: bytes): + self.file_text = self.disassemble_data(rom_bytes) + + def disassemble_data(self, rom_bytes): + vertex_data = rom_bytes[self.rom_start:self.rom_end] + segment_length = len(vertex_data) + if (segment_length) % 16 != 0: + error(f"Error: Vtx segment {self.name} length ({segment_length}) is not a multiple of 16!") + + lines = [] + preamble = options.get_generated_c_premble() + lines.append(preamble) + lines.append("") + + vertex_count = segment_length // 16 + cname = re.sub(r"[^0-9a-zA-Z_]", "_", self.name) + lines.append(f"Vtx {cname}[{vertex_count}] = {{") + + for vtx in struct.iter_unpack(">hhhHhhBBBB", vertex_data): + x, y, z, flg, t, c, r, g, b, a = vtx + vtx_string = f" {{{{{{ {x:5}, {y:5}, {z:5} }}, {flg}, {{ {t:5}, {c:5} }}, {{ {r:3}, {g:3}, {b:3}, {a:3} }}}}}}," + if flg != 0: + self.warn(f"Non-zero flag found in vertex data {self.name}!") + lines.append(vtx_string) + + lines.append("};") + + # enforce newline at end of file + lines.append("") + return "\n".join(lines) + + def split(self, rom_bytes: bytes): + if self.file_text and self.out_path(): + self.out_path().parent.mkdir(parents=True, exist_ok=True) + + with open(self.out_path(), "w", newline="\n") as f: + f.write(self.file_text) + + def should_scan(self) -> bool: + return options.mode_active("vtx") and self.rom_start != "auto" and self.rom_end != "auto" + + def should_split(self) -> bool: + return self.extract and options.mode_active("vtx") \ No newline at end of file diff --git a/tools/splat/segtypes/segment.py b/tools/splat/segtypes/segment.py index 1602e43f62..e05a4782d6 100644 --- a/tools/splat/segtypes/segment.py +++ b/tools/splat/segtypes/segment.py @@ -1,4 +1,6 @@ import importlib +import importlib.util + from typing import Dict, TYPE_CHECKING, Type, Union, Optional, List from pathlib import Path @@ -102,7 +104,7 @@ class Segment: else: return str(cls.get_default_name(rom_start)) - def __init__(self, rom_start, rom_end, type, name, vram_start, extract = True, + def __init__(self, rom_start, rom_end, type, name, vram_start, extract = True, given_subalign = options.get_subalign(), given_is_overlay: Optional[bool] = False, given_dir: Path = Path(), args = [], yaml = {}): self.rom_start = rom_start self.rom_end = rom_end @@ -128,7 +130,7 @@ class Segment: if self.rom_start == "auto": self.extract = False - + if self.type.startswith("."): self.extract = False @@ -152,7 +154,7 @@ class Segment: args:List[str] = [] if isinstance(yaml, dict) else yaml[3:] return cls(rom_start, rom_end, type, name, vram_start, extract, given_subalign, given_is_overlay, given_dir, args, yaml) - + @property def needs_symbols(self) -> bool: return False @@ -163,14 +165,14 @@ class Segment: return self.parent.dir / self.given_dir else: return self.given_dir - + @property def subalign(self) -> int: if self.parent: return self.parent.subalign else: return self.given_subalign - + @property def is_overlay(self) -> bool: if self.parent: @@ -239,10 +241,10 @@ class Segment: def should_scan(self) -> bool: return self.should_split() - + def should_split(self) -> bool: return self.extract and options.mode_active(self.type) - + def scan(self, rom_bytes: bytes): pass diff --git a/tools/splat/util/options.py b/tools/splat/util/options.py index 0b20868e5d..808689a72c 100644 --- a/tools/splat/util/options.py +++ b/tools/splat/util/options.py @@ -38,6 +38,9 @@ def get_header_encoding() -> str: def get_subalign() -> int: return opts.get("subalign", 16) +def get_generated_c_premble() -> str: + return opts.get("generated_c_preamble", '#include "common.h"') + def mode_active(mode): return mode in opts["modes"] or "all" in opts["modes"] diff --git a/ver/us/asm/data/6e40_beginning_data.data.s b/ver/us/asm/data/6e40_beginning_data.data.s deleted file mode 100644 index 1ff2899842..0000000000 --- a/ver/us/asm/data/6e40_beginning_data.data.s +++ /dev/null @@ -1,72 +0,0 @@ -.include "macro.inc" - -.section .data - -glabel D_800745E0 -.word 0x99999999, 0x33333333, 0x99999999, 0x33333333, 0x99999999, 0x33333333, 0x99999999, 0x33333333, 0x99999999, 0x33333333, 0x99999999, 0x33333333, 0x33333333, 0x99999999, 0x44444444, 0x99999999, 0x44444444, 0xAAAAAAAA, 0x44444444, 0xAAAAAAAA, 0x44444444, 0xAAAAAAAA, 0x44444444, 0xAAAAAAAA, 0x44444444, 0xAAAAAAAA, 0x55555555, 0xAAAAAAAA, 0x55555555, 0xAAAAAAAA, 0x55555555, 0xBBBBBBBB, 0xBBBBBBBB, 0x66666666, 0xBBBBBBBB, 0x66666666, 0xBBBBBBBB, 0x66666666, 0xCCCCCCCC, 0x66666666, 0xCCCCCCCC, 0x66666666, 0xCCCCCCCC, 0x77777777, 0xCCCCCCCC, 0x77777777, 0xCCCCCCCC, 0x77777777, 0xCCCCCCCC, 0x77777777, 0x88888888, 0xDDDDDDDD, 0x88888888, 0xDDDDDDDD, 0x88888888, 0xDDDDDDDD, 0x88888888, 0xDDDDDDDD, 0x88888888, 0xDDDDDDDD, 0x88888888, 0xDDDDDDDD, 0x88888888, 0xDDDDDDDD - -glabel D_800746E0 -.word 0xE3001001, 0x00000000, 0xD7000002, 0xFFFFFFFF, 0xFD900000, D_800745E0, 0xF5900000, 0x07094040, 0xE6000000, 0x00000000, 0xF3000000, 0x0707F800, 0xE7000000, 0x00000000, 0xF5800200, 0x00094040, 0xF2000000, 0x0003C07C, 0xDF000000, 0x00000000 - -glabel D_80074730 -.word 0x9F7C1A00, 0xA9851B00, 0xA9851B00, 0xA9851B00, 0xA9851B00, 0xA9851B00, 0xA9851B00, 0xA9851B00, 0xA9851B00, 0xA9851B00, 0xA9851B00, 0xA9851B00, 0xA9851B00, 0xA9851B00, 0xA9851B00, 0xA9851B00, 0xA9851B00, 0xAA851B00, 0xAA851B00, 0xAA851B00, 0xAA851B00, 0xAA851B00, 0xAA851B00, 0xAA851B00, 0xAA851B00, 0xAA851B00, 0xAA851B02, 0xAA851B03, 0xAA851B05, 0xAA851B05, 0xAA851B05, 0xA07E1A05, 0xAC871C00, 0xB48D1D00, 0xB48D1D00, 0xB48D1D00, 0xB48D1D00, 0xB48D1D00, 0xB48D1D00, 0xB48D1D00, 0xB48D1D00, 0xB48D1D00, 0xB48D1D00, 0xB48D1D00, 0xB48D1D00, 0xB48D1D00, 0xB48D1D00, 0xB48D1D00, 0xB48D1D00, 0xB48D1D00, 0xB58F1D01, 0xB7931E03, 0xBC9A200E, 0xBE9E2126, 0xC3A72453, 0xC4A92477, 0xD0BA2C92, 0xD1BA2BAA, 0xD5C030CF, 0xCBB327EB, 0xD3BD2EEB, 0xCDB629EC, 0xCAB127E6, 0xCCB327DE, 0xA9851B00, 0xB48D1D00, 0xB48D1D00, 0xB48D1D00, 0xB48D1D00, 0xB48D1D00, 0xB48D1D00, 0xB48D1D00, 0xB48D1D00, 0xB48D1D00, 0xB48D1D00, 0xB48D1D00, 0xB48D1D00, 0xB48D1D00, 0xB48D1D00, 0xB8931E00, 0xBC9B2112, 0xCEB62C38, 0xCDB52973, 0xCDB627B4, 0xD0B929E0, 0xD3BE2CE8, 0xE2D039ED, 0xC9B122EE, 0xE8D83FEF, 0xDBC734EE, 0xEDDE45ED, 0xCDB422CF, 0xE5D43DF2, 0xD9C42FD8, 0xC6AA1FE9, 0xE4D33AF4, 0xA9851B00, 0xB48D1D00, 0xB48D1D00, 0xB48D1D00, 0xB48D1D00, 0xB48D1D00, 0xB48D1D00, 0xB48D1D00, 0xB48D1D00, 0xB48D1D00, 0xB48D1D00, 0xB48D1D00, 0xB48D1D00, 0xB9951F0C, 0xC3A72341, 0xD1BB2A9D, 0xCCB525DF, 0xEBDC42E1, 0xD5BF2DD2, 0xE3D13AE8, 0xD6C02BCB, 0xDECB37F0, 0xE4D239CC, 0xC2A51CD8, 0xE9DA3FEE, 0xD3BB2AD5, 0xEDDD45E2, 0xCFB824CC, 0xEADB43F1, 0xDCC62FCE, 0xC2A61CE9, 0xE7D73CFC, 0xA9851B00, 0xB48D1D00, 0xB48D1D00, 0xB48D1D00, 0xB48D1D00, 0xB48D1D00, 0xB48D1D00, 0xB48D1D00, 0xB48D1D00, 0xB48D1D00, 0xB8941F06, 0xC2A3232D, 0xC6AA256E, 0xD3BE2BC0, 0xD4BF2BFD, 0xE6D43BDA, 0xC3A61CD5, 0xF0E247EE, 0xD3BB2ACE, 0xE7D63EE2, 0xD9C42DCE, 0xE3D13BF2, 0xEDDE44CF, 0xC4A71DD6, 0xECDD42F0, 0xCFB726CE, 0xECDD44E2, 0xD3BC27CD, 0xE9D942F2, 0xDCC72FCE, 0xC7AC20E9, 0xE3D035FC, 0xAA851B00, 0xB48D1D00, 0xB48D1D00, 0xB48D1D00, 0xB48D1D00, 0xB48D1D00, 0xB48D1D00, 0xB48D1D00, 0xB6911E01, 0xBE9E2229, 0xD1BB2AA2, 0xD1BA27ED, 0xD7C22DF3, 0xF2E54AD2, 0xD1BC2BF0, 0xE8D83DCF, 0xC4A81DD6, 0xF2E54AF0, 0xCAB020CE, 0xECDD44E3, 0xD2BB27CC, 0xD2BC2DF1, 0xE5D43CCC, 0xC7AD22D5, 0xEDDE44EF, 0xD4BF2ECF, 0xE4D33DE4, 0xD9C331D2, 0xF4E64CF5, 0xE7D63FD7, 0xD6C230EE, 0xEADA43FD, 0xAE8A1B00, 0xB48D1D00, 0xB48D1D00, 0xB48D1D00, 0xB48D1D00, 0xB48D1D00, 0xB58F1D01, 0xBC9A201F, 0xCEB62993, 0xCEB927F3, 0xD9C62DF8, 0xC9AE20CC, 0xE5D43DE2, 0xF4E64CCE, 0xD6C12FF2, 0xEBDB41CF, 0xC4A81DD4, 0xECDD44EF, 0xC8AE22CD, 0xD7C230E4, 0xD1B92AD4, 0xD7C32FF8, 0xDBC833E2, 0xDAC62FF2, 0xDCC634F9, 0xD3B92DF6, 0xCCAC2AFB, 0xC59E26FD, 0xC09324FF, 0xC29124FE, 0xC38F25FF, 0xCA9627FF, 0xB38F1B00, 0xB48D1D00, 0xB38C1D00, 0xB28B1C00, 0xB38C1C01, 0xBC9B2059, 0xCCB328A8, 0xCFB928F0, 0xE0CE34E6, 0xC5A91ED5, 0xE1CF34EF, 0xCAB020CE, 0xE4D23CE2, 0xEEE046CC, 0xCDB629F2, 0xF3E64BCE, 0xCDB529E3, 0xE7D63DF2, 0xDFCD32EF, 0xDDCA31F9, 0xD4BC2DFD, 0xC09024FF, 0xAB5C1AFF, 0xA34715FF, 0x95330FFF, 0x88260BFF, 0x822009FF, 0x811F09FF, 0x801E09FF, 0x821F09FF, 0x811D08FF, 0x801D08FF, 0xC8AF25A0, 0xC5AB2487, 0xBE9E2198, 0xC0A32265, 0xBE9F2174, 0xC8AF23F6, 0xD2BC28EC, 0xC8AF22F3, 0xECDC42CF, 0xD2BA2BD6, 0xEADA40F0, 0xC9AE20CB, 0xD8C332E3, 0xD9C533D6, 0xD8C32EFC, 0xDFCE33F1, 0xE0CB34FF, 0xD7AA2DFF, 0xC17221FF, 0x9F4013FF, 0x87250BFF, 0x7E1D07FF, 0x7A1B06FF, 0x791A06FF, 0x771A06FF, 0x771A06FF, 0x791A06FF, 0x7B1B07FF, 0x7E1E07FF, 0x7C1B07FF, 0x7B1B07FF, 0x7B1B07FF, 0xCDB828FF, 0xCAB326FF, 0xBFA321FF, 0xC8B026FF, 0xE3D434FB, 0xC3A821F5, 0xD3BD2BD2, 0xCBB325F2, 0xE8D73DCF, 0xCEB528D5, 0xE2D03AEC, 0xD3B92BE4, 0xDFCD33F6, 0xDBC331FE, 0xC88B26FF, 0xB75C1AFF, 0xA23712FF, 0x89230AFF, 0x7C1C08FF, 0x781A06FF, 0x771A06FF, 0x771A06FF, 0x771A06FF, 0x781A06FF, 0x781A06FF, 0x781A06FF, 0x791B07FF, 0x7B1B07FF, 0x7C1C07FF, 0x7A1B07FF, 0x7B1B07FF, 0x7B1B07FF, 0xD9C530FF, 0xCBB527FF, 0xD7BF38FF, 0xD0B92DFF, 0xDECE30FC, 0xBFA31FF1, 0xE1CF3ACB, 0xDDC936F2, 0xEDDD45CC, 0xDFCB36F2, 0xE4D536F9, 0xD8BA30FF, 0xB35E1BFF, 0x97300EFF, 0x8A220AFF, 0x811E08FF, 0x7A1B07FF, 0x781B06FF, 0x771A06FF, 0x771A06FF, 0x781A06FF, 0x781A06FF, 0x771A06FF, 0x751906FF, 0x751805FF, 0x741804FF, 0x731704FF, 0x751704FF, 0x771905FF, 0x7A1A06FF, 0x791A06FF, 0x7A1A06FF, 0xE4D33AFF, 0xCCB627FF, 0xDBC63CFF, 0xCFB82EFF, 0xC9B327E3, 0xBC9D27EA, 0xCEB529CC, 0xD5B62FFC, 0xE9DB3BF2, 0xE8D237FF, 0xCB8524FF, 0x98350FFF, 0x831E08FF, 0x801D08FF, 0x811E08FF, 0x7E1C07FF, 0x7B1B07FF, 0x791B07FF, 0x771A06FF, 0x751905FF, 0x731805FF, 0x731804FF, 0x751703FF, 0x761704FF, 0x771804FF, 0x781804FF, 0x791804FF, 0x7A1804FF, 0x7A1804FF, 0x7A1804FF, 0x7B1804FF, 0x7A1804FF, 0xE8D543FF, 0xCDB729FF, 0xDEC841FF, 0xBCA119FF, 0xC2A943DC, 0xB08819F2, 0xD5C02DF5, 0xEAD737FF, 0xCB8A25FF, 0x95330DFF, 0x871E07FF, 0x861E07FF, 0x821D08FF, 0x801C07FF, 0x7B1A06FF, 0x761905FF, 0x741805FF, 0x731704FF, 0x741804FF, 0x771804FF, 0x791804FF, 0x7B1805FF, 0x7B1805FF, 0x7B1805FF, 0x7B1805FF, 0x7B1805FF, 0x7A1805FF, 0x791805FF, 0x791805FF, 0x791905FF, 0x7A1905FF, 0x791805FF, 0xEAD74EFF, 0xD3BD31FF, 0xDEC842FF, 0xB5961AFF, 0xB6913AF4, 0xC9AD24FC, 0xCFA128FF, 0x96370EFF, 0x801804FF, 0x801904FF, 0x821904FF, 0x801803FF, 0x7B1703FF, 0x751502FF, 0x721503FF, 0x731603FF, 0x781704FF, 0x7A1804FF, 0x7B1804FF, 0x7C1804FF, 0x7C1805FF, 0x7A1805FF, 0x7A1805FF, 0x791805FF, 0x781805FF, 0x761805FF, 0x751805FF, 0x741705FF, 0x721705FF, 0x721705FF, 0x721705FF, 0x721705FF, 0xECD955FF, 0xE5D049FF, 0xD2B934FF, 0xB19127FF, 0xC1A12EFF, 0xA56715FF, 0x7C1D05FF, 0x7E1804FF, 0x7D1703FF, 0x7B1702FF, 0x771501FF, 0x761401FF, 0x741401FF, 0x751603FF, 0x781704FF, 0x7A1704FF, 0x7B1704FF, 0x7B1704FF, 0x7A1805FF, 0x791805FF, 0x771705FF, 0x751705FF, 0x731705FF, 0x721705FF, 0x701605FF, 0x6D1605FF, 0x6B1605FF, 0x691505FF, 0x681505FF, 0x671404FF, 0x671405FF, 0x671405FF, 0xEDDA57FF, 0xEAD64FFF, 0xD1B933FF, 0xA88622FF, 0x8C491EFF, 0x6C1302FF, 0x771503FF, 0x761502FF, 0x701402FF, 0x6D1301FF, 0x6E1403FF, 0x701503FF, 0x751603FF, 0x781804FF, 0x7A1804FF, 0x791804FF, 0x781705FF, 0x751705FF, 0x721805FF, 0x6F1705FF, 0x6C1605FF, 0x691605FF, 0x671605FF, 0x661405FF, 0x641305FF, 0x621305FF, 0x601304FF, 0x611304FF, 0x611304FF, 0x611304FF, 0x611304FF, 0x631404FF, 0xEFDB56FF, 0xF0DF53FF, 0xD5BE38FF, 0x9B7016FF, 0x671704FF, 0x6C1202FF, 0x6E1301FF, 0x691302FF, 0x681303FF, 0x6B1404FF, 0x6F1605FF, 0x731805FF, 0x761705FF, 0x761805FF, 0x741705FF, 0x701605FF, 0x6E1705FF, 0x691605FF, 0x651504FF, 0x631404FF, 0x611304FF, 0x5F1204FF, 0x5E1204FF, 0x5E1204FF, 0x5D1204FF, 0x5D1204FF, 0x5F1204FF, 0x5F1204FF, 0x601304FF, 0x621404FF, 0x621404FF, 0x651604FF, 0xF3E44FFF, 0xF4E74CFF, 0xCFB82EFF, 0x905A19FF, 0x610F01FF, 0x641202FF, 0x631203FF, 0x641303FF, 0x691404FF, 0x701705FF, 0x721805FF, 0x721805FF, 0x711705FF, 0x6E1705FF, 0x691504FF, 0x661405FF, 0x621404FF, 0x5F1304FF, 0x5E1204FF, 0x5D1204FF, 0x5C1204FF, 0x5C1204FF, 0x5C1204FF, 0x5D1204FF, 0x5E1204FF, 0x5F1304FF, 0x601304FF, 0x611404FF, 0x621404FF, 0x631504FF, 0x651604FF, 0x671704FF, 0xEBDC42FF, 0xDCCB35FF, 0xAE8B1EFF, 0x692008FF, 0x580E01FF, 0x590F02FF, 0x5F1203FF, 0x681404FF, 0x6F1605FF, 0x711705FF, 0x6D1705FF, 0x6A1605FF, 0x671505FF, 0x641404FF, 0x601303FF, 0x5E1304FF, 0x5D1204FF, 0x5C1204FF, 0x5C1204FF, 0x5C1203FF, 0x5C1203FF, 0x5D1303FF, 0x5D1304FF, 0x5D1404FF, 0x5D1404FF, 0x5E1404FF, 0x5F1403FF, 0x5F1403FF, 0x601403FF, 0x611403FF, 0x621402FF, 0x641402FF, 0xE2CD3AFF, 0xB09020FF, 0x6C2A0BFF, 0x4F0C01FF, 0x4D0D01FF, 0x591102FF, 0x651404FF, 0x6C1605FF, 0x6C1605FF, 0x681605FF, 0x641405FF, 0x611304FF, 0x601204FF, 0x5E1203FF, 0x5C1203FF, 0x5C1203FF, 0x5C1204FF, 0x5D1304FF, 0x5F1304FF, 0x601404FF, 0x611404FF, 0x601403FF, 0x5F1403FF, 0x5D1403FF, 0x5E1403FF, 0x5F1403FF, 0x601403FF, 0x621403FF, 0x621403FF, 0x631403FF, 0x641402FF, 0x651402FF, 0xE9D63EFF, 0xA98421FF, 0x4E0F03FF, 0x470B01FF, 0x530F03FF, 0x621305FF, 0x681605FF, 0x651505FF, 0x611404FF, 0x5E1203FF, 0x5C1204FF, 0x5C1204FF, 0x5C1203FF, 0x5C1304FF, 0x5D1204FF, 0x5F1405FF, 0x611506FF, 0x631505FF, 0x641505FF, 0x641505FF, 0x641504FF, 0x631503FF, 0x621403FF, 0x641403FF, 0x671503FF, 0x681603FF, 0x6A1604FF, 0x6C1704FF, 0x6D1704FF, 0x6D1704FF, 0x6D1804FF, 0x6C1804FF, 0xE4CC37FF, 0x9E7322FF, 0x440901FF, 0x4A0C01FF, 0x5C1204FF, 0x651405FF, 0x611504FF, 0x5C1204FF, 0x5A1102FF, 0x591003FF, 0x5A1104FF, 0x5C1204FF, 0x5E1305FF, 0x601405FF, 0x611405FF, 0x621605FF, 0x621605FF, 0x631604FF, 0x631504FF, 0x651603FF, 0x671603FF, 0x691603FF, 0x6D1703FF, 0x701704FF, 0x721804FF, 0x731804FF, 0x751904FF, 0x751904FF, 0x761904FF, 0x751904FF, 0x751904FF, 0x731804FF, 0xEDD639FF, 0xAA8624FF, 0x460B01FF, 0x510F03FF, 0x5E1304FF, 0x5E1304FF, 0x5A1103FF, 0x571002FF, 0x561002FF, 0x581104FF, 0x5E1205FF, 0x611505FF, 0x621506FF, 0x611505FF, 0x5F1404FF, 0x5D1403FF, 0x5F1403FF, 0x641503FF, 0x681603FF, 0x6B1703FF, 0x6E1704FF, 0x721804FF, 0x751804FF, 0x771904FF, 0x771904FF, 0x781905FF, 0x791905FF, 0x791905FF, 0x781905FF, 0x781905FF, 0x781905FF, 0x751805FF, 0xCBAE27FF, 0x956E1DFF, 0x4A0C02FF, 0x520F03FF, 0x591104FF, 0x571102FF, 0x550F02FF, 0x540F03FF, 0x571104FF, 0x5D1405FF, 0x631506FF, 0x621505FF, 0x5E1404FF, 0x5C1204FF, 0x5B1203FF, 0x5D1303FF, 0x631503FF, 0x6A1703FF, 0x6E1804FF, 0x711804FF, 0x741905FF, 0x771904FF, 0x791A05FF, 0x7A1A05FF, 0x7A1A05FF, 0x7A1A05FF, 0x7A1A05FF, 0x791905FF, 0x791905FF, 0x791905FF, 0x781905FF, 0x751805FF, 0xAF8612FF, 0x612C0CFF, 0x480C02FF, 0x4B0D02FF, 0x510E01FF, 0x510E01FF, 0x530F03FF, 0x571104FF, 0x5D1305FF, 0x611505FF, 0x601404FF, 0x5C1303FF, 0x5B1103FF, 0x5D1203FF, 0x601403FF, 0x651504FF, 0x6C1804FF, 0x721905FF, 0x761A05FF, 0x781905FF, 0x7A1A05FF, 0x7B1A05FF, 0x7B1A05FF, 0x7B1A06FF, 0x7B1A06FF, 0x7B1A05FF, 0x7A1A05FF, 0x7A1A05FF, 0x7A1905FF, 0x781905FF, 0x781905FF, 0x751804FF, 0xA6790EFF, 0x481002FF, 0x400A01FF, 0x420A01FF, 0x490C01FF, 0x510E03FF, 0x571204FF, 0x5D1405FF, 0x5E1405FF, 0x5C1304FF, 0x5A1203FF, 0x5A1203FF, 0x5D1303FF, 0x621504FF, 0x6A1705FF, 0x701805FF, 0x761905FF, 0x791A05FF, 0x7A1A06FF, 0x7B1A06FF, 0x7A1A06FF, 0x791A06FF, 0x781A06FF, 0x781A06FF, 0x771906FF, 0x761905FF, 0x771905FF, 0x781905FF, 0x781905FF, 0x771905FF, 0x761905FF, 0x731804FF, 0xAA7F10FF, 0x440F01FF, 0x390800FF, 0x3D0801FF, 0x4B0E03FF, 0x571204FF, 0x5D1305FF, 0x5D1405FF, 0x5B1304FF, 0x591102FF, 0x581102FF, 0x5A1304FF, 0x621504FF, 0x6C1705FF, 0x741905FF, 0x781A05FF, 0x7A1A05FF, 0x791A06FF, 0x771906FF, 0x751905FF, 0x741805FF, 0x731805FF, 0x711704FF, 0x701704FF, 0x701703FF, 0x711704FF, 0x731805FF, 0x741805FF, 0x741805FF, 0x731804FF, 0x721804FF, 0x701704FF, 0xA97E0FFF, 0x430F02FF, 0x370801FF, 0x420B02FF, 0x531104FF, 0x5C1305FF, 0x5C1305FF, 0x581103FF, 0x561002FF, 0x571103FF, 0x5A1304FF, 0x631605FF, 0x6E1704FF, 0x741905FF, 0x761905FF, 0x751905FF, 0x741805FF, 0x711705FF, 0x6E1703FF, 0x6D1703FF, 0x6C1703FF, 0x6C1604FF, 0x6C1603FF, 0x6D1604FF, 0x6E1704FF, 0x701705FF, 0x701705FF, 0x701704FF, 0x6F1604FF, 0x6D1604FF, 0x6C1604FF, 0x6A1604FF, 0xA97F0FFF, 0x410D01FF, 0x3C0A01FF, 0x4B0F03FF, 0x5A1305FF, 0x591305FF, 0x511002FF, 0x4F0F02FF, 0x551204FF, 0x5F1404FF, 0x681605FF, 0x6C1704FF, 0x6D1704FF, 0x6E1805FF, 0x6D1804FF, 0x6B1604FF, 0x691504FF, 0x691503FF, 0x681503FF, 0x681503FF, 0x691504FF, 0x691504FF, 0x6A1604FF, 0x6A1605FF, 0x6A1504FF, 0x691604FF, 0x681604FF, 0x661504FF, 0x641504FF, 0x641504FF, 0x641504FF, 0x601504FF, 0xA97F10FF, 0x3E0D01FF, 0x420B02FF, 0x521003FF, 0x561205FF, 0x4B0E03FF, 0x4B0D02FF, 0x561203FF, 0x611504FF, 0x671504FF, 0x651604FF, 0x621504FF, 0x611504FF, 0x621404FF, 0x601404FF, 0x5F1404FF, 0x5F1404FF, 0x611404FF, 0x611404FF, 0x611404FF, 0x611404FF, 0x611404FF, 0x601404FF, 0x611503FF, 0x601403FF, 0x5F1403FF, 0x5E1404FF, 0x5D1404FF, 0x5C1403FF, 0x5C1403FF, 0x5C1403FF, 0x5A1403FF, 0xA87E0FFF, 0x430E01FF, 0x4B0E03FF, 0x4E0F03FF, 0x460C02FF, 0x490C02FF, 0x571204FF, 0x5F1504FF, 0x5D1403FF, 0x591404FF, 0x571304FF, 0x571304FF, 0x571304FF, 0x571304FF, 0x571304FF, 0x561303FF, 0x571403FF, 0x571403FF, 0x571403FF, 0x571403FF, 0x581403FF, 0x581403FF, 0x581403FF, 0x581403FF, 0x581403FF, 0x581403FF, 0x571403FF, 0x571303FF, 0x571303FF, 0x561303FF, 0x561303FF, 0x541303F4, 0xA77D12FF, 0x4B1002FF, 0x4B0F03FF, 0x450C03FF, 0x4A0D02FF, 0x541304FF, 0x561404FF, 0x521304FF, 0x501203FF, 0x501203FF, 0x501203FF, 0x511203FF, 0x511203FF, 0x511203FF, 0x511203FF, 0x511203FF, 0x511203FF, 0x511203FF, 0x511203FF, 0x521303FF, 0x531303FF, 0x531303FF, 0x531303FF, 0x531303FF, 0x531303FF, 0x531303FF, 0x531303FF, 0x531203FF, 0x521203FF, 0x521303FF, 0x521303FF, 0x521303FF - -glabel D_80075730 -.word 0xE3001001, 0x00000000, 0xD7000002, 0xFFFFFFFF, 0xFD180000, D_80074730, 0xF5180000, 0x07094150, 0xE6000000, 0x00000000, 0xF3000000, 0x073FF080, 0xE7000000, 0x00000000, 0xF5181000, 0x00094150, 0xF2000000, 0x0007C07C, 0xDF000000, 0x00000000 - -glabel D_80075780 -.word 0x09333336, 0x72222222, 0x53333336, 0x72222222, 0x44005553, 0x11177772, 0x00005553, 0x11177D82, 0x44005553, 0x11117772, 0x00005553, 0x11117D82, 0x44A00553, 0x16111772, 0x00000553, 0x16111D82, 0x44A00053, 0x16611172, 0x00000053, 0x16611782, 0x44A00003, 0x16661112, 0x00000003, 0x16661782, 0x44A00003, 0x16666112, 0x00000003, 0x16666182, 0x4400000F, 0x1111111D, 0x0000000F, 0x111111D2, 0x61D22222, 0x53333336, 0x72222222, 0x5333336D, 0xE9677772, 0x00005553, 0x11177772, 0x0000537D, 0xE9617772, 0x00005553, 0x11117772, 0x0000537D, 0xE9611772, 0x00000553, 0x16111772, 0x00000C7D, 0xE9B61172, 0x00000053, 0x16611172, 0x00000C7D, 0xE9B61112, 0x00000003, 0x16661112, 0x0000091D, 0xE9B66112, 0x00000003, 0x16666112, 0x0000051D, 0xEE11111D, 0x0000000F, 0x1111111D, 0x00000097 - -glabel D_80075880 -.word 0xE5D79BC9, 0x7285BCCF, 0xEE9FDD93, 0xA40D9345, 0x6203C515, 0xE61BAC4F, 0xCD118309, 0xB4D5D555 - -glabel D_800758A0 -.word 0xE3001001, 0x00008000, 0xFD100000, D_80075880, 0xE8000000, 0x00000000, 0xF5000100, 0x07000000, 0xE6000000, 0x00000000, 0xF0000000, 0x0703C000, 0xE7000000, 0x00000000, 0xD7000002, 0xFFFFFFFF, 0xFD500000, D_80075780, 0xF5500000, 0x07010250, 0xE6000000, 0x00000000, 0xF3000000, 0x0707F400, 0xE7000000, 0x00000000, 0xF5400400, 0x00010250, 0xF2000000, 0x0007C03C, 0xDF000000, 0x00000000 - -glabel D_80075920 -.word 0xF9C0FD44, 0x00500000, 0x00CD0000, 0xFFFFFFFF, 0xFAB0FD44, 0x00500000, 0x035C0000, 0xFFFFFFFF, 0xFAB0039D, 0x00500000, 0x035C1155, 0xFFFFFFFF, 0xF9C0039D, 0x00500000, 0x00CD1155, 0xFFFFFFFF, 0xFAECFD44, 0x00000000, 0x04000000, 0xC1BBA3FF, 0xFAEC039D, 0x00000000, 0x04001155, 0xC1BBA3FF - -glabel D_80075980 -.word 0x0514FD44, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x0550FD44, 0x00500000, 0x00A40000, 0xFFFFFFFF, 0x0550039D, 0x00500000, 0x00A41155, 0xC1BBA3FF, 0x0514039D, 0x00000000, 0x00001155, 0xFFFFFFFF, 0x0640FD44, 0x00500000, 0x03330000, 0xC5B69FFF, 0x0640039D, 0x00500000, 0x03331155, 0x867C49FF - -glabel D_800759E0 -.word 0x0320FD44, 0x00000000, 0x0A800400, 0xFFFFFFFF, 0x0000FD44, 0x00000000, 0x06800400, 0xFFFFFFFF, 0x0000FD13, 0x03480000, 0x0680008B, 0xFFFFFFFF, 0x0320FD13, 0x03480000, 0x0A80008B, 0xFFFFFFFF, 0x0640FD13, 0x03480000, 0x0E80008B, 0xC7C7D0FF, 0x0640FD44, 0x00000000, 0x0E800400, 0xC7C7D0FF, 0xFCE0FD44, 0x00000000, 0x02800400, 0xFFFFFFFF, 0xFCE0FD13, 0x03480000, 0x0280008B, 0xFFFFFFFF, 0x0000FD13, 0x03480000, 0x0680008B, 0xFFFFFFFF, 0x0000FCDD, 0x03520000, 0x06800080, 0xC7C7D0FF, 0x0320FCDD, 0x03520000, 0x0A800080, 0xC7C7D0FF, 0x0640FCDD, 0x03520000, 0x0E800080, 0x8C8CA9FF, 0xFCE0FD13, 0x03480000, 0x0280008B, 0xFFFFFFFF, 0xF9C0FD13, 0x03480000, 0xFE80008B, 0xC7C7D0FF, 0xF9C0FCDD, 0x03520000, 0xFE800080, 0x8C8CA9FF, 0xFCE0FCDD, 0x03520000, 0x02800080, 0xC7C7D0FF, 0xF9C0FD44, 0x00000000, 0xFE800400, 0xC7C7D0FF, 0xF9C0F9BD, 0x03200000, 0xFE80FD00, 0x8C8CA9FF, 0xFCE0F9BD, 0x03200000, 0x0280FD00, 0x8C8CA9FF, 0xFCE0FCDD, 0x03520000, 0x02800080, 0xA5A5B6FF, 0x0640F9BD, 0x03200000, 0x0E80FD00, 0x8C8CA9FF, 0x0320F9BD, 0x03200000, 0x0A80FD00, 0x8C8CA9FF, 0x0320FCDD, 0x03520000, 0x0A800080, 0xA5A5B6FF, 0x0000FCDD, 0x03520000, 0x06800080, 0xA5A5B6FF, 0x0000F9BD, 0x03200000, 0x0680FD00, 0x8C8CA9FF - -glabel D_80075B70 -.word 0x04C9FD44, 0x00000000, 0x00000000, 0x00000000, 0x0514FD44, 0x00000000, 0x00000000, 0x00000065, 0x0514038E, 0x00000000, 0x00000000, 0x00000065, 0x04C9038E, 0x00000000, 0x00000000, 0x00000000 - -glabel D_80075BB0 -.word 0xFAECFD44, 0xFFFF0000, 0x00000000, 0x00000065, 0xFB37FD44, 0xFFFF0000, 0x00000000, 0x00000000, 0xFB37038E, 0xFFFF0000, 0x00000000, 0x00000000, 0xFAEC038E, 0xFFFF0000, 0x00000000, 0x00000065 - -glabel D_80075BF0 -.word 0x01400470, 0x013A0000, 0xFC000400, 0xFFFFFFFF, 0x03C00467, 0x01080000, 0x04000400, 0xFFFFFFFF, 0x03C00623, 0x00C30000, 0x04000800, 0x000000FF, 0x0140062C, 0x00F40000, 0xFC000800, 0x000000FF, 0xFEC00470, 0x013A0000, 0xFC000400, 0xFFFFFFFF, 0x01400470, 0x013A0000, 0x04000400, 0xFFFFFFFF, 0x0140062C, 0x00F40000, 0x04000800, 0x000000FF, 0xFEC0062C, 0x00F40000, 0xFC000800, 0x000000FF, 0xFC400467, 0x01080000, 0xFC000400, 0xFFFFFFFF, 0xFEC00470, 0x013A0000, 0x04000400, 0xFFFFFFFF, 0xFEC0062C, 0x00F40000, 0x04000800, 0x000000FF, 0xFC400623, 0x00C30000, 0xFC000800, 0x000000FF, 0xF9C0029A, 0x00EB0000, 0xFC000000, 0xC1A9A3FF, 0xFC4002AB, 0x014E0000, 0x04000000, 0xFFFFFFFF, 0xFC400467, 0x01080000, 0x04000400, 0xFFFFFFFF, 0xF9C00456, 0x00A60000, 0xFC000400, 0xC1A9A3FF, 0xFC400467, 0x01080000, 0x04000400, 0xFFFFFFFF, 0xFC400623, 0x00C30000, 0x04000800, 0x000000FF, 0xF9C00612, 0x00610000, 0xFC000800, 0x000000FF, 0x03C00467, 0x01080000, 0xFC000400, 0xFFFFFFFF, 0x06400456, 0x00A60000, 0x04000400, 0xC1A9A3FF, 0x06400612, 0x00610000, 0x04000800, 0x000000FF, 0x03C00623, 0x00C30000, 0xFC000800, 0x000000FF, 0xFEC002B4, 0x017F0000, 0x0C000000, 0xFFFFFFFF, 0xFEC00470, 0x013A0000, 0x0C000400, 0xFFFFFFFF, 0x014002B4, 0x017F0000, 0x14000000, 0xFFFFFFFF, 0x01400470, 0x013A0000, 0x14000400, 0xFFFFFFFF, 0x03C002AB, 0x014E0000, 0x1C000000, 0xFFFFFFFF, 0x03C00467, 0x01080000, 0x1C000400, 0xFFFFFFFF, 0x0640029A, 0x00EB0000, 0x24000000, 0xC1A9A3FF, 0x06400456, 0x00A60000, 0x24000400, 0xC1A9A3FF - -glabel D_80075DE0 -.word 0xF9C002A3, 0x006E0000, 0xFC000000, 0x0000004B, 0xFB3702A3, 0x006E0000, 0x00B00000, 0x00000023, 0xFB37039D, 0x006E0000, 0x00B00253, 0x00000023, 0xF9C0039D, 0x006E0000, 0xFC000253, 0x0000004B, 0x04C902A3, 0x006E0000, 0x1F500000, 0x00000023, 0x064002A3, 0x006E0000, 0x24000000, 0x0000004B, 0x0640039D, 0x006E0000, 0x24000253, 0x0000004B, 0x04C9039D, 0x006E0000, 0x1F500253, 0x00000023 - -glabel D_80075E60 -.word 0xE7000000, 0x00000000, 0xE200001C, 0x0C184340, 0xFC121803, 0xFFFFFFF8, 0xDE000000, D_80075730, 0x01008010, D_80075DE0, 0x06000204, 0x00000406, 0x06080A0C, 0x00080C0E, 0xDF000000, 0x00000000 - -glabel D_80075EA0 -.word 0xE7000000, 0x00000000, 0xE200001C, 0x0C184240, 0xFC127E03, 0xFFFFF3F8, 0xDE000000, D_80075730, 0x0101F03E, D_80075BF0, 0x06000204, 0x00000406, 0x06080A0C, 0x00080C0E, 0x06101214, 0x00101416, 0x06181A1C, 0x00181C1E, 0x061E2022, 0x001E2224, 0x0626282A, 0x00262A2C, 0x061A2E30, 0x001A301C, 0x062E3234, 0x002E3430, 0x06323638, 0x00323834, 0x06363A3C, 0x00363C38, 0xDF000000, 0x00000000 - -glabel D_80075F20 -.word 0xE7000000, 0x00000000, 0xE200001C, 0x0C184240, 0xFCFFFE03, 0xFFFE79F8, 0xD7000000, 0x00800080, 0x01004008, D_80075B70, 0x06000204, 0x00000406, 0x01004008, D_80075BB0, 0x06000204, 0x00000406, 0xDF000000, 0x00000000 - -glabel D_80075F68 -.word 0xE7000000, 0x00000000, 0xE200001C, 0x0F0A4200, 0xFC121803, 0xFFFFFFF8, 0xDE000000, D_800746E0, 0x01019032, D_800759E0, 0x06000204, 0x00000406, 0x06080A00, 0x00080006, 0x06020C0E, 0x00020E04, 0x06061012, 0x00061214, 0x06160806, 0x00160614, 0x06181A1C, 0x00181C1E, 0x0610181E, 0x00101E12, 0x060C201A, 0x000C1A0E, 0x061C2224, 0x00261C24, 0x0628162A, 0x00162C2A, 0x062E2624, 0x002E2430, 0x062C2E30, 0x002C302A, 0xDF000000, 0x00000000 - -glabel D_80075FF8 -.word 0xE7000000, 0x00000000, 0xE200001C, 0x0F0A4200, 0xFC121803, 0xFFFFFFF8, 0xDE000000, D_800758A0, 0x0100600C, D_80075980, 0x06000204, 0x00000406, 0x0602080A, 0x00020A04, 0xDF000000, 0x00000000 - -glabel D_80076038 -.word 0xE7000000, 0x00000000, 0xE200001C, 0x0F0A4200, 0xFC121803, 0xFFFFFFF8, 0xDE000000, D_800758A0, 0x0100600C, D_80075920, 0x06000204, 0x00000406, 0x0602080A, 0x00020A04, 0xDF000000, 0x00000000 - -glabel D_80076078 -.word 0xDE000000, D_80075F68, 0xDE000000, D_80076038, 0xDE000000, D_80075FF8, 0xDE000000, D_80075F20, 0xDE000000, D_80075E60, 0xDE000000, D_80075EA0, 0xDF000000, 0x00000000 - -glabel D_800760B0 -.word 0x028001E0, 0x01FF0000, 0x028001E0, 0x01FF0000 - -glabel D_800760C0 -.word 0xDC080008, D_800760B0, 0xE3000A01, 0x00100000, 0xE3000F00, 0x00000000, 0xE3000C00, 0x00080000, 0xE3001201, 0x00002000, 0xE3000D01, 0x00000000, 0xE3001402, 0x00000C00, 0xE3001700, 0x00000000, 0xE2001E01, 0x00000000, 0xED000000, 0x005003C0, 0xE3001801, 0x00000000, 0xE3001A01, 0x00000000, 0xD9000000, 0x00000000, 0xD9FFFFFF, 0x00200004, 0xDB0E0000, 0x00000014, 0xDF000000, 0x00000000 diff --git a/ver/us/asm/data/fio.data.s b/ver/us/asm/data/fio.data.s deleted file mode 100644 index 1ff2899842..0000000000 --- a/ver/us/asm/data/fio.data.s +++ /dev/null @@ -1,72 +0,0 @@ -.include "macro.inc" - -.section .data - -glabel D_800745E0 -.word 0x99999999, 0x33333333, 0x99999999, 0x33333333, 0x99999999, 0x33333333, 0x99999999, 0x33333333, 0x99999999, 0x33333333, 0x99999999, 0x33333333, 0x33333333, 0x99999999, 0x44444444, 0x99999999, 0x44444444, 0xAAAAAAAA, 0x44444444, 0xAAAAAAAA, 0x44444444, 0xAAAAAAAA, 0x44444444, 0xAAAAAAAA, 0x44444444, 0xAAAAAAAA, 0x55555555, 0xAAAAAAAA, 0x55555555, 0xAAAAAAAA, 0x55555555, 0xBBBBBBBB, 0xBBBBBBBB, 0x66666666, 0xBBBBBBBB, 0x66666666, 0xBBBBBBBB, 0x66666666, 0xCCCCCCCC, 0x66666666, 0xCCCCCCCC, 0x66666666, 0xCCCCCCCC, 0x77777777, 0xCCCCCCCC, 0x77777777, 0xCCCCCCCC, 0x77777777, 0xCCCCCCCC, 0x77777777, 0x88888888, 0xDDDDDDDD, 0x88888888, 0xDDDDDDDD, 0x88888888, 0xDDDDDDDD, 0x88888888, 0xDDDDDDDD, 0x88888888, 0xDDDDDDDD, 0x88888888, 0xDDDDDDDD, 0x88888888, 0xDDDDDDDD - -glabel D_800746E0 -.word 0xE3001001, 0x00000000, 0xD7000002, 0xFFFFFFFF, 0xFD900000, D_800745E0, 0xF5900000, 0x07094040, 0xE6000000, 0x00000000, 0xF3000000, 0x0707F800, 0xE7000000, 0x00000000, 0xF5800200, 0x00094040, 0xF2000000, 0x0003C07C, 0xDF000000, 0x00000000 - -glabel D_80074730 -.word 0x9F7C1A00, 0xA9851B00, 0xA9851B00, 0xA9851B00, 0xA9851B00, 0xA9851B00, 0xA9851B00, 0xA9851B00, 0xA9851B00, 0xA9851B00, 0xA9851B00, 0xA9851B00, 0xA9851B00, 0xA9851B00, 0xA9851B00, 0xA9851B00, 0xA9851B00, 0xAA851B00, 0xAA851B00, 0xAA851B00, 0xAA851B00, 0xAA851B00, 0xAA851B00, 0xAA851B00, 0xAA851B00, 0xAA851B00, 0xAA851B02, 0xAA851B03, 0xAA851B05, 0xAA851B05, 0xAA851B05, 0xA07E1A05, 0xAC871C00, 0xB48D1D00, 0xB48D1D00, 0xB48D1D00, 0xB48D1D00, 0xB48D1D00, 0xB48D1D00, 0xB48D1D00, 0xB48D1D00, 0xB48D1D00, 0xB48D1D00, 0xB48D1D00, 0xB48D1D00, 0xB48D1D00, 0xB48D1D00, 0xB48D1D00, 0xB48D1D00, 0xB48D1D00, 0xB58F1D01, 0xB7931E03, 0xBC9A200E, 0xBE9E2126, 0xC3A72453, 0xC4A92477, 0xD0BA2C92, 0xD1BA2BAA, 0xD5C030CF, 0xCBB327EB, 0xD3BD2EEB, 0xCDB629EC, 0xCAB127E6, 0xCCB327DE, 0xA9851B00, 0xB48D1D00, 0xB48D1D00, 0xB48D1D00, 0xB48D1D00, 0xB48D1D00, 0xB48D1D00, 0xB48D1D00, 0xB48D1D00, 0xB48D1D00, 0xB48D1D00, 0xB48D1D00, 0xB48D1D00, 0xB48D1D00, 0xB48D1D00, 0xB8931E00, 0xBC9B2112, 0xCEB62C38, 0xCDB52973, 0xCDB627B4, 0xD0B929E0, 0xD3BE2CE8, 0xE2D039ED, 0xC9B122EE, 0xE8D83FEF, 0xDBC734EE, 0xEDDE45ED, 0xCDB422CF, 0xE5D43DF2, 0xD9C42FD8, 0xC6AA1FE9, 0xE4D33AF4, 0xA9851B00, 0xB48D1D00, 0xB48D1D00, 0xB48D1D00, 0xB48D1D00, 0xB48D1D00, 0xB48D1D00, 0xB48D1D00, 0xB48D1D00, 0xB48D1D00, 0xB48D1D00, 0xB48D1D00, 0xB48D1D00, 0xB9951F0C, 0xC3A72341, 0xD1BB2A9D, 0xCCB525DF, 0xEBDC42E1, 0xD5BF2DD2, 0xE3D13AE8, 0xD6C02BCB, 0xDECB37F0, 0xE4D239CC, 0xC2A51CD8, 0xE9DA3FEE, 0xD3BB2AD5, 0xEDDD45E2, 0xCFB824CC, 0xEADB43F1, 0xDCC62FCE, 0xC2A61CE9, 0xE7D73CFC, 0xA9851B00, 0xB48D1D00, 0xB48D1D00, 0xB48D1D00, 0xB48D1D00, 0xB48D1D00, 0xB48D1D00, 0xB48D1D00, 0xB48D1D00, 0xB48D1D00, 0xB8941F06, 0xC2A3232D, 0xC6AA256E, 0xD3BE2BC0, 0xD4BF2BFD, 0xE6D43BDA, 0xC3A61CD5, 0xF0E247EE, 0xD3BB2ACE, 0xE7D63EE2, 0xD9C42DCE, 0xE3D13BF2, 0xEDDE44CF, 0xC4A71DD6, 0xECDD42F0, 0xCFB726CE, 0xECDD44E2, 0xD3BC27CD, 0xE9D942F2, 0xDCC72FCE, 0xC7AC20E9, 0xE3D035FC, 0xAA851B00, 0xB48D1D00, 0xB48D1D00, 0xB48D1D00, 0xB48D1D00, 0xB48D1D00, 0xB48D1D00, 0xB48D1D00, 0xB6911E01, 0xBE9E2229, 0xD1BB2AA2, 0xD1BA27ED, 0xD7C22DF3, 0xF2E54AD2, 0xD1BC2BF0, 0xE8D83DCF, 0xC4A81DD6, 0xF2E54AF0, 0xCAB020CE, 0xECDD44E3, 0xD2BB27CC, 0xD2BC2DF1, 0xE5D43CCC, 0xC7AD22D5, 0xEDDE44EF, 0xD4BF2ECF, 0xE4D33DE4, 0xD9C331D2, 0xF4E64CF5, 0xE7D63FD7, 0xD6C230EE, 0xEADA43FD, 0xAE8A1B00, 0xB48D1D00, 0xB48D1D00, 0xB48D1D00, 0xB48D1D00, 0xB48D1D00, 0xB58F1D01, 0xBC9A201F, 0xCEB62993, 0xCEB927F3, 0xD9C62DF8, 0xC9AE20CC, 0xE5D43DE2, 0xF4E64CCE, 0xD6C12FF2, 0xEBDB41CF, 0xC4A81DD4, 0xECDD44EF, 0xC8AE22CD, 0xD7C230E4, 0xD1B92AD4, 0xD7C32FF8, 0xDBC833E2, 0xDAC62FF2, 0xDCC634F9, 0xD3B92DF6, 0xCCAC2AFB, 0xC59E26FD, 0xC09324FF, 0xC29124FE, 0xC38F25FF, 0xCA9627FF, 0xB38F1B00, 0xB48D1D00, 0xB38C1D00, 0xB28B1C00, 0xB38C1C01, 0xBC9B2059, 0xCCB328A8, 0xCFB928F0, 0xE0CE34E6, 0xC5A91ED5, 0xE1CF34EF, 0xCAB020CE, 0xE4D23CE2, 0xEEE046CC, 0xCDB629F2, 0xF3E64BCE, 0xCDB529E3, 0xE7D63DF2, 0xDFCD32EF, 0xDDCA31F9, 0xD4BC2DFD, 0xC09024FF, 0xAB5C1AFF, 0xA34715FF, 0x95330FFF, 0x88260BFF, 0x822009FF, 0x811F09FF, 0x801E09FF, 0x821F09FF, 0x811D08FF, 0x801D08FF, 0xC8AF25A0, 0xC5AB2487, 0xBE9E2198, 0xC0A32265, 0xBE9F2174, 0xC8AF23F6, 0xD2BC28EC, 0xC8AF22F3, 0xECDC42CF, 0xD2BA2BD6, 0xEADA40F0, 0xC9AE20CB, 0xD8C332E3, 0xD9C533D6, 0xD8C32EFC, 0xDFCE33F1, 0xE0CB34FF, 0xD7AA2DFF, 0xC17221FF, 0x9F4013FF, 0x87250BFF, 0x7E1D07FF, 0x7A1B06FF, 0x791A06FF, 0x771A06FF, 0x771A06FF, 0x791A06FF, 0x7B1B07FF, 0x7E1E07FF, 0x7C1B07FF, 0x7B1B07FF, 0x7B1B07FF, 0xCDB828FF, 0xCAB326FF, 0xBFA321FF, 0xC8B026FF, 0xE3D434FB, 0xC3A821F5, 0xD3BD2BD2, 0xCBB325F2, 0xE8D73DCF, 0xCEB528D5, 0xE2D03AEC, 0xD3B92BE4, 0xDFCD33F6, 0xDBC331FE, 0xC88B26FF, 0xB75C1AFF, 0xA23712FF, 0x89230AFF, 0x7C1C08FF, 0x781A06FF, 0x771A06FF, 0x771A06FF, 0x771A06FF, 0x781A06FF, 0x781A06FF, 0x781A06FF, 0x791B07FF, 0x7B1B07FF, 0x7C1C07FF, 0x7A1B07FF, 0x7B1B07FF, 0x7B1B07FF, 0xD9C530FF, 0xCBB527FF, 0xD7BF38FF, 0xD0B92DFF, 0xDECE30FC, 0xBFA31FF1, 0xE1CF3ACB, 0xDDC936F2, 0xEDDD45CC, 0xDFCB36F2, 0xE4D536F9, 0xD8BA30FF, 0xB35E1BFF, 0x97300EFF, 0x8A220AFF, 0x811E08FF, 0x7A1B07FF, 0x781B06FF, 0x771A06FF, 0x771A06FF, 0x781A06FF, 0x781A06FF, 0x771A06FF, 0x751906FF, 0x751805FF, 0x741804FF, 0x731704FF, 0x751704FF, 0x771905FF, 0x7A1A06FF, 0x791A06FF, 0x7A1A06FF, 0xE4D33AFF, 0xCCB627FF, 0xDBC63CFF, 0xCFB82EFF, 0xC9B327E3, 0xBC9D27EA, 0xCEB529CC, 0xD5B62FFC, 0xE9DB3BF2, 0xE8D237FF, 0xCB8524FF, 0x98350FFF, 0x831E08FF, 0x801D08FF, 0x811E08FF, 0x7E1C07FF, 0x7B1B07FF, 0x791B07FF, 0x771A06FF, 0x751905FF, 0x731805FF, 0x731804FF, 0x751703FF, 0x761704FF, 0x771804FF, 0x781804FF, 0x791804FF, 0x7A1804FF, 0x7A1804FF, 0x7A1804FF, 0x7B1804FF, 0x7A1804FF, 0xE8D543FF, 0xCDB729FF, 0xDEC841FF, 0xBCA119FF, 0xC2A943DC, 0xB08819F2, 0xD5C02DF5, 0xEAD737FF, 0xCB8A25FF, 0x95330DFF, 0x871E07FF, 0x861E07FF, 0x821D08FF, 0x801C07FF, 0x7B1A06FF, 0x761905FF, 0x741805FF, 0x731704FF, 0x741804FF, 0x771804FF, 0x791804FF, 0x7B1805FF, 0x7B1805FF, 0x7B1805FF, 0x7B1805FF, 0x7B1805FF, 0x7A1805FF, 0x791805FF, 0x791805FF, 0x791905FF, 0x7A1905FF, 0x791805FF, 0xEAD74EFF, 0xD3BD31FF, 0xDEC842FF, 0xB5961AFF, 0xB6913AF4, 0xC9AD24FC, 0xCFA128FF, 0x96370EFF, 0x801804FF, 0x801904FF, 0x821904FF, 0x801803FF, 0x7B1703FF, 0x751502FF, 0x721503FF, 0x731603FF, 0x781704FF, 0x7A1804FF, 0x7B1804FF, 0x7C1804FF, 0x7C1805FF, 0x7A1805FF, 0x7A1805FF, 0x791805FF, 0x781805FF, 0x761805FF, 0x751805FF, 0x741705FF, 0x721705FF, 0x721705FF, 0x721705FF, 0x721705FF, 0xECD955FF, 0xE5D049FF, 0xD2B934FF, 0xB19127FF, 0xC1A12EFF, 0xA56715FF, 0x7C1D05FF, 0x7E1804FF, 0x7D1703FF, 0x7B1702FF, 0x771501FF, 0x761401FF, 0x741401FF, 0x751603FF, 0x781704FF, 0x7A1704FF, 0x7B1704FF, 0x7B1704FF, 0x7A1805FF, 0x791805FF, 0x771705FF, 0x751705FF, 0x731705FF, 0x721705FF, 0x701605FF, 0x6D1605FF, 0x6B1605FF, 0x691505FF, 0x681505FF, 0x671404FF, 0x671405FF, 0x671405FF, 0xEDDA57FF, 0xEAD64FFF, 0xD1B933FF, 0xA88622FF, 0x8C491EFF, 0x6C1302FF, 0x771503FF, 0x761502FF, 0x701402FF, 0x6D1301FF, 0x6E1403FF, 0x701503FF, 0x751603FF, 0x781804FF, 0x7A1804FF, 0x791804FF, 0x781705FF, 0x751705FF, 0x721805FF, 0x6F1705FF, 0x6C1605FF, 0x691605FF, 0x671605FF, 0x661405FF, 0x641305FF, 0x621305FF, 0x601304FF, 0x611304FF, 0x611304FF, 0x611304FF, 0x611304FF, 0x631404FF, 0xEFDB56FF, 0xF0DF53FF, 0xD5BE38FF, 0x9B7016FF, 0x671704FF, 0x6C1202FF, 0x6E1301FF, 0x691302FF, 0x681303FF, 0x6B1404FF, 0x6F1605FF, 0x731805FF, 0x761705FF, 0x761805FF, 0x741705FF, 0x701605FF, 0x6E1705FF, 0x691605FF, 0x651504FF, 0x631404FF, 0x611304FF, 0x5F1204FF, 0x5E1204FF, 0x5E1204FF, 0x5D1204FF, 0x5D1204FF, 0x5F1204FF, 0x5F1204FF, 0x601304FF, 0x621404FF, 0x621404FF, 0x651604FF, 0xF3E44FFF, 0xF4E74CFF, 0xCFB82EFF, 0x905A19FF, 0x610F01FF, 0x641202FF, 0x631203FF, 0x641303FF, 0x691404FF, 0x701705FF, 0x721805FF, 0x721805FF, 0x711705FF, 0x6E1705FF, 0x691504FF, 0x661405FF, 0x621404FF, 0x5F1304FF, 0x5E1204FF, 0x5D1204FF, 0x5C1204FF, 0x5C1204FF, 0x5C1204FF, 0x5D1204FF, 0x5E1204FF, 0x5F1304FF, 0x601304FF, 0x611404FF, 0x621404FF, 0x631504FF, 0x651604FF, 0x671704FF, 0xEBDC42FF, 0xDCCB35FF, 0xAE8B1EFF, 0x692008FF, 0x580E01FF, 0x590F02FF, 0x5F1203FF, 0x681404FF, 0x6F1605FF, 0x711705FF, 0x6D1705FF, 0x6A1605FF, 0x671505FF, 0x641404FF, 0x601303FF, 0x5E1304FF, 0x5D1204FF, 0x5C1204FF, 0x5C1204FF, 0x5C1203FF, 0x5C1203FF, 0x5D1303FF, 0x5D1304FF, 0x5D1404FF, 0x5D1404FF, 0x5E1404FF, 0x5F1403FF, 0x5F1403FF, 0x601403FF, 0x611403FF, 0x621402FF, 0x641402FF, 0xE2CD3AFF, 0xB09020FF, 0x6C2A0BFF, 0x4F0C01FF, 0x4D0D01FF, 0x591102FF, 0x651404FF, 0x6C1605FF, 0x6C1605FF, 0x681605FF, 0x641405FF, 0x611304FF, 0x601204FF, 0x5E1203FF, 0x5C1203FF, 0x5C1203FF, 0x5C1204FF, 0x5D1304FF, 0x5F1304FF, 0x601404FF, 0x611404FF, 0x601403FF, 0x5F1403FF, 0x5D1403FF, 0x5E1403FF, 0x5F1403FF, 0x601403FF, 0x621403FF, 0x621403FF, 0x631403FF, 0x641402FF, 0x651402FF, 0xE9D63EFF, 0xA98421FF, 0x4E0F03FF, 0x470B01FF, 0x530F03FF, 0x621305FF, 0x681605FF, 0x651505FF, 0x611404FF, 0x5E1203FF, 0x5C1204FF, 0x5C1204FF, 0x5C1203FF, 0x5C1304FF, 0x5D1204FF, 0x5F1405FF, 0x611506FF, 0x631505FF, 0x641505FF, 0x641505FF, 0x641504FF, 0x631503FF, 0x621403FF, 0x641403FF, 0x671503FF, 0x681603FF, 0x6A1604FF, 0x6C1704FF, 0x6D1704FF, 0x6D1704FF, 0x6D1804FF, 0x6C1804FF, 0xE4CC37FF, 0x9E7322FF, 0x440901FF, 0x4A0C01FF, 0x5C1204FF, 0x651405FF, 0x611504FF, 0x5C1204FF, 0x5A1102FF, 0x591003FF, 0x5A1104FF, 0x5C1204FF, 0x5E1305FF, 0x601405FF, 0x611405FF, 0x621605FF, 0x621605FF, 0x631604FF, 0x631504FF, 0x651603FF, 0x671603FF, 0x691603FF, 0x6D1703FF, 0x701704FF, 0x721804FF, 0x731804FF, 0x751904FF, 0x751904FF, 0x761904FF, 0x751904FF, 0x751904FF, 0x731804FF, 0xEDD639FF, 0xAA8624FF, 0x460B01FF, 0x510F03FF, 0x5E1304FF, 0x5E1304FF, 0x5A1103FF, 0x571002FF, 0x561002FF, 0x581104FF, 0x5E1205FF, 0x611505FF, 0x621506FF, 0x611505FF, 0x5F1404FF, 0x5D1403FF, 0x5F1403FF, 0x641503FF, 0x681603FF, 0x6B1703FF, 0x6E1704FF, 0x721804FF, 0x751804FF, 0x771904FF, 0x771904FF, 0x781905FF, 0x791905FF, 0x791905FF, 0x781905FF, 0x781905FF, 0x781905FF, 0x751805FF, 0xCBAE27FF, 0x956E1DFF, 0x4A0C02FF, 0x520F03FF, 0x591104FF, 0x571102FF, 0x550F02FF, 0x540F03FF, 0x571104FF, 0x5D1405FF, 0x631506FF, 0x621505FF, 0x5E1404FF, 0x5C1204FF, 0x5B1203FF, 0x5D1303FF, 0x631503FF, 0x6A1703FF, 0x6E1804FF, 0x711804FF, 0x741905FF, 0x771904FF, 0x791A05FF, 0x7A1A05FF, 0x7A1A05FF, 0x7A1A05FF, 0x7A1A05FF, 0x791905FF, 0x791905FF, 0x791905FF, 0x781905FF, 0x751805FF, 0xAF8612FF, 0x612C0CFF, 0x480C02FF, 0x4B0D02FF, 0x510E01FF, 0x510E01FF, 0x530F03FF, 0x571104FF, 0x5D1305FF, 0x611505FF, 0x601404FF, 0x5C1303FF, 0x5B1103FF, 0x5D1203FF, 0x601403FF, 0x651504FF, 0x6C1804FF, 0x721905FF, 0x761A05FF, 0x781905FF, 0x7A1A05FF, 0x7B1A05FF, 0x7B1A05FF, 0x7B1A06FF, 0x7B1A06FF, 0x7B1A05FF, 0x7A1A05FF, 0x7A1A05FF, 0x7A1905FF, 0x781905FF, 0x781905FF, 0x751804FF, 0xA6790EFF, 0x481002FF, 0x400A01FF, 0x420A01FF, 0x490C01FF, 0x510E03FF, 0x571204FF, 0x5D1405FF, 0x5E1405FF, 0x5C1304FF, 0x5A1203FF, 0x5A1203FF, 0x5D1303FF, 0x621504FF, 0x6A1705FF, 0x701805FF, 0x761905FF, 0x791A05FF, 0x7A1A06FF, 0x7B1A06FF, 0x7A1A06FF, 0x791A06FF, 0x781A06FF, 0x781A06FF, 0x771906FF, 0x761905FF, 0x771905FF, 0x781905FF, 0x781905FF, 0x771905FF, 0x761905FF, 0x731804FF, 0xAA7F10FF, 0x440F01FF, 0x390800FF, 0x3D0801FF, 0x4B0E03FF, 0x571204FF, 0x5D1305FF, 0x5D1405FF, 0x5B1304FF, 0x591102FF, 0x581102FF, 0x5A1304FF, 0x621504FF, 0x6C1705FF, 0x741905FF, 0x781A05FF, 0x7A1A05FF, 0x791A06FF, 0x771906FF, 0x751905FF, 0x741805FF, 0x731805FF, 0x711704FF, 0x701704FF, 0x701703FF, 0x711704FF, 0x731805FF, 0x741805FF, 0x741805FF, 0x731804FF, 0x721804FF, 0x701704FF, 0xA97E0FFF, 0x430F02FF, 0x370801FF, 0x420B02FF, 0x531104FF, 0x5C1305FF, 0x5C1305FF, 0x581103FF, 0x561002FF, 0x571103FF, 0x5A1304FF, 0x631605FF, 0x6E1704FF, 0x741905FF, 0x761905FF, 0x751905FF, 0x741805FF, 0x711705FF, 0x6E1703FF, 0x6D1703FF, 0x6C1703FF, 0x6C1604FF, 0x6C1603FF, 0x6D1604FF, 0x6E1704FF, 0x701705FF, 0x701705FF, 0x701704FF, 0x6F1604FF, 0x6D1604FF, 0x6C1604FF, 0x6A1604FF, 0xA97F0FFF, 0x410D01FF, 0x3C0A01FF, 0x4B0F03FF, 0x5A1305FF, 0x591305FF, 0x511002FF, 0x4F0F02FF, 0x551204FF, 0x5F1404FF, 0x681605FF, 0x6C1704FF, 0x6D1704FF, 0x6E1805FF, 0x6D1804FF, 0x6B1604FF, 0x691504FF, 0x691503FF, 0x681503FF, 0x681503FF, 0x691504FF, 0x691504FF, 0x6A1604FF, 0x6A1605FF, 0x6A1504FF, 0x691604FF, 0x681604FF, 0x661504FF, 0x641504FF, 0x641504FF, 0x641504FF, 0x601504FF, 0xA97F10FF, 0x3E0D01FF, 0x420B02FF, 0x521003FF, 0x561205FF, 0x4B0E03FF, 0x4B0D02FF, 0x561203FF, 0x611504FF, 0x671504FF, 0x651604FF, 0x621504FF, 0x611504FF, 0x621404FF, 0x601404FF, 0x5F1404FF, 0x5F1404FF, 0x611404FF, 0x611404FF, 0x611404FF, 0x611404FF, 0x611404FF, 0x601404FF, 0x611503FF, 0x601403FF, 0x5F1403FF, 0x5E1404FF, 0x5D1404FF, 0x5C1403FF, 0x5C1403FF, 0x5C1403FF, 0x5A1403FF, 0xA87E0FFF, 0x430E01FF, 0x4B0E03FF, 0x4E0F03FF, 0x460C02FF, 0x490C02FF, 0x571204FF, 0x5F1504FF, 0x5D1403FF, 0x591404FF, 0x571304FF, 0x571304FF, 0x571304FF, 0x571304FF, 0x571304FF, 0x561303FF, 0x571403FF, 0x571403FF, 0x571403FF, 0x571403FF, 0x581403FF, 0x581403FF, 0x581403FF, 0x581403FF, 0x581403FF, 0x581403FF, 0x571403FF, 0x571303FF, 0x571303FF, 0x561303FF, 0x561303FF, 0x541303F4, 0xA77D12FF, 0x4B1002FF, 0x4B0F03FF, 0x450C03FF, 0x4A0D02FF, 0x541304FF, 0x561404FF, 0x521304FF, 0x501203FF, 0x501203FF, 0x501203FF, 0x511203FF, 0x511203FF, 0x511203FF, 0x511203FF, 0x511203FF, 0x511203FF, 0x511203FF, 0x511203FF, 0x521303FF, 0x531303FF, 0x531303FF, 0x531303FF, 0x531303FF, 0x531303FF, 0x531303FF, 0x531303FF, 0x531203FF, 0x521203FF, 0x521303FF, 0x521303FF, 0x521303FF - -glabel D_80075730 -.word 0xE3001001, 0x00000000, 0xD7000002, 0xFFFFFFFF, 0xFD180000, D_80074730, 0xF5180000, 0x07094150, 0xE6000000, 0x00000000, 0xF3000000, 0x073FF080, 0xE7000000, 0x00000000, 0xF5181000, 0x00094150, 0xF2000000, 0x0007C07C, 0xDF000000, 0x00000000 - -glabel D_80075780 -.word 0x09333336, 0x72222222, 0x53333336, 0x72222222, 0x44005553, 0x11177772, 0x00005553, 0x11177D82, 0x44005553, 0x11117772, 0x00005553, 0x11117D82, 0x44A00553, 0x16111772, 0x00000553, 0x16111D82, 0x44A00053, 0x16611172, 0x00000053, 0x16611782, 0x44A00003, 0x16661112, 0x00000003, 0x16661782, 0x44A00003, 0x16666112, 0x00000003, 0x16666182, 0x4400000F, 0x1111111D, 0x0000000F, 0x111111D2, 0x61D22222, 0x53333336, 0x72222222, 0x5333336D, 0xE9677772, 0x00005553, 0x11177772, 0x0000537D, 0xE9617772, 0x00005553, 0x11117772, 0x0000537D, 0xE9611772, 0x00000553, 0x16111772, 0x00000C7D, 0xE9B61172, 0x00000053, 0x16611172, 0x00000C7D, 0xE9B61112, 0x00000003, 0x16661112, 0x0000091D, 0xE9B66112, 0x00000003, 0x16666112, 0x0000051D, 0xEE11111D, 0x0000000F, 0x1111111D, 0x00000097 - -glabel D_80075880 -.word 0xE5D79BC9, 0x7285BCCF, 0xEE9FDD93, 0xA40D9345, 0x6203C515, 0xE61BAC4F, 0xCD118309, 0xB4D5D555 - -glabel D_800758A0 -.word 0xE3001001, 0x00008000, 0xFD100000, D_80075880, 0xE8000000, 0x00000000, 0xF5000100, 0x07000000, 0xE6000000, 0x00000000, 0xF0000000, 0x0703C000, 0xE7000000, 0x00000000, 0xD7000002, 0xFFFFFFFF, 0xFD500000, D_80075780, 0xF5500000, 0x07010250, 0xE6000000, 0x00000000, 0xF3000000, 0x0707F400, 0xE7000000, 0x00000000, 0xF5400400, 0x00010250, 0xF2000000, 0x0007C03C, 0xDF000000, 0x00000000 - -glabel D_80075920 -.word 0xF9C0FD44, 0x00500000, 0x00CD0000, 0xFFFFFFFF, 0xFAB0FD44, 0x00500000, 0x035C0000, 0xFFFFFFFF, 0xFAB0039D, 0x00500000, 0x035C1155, 0xFFFFFFFF, 0xF9C0039D, 0x00500000, 0x00CD1155, 0xFFFFFFFF, 0xFAECFD44, 0x00000000, 0x04000000, 0xC1BBA3FF, 0xFAEC039D, 0x00000000, 0x04001155, 0xC1BBA3FF - -glabel D_80075980 -.word 0x0514FD44, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x0550FD44, 0x00500000, 0x00A40000, 0xFFFFFFFF, 0x0550039D, 0x00500000, 0x00A41155, 0xC1BBA3FF, 0x0514039D, 0x00000000, 0x00001155, 0xFFFFFFFF, 0x0640FD44, 0x00500000, 0x03330000, 0xC5B69FFF, 0x0640039D, 0x00500000, 0x03331155, 0x867C49FF - -glabel D_800759E0 -.word 0x0320FD44, 0x00000000, 0x0A800400, 0xFFFFFFFF, 0x0000FD44, 0x00000000, 0x06800400, 0xFFFFFFFF, 0x0000FD13, 0x03480000, 0x0680008B, 0xFFFFFFFF, 0x0320FD13, 0x03480000, 0x0A80008B, 0xFFFFFFFF, 0x0640FD13, 0x03480000, 0x0E80008B, 0xC7C7D0FF, 0x0640FD44, 0x00000000, 0x0E800400, 0xC7C7D0FF, 0xFCE0FD44, 0x00000000, 0x02800400, 0xFFFFFFFF, 0xFCE0FD13, 0x03480000, 0x0280008B, 0xFFFFFFFF, 0x0000FD13, 0x03480000, 0x0680008B, 0xFFFFFFFF, 0x0000FCDD, 0x03520000, 0x06800080, 0xC7C7D0FF, 0x0320FCDD, 0x03520000, 0x0A800080, 0xC7C7D0FF, 0x0640FCDD, 0x03520000, 0x0E800080, 0x8C8CA9FF, 0xFCE0FD13, 0x03480000, 0x0280008B, 0xFFFFFFFF, 0xF9C0FD13, 0x03480000, 0xFE80008B, 0xC7C7D0FF, 0xF9C0FCDD, 0x03520000, 0xFE800080, 0x8C8CA9FF, 0xFCE0FCDD, 0x03520000, 0x02800080, 0xC7C7D0FF, 0xF9C0FD44, 0x00000000, 0xFE800400, 0xC7C7D0FF, 0xF9C0F9BD, 0x03200000, 0xFE80FD00, 0x8C8CA9FF, 0xFCE0F9BD, 0x03200000, 0x0280FD00, 0x8C8CA9FF, 0xFCE0FCDD, 0x03520000, 0x02800080, 0xA5A5B6FF, 0x0640F9BD, 0x03200000, 0x0E80FD00, 0x8C8CA9FF, 0x0320F9BD, 0x03200000, 0x0A80FD00, 0x8C8CA9FF, 0x0320FCDD, 0x03520000, 0x0A800080, 0xA5A5B6FF, 0x0000FCDD, 0x03520000, 0x06800080, 0xA5A5B6FF, 0x0000F9BD, 0x03200000, 0x0680FD00, 0x8C8CA9FF - -glabel D_80075B70 -.word 0x04C9FD44, 0x00000000, 0x00000000, 0x00000000, 0x0514FD44, 0x00000000, 0x00000000, 0x00000065, 0x0514038E, 0x00000000, 0x00000000, 0x00000065, 0x04C9038E, 0x00000000, 0x00000000, 0x00000000 - -glabel D_80075BB0 -.word 0xFAECFD44, 0xFFFF0000, 0x00000000, 0x00000065, 0xFB37FD44, 0xFFFF0000, 0x00000000, 0x00000000, 0xFB37038E, 0xFFFF0000, 0x00000000, 0x00000000, 0xFAEC038E, 0xFFFF0000, 0x00000000, 0x00000065 - -glabel D_80075BF0 -.word 0x01400470, 0x013A0000, 0xFC000400, 0xFFFFFFFF, 0x03C00467, 0x01080000, 0x04000400, 0xFFFFFFFF, 0x03C00623, 0x00C30000, 0x04000800, 0x000000FF, 0x0140062C, 0x00F40000, 0xFC000800, 0x000000FF, 0xFEC00470, 0x013A0000, 0xFC000400, 0xFFFFFFFF, 0x01400470, 0x013A0000, 0x04000400, 0xFFFFFFFF, 0x0140062C, 0x00F40000, 0x04000800, 0x000000FF, 0xFEC0062C, 0x00F40000, 0xFC000800, 0x000000FF, 0xFC400467, 0x01080000, 0xFC000400, 0xFFFFFFFF, 0xFEC00470, 0x013A0000, 0x04000400, 0xFFFFFFFF, 0xFEC0062C, 0x00F40000, 0x04000800, 0x000000FF, 0xFC400623, 0x00C30000, 0xFC000800, 0x000000FF, 0xF9C0029A, 0x00EB0000, 0xFC000000, 0xC1A9A3FF, 0xFC4002AB, 0x014E0000, 0x04000000, 0xFFFFFFFF, 0xFC400467, 0x01080000, 0x04000400, 0xFFFFFFFF, 0xF9C00456, 0x00A60000, 0xFC000400, 0xC1A9A3FF, 0xFC400467, 0x01080000, 0x04000400, 0xFFFFFFFF, 0xFC400623, 0x00C30000, 0x04000800, 0x000000FF, 0xF9C00612, 0x00610000, 0xFC000800, 0x000000FF, 0x03C00467, 0x01080000, 0xFC000400, 0xFFFFFFFF, 0x06400456, 0x00A60000, 0x04000400, 0xC1A9A3FF, 0x06400612, 0x00610000, 0x04000800, 0x000000FF, 0x03C00623, 0x00C30000, 0xFC000800, 0x000000FF, 0xFEC002B4, 0x017F0000, 0x0C000000, 0xFFFFFFFF, 0xFEC00470, 0x013A0000, 0x0C000400, 0xFFFFFFFF, 0x014002B4, 0x017F0000, 0x14000000, 0xFFFFFFFF, 0x01400470, 0x013A0000, 0x14000400, 0xFFFFFFFF, 0x03C002AB, 0x014E0000, 0x1C000000, 0xFFFFFFFF, 0x03C00467, 0x01080000, 0x1C000400, 0xFFFFFFFF, 0x0640029A, 0x00EB0000, 0x24000000, 0xC1A9A3FF, 0x06400456, 0x00A60000, 0x24000400, 0xC1A9A3FF - -glabel D_80075DE0 -.word 0xF9C002A3, 0x006E0000, 0xFC000000, 0x0000004B, 0xFB3702A3, 0x006E0000, 0x00B00000, 0x00000023, 0xFB37039D, 0x006E0000, 0x00B00253, 0x00000023, 0xF9C0039D, 0x006E0000, 0xFC000253, 0x0000004B, 0x04C902A3, 0x006E0000, 0x1F500000, 0x00000023, 0x064002A3, 0x006E0000, 0x24000000, 0x0000004B, 0x0640039D, 0x006E0000, 0x24000253, 0x0000004B, 0x04C9039D, 0x006E0000, 0x1F500253, 0x00000023 - -glabel D_80075E60 -.word 0xE7000000, 0x00000000, 0xE200001C, 0x0C184340, 0xFC121803, 0xFFFFFFF8, 0xDE000000, D_80075730, 0x01008010, D_80075DE0, 0x06000204, 0x00000406, 0x06080A0C, 0x00080C0E, 0xDF000000, 0x00000000 - -glabel D_80075EA0 -.word 0xE7000000, 0x00000000, 0xE200001C, 0x0C184240, 0xFC127E03, 0xFFFFF3F8, 0xDE000000, D_80075730, 0x0101F03E, D_80075BF0, 0x06000204, 0x00000406, 0x06080A0C, 0x00080C0E, 0x06101214, 0x00101416, 0x06181A1C, 0x00181C1E, 0x061E2022, 0x001E2224, 0x0626282A, 0x00262A2C, 0x061A2E30, 0x001A301C, 0x062E3234, 0x002E3430, 0x06323638, 0x00323834, 0x06363A3C, 0x00363C38, 0xDF000000, 0x00000000 - -glabel D_80075F20 -.word 0xE7000000, 0x00000000, 0xE200001C, 0x0C184240, 0xFCFFFE03, 0xFFFE79F8, 0xD7000000, 0x00800080, 0x01004008, D_80075B70, 0x06000204, 0x00000406, 0x01004008, D_80075BB0, 0x06000204, 0x00000406, 0xDF000000, 0x00000000 - -glabel D_80075F68 -.word 0xE7000000, 0x00000000, 0xE200001C, 0x0F0A4200, 0xFC121803, 0xFFFFFFF8, 0xDE000000, D_800746E0, 0x01019032, D_800759E0, 0x06000204, 0x00000406, 0x06080A00, 0x00080006, 0x06020C0E, 0x00020E04, 0x06061012, 0x00061214, 0x06160806, 0x00160614, 0x06181A1C, 0x00181C1E, 0x0610181E, 0x00101E12, 0x060C201A, 0x000C1A0E, 0x061C2224, 0x00261C24, 0x0628162A, 0x00162C2A, 0x062E2624, 0x002E2430, 0x062C2E30, 0x002C302A, 0xDF000000, 0x00000000 - -glabel D_80075FF8 -.word 0xE7000000, 0x00000000, 0xE200001C, 0x0F0A4200, 0xFC121803, 0xFFFFFFF8, 0xDE000000, D_800758A0, 0x0100600C, D_80075980, 0x06000204, 0x00000406, 0x0602080A, 0x00020A04, 0xDF000000, 0x00000000 - -glabel D_80076038 -.word 0xE7000000, 0x00000000, 0xE200001C, 0x0F0A4200, 0xFC121803, 0xFFFFFFF8, 0xDE000000, D_800758A0, 0x0100600C, D_80075920, 0x06000204, 0x00000406, 0x0602080A, 0x00020A04, 0xDF000000, 0x00000000 - -glabel D_80076078 -.word 0xDE000000, D_80075F68, 0xDE000000, D_80076038, 0xDE000000, D_80075FF8, 0xDE000000, D_80075F20, 0xDE000000, D_80075E60, 0xDE000000, D_80075EA0, 0xDF000000, 0x00000000 - -glabel D_800760B0 -.word 0x028001E0, 0x01FF0000, 0x028001E0, 0x01FF0000 - -glabel D_800760C0 -.word 0xDC080008, D_800760B0, 0xE3000A01, 0x00100000, 0xE3000F00, 0x00000000, 0xE3000C00, 0x00080000, 0xE3001201, 0x00002000, 0xE3000D01, 0x00000000, 0xE3001402, 0x00000C00, 0xE3001700, 0x00000000, 0xE2001E01, 0x00000000, 0xED000000, 0x005003C0, 0xE3001801, 0x00000000, 0xE3001A01, 0x00000000, 0xD9000000, 0x00000000, 0xD9FFFFFF, 0x00200004, 0xDB0E0000, 0x00000014, 0xDF000000, 0x00000000 diff --git a/ver/us/asm/nonmatchings/1a1f0_len_5390/check_conversation_trigger.s b/ver/us/asm/nonmatchings/1a1f0_len_5390/check_conversation_trigger.s index 66b198b21e..d2592c16b2 100644 --- a/ver/us/asm/nonmatchings/1a1f0_len_5390/check_conversation_trigger.s +++ b/ver/us/asm/nonmatchings/1a1f0_len_5390/check_conversation_trigger.s @@ -55,8 +55,8 @@ glabel check_conversation_trigger /* 1E6A4 800432A4 E7A6003C */ swc1 $f6, 0x3c($sp) /* 1E6A8 800432A8 E7A80040 */ swc1 $f8, 0x40($sp) /* 1E6AC 800432AC C6860028 */ lwc1 $f6, 0x28($s4) -/* 1E6B0 800432B0 3C028011 */ lui $v0, %hi(D_8010EBB0) -/* 1E6B4 800432B4 8042EBB0 */ lb $v0, %lo(D_8010EBB0)($v0) +/* 1E6B0 800432B0 3C028011 */ lui $v0, %hi(gPartnerActionStatus) +/* 1E6B4 800432B4 8042EBB0 */ lb $v0, %lo(gPartnerActionStatus)($v0) /* 1E6B8 800432B8 E7A60030 */ swc1 $f6, 0x30($sp) /* 1E6BC 800432BC C688002C */ lwc1 $f8, 0x2c($s4) /* 1E6C0 800432C0 E7A80034 */ swc1 $f8, 0x34($sp) diff --git a/ver/us/asm/nonmatchings/1a1f0_len_5390/update_encounters_neutral.s b/ver/us/asm/nonmatchings/1a1f0_len_5390/update_encounters_neutral.s index a73f166d4c..05581b0616 100644 --- a/ver/us/asm/nonmatchings/1a1f0_len_5390/update_encounters_neutral.s +++ b/ver/us/asm/nonmatchings/1a1f0_len_5390/update_encounters_neutral.s @@ -436,8 +436,8 @@ glabel update_encounters_neutral /* 1B1E8 8003FDE8 30820040 */ andi $v0, $a0, 0x40 /* 1B1EC 8003FDEC 144002B6 */ bnez $v0, .L800408C8 /* 1B1F0 8003FDF0 24020009 */ addiu $v0, $zero, 9 -/* 1B1F4 8003FDF4 3C038011 */ lui $v1, %hi(D_8010EBB0+0x3) -/* 1B1F8 8003FDF8 8063EBB3 */ lb $v1, %lo(D_8010EBB0+0x3)($v1) +/* 1B1F4 8003FDF4 3C038011 */ lui $v1, %hi(gPartnerActionStatus+0x3) +/* 1B1F8 8003FDF8 8063EBB3 */ lb $v1, %lo(gPartnerActionStatus+0x3)($v1) /* 1B1FC 8003FDFC 106202B2 */ beq $v1, $v0, .L800408C8 /* 1B200 8003FE00 00000000 */ nop /* 1B204 8003FE04 8E220000 */ lw $v0, ($s1) diff --git a/ver/us/asm/nonmatchings/1a1f0_len_5390/update_encounters_post_battle.s b/ver/us/asm/nonmatchings/1a1f0_len_5390/update_encounters_post_battle.s index 65b9e7e9ec..6b4c0412de 100644 --- a/ver/us/asm/nonmatchings/1a1f0_len_5390/update_encounters_post_battle.s +++ b/ver/us/asm/nonmatchings/1a1f0_len_5390/update_encounters_post_battle.s @@ -149,8 +149,8 @@ glabel update_encounters_post_battle /* 1D510 80042110 0C03ADB1 */ jal partner_handle_after_battle /* 1D514 80042114 00000000 */ nop .L80042118: -/* 1D518 80042118 3C028011 */ lui $v0, %hi(D_8010EBB0) -/* 1D51C 8004211C 2442EBB0 */ addiu $v0, $v0, %lo(D_8010EBB0) +/* 1D518 80042118 3C028011 */ lui $v0, %hi(gPartnerActionStatus) +/* 1D51C 8004211C 2442EBB0 */ addiu $v0, $v0, %lo(gPartnerActionStatus) /* 1D520 80042120 80420001 */ lb $v0, 1($v0) /* 1D524 80042124 3C03800A */ lui $v1, %hi(D_8009A63C) /* 1D528 80042128 2463A63C */ addiu $v1, $v1, %lo(D_8009A63C) diff --git a/ver/us/asm/nonmatchings/23680/func_800490B4.s b/ver/us/asm/nonmatchings/23680/func_800490B4.s index 27f1690077..8be482b5d0 100644 --- a/ver/us/asm/nonmatchings/23680/func_800490B4.s +++ b/ver/us/asm/nonmatchings/23680/func_800490B4.s @@ -36,8 +36,8 @@ glabel func_800490B4 /* 24508 80049108 30420002 */ andi $v0, $v0, 2 /* 2450C 8004910C 144000AC */ bnez $v0, .L800493C0 /* 24510 80049110 0000102D */ daddu $v0, $zero, $zero -/* 24514 80049114 3C048011 */ lui $a0, %hi(D_8010EBB0) -/* 24518 80049118 2484EBB0 */ addiu $a0, $a0, %lo(D_8010EBB0) +/* 24514 80049114 3C048011 */ lui $a0, %hi(gPartnerActionStatus) +/* 24518 80049118 2484EBB0 */ addiu $a0, $a0, %lo(gPartnerActionStatus) /* 2451C 8004911C 80830003 */ lb $v1, 3($a0) /* 24520 80049120 24020009 */ addiu $v0, $zero, 9 /* 24524 80049124 14620008 */ bne $v1, $v0, .L80049148 diff --git a/ver/us/asm/nonmatchings/316C00/func_802AE000_316C00.s b/ver/us/asm/nonmatchings/316C00/func_802AE000_316C00.s deleted file mode 100644 index d5ad244973..0000000000 --- a/ver/us/asm/nonmatchings/316C00/func_802AE000_316C00.s +++ /dev/null @@ -1,110 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802AE000_316C00 -/* 316C00 802AE000 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* 316C04 802AE004 AFB40028 */ sw $s4, 0x28($sp) -/* 316C08 802AE008 3C144BF1 */ lui $s4, 0x4bf1 -/* 316C0C 802AE00C 36945BF6 */ ori $s4, $s4, 0x5bf6 -/* 316C10 802AE010 AFB30024 */ sw $s3, 0x24($sp) -/* 316C14 802AE014 3C137013 */ lui $s3, 0x7013 -/* 316C18 802AE018 2673BC11 */ addiu $s3, $s3, -0x43ef -/* 316C1C 802AE01C AFB00018 */ sw $s0, 0x18($sp) -/* 316C20 802AE020 0000802D */ daddu $s0, $zero, $zero -/* 316C24 802AE024 3C05B000 */ lui $a1, 0xb000 -/* 316C28 802AE028 34A50574 */ ori $a1, $a1, 0x574 -/* 316C2C 802AE02C 3C04800A */ lui $a0, %hi(nuPiCartHandle) -/* 316C30 802AE030 8C84A638 */ lw $a0, %lo(nuPiCartHandle)($a0) -/* 316C34 802AE034 27A60010 */ addiu $a2, $sp, 0x10 -/* 316C38 802AE038 AFB20020 */ sw $s2, 0x20($sp) -/* 316C3C 802AE03C 0200902D */ daddu $s2, $s0, $zero -/* 316C40 802AE040 AFB5002C */ sw $s5, 0x2c($sp) -/* 316C44 802AE044 3C158006 */ lui $s5, %hi(osEPiReadIo) -/* 316C48 802AE048 26B50DC0 */ addiu $s5, $s5, %lo(osEPiReadIo) -/* 316C4C 802AE04C AFBF003C */ sw $ra, 0x3c($sp) -/* 316C50 802AE050 AFBE0038 */ sw $fp, 0x38($sp) -/* 316C54 802AE054 AFB70034 */ sw $s7, 0x34($sp) -/* 316C58 802AE058 AFB60030 */ sw $s6, 0x30($sp) -/* 316C5C 802AE05C 02A0F809 */ jalr $s5 -/* 316C60 802AE060 AFB1001C */ sw $s1, 0x1c($sp) -/* 316C64 802AE064 3C110031 */ lui $s1, 0x31 -/* 316C68 802AE068 26316A70 */ addiu $s1, $s1, 0x6a70 -/* 316C6C 802AE06C 8FA20010 */ lw $v0, 0x10($sp) -/* 316C70 802AE070 3C030031 */ lui $v1, 0x31 -/* 316C74 802AE074 24636C00 */ addiu $v1, $v1, 0x6c00 -/* 316C78 802AE078 0282A023 */ subu $s4, $s4, $v0 -/* 316C7C 802AE07C 0223102B */ sltu $v0, $s1, $v1 -/* 316C80 802AE080 1040002B */ beqz $v0, .L802AE130 -/* 316C84 802AE084 241E0023 */ addiu $fp, $zero, 0x23 -/* 316C88 802AE088 24170003 */ addiu $s7, $zero, 3 -/* 316C8C 802AE08C 0060B02D */ daddu $s6, $v1, $zero -.L802AE090: -/* 316C90 802AE090 0220282D */ daddu $a1, $s1, $zero -/* 316C94 802AE094 3C04800A */ lui $a0, %hi(nuPiCartHandle) -/* 316C98 802AE098 8C84A638 */ lw $a0, %lo(nuPiCartHandle)($a0) -/* 316C9C 802AE09C 02A0F809 */ jalr $s5 -/* 316CA0 802AE0A0 27A60010 */ addiu $a2, $sp, 0x10 -/* 316CA4 802AE0A4 8FA30010 */ lw $v1, 0x10($sp) -/* 316CA8 802AE0A8 2407000F */ addiu $a3, $zero, 0xf -/* 316CAC 802AE0AC 3065FFFF */ andi $a1, $v1, 0xffff -/* 316CB0 802AE0B0 00032402 */ srl $a0, $v1, 0x10 -/* 316CB4 802AE0B4 00A41021 */ addu $v0, $a1, $a0 -/* 316CB8 802AE0B8 02028021 */ addu $s0, $s0, $v0 -/* 316CBC 802AE0BC 00121682 */ srl $v0, $s2, 0x1a -/* 316CC0 802AE0C0 1447000F */ bne $v0, $a3, .L802AE100 -/* 316CC4 802AE0C4 00031682 */ srl $v0, $v1, 0x1a -/* 316CC8 802AE0C8 24070009 */ addiu $a3, $zero, 9 -/* 316CCC 802AE0CC 50470003 */ beql $v0, $a3, .L802AE0DC -/* 316CD0 802AE0D0 00031542 */ srl $v0, $v1, 0x15 -/* 316CD4 802AE0D4 145E000A */ bne $v0, $fp, .L802AE100 -/* 316CD8 802AE0D8 00031542 */ srl $v0, $v1, 0x15 -.L802AE0DC: -/* 316CDC 802AE0DC 3043001F */ andi $v1, $v0, 0x1f -/* 316CE0 802AE0E0 00121402 */ srl $v0, $s2, 0x10 -/* 316CE4 802AE0E4 3042001F */ andi $v0, $v0, 0x1f -/* 316CE8 802AE0E8 14620005 */ bne $v1, $v0, .L802AE100 -/* 316CEC 802AE0EC 3082001F */ andi $v0, $a0, 0x1f -/* 316CF0 802AE0F0 14620003 */ bne $v1, $v0, .L802AE100 -/* 316CF4 802AE0F4 3242FFFF */ andi $v0, $s2, 0xffff -/* 316CF8 802AE0F8 02058023 */ subu $s0, $s0, $a1 -/* 316CFC 802AE0FC 02028023 */ subu $s0, $s0, $v0 -.L802AE100: -/* 316D00 802AE100 8FA40010 */ lw $a0, 0x10($sp) -/* 316D04 802AE104 00041682 */ srl $v0, $a0, 0x1a -/* 316D08 802AE108 14570006 */ bne $v0, $s7, .L802AE124 -/* 316D0C 802AE10C 26310004 */ addiu $s1, $s1, 4 -/* 316D10 802AE110 3083FFFF */ andi $v1, $a0, 0xffff -/* 316D14 802AE114 00041402 */ srl $v0, $a0, 0x10 -/* 316D18 802AE118 3042FC00 */ andi $v0, $v0, 0xfc00 -/* 316D1C 802AE11C 00621821 */ addu $v1, $v1, $v0 -/* 316D20 802AE120 02038023 */ subu $s0, $s0, $v1 -.L802AE124: -/* 316D24 802AE124 0236102B */ sltu $v0, $s1, $s6 -/* 316D28 802AE128 1440FFD9 */ bnez $v0, .L802AE090 -/* 316D2C 802AE12C 0080902D */ daddu $s2, $a0, $zero -.L802AE130: -/* 316D30 802AE130 3C02FFDB */ lui $v0, 0xffdb -/* 316D34 802AE134 34426641 */ ori $v0, $v0, 0x6641 -/* 316D38 802AE138 02021021 */ addu $v0, $s0, $v0 -/* 316D3C 802AE13C 02821023 */ subu $v0, $s4, $v0 -/* 316D40 802AE140 02629821 */ addu $s3, $s3, $v0 -/* 316D44 802AE144 00131F02 */ srl $v1, $s3, 0x1c -/* 316D48 802AE148 24020008 */ addiu $v0, $zero, 8 -/* 316D4C 802AE14C 14620003 */ bne $v1, $v0, .L802AE15C -/* 316D50 802AE150 00000000 */ nop -/* 316D54 802AE154 0260F809 */ jalr $s3 -/* 316D58 802AE158 00000000 */ nop -.L802AE15C: -/* 316D5C 802AE15C 8FBF003C */ lw $ra, 0x3c($sp) -/* 316D60 802AE160 8FBE0038 */ lw $fp, 0x38($sp) -/* 316D64 802AE164 8FB70034 */ lw $s7, 0x34($sp) -/* 316D68 802AE168 8FB60030 */ lw $s6, 0x30($sp) -/* 316D6C 802AE16C 8FB5002C */ lw $s5, 0x2c($sp) -/* 316D70 802AE170 8FB40028 */ lw $s4, 0x28($sp) -/* 316D74 802AE174 8FB30024 */ lw $s3, 0x24($sp) -/* 316D78 802AE178 8FB20020 */ lw $s2, 0x20($sp) -/* 316D7C 802AE17C 8FB1001C */ lw $s1, 0x1c($sp) -/* 316D80 802AE180 8FB00018 */ lw $s0, 0x18($sp) -/* 316D84 802AE184 03E00008 */ jr $ra -/* 316D88 802AE188 27BD0040 */ addiu $sp, $sp, 0x40 -/* 316D8C 802AE18C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/316d90/func_802AE000.s b/ver/us/asm/nonmatchings/316d90/func_802AE000.s deleted file mode 100644 index bf304896b1..0000000000 --- a/ver/us/asm/nonmatchings/316d90/func_802AE000.s +++ /dev/null @@ -1,115 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802AE000 -/* 316D90 802AE000 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* 316D94 802AE004 AFB40028 */ sw $s4, 0x28($sp) -/* 316D98 802AE008 3C1433F5 */ lui $s4, 0x33f5 -/* 316D9C 802AE00C AFB30024 */ sw $s3, 0x24($sp) -/* 316DA0 802AE010 3C137013 */ lui $s3, 0x7013 -/* 316DA4 802AE014 2673ACA1 */ addiu $s3, $s3, -0x535f -/* 316DA8 802AE018 AFB00018 */ sw $s0, 0x18($sp) -/* 316DAC 802AE01C 0000802D */ daddu $s0, $zero, $zero -/* 316DB0 802AE020 3C05B000 */ lui $a1, 0xb000 -/* 316DB4 802AE024 34A50800 */ ori $a1, $a1, 0x800 -/* 316DB8 802AE028 3C04800A */ lui $a0, %hi(nuPiCartHandle) -/* 316DBC 802AE02C 8C84A638 */ lw $a0, %lo(nuPiCartHandle)($a0) -/* 316DC0 802AE030 27A60010 */ addiu $a2, $sp, 0x10 -/* 316DC4 802AE034 AFB20020 */ sw $s2, 0x20($sp) -/* 316DC8 802AE038 0200902D */ daddu $s2, $s0, $zero -/* 316DCC 802AE03C AFB5002C */ sw $s5, 0x2c($sp) -/* 316DD0 802AE040 3C158006 */ lui $s5, %hi(osEPiReadIo) -/* 316DD4 802AE044 26B50DC0 */ addiu $s5, $s5, %lo(osEPiReadIo) -/* 316DD8 802AE048 AFBF003C */ sw $ra, 0x3c($sp) -/* 316DDC 802AE04C AFBE0038 */ sw $fp, 0x38($sp) -/* 316DE0 802AE050 AFB70034 */ sw $s7, 0x34($sp) -/* 316DE4 802AE054 AFB60030 */ sw $s6, 0x30($sp) -/* 316DE8 802AE058 02A0F809 */ jalr $s5 -/* 316DEC 802AE05C AFB1001C */ sw $s1, 0x1c($sp) -/* 316DF0 802AE060 3C110031 */ lui $s1, 0x31 -/* 316DF4 802AE064 26316C00 */ addiu $s1, $s1, 0x6c00 -/* 316DF8 802AE068 8FA20010 */ lw $v0, 0x10($sp) -/* 316DFC 802AE06C 3C030031 */ lui $v1, 0x31 -/* 316E00 802AE070 24636D90 */ addiu $v1, $v1, 0x6d90 -/* 316E04 802AE074 0282A023 */ subu $s4, $s4, $v0 -/* 316E08 802AE078 0223102B */ sltu $v0, $s1, $v1 -/* 316E0C 802AE07C 1040002B */ beqz $v0, .L802AE12C -/* 316E10 802AE080 241E0023 */ addiu $fp, $zero, 0x23 -/* 316E14 802AE084 24170003 */ addiu $s7, $zero, 3 -/* 316E18 802AE088 0060B02D */ daddu $s6, $v1, $zero -.L802AE08C: -/* 316E1C 802AE08C 0220282D */ daddu $a1, $s1, $zero -/* 316E20 802AE090 3C04800A */ lui $a0, %hi(nuPiCartHandle) -/* 316E24 802AE094 8C84A638 */ lw $a0, %lo(nuPiCartHandle)($a0) -/* 316E28 802AE098 02A0F809 */ jalr $s5 -/* 316E2C 802AE09C 27A60010 */ addiu $a2, $sp, 0x10 -/* 316E30 802AE0A0 8FA30010 */ lw $v1, 0x10($sp) -/* 316E34 802AE0A4 2407000F */ addiu $a3, $zero, 0xf -/* 316E38 802AE0A8 3065FFFF */ andi $a1, $v1, 0xffff -/* 316E3C 802AE0AC 00032402 */ srl $a0, $v1, 0x10 -/* 316E40 802AE0B0 00A41021 */ addu $v0, $a1, $a0 -/* 316E44 802AE0B4 02028021 */ addu $s0, $s0, $v0 -/* 316E48 802AE0B8 00121682 */ srl $v0, $s2, 0x1a -/* 316E4C 802AE0BC 1447000F */ bne $v0, $a3, .L802AE0FC -/* 316E50 802AE0C0 00031682 */ srl $v0, $v1, 0x1a -/* 316E54 802AE0C4 24070009 */ addiu $a3, $zero, 9 -/* 316E58 802AE0C8 50470003 */ beql $v0, $a3, .L802AE0D8 -/* 316E5C 802AE0CC 00031542 */ srl $v0, $v1, 0x15 -/* 316E60 802AE0D0 145E000A */ bne $v0, $fp, .L802AE0FC -/* 316E64 802AE0D4 00031542 */ srl $v0, $v1, 0x15 -.L802AE0D8: -/* 316E68 802AE0D8 3043001F */ andi $v1, $v0, 0x1f -/* 316E6C 802AE0DC 00121402 */ srl $v0, $s2, 0x10 -/* 316E70 802AE0E0 3042001F */ andi $v0, $v0, 0x1f -/* 316E74 802AE0E4 14620005 */ bne $v1, $v0, .L802AE0FC -/* 316E78 802AE0E8 3082001F */ andi $v0, $a0, 0x1f -/* 316E7C 802AE0EC 14620003 */ bne $v1, $v0, .L802AE0FC -/* 316E80 802AE0F0 3242FFFF */ andi $v0, $s2, 0xffff -/* 316E84 802AE0F4 02058023 */ subu $s0, $s0, $a1 -/* 316E88 802AE0F8 02028023 */ subu $s0, $s0, $v0 -.L802AE0FC: -/* 316E8C 802AE0FC 8FA40010 */ lw $a0, 0x10($sp) -/* 316E90 802AE100 00041682 */ srl $v0, $a0, 0x1a -/* 316E94 802AE104 14570006 */ bne $v0, $s7, .L802AE120 -/* 316E98 802AE108 26310004 */ addiu $s1, $s1, 4 -/* 316E9C 802AE10C 3083FFFF */ andi $v1, $a0, 0xffff -/* 316EA0 802AE110 00041402 */ srl $v0, $a0, 0x10 -/* 316EA4 802AE114 3042FC00 */ andi $v0, $v0, 0xfc00 -/* 316EA8 802AE118 00621821 */ addu $v1, $v1, $v0 -/* 316EAC 802AE11C 02038023 */ subu $s0, $s0, $v1 -.L802AE120: -/* 316EB0 802AE120 0236102B */ sltu $v0, $s1, $s6 -/* 316EB4 802AE124 1440FFD9 */ bnez $v0, .L802AE08C -/* 316EB8 802AE128 0080902D */ daddu $s2, $a0, $zero -.L802AE12C: -/* 316EBC 802AE12C 3C02FFD6 */ lui $v0, 0xffd6 -/* 316EC0 802AE130 3442E66D */ ori $v0, $v0, 0xe66d -/* 316EC4 802AE134 02021021 */ addu $v0, $s0, $v0 -/* 316EC8 802AE138 02821023 */ subu $v0, $s4, $v0 -/* 316ECC 802AE13C 02629821 */ addu $s3, $s3, $v0 -/* 316ED0 802AE140 00131F02 */ srl $v1, $s3, 0x1c -/* 316ED4 802AE144 24020008 */ addiu $v0, $zero, 8 -/* 316ED8 802AE148 14620005 */ bne $v1, $v0, .L802AE160 -/* 316EDC 802AE14C 00000000 */ nop -/* 316EE0 802AE150 0260F809 */ jalr $s3 -/* 316EE4 802AE154 00000000 */ nop -/* 316EE8 802AE158 080AB85C */ j .L802AE170 -/* 316EEC 802AE15C 00000000 */ nop -.L802AE160: -/* 316EF0 802AE160 3C04803E */ lui $a0, %hi(D_803DA800) -/* 316EF4 802AE164 2484A800 */ addiu $a0, $a0, %lo(D_803DA800) -/* 316EF8 802AE168 0C00A40C */ jal _heap_create -/* 316EFC 802AE16C 3C050001 */ lui $a1, 1 -.L802AE170: -/* 316F00 802AE170 8FBF003C */ lw $ra, 0x3c($sp) -/* 316F04 802AE174 8FBE0038 */ lw $fp, 0x38($sp) -/* 316F08 802AE178 8FB70034 */ lw $s7, 0x34($sp) -/* 316F0C 802AE17C 8FB60030 */ lw $s6, 0x30($sp) -/* 316F10 802AE180 8FB5002C */ lw $s5, 0x2c($sp) -/* 316F14 802AE184 8FB40028 */ lw $s4, 0x28($sp) -/* 316F18 802AE188 8FB30024 */ lw $s3, 0x24($sp) -/* 316F1C 802AE18C 8FB20020 */ lw $s2, 0x20($sp) -/* 316F20 802AE190 8FB1001C */ lw $s1, 0x1c($sp) -/* 316F24 802AE194 8FB00018 */ lw $s0, 0x18($sp) -/* 316F28 802AE198 03E00008 */ jr $ra -/* 316F2C 802AE19C 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/ver/us/asm/nonmatchings/362a0_len_2f70/_add_hit_vert_to_buffer.s b/ver/us/asm/nonmatchings/362a0_len_2f70/_add_hit_vert_to_buffer.s deleted file mode 100644 index dee058f166..0000000000 --- a/ver/us/asm/nonmatchings/362a0_len_2f70/_add_hit_vert_to_buffer.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel _add_hit_vert_to_buffer -/* 36DA0 8005B9A0 8CC80000 */ lw $t0, ($a2) -/* 36DA4 8005B9A4 19000009 */ blez $t0, .L8005B9CC -/* 36DA8 8005B9A8 0000182D */ daddu $v1, $zero, $zero -/* 36DAC 8005B9AC 0080382D */ daddu $a3, $a0, $zero -.L8005B9B0: -/* 36DB0 8005B9B0 8CE20000 */ lw $v0, ($a3) -/* 36DB4 8005B9B4 10450005 */ beq $v0, $a1, .L8005B9CC -/* 36DB8 8005B9B8 00000000 */ nop -/* 36DBC 8005B9BC 24630001 */ addiu $v1, $v1, 1 -/* 36DC0 8005B9C0 0068102A */ slt $v0, $v1, $t0 -/* 36DC4 8005B9C4 1440FFFA */ bnez $v0, .L8005B9B0 -/* 36DC8 8005B9C8 24E70004 */ addiu $a3, $a3, 4 -.L8005B9CC: -/* 36DCC 8005B9CC 8CC20000 */ lw $v0, ($a2) -/* 36DD0 8005B9D0 14620006 */ bne $v1, $v0, .L8005B9EC -/* 36DD4 8005B9D4 00031080 */ sll $v0, $v1, 2 -/* 36DD8 8005B9D8 00441021 */ addu $v0, $v0, $a0 -/* 36DDC 8005B9DC AC450000 */ sw $a1, ($v0) -/* 36DE0 8005B9E0 8CC20000 */ lw $v0, ($a2) -/* 36DE4 8005B9E4 24420001 */ addiu $v0, $v0, 1 -/* 36DE8 8005B9E8 ACC20000 */ sw $v0, ($a2) -.L8005B9EC: -/* 36DEC 8005B9EC 03E00008 */ jr $ra -/* 36DF0 8005B9F0 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/362a0_len_2f70/func_8005DB00.s b/ver/us/asm/nonmatchings/362a0_len_2f70/func_8005DB00.s index e10926f661..511a2c1174 100644 --- a/ver/us/asm/nonmatchings/362a0_len_2f70/func_8005DB00.s +++ b/ver/us/asm/nonmatchings/362a0_len_2f70/func_8005DB00.s @@ -56,8 +56,8 @@ glabel func_8005DB00 /* 38FC4 8005DBC4 0801774D */ j .L8005DD34 /* 38FC8 8005DBC8 AE420070 */ sw $v0, 0x70($s2) .L8005DBCC: -/* 38FCC 8005DBCC 3C028011 */ lui $v0, %hi(D_8010EBB0) -/* 38FD0 8005DBD0 2442EBB0 */ addiu $v0, $v0, %lo(D_8010EBB0) +/* 38FCC 8005DBCC 3C028011 */ lui $v0, %hi(gPartnerActionStatus) +/* 38FD0 8005DBD0 2442EBB0 */ addiu $v0, $v0, %lo(gPartnerActionStatus) /* 38FD4 8005DBD4 80430003 */ lb $v1, 3($v0) /* 38FD8 8005DBD8 24020009 */ addiu $v0, $zero, 9 /* 38FDC 8005DBDC 10620056 */ beq $v1, $v0, .L8005DD38 diff --git a/ver/us/asm/nonmatchings/362a0_len_2f70/func_8005DD54.s b/ver/us/asm/nonmatchings/362a0_len_2f70/func_8005DD54.s deleted file mode 100644 index 775f76e565..0000000000 --- a/ver/us/asm/nonmatchings/362a0_len_2f70/func_8005DD54.s +++ /dev/null @@ -1,45 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8005DD54 -/* 39154 8005DD54 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 39158 8005DD58 AFB00010 */ sw $s0, 0x10($sp) -/* 3915C 8005DD5C 0080802D */ daddu $s0, $a0, $zero -/* 39160 8005DD60 AFBF0014 */ sw $ra, 0x14($sp) -/* 39164 8005DD64 C60C0084 */ lwc1 $f12, 0x84($s0) -/* 39168 8005DD68 0C00A6C9 */ jal clamp_angle -/* 3916C 8005DD6C 46806320 */ cvt.s.w $f12, $f12 -/* 39170 8005DD70 3C014334 */ lui $at, 0x4334 -/* 39174 8005DD74 44811000 */ mtc1 $at, $f2 -/* 39178 8005DD78 4600018D */ trunc.w.s $f6, $f0 -/* 3917C 8005DD7C E6060084 */ swc1 $f6, 0x84($s0) -/* 39180 8005DD80 4600103E */ c.le.s $f2, $f0 -/* 39184 8005DD84 00000000 */ nop -/* 39188 8005DD88 45030001 */ bc1tl .L8005DD90 -/* 3918C 8005DD8C 46020001 */ sub.s $f0, $f0, $f2 -.L8005DD90: -/* 39190 8005DD90 3C0142B4 */ lui $at, 0x42b4 -/* 39194 8005DD94 44812000 */ mtc1 $at, $f4 -/* 39198 8005DD98 00000000 */ nop -/* 3919C 8005DD9C 4600203E */ c.le.s $f4, $f0 -/* 391A0 8005DDA0 00000000 */ nop -/* 391A4 8005DDA4 45030001 */ bc1tl .L8005DDAC -/* 391A8 8005DDA8 46001001 */ sub.s $f0, $f2, $f0 -.L8005DDAC: -/* 391AC 8005DDAC 46002001 */ sub.s $f0, $f4, $f0 -/* 391B0 8005DDB0 3C0142BE */ lui $at, 0x42be -/* 391B4 8005DDB4 44811000 */ mtc1 $at, $f2 -/* 391B8 8005DDB8 00000000 */ nop -/* 391BC 8005DDBC 46020002 */ mul.s $f0, $f0, $f2 -/* 391C0 8005DDC0 00000000 */ nop -/* 391C4 8005DDC4 46040003 */ div.s $f0, $f0, $f4 -/* 391C8 8005DDC8 4600018D */ trunc.w.s $f6, $f0 -/* 391CC 8005DDCC 44023000 */ mfc1 $v0, $f6 -/* 391D0 8005DDD0 00000000 */ nop -/* 391D4 8005DDD4 244200A0 */ addiu $v0, $v0, 0xa0 -/* 391D8 8005DDD8 AE02008C */ sw $v0, 0x8c($s0) -/* 391DC 8005DDDC 8FBF0014 */ lw $ra, 0x14($sp) -/* 391E0 8005DDE0 8FB00010 */ lw $s0, 0x10($sp) -/* 391E4 8005DDE4 24020002 */ addiu $v0, $zero, 2 -/* 391E8 8005DDE8 03E00008 */ jr $ra -/* 391EC 8005DDEC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/362a0_len_2f70/get_collider_center.s b/ver/us/asm/nonmatchings/362a0_len_2f70/get_collider_center.s deleted file mode 100644 index 05dbd2103f..0000000000 --- a/ver/us/asm/nonmatchings/362a0_len_2f70/get_collider_center.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel get_collider_center -/* 37210 8005BE10 000410C0 */ sll $v0, $a0, 3 -/* 37214 8005BE14 00441023 */ subu $v0, $v0, $a0 -/* 37218 8005BE18 3C03800B */ lui $v1, %hi(gCollisionData+0x4) -/* 3721C 8005BE1C 8C6342E4 */ lw $v1, %lo(gCollisionData+0x4)($v1) -/* 37220 8005BE20 00021080 */ sll $v0, $v0, 2 -/* 37224 8005BE24 00431021 */ addu $v0, $v0, $v1 -/* 37228 8005BE28 8C420010 */ lw $v0, 0x10($v0) -/* 3722C 8005BE2C C4400000 */ lwc1 $f0, ($v0) -/* 37230 8005BE30 C442000C */ lwc1 $f2, 0xc($v0) -/* 37234 8005BE34 46020000 */ add.s $f0, $f0, $f2 -/* 37238 8005BE38 3C013F00 */ lui $at, 0x3f00 -/* 3723C 8005BE3C 44812000 */ mtc1 $at, $f4 -/* 37240 8005BE40 00000000 */ nop -/* 37244 8005BE44 46040002 */ mul.s $f0, $f0, $f4 -/* 37248 8005BE48 00000000 */ nop -/* 3724C 8005BE4C E4A00000 */ swc1 $f0, ($a1) -/* 37250 8005BE50 C4400004 */ lwc1 $f0, 4($v0) -/* 37254 8005BE54 C4420010 */ lwc1 $f2, 0x10($v0) -/* 37258 8005BE58 46020000 */ add.s $f0, $f0, $f2 -/* 3725C 8005BE5C 46040002 */ mul.s $f0, $f0, $f4 -/* 37260 8005BE60 00000000 */ nop -/* 37264 8005BE64 E4C00000 */ swc1 $f0, ($a2) -/* 37268 8005BE68 C4400008 */ lwc1 $f0, 8($v0) -/* 3726C 8005BE6C C4420014 */ lwc1 $f2, 0x14($v0) -/* 37270 8005BE70 46020000 */ add.s $f0, $f0, $f2 -/* 37274 8005BE74 46040002 */ mul.s $f0, $f0, $f4 -/* 37278 8005BE78 00000000 */ nop -/* 3727C 8005BE7C 03E00008 */ jr $ra -/* 37280 8005BE80 E4E00000 */ swc1 $f0, ($a3) diff --git a/ver/us/asm/nonmatchings/362a0_len_2f70/get_collider_type_by_id.s b/ver/us/asm/nonmatchings/362a0_len_2f70/get_collider_type_by_id.s deleted file mode 100644 index a97028ad9e..0000000000 --- a/ver/us/asm/nonmatchings/362a0_len_2f70/get_collider_type_by_id.s +++ /dev/null @@ -1,17 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel get_collider_type_by_id -/* 371A8 8005BDA8 30824000 */ andi $v0, $a0, 0x4000 -/* 371AC 8005BDAC 14400008 */ bnez $v0, .L8005BDD0 -/* 371B0 8005BDB0 000410C0 */ sll $v0, $a0, 3 -/* 371B4 8005BDB4 00441023 */ subu $v0, $v0, $a0 -/* 371B8 8005BDB8 3C03800B */ lui $v1, %hi(gCollisionData+0x4) -/* 371BC 8005BDBC 8C6342E4 */ lw $v1, %lo(gCollisionData+0x4)($v1) -/* 371C0 8005BDC0 00021080 */ sll $v0, $v0, 2 -/* 371C4 8005BDC4 00431021 */ addu $v0, $v0, $v1 -/* 371C8 8005BDC8 03E00008 */ jr $ra -/* 371CC 8005BDCC 8C420000 */ lw $v0, ($v0) -.L8005BDD0: -/* 371D0 8005BDD0 03E00008 */ jr $ra -/* 371D4 8005BDD4 0000102D */ daddu $v0, $zero, $zero diff --git a/ver/us/asm/nonmatchings/362a0_len_2f70/get_flat_collider_normal.s b/ver/us/asm/nonmatchings/362a0_len_2f70/get_flat_collider_normal.s deleted file mode 100644 index 47eab148d6..0000000000 --- a/ver/us/asm/nonmatchings/362a0_len_2f70/get_flat_collider_normal.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel get_flat_collider_normal -/* 371D8 8005BDD8 000410C0 */ sll $v0, $a0, 3 -/* 371DC 8005BDDC 00441023 */ subu $v0, $v0, $a0 -/* 371E0 8005BDE0 3C03800B */ lui $v1, %hi(gCollisionData+0x4) -/* 371E4 8005BDE4 8C6342E4 */ lw $v1, %lo(gCollisionData+0x4)($v1) -/* 371E8 8005BDE8 00021080 */ sll $v0, $v0, 2 -/* 371EC 8005BDEC 00431021 */ addu $v0, $v0, $v1 -/* 371F0 8005BDF0 8C42000C */ lw $v0, 0xc($v0) -/* 371F4 8005BDF4 C4400030 */ lwc1 $f0, 0x30($v0) -/* 371F8 8005BDF8 E4A00000 */ swc1 $f0, ($a1) -/* 371FC 8005BDFC C4400034 */ lwc1 $f0, 0x34($v0) -/* 37200 8005BE00 E4C00000 */ swc1 $f0, ($a2) -/* 37204 8005BE04 C4400038 */ lwc1 $f0, 0x38($v0) -/* 37208 8005BE08 03E00008 */ jr $ra -/* 3720C 8005BE0C E4E00000 */ swc1 $f0, ($a3) diff --git a/ver/us/asm/nonmatchings/759b0_len_61b0/npc_test_move_simple_with_slipping.s b/ver/us/asm/nonmatchings/759b0_len_61b0/npc_test_move_simple_with_slipping.s deleted file mode 100644 index a3327ee6f1..0000000000 --- a/ver/us/asm/nonmatchings/759b0_len_61b0/npc_test_move_simple_with_slipping.s +++ /dev/null @@ -1,46 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel npc_test_move_simple_with_slipping -/* 770F4 800DDC44 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* 770F8 800DDC48 AFB10034 */ sw $s1, 0x34($sp) -/* 770FC 800DDC4C 00A0882D */ daddu $s1, $a1, $zero -/* 77100 800DDC50 AFBF0038 */ sw $ra, 0x38($sp) -/* 77104 800DDC54 AFB00030 */ sw $s0, 0x30($sp) -/* 77108 800DDC58 C6200000 */ lwc1 $f0, ($s1) -/* 7710C 800DDC5C C7A40050 */ lwc1 $f4, 0x50($sp) -/* 77110 800DDC60 C7A80054 */ lwc1 $f8, 0x54($sp) -/* 77114 800DDC64 C7A6005C */ lwc1 $f6, 0x5c($sp) -/* 77118 800DDC68 3C014120 */ lui $at, 0x4120 -/* 7711C 800DDC6C 342128F6 */ ori $at, $at, 0x28f6 -/* 77120 800DDC70 44811000 */ mtc1 $at, $f2 -/* 77124 800DDC74 E7A00020 */ swc1 $f0, 0x20($sp) -/* 77128 800DDC78 C4C00000 */ lwc1 $f0, ($a2) -/* 7712C 800DDC7C 00E0802D */ daddu $s0, $a3, $zero -/* 77130 800DDC80 46020000 */ add.s $f0, $f0, $f2 -/* 77134 800DDC84 3C013F00 */ lui $at, 0x3f00 -/* 77138 800DDC88 44811000 */ mtc1 $at, $f2 -/* 7713C 800DDC8C 27A50020 */ addiu $a1, $sp, 0x20 -/* 77140 800DDC90 46023182 */ mul.s $f6, $f6, $f2 -/* 77144 800DDC94 00000000 */ nop -/* 77148 800DDC98 27A70028 */ addiu $a3, $sp, 0x28 -/* 7714C 800DDC9C 27A60024 */ addiu $a2, $sp, 0x24 -/* 77150 800DDCA0 E7A00024 */ swc1 $f0, 0x24($sp) -/* 77154 800DDCA4 C6000000 */ lwc1 $f0, ($s0) -/* 77158 800DDCA8 46002105 */ abs.s $f4, $f4 -/* 7715C 800DDCAC E7A00028 */ swc1 $f0, 0x28($sp) -/* 77160 800DDCB0 E7A40010 */ swc1 $f4, 0x10($sp) -/* 77164 800DDCB4 E7A80014 */ swc1 $f8, 0x14($sp) -/* 77168 800DDCB8 0C037586 */ jal npc_test_move_with_slipping -/* 7716C 800DDCBC E7A60018 */ swc1 $f6, 0x18($sp) -/* 77170 800DDCC0 C7A00020 */ lwc1 $f0, 0x20($sp) -/* 77174 800DDCC4 E6200000 */ swc1 $f0, ($s1) -/* 77178 800DDCC8 C7A00028 */ lwc1 $f0, 0x28($sp) -/* 7717C 800DDCCC 00021027 */ nor $v0, $zero, $v0 -/* 77180 800DDCD0 E6000000 */ swc1 $f0, ($s0) -/* 77184 800DDCD4 8FBF0038 */ lw $ra, 0x38($sp) -/* 77188 800DDCD8 8FB10034 */ lw $s1, 0x34($sp) -/* 7718C 800DDCDC 8FB00030 */ lw $s0, 0x30($sp) -/* 77190 800DDCE0 000217C2 */ srl $v0, $v0, 0x1f -/* 77194 800DDCE4 03E00008 */ jr $ra -/* 77198 800DDCE8 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/ver/us/asm/nonmatchings/759b0_len_61b0/npc_test_move_simple_without_slipping.s b/ver/us/asm/nonmatchings/759b0_len_61b0/npc_test_move_simple_without_slipping.s deleted file mode 100644 index f246ab4110..0000000000 --- a/ver/us/asm/nonmatchings/759b0_len_61b0/npc_test_move_simple_without_slipping.s +++ /dev/null @@ -1,46 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel npc_test_move_simple_without_slipping -/* 7719C 800DDCEC 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* 771A0 800DDCF0 AFB10034 */ sw $s1, 0x34($sp) -/* 771A4 800DDCF4 00A0882D */ daddu $s1, $a1, $zero -/* 771A8 800DDCF8 AFBF0038 */ sw $ra, 0x38($sp) -/* 771AC 800DDCFC AFB00030 */ sw $s0, 0x30($sp) -/* 771B0 800DDD00 C6200000 */ lwc1 $f0, ($s1) -/* 771B4 800DDD04 C7A40050 */ lwc1 $f4, 0x50($sp) -/* 771B8 800DDD08 C7A80054 */ lwc1 $f8, 0x54($sp) -/* 771BC 800DDD0C C7A6005C */ lwc1 $f6, 0x5c($sp) -/* 771C0 800DDD10 3C014120 */ lui $at, 0x4120 -/* 771C4 800DDD14 342128F6 */ ori $at, $at, 0x28f6 -/* 771C8 800DDD18 44811000 */ mtc1 $at, $f2 -/* 771CC 800DDD1C E7A00020 */ swc1 $f0, 0x20($sp) -/* 771D0 800DDD20 C4C00000 */ lwc1 $f0, ($a2) -/* 771D4 800DDD24 00E0802D */ daddu $s0, $a3, $zero -/* 771D8 800DDD28 46020000 */ add.s $f0, $f0, $f2 -/* 771DC 800DDD2C 3C013F00 */ lui $at, 0x3f00 -/* 771E0 800DDD30 44811000 */ mtc1 $at, $f2 -/* 771E4 800DDD34 27A50020 */ addiu $a1, $sp, 0x20 -/* 771E8 800DDD38 46023182 */ mul.s $f6, $f6, $f2 -/* 771EC 800DDD3C 00000000 */ nop -/* 771F0 800DDD40 27A70028 */ addiu $a3, $sp, 0x28 -/* 771F4 800DDD44 27A60024 */ addiu $a2, $sp, 0x24 -/* 771F8 800DDD48 E7A00024 */ swc1 $f0, 0x24($sp) -/* 771FC 800DDD4C C6000000 */ lwc1 $f0, ($s0) -/* 77200 800DDD50 46002105 */ abs.s $f4, $f4 -/* 77204 800DDD54 E7A00028 */ swc1 $f0, 0x28($sp) -/* 77208 800DDD58 E7A40010 */ swc1 $f4, 0x10($sp) -/* 7720C 800DDD5C E7A80014 */ swc1 $f8, 0x14($sp) -/* 77210 800DDD60 0C03763F */ jal npc_test_move_without_slipping -/* 77214 800DDD64 E7A60018 */ swc1 $f6, 0x18($sp) -/* 77218 800DDD68 C7A00020 */ lwc1 $f0, 0x20($sp) -/* 7721C 800DDD6C E6200000 */ swc1 $f0, ($s1) -/* 77220 800DDD70 C7A00028 */ lwc1 $f0, 0x28($sp) -/* 77224 800DDD74 00021027 */ nor $v0, $zero, $v0 -/* 77228 800DDD78 E6000000 */ swc1 $f0, ($s0) -/* 7722C 800DDD7C 8FBF0038 */ lw $ra, 0x38($sp) -/* 77230 800DDD80 8FB10034 */ lw $s1, 0x34($sp) -/* 77234 800DDD84 8FB00030 */ lw $s0, 0x30($sp) -/* 77238 800DDD88 000217C2 */ srl $v0, $v0, 0x1f -/* 7723C 800DDD8C 03E00008 */ jr $ra -/* 77240 800DDD90 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/ver/us/asm/nonmatchings/759b0_len_61b0/npc_test_move_taller_with_slipping.s b/ver/us/asm/nonmatchings/759b0_len_61b0/npc_test_move_taller_with_slipping.s deleted file mode 100644 index 0ded48066a..0000000000 --- a/ver/us/asm/nonmatchings/759b0_len_61b0/npc_test_move_taller_with_slipping.s +++ /dev/null @@ -1,94 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel npc_test_move_taller_with_slipping -/* 76F94 800DDAE4 27BDFF98 */ addiu $sp, $sp, -0x68 -/* 76F98 800DDAE8 F7B40050 */ sdc1 $f20, 0x50($sp) -/* 76F9C 800DDAEC C7B40084 */ lwc1 $f20, 0x84($sp) -/* 76FA0 800DDAF0 C7A40078 */ lwc1 $f4, 0x78($sp) -/* 76FA4 800DDAF4 AFB60048 */ sw $s6, 0x48($sp) -/* 76FA8 800DDAF8 0080B02D */ daddu $s6, $a0, $zero -/* 76FAC 800DDAFC AFB3003C */ sw $s3, 0x3c($sp) -/* 76FB0 800DDB00 00A0982D */ daddu $s3, $a1, $zero -/* 76FB4 800DDB04 AFB50044 */ sw $s5, 0x44($sp) -/* 76FB8 800DDB08 00C0A82D */ daddu $s5, $a2, $zero -/* 76FBC 800DDB0C AFB40040 */ sw $s4, 0x40($sp) -/* 76FC0 800DDB10 00E0A02D */ daddu $s4, $a3, $zero -/* 76FC4 800DDB14 F7B80060 */ sdc1 $f24, 0x60($sp) -/* 76FC8 800DDB18 C7B8007C */ lwc1 $f24, 0x7c($sp) -/* 76FCC 800DDB1C C7A20080 */ lwc1 $f2, 0x80($sp) -/* 76FD0 800DDB20 AFBF004C */ sw $ra, 0x4c($sp) -/* 76FD4 800DDB24 AFB20038 */ sw $s2, 0x38($sp) -/* 76FD8 800DDB28 AFB10034 */ sw $s1, 0x34($sp) -/* 76FDC 800DDB2C AFB00030 */ sw $s0, 0x30($sp) -/* 76FE0 800DDB30 F7B60058 */ sdc1 $f22, 0x58($sp) -/* 76FE4 800DDB34 C6600000 */ lwc1 $f0, ($s3) -/* 76FE8 800DDB38 27B20020 */ addiu $s2, $sp, 0x20 -/* 76FEC 800DDB3C E7A00020 */ swc1 $f0, 0x20($sp) -/* 76FF0 800DDB40 C6A00000 */ lwc1 $f0, ($s5) -/* 76FF4 800DDB44 0240282D */ daddu $a1, $s2, $zero -/* 76FF8 800DDB48 46020000 */ add.s $f0, $f0, $f2 -/* 76FFC 800DDB4C 3C013F80 */ lui $at, 0x3f80 -/* 77000 800DDB50 44811000 */ mtc1 $at, $f2 -/* 77004 800DDB54 27B10024 */ addiu $s1, $sp, 0x24 -/* 77008 800DDB58 46020001 */ sub.s $f0, $f0, $f2 -/* 7700C 800DDB5C 3C013F00 */ lui $at, 0x3f00 -/* 77010 800DDB60 44811000 */ mtc1 $at, $f2 -/* 77014 800DDB64 0220302D */ daddu $a2, $s1, $zero -/* 77018 800DDB68 4602A502 */ mul.s $f20, $f20, $f2 -/* 7701C 800DDB6C 00000000 */ nop -/* 77020 800DDB70 27B00028 */ addiu $s0, $sp, 0x28 -/* 77024 800DDB74 0200382D */ daddu $a3, $s0, $zero -/* 77028 800DDB78 E7A00024 */ swc1 $f0, 0x24($sp) -/* 7702C 800DDB7C C6800000 */ lwc1 $f0, ($s4) -/* 77030 800DDB80 46002585 */ abs.s $f22, $f4 -/* 77034 800DDB84 E7A00028 */ swc1 $f0, 0x28($sp) -/* 77038 800DDB88 E7B60010 */ swc1 $f22, 0x10($sp) -/* 7703C 800DDB8C E7B80014 */ swc1 $f24, 0x14($sp) -/* 77040 800DDB90 0C037586 */ jal npc_test_move_with_slipping -/* 77044 800DDB94 E7B40018 */ swc1 $f20, 0x18($sp) -/* 77048 800DDB98 04430019 */ bgezl $v0, .L800DDC00 -/* 7704C 800DDB9C 24020001 */ addiu $v0, $zero, 1 -/* 77050 800DDBA0 C6600000 */ lwc1 $f0, ($s3) -/* 77054 800DDBA4 3C014120 */ lui $at, 0x4120 -/* 77058 800DDBA8 342128F6 */ ori $at, $at, 0x28f6 -/* 7705C 800DDBAC 44811000 */ mtc1 $at, $f2 -/* 77060 800DDBB0 E7A00020 */ swc1 $f0, 0x20($sp) -/* 77064 800DDBB4 C6A00000 */ lwc1 $f0, ($s5) -/* 77068 800DDBB8 02C0202D */ daddu $a0, $s6, $zero -/* 7706C 800DDBBC 46020000 */ add.s $f0, $f0, $f2 -/* 77070 800DDBC0 0240282D */ daddu $a1, $s2, $zero -/* 77074 800DDBC4 0220302D */ daddu $a2, $s1, $zero -/* 77078 800DDBC8 E7A00024 */ swc1 $f0, 0x24($sp) -/* 7707C 800DDBCC C6800000 */ lwc1 $f0, ($s4) -/* 77080 800DDBD0 0200382D */ daddu $a3, $s0, $zero -/* 77084 800DDBD4 E7A00028 */ swc1 $f0, 0x28($sp) -/* 77088 800DDBD8 E7B60010 */ swc1 $f22, 0x10($sp) -/* 7708C 800DDBDC E7B80014 */ swc1 $f24, 0x14($sp) -/* 77090 800DDBE0 0C037586 */ jal npc_test_move_with_slipping -/* 77094 800DDBE4 E7B40018 */ swc1 $f20, 0x18($sp) -/* 77098 800DDBE8 C7A00020 */ lwc1 $f0, 0x20($sp) -/* 7709C 800DDBEC 00021027 */ nor $v0, $zero, $v0 -/* 770A0 800DDBF0 E6600000 */ swc1 $f0, ($s3) -/* 770A4 800DDBF4 C7A00028 */ lwc1 $f0, 0x28($sp) -/* 770A8 800DDBF8 08037703 */ j .L800DDC0C -/* 770AC 800DDBFC 000217C2 */ srl $v0, $v0, 0x1f -.L800DDC00: -/* 770B0 800DDC00 C7A00020 */ lwc1 $f0, 0x20($sp) -/* 770B4 800DDC04 E6600000 */ swc1 $f0, ($s3) -/* 770B8 800DDC08 C7A00028 */ lwc1 $f0, 0x28($sp) -.L800DDC0C: -/* 770BC 800DDC0C E6800000 */ swc1 $f0, ($s4) -/* 770C0 800DDC10 8FBF004C */ lw $ra, 0x4c($sp) -/* 770C4 800DDC14 8FB60048 */ lw $s6, 0x48($sp) -/* 770C8 800DDC18 8FB50044 */ lw $s5, 0x44($sp) -/* 770CC 800DDC1C 8FB40040 */ lw $s4, 0x40($sp) -/* 770D0 800DDC20 8FB3003C */ lw $s3, 0x3c($sp) -/* 770D4 800DDC24 8FB20038 */ lw $s2, 0x38($sp) -/* 770D8 800DDC28 8FB10034 */ lw $s1, 0x34($sp) -/* 770DC 800DDC2C 8FB00030 */ lw $s0, 0x30($sp) -/* 770E0 800DDC30 D7B80060 */ ldc1 $f24, 0x60($sp) -/* 770E4 800DDC34 D7B60058 */ ldc1 $f22, 0x58($sp) -/* 770E8 800DDC38 D7B40050 */ ldc1 $f20, 0x50($sp) -/* 770EC 800DDC3C 03E00008 */ jr $ra -/* 770F0 800DDC40 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/ver/us/asm/nonmatchings/759b0_len_61b0/npc_test_move_without_slipping.s b/ver/us/asm/nonmatchings/759b0_len_61b0/npc_test_move_without_slipping.s deleted file mode 100644 index 0ce5e42b9f..0000000000 --- a/ver/us/asm/nonmatchings/759b0_len_61b0/npc_test_move_without_slipping.s +++ /dev/null @@ -1,127 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel npc_test_move_without_slipping -/* 76DAC 800DD8FC 27BDFF68 */ addiu $sp, $sp, -0x98 -/* 76DB0 800DD900 C7AC00AC */ lwc1 $f12, 0xac($sp) -/* 76DB4 800DD904 3C0140C9 */ lui $at, 0x40c9 -/* 76DB8 800DD908 34210FD0 */ ori $at, $at, 0xfd0 -/* 76DBC 800DD90C 44810000 */ mtc1 $at, $f0 -/* 76DC0 800DD910 AFB10064 */ sw $s1, 0x64($sp) -/* 76DC4 800DD914 0080882D */ daddu $s1, $a0, $zero -/* 76DC8 800DD918 AFB3006C */ sw $s3, 0x6c($sp) -/* 76DCC 800DD91C 00A0982D */ daddu $s3, $a1, $zero -/* 76DD0 800DD920 AFB00060 */ sw $s0, 0x60($sp) -/* 76DD4 800DD924 00C0802D */ daddu $s0, $a2, $zero -/* 76DD8 800DD928 AFB40070 */ sw $s4, 0x70($sp) -/* 76DDC 800DD92C 00E0A02D */ daddu $s4, $a3, $zero -/* 76DE0 800DD930 F7B60080 */ sdc1 $f22, 0x80($sp) -/* 76DE4 800DD934 C7B600A8 */ lwc1 $f22, 0xa8($sp) -/* 76DE8 800DD938 27A50038 */ addiu $a1, $sp, 0x38 -/* 76DEC 800DD93C F7B40078 */ sdc1 $f20, 0x78($sp) -/* 76DF0 800DD940 C7B400B0 */ lwc1 $f20, 0xb0($sp) -/* 76DF4 800DD944 46006302 */ mul.s $f12, $f12, $f0 -/* 76DF8 800DD948 00000000 */ nop -/* 76DFC 800DD94C 3C0143B4 */ lui $at, 0x43b4 -/* 76E00 800DD950 44810000 */ mtc1 $at, $f0 -/* 76E04 800DD954 27A6003C */ addiu $a2, $sp, 0x3c -/* 76E08 800DD958 AFBF0074 */ sw $ra, 0x74($sp) -/* 76E0C 800DD95C AFB20068 */ sw $s2, 0x68($sp) -/* 76E10 800DD960 F7BA0090 */ sdc1 $f26, 0x90($sp) -/* 76E14 800DD964 F7B80088 */ sdc1 $f24, 0x88($sp) -/* 76E18 800DD968 0C00A82D */ jal sin_cos_rad -/* 76E1C 800DD96C 46006303 */ div.s $f12, $f12, $f0 -/* 76E20 800DD970 3C013F00 */ lui $at, 0x3f00 -/* 76E24 800DD974 44813000 */ mtc1 $at, $f6 -/* 76E28 800DD978 00000000 */ nop -/* 76E2C 800DD97C 4606A082 */ mul.s $f2, $f20, $f6 -/* 76E30 800DD980 00000000 */ nop -/* 76E34 800DD984 4614B000 */ add.s $f0, $f22, $f20 -/* 76E38 800DD988 46020600 */ add.s $f24, $f0, $f2 -/* 76E3C 800DD98C C7A00038 */ lwc1 $f0, 0x38($sp) -/* 76E40 800DD990 4600B682 */ mul.s $f26, $f22, $f0 -/* 76E44 800DD994 00000000 */ nop -/* 76E48 800DD998 2412FFFF */ addiu $s2, $zero, -1 -/* 76E4C 800DD99C 27A20040 */ addiu $v0, $sp, 0x40 -/* 76E50 800DD9A0 C7A2003C */ lwc1 $f2, 0x3c($sp) -/* 76E54 800DD9A4 46001087 */ neg.s $f2, $f2 -/* 76E58 800DD9A8 4600A102 */ mul.s $f4, $f20, $f0 -/* 76E5C 800DD9AC 00000000 */ nop -/* 76E60 800DD9B0 E7A2003C */ swc1 $f2, 0x3c($sp) -/* 76E64 800DD9B4 E7B8004C */ swc1 $f24, 0x4c($sp) -/* 76E68 800DD9B8 C6680000 */ lwc1 $f8, ($s3) -/* 76E6C 800DD9BC C68A0000 */ lwc1 $f10, ($s4) -/* 76E70 800DD9C0 4602A502 */ mul.s $f20, $f20, $f2 -/* 76E74 800DD9C4 00000000 */ nop -/* 76E78 800DD9C8 AFA2001C */ sw $v0, 0x1c($sp) -/* 76E7C 800DD9CC 27A20044 */ addiu $v0, $sp, 0x44 -/* 76E80 800DD9D0 AFA20020 */ sw $v0, 0x20($sp) -/* 76E84 800DD9D4 27A20048 */ addiu $v0, $sp, 0x48 -/* 76E88 800DD9D8 AFA20024 */ sw $v0, 0x24($sp) -/* 76E8C 800DD9DC 27A2004C */ addiu $v0, $sp, 0x4c -/* 76E90 800DD9E0 46062102 */ mul.s $f4, $f4, $f6 -/* 76E94 800DD9E4 00000000 */ nop -/* 76E98 800DD9E8 AFA20028 */ sw $v0, 0x28($sp) -/* 76E9C 800DD9EC 27A20050 */ addiu $v0, $sp, 0x50 -/* 76EA0 800DD9F0 AFA2002C */ sw $v0, 0x2c($sp) -/* 76EA4 800DD9F4 27A20054 */ addiu $v0, $sp, 0x54 -/* 76EA8 800DD9F8 4606A502 */ mul.s $f20, $f20, $f6 -/* 76EAC 800DD9FC 00000000 */ nop -/* 76EB0 800DDA00 AFA20030 */ sw $v0, 0x30($sp) -/* 76EB4 800DDA04 27A20058 */ addiu $v0, $sp, 0x58 -/* 76EB8 800DDA08 E7A00010 */ swc1 $f0, 0x10($sp) -/* 76EBC 800DDA0C AFA00014 */ sw $zero, 0x14($sp) -/* 76EC0 800DDA10 46044201 */ sub.s $f8, $f8, $f4 -/* 76EC4 800DDA14 E7A20018 */ swc1 $f2, 0x18($sp) -/* 76EC8 800DDA18 AFA20034 */ sw $v0, 0x34($sp) -/* 76ECC 800DDA1C 46145281 */ sub.s $f10, $f10, $f20 -/* 76ED0 800DDA20 8E060000 */ lw $a2, ($s0) -/* 76ED4 800DDA24 44054000 */ mfc1 $a1, $f8 -/* 76ED8 800DDA28 44075000 */ mfc1 $a3, $f10 -/* 76EDC 800DDA2C 4602B582 */ mul.s $f22, $f22, $f2 -/* 76EE0 800DDA30 00000000 */ nop -/* 76EE4 800DDA34 0C037513 */ jal npc_raycast_general -/* 76EE8 800DDA38 0220202D */ daddu $a0, $s1, $zero -/* 76EEC 800DDA3C 04400016 */ bltz $v0, .L800DDA98 -/* 76EF0 800DDA40 00000000 */ nop -/* 76EF4 800DDA44 C7A4004C */ lwc1 $f4, 0x4c($sp) -/* 76EF8 800DDA48 4618203E */ c.le.s $f4, $f24 -/* 76EFC 800DDA4C 00000000 */ nop -/* 76F00 800DDA50 45000011 */ bc1f .L800DDA98 -/* 76F04 800DDA54 00000000 */ nop -/* 76F08 800DDA58 46182101 */ sub.s $f4, $f4, $f24 -/* 76F0C 800DDA5C C7A00038 */ lwc1 $f0, 0x38($sp) -/* 76F10 800DDA60 46002002 */ mul.s $f0, $f4, $f0 -/* 76F14 800DDA64 00000000 */ nop -/* 76F18 800DDA68 C6620000 */ lwc1 $f2, ($s3) -/* 76F1C 800DDA6C 46001080 */ add.s $f2, $f2, $f0 -/* 76F20 800DDA70 C7A0003C */ lwc1 $f0, 0x3c($sp) -/* 76F24 800DDA74 46002102 */ mul.s $f4, $f4, $f0 -/* 76F28 800DDA78 00000000 */ nop -/* 76F2C 800DDA7C E6620000 */ swc1 $f2, ($s3) -/* 76F30 800DDA80 C6800000 */ lwc1 $f0, ($s4) -/* 76F34 800DDA84 46040000 */ add.s $f0, $f0, $f4 -/* 76F38 800DDA88 0040902D */ daddu $s2, $v0, $zero -/* 76F3C 800DDA8C E6800000 */ swc1 $f0, ($s4) -/* 76F40 800DDA90 3C018011 */ lui $at, %hi(D_8010C978) -/* 76F44 800DDA94 AC32C978 */ sw $s2, %lo(D_8010C978)($at) -.L800DDA98: -/* 76F48 800DDA98 C6600000 */ lwc1 $f0, ($s3) -/* 76F4C 800DDA9C 461A0000 */ add.s $f0, $f0, $f26 -/* 76F50 800DDAA0 E6600000 */ swc1 $f0, ($s3) -/* 76F54 800DDAA4 C6800000 */ lwc1 $f0, ($s4) -/* 76F58 800DDAA8 46160000 */ add.s $f0, $f0, $f22 -/* 76F5C 800DDAAC 0240102D */ daddu $v0, $s2, $zero -/* 76F60 800DDAB0 E6800000 */ swc1 $f0, ($s4) -/* 76F64 800DDAB4 8FBF0074 */ lw $ra, 0x74($sp) -/* 76F68 800DDAB8 8FB40070 */ lw $s4, 0x70($sp) -/* 76F6C 800DDABC 8FB3006C */ lw $s3, 0x6c($sp) -/* 76F70 800DDAC0 8FB20068 */ lw $s2, 0x68($sp) -/* 76F74 800DDAC4 8FB10064 */ lw $s1, 0x64($sp) -/* 76F78 800DDAC8 8FB00060 */ lw $s0, 0x60($sp) -/* 76F7C 800DDACC D7BA0090 */ ldc1 $f26, 0x90($sp) -/* 76F80 800DDAD0 D7B80088 */ ldc1 $f24, 0x88($sp) -/* 76F84 800DDAD4 D7B60080 */ ldc1 $f22, 0x80($sp) -/* 76F88 800DDAD8 D7B40078 */ ldc1 $f20, 0x78($sp) -/* 76F8C 800DDADC 03E00008 */ jr $ra -/* 76F90 800DDAE0 27BD0098 */ addiu $sp, $sp, 0x98 diff --git a/ver/us/asm/nonmatchings/77480/get_overriding_player_anim.s b/ver/us/asm/nonmatchings/77480/get_overriding_player_anim.s index 1a9edbce21..d351b7011a 100644 --- a/ver/us/asm/nonmatchings/77480/get_overriding_player_anim.s +++ b/ver/us/asm/nonmatchings/77480/get_overriding_player_anim.s @@ -7,8 +7,8 @@ glabel get_overriding_player_anim /* 79200 800DFD50 0080802D */ daddu $s0, $a0, $zero /* 79204 800DFD54 3C058011 */ lui $a1, %hi(gPlayerStatus) /* 79208 800DFD58 24A5EFC8 */ addiu $a1, $a1, %lo(gPlayerStatus) -/* 7920C 800DFD5C 3C048011 */ lui $a0, %hi(D_8010EBB0) -/* 79210 800DFD60 2484EBB0 */ addiu $a0, $a0, %lo(D_8010EBB0) +/* 7920C 800DFD5C 3C048011 */ lui $a0, %hi(gPartnerActionStatus) +/* 79210 800DFD60 2484EBB0 */ addiu $a0, $a0, %lo(gPartnerActionStatus) /* 79214 800DFD64 AFBF0014 */ sw $ra, 0x14($sp) /* 79218 800DFD68 80A300B4 */ lb $v1, 0xb4($a1) /* 7921C 800DFD6C 2402001D */ addiu $v0, $zero, 0x1d diff --git a/ver/us/asm/nonmatchings/77480/update_player_blink.s b/ver/us/asm/nonmatchings/77480/update_player_blink.s index a55ed05c57..d3d533cd8f 100644 --- a/ver/us/asm/nonmatchings/77480/update_player_blink.s +++ b/ver/us/asm/nonmatchings/77480/update_player_blink.s @@ -4,8 +4,8 @@ glabel update_player_blink /* 7947C 800DFFCC 3C058011 */ lui $a1, %hi(gPlayerStatus) /* 79480 800DFFD0 24A5EFC8 */ addiu $a1, $a1, %lo(gPlayerStatus) -/* 79484 800DFFD4 3C048011 */ lui $a0, %hi(D_8010EBB0) -/* 79488 800DFFD8 2484EBB0 */ addiu $a0, $a0, %lo(D_8010EBB0) +/* 79484 800DFFD4 3C048011 */ lui $a0, %hi(gPartnerActionStatus) +/* 79488 800DFFD8 2484EBB0 */ addiu $a0, $a0, %lo(gPartnerActionStatus) /* 7948C 800DFFDC 80830003 */ lb $v1, 3($a0) /* 79490 800DFFE0 24020009 */ addiu $v0, $zero, 9 /* 79494 800DFFE4 14620003 */ bne $v1, $v0, .L800DFFF4 diff --git a/ver/us/asm/nonmatchings/7bb60_len_41b0/func_800E315C.s b/ver/us/asm/nonmatchings/7bb60_len_41b0/func_800E315C.s index a9b09ba35e..d6fb2e08c8 100644 --- a/ver/us/asm/nonmatchings/7bb60_len_41b0/func_800E315C.s +++ b/ver/us/asm/nonmatchings/7bb60_len_41b0/func_800E315C.s @@ -14,8 +14,8 @@ glabel func_800E315C /* 7C614 800E3164 3C108011 */ lui $s0, %hi(gPlayerStatus) /* 7C618 800E3168 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) /* 7C61C 800E316C AFB10014 */ sw $s1, 0x14($sp) -/* 7C620 800E3170 3C118011 */ lui $s1, %hi(D_8010EBB0) -/* 7C624 800E3174 2631EBB0 */ addiu $s1, $s1, %lo(D_8010EBB0) +/* 7C620 800E3170 3C118011 */ lui $s1, %hi(gPartnerActionStatus) +/* 7C624 800E3174 2631EBB0 */ addiu $s1, $s1, %lo(gPartnerActionStatus) /* 7C628 800E3178 0480003A */ bltz $a0, .L800E3264 /* 7C62C 800E317C AFBF0018 */ sw $ra, 0x18($sp) /* 7C630 800E3180 0C016F6A */ jal get_collider_type_by_id diff --git a/ver/us/asm/nonmatchings/7bb60_len_41b0/gravity_use_fall_parms.s b/ver/us/asm/nonmatchings/7bb60_len_41b0/gravity_use_fall_parms.s deleted file mode 100644 index 5db6a2f3b7..0000000000 --- a/ver/us/asm/nonmatchings/7bb60_len_41b0/gravity_use_fall_parms.s +++ /dev/null @@ -1,42 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel gravity_use_fall_parms -/* 7C51C 800E306C 3C04800F */ lui $a0, %hi(D_800F7B60) -/* 7C520 800E3070 24847B60 */ addiu $a0, $a0, %lo(D_800F7B60) -/* 7C524 800E3074 3C068011 */ lui $a2, %hi(gPlayerStatus) -/* 7C528 800E3078 24C6EFC8 */ addiu $a2, $a2, %lo(gPlayerStatus) -/* 7C52C 800E307C 8CC20000 */ lw $v0, ($a2) -/* 7C530 800E3080 3C030004 */ lui $v1, 4 -/* 7C534 800E3084 00431024 */ and $v0, $v0, $v1 -/* 7C538 800E3088 10400012 */ beqz $v0, .L800E30D4 -/* 7C53C 800E308C 00C0282D */ daddu $a1, $a2, $zero -/* 7C540 800E3090 C4800000 */ lwc1 $f0, ($a0) -/* 7C544 800E3094 3C014140 */ lui $at, 0x4140 -/* 7C548 800E3098 44811000 */ mtc1 $at, $f2 -/* 7C54C 800E309C 24840004 */ addiu $a0, $a0, 4 -/* 7C550 800E30A0 46020003 */ div.s $f0, $f0, $f2 -/* 7C554 800E30A4 E4C00070 */ swc1 $f0, 0x70($a2) -/* 7C558 800E30A8 C4800000 */ lwc1 $f0, ($a0) -/* 7C55C 800E30AC 24840004 */ addiu $a0, $a0, 4 -/* 7C560 800E30B0 46020003 */ div.s $f0, $f0, $f2 -/* 7C564 800E30B4 E4C00074 */ swc1 $f0, 0x74($a2) -/* 7C568 800E30B8 C4800000 */ lwc1 $f0, ($a0) -/* 7C56C 800E30BC 46020003 */ div.s $f0, $f0, $f2 -/* 7C570 800E30C0 E4C00078 */ swc1 $f0, 0x78($a2) -/* 7C574 800E30C4 C4800004 */ lwc1 $f0, 4($a0) -/* 7C578 800E30C8 46020003 */ div.s $f0, $f0, $f2 -/* 7C57C 800E30CC 03E00008 */ jr $ra -/* 7C580 800E30D0 E4C0007C */ swc1 $f0, 0x7c($a2) -.L800E30D4: -/* 7C584 800E30D4 C4800000 */ lwc1 $f0, ($a0) -/* 7C588 800E30D8 24840004 */ addiu $a0, $a0, 4 -/* 7C58C 800E30DC E4A00070 */ swc1 $f0, 0x70($a1) -/* 7C590 800E30E0 C4800000 */ lwc1 $f0, ($a0) -/* 7C594 800E30E4 24840004 */ addiu $a0, $a0, 4 -/* 7C598 800E30E8 E4A00074 */ swc1 $f0, 0x74($a1) -/* 7C59C 800E30EC C4800000 */ lwc1 $f0, ($a0) -/* 7C5A0 800E30F0 E4A00078 */ swc1 $f0, 0x78($a1) -/* 7C5A4 800E30F4 C4800004 */ lwc1 $f0, 4($a0) -/* 7C5A8 800E30F8 03E00008 */ jr $ra -/* 7C5AC 800E30FC E4A0007C */ swc1 $f0, 0x7c($a1) diff --git a/ver/us/asm/nonmatchings/7bb60_len_41b0/phys_adjust_cam_on_landing.s b/ver/us/asm/nonmatchings/7bb60_len_41b0/phys_adjust_cam_on_landing.s index 98100a2910..e1b8a362ad 100644 --- a/ver/us/asm/nonmatchings/7bb60_len_41b0/phys_adjust_cam_on_landing.s +++ b/ver/us/asm/nonmatchings/7bb60_len_41b0/phys_adjust_cam_on_landing.s @@ -12,8 +12,8 @@ glabel phys_adjust_cam_on_landing /* 7E9E0 800E5530 27BDFFE0 */ addiu $sp, $sp, -0x20 /* 7E9E4 800E5534 AFB00010 */ sw $s0, 0x10($sp) /* 7E9E8 800E5538 AFB10014 */ sw $s1, 0x14($sp) -/* 7E9EC 800E553C 3C118011 */ lui $s1, %hi(D_8010EBB0) -/* 7E9F0 800E5540 2631EBB0 */ addiu $s1, $s1, %lo(D_8010EBB0) +/* 7E9EC 800E553C 3C118011 */ lui $s1, %hi(gPartnerActionStatus) +/* 7E9F0 800E5540 2631EBB0 */ addiu $s1, $s1, %lo(gPartnerActionStatus) /* 7E9F4 800E5544 3C038007 */ lui $v1, %hi(gGameStatusPtr) /* 7E9F8 800E5548 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) /* 7E9FC 800E554C 3C058011 */ lui $a1, %hi(gPlayerStatus) diff --git a/ver/us/asm/nonmatchings/7bb60_len_41b0/phys_can_player_interact.s b/ver/us/asm/nonmatchings/7bb60_len_41b0/phys_can_player_interact.s deleted file mode 100644 index 7e6a058f36..0000000000 --- a/ver/us/asm/nonmatchings/7bb60_len_41b0/phys_can_player_interact.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel phys_can_player_interact -/* 7E7A8 800E52F8 3C028011 */ lui $v0, %hi(D_8010EBB0) -/* 7E7AC 800E52FC 2442EBB0 */ addiu $v0, $v0, %lo(D_8010EBB0) -/* 7E7B0 800E5300 80440000 */ lb $a0, ($v0) -/* 7E7B4 800E5304 10800008 */ beqz $a0, .L800E5328 -/* 7E7B8 800E5308 24030001 */ addiu $v1, $zero, 1 -/* 7E7BC 800E530C 80430003 */ lb $v1, 3($v0) -/* 7E7C0 800E5310 24020003 */ addiu $v0, $zero, 3 -/* 7E7C4 800E5314 1462000A */ bne $v1, $v0, .L800E5340 -/* 7E7C8 800E5318 0000182D */ daddu $v1, $zero, $zero -/* 7E7CC 800E531C 0082102A */ slt $v0, $a0, $v0 -/* 7E7D0 800E5320 080394D0 */ j .L800E5340 -/* 7E7D4 800E5324 38430001 */ xori $v1, $v0, 1 -.L800E5328: -/* 7E7D8 800E5328 3C028011 */ lui $v0, %hi(gPlayerStatus) -/* 7E7DC 800E532C 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) -/* 7E7E0 800E5330 904200B4 */ lbu $v0, 0xb4($v0) -/* 7E7E4 800E5334 2C420003 */ sltiu $v0, $v0, 3 -/* 7E7E8 800E5338 50400001 */ beql $v0, $zero, .L800E5340 -/* 7E7EC 800E533C 0000182D */ daddu $v1, $zero, $zero -.L800E5340: -/* 7E7F0 800E5340 03E00008 */ jr $ra -/* 7E7F4 800E5344 0060102D */ daddu $v0, $v1, $zero diff --git a/ver/us/asm/nonmatchings/7bb60_len_41b0/phys_clear_spin_history.s b/ver/us/asm/nonmatchings/7bb60_len_41b0/phys_clear_spin_history.s deleted file mode 100644 index 21f277d3bc..0000000000 --- a/ver/us/asm/nonmatchings/7bb60_len_41b0/phys_clear_spin_history.s +++ /dev/null @@ -1,23 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel phys_clear_spin_history -/* 7EDA0 800E58F0 3C018011 */ lui $at, %hi(D_8010C944) -/* 7EDA4 800E58F4 AC20C944 */ sw $zero, %lo(D_8010C944)($at) -/* 7EDA8 800E58F8 0000282D */ daddu $a1, $zero, $zero -/* 7EDAC 800E58FC 240700B4 */ addiu $a3, $zero, 0xb4 -/* 7EDB0 800E5900 3C068000 */ lui $a2, 0x8000 -/* 7EDB4 800E5904 3C048011 */ lui $a0, %hi(D_8010EF10) -/* 7EDB8 800E5908 2484EF10 */ addiu $a0, $a0, %lo(D_8010EF10) -/* 7EDBC 800E590C 3C038011 */ lui $v1, %hi(D_8010F6B8) -/* 7EDC0 800E5910 2463F6B8 */ addiu $v1, $v1, %lo(D_8010F6B8) -.L800E5914: -/* 7EDC4 800E5914 A4670000 */ sh $a3, ($v1) -/* 7EDC8 800E5918 AC860000 */ sw $a2, ($a0) -/* 7EDCC 800E591C 24840004 */ addiu $a0, $a0, 4 -/* 7EDD0 800E5920 24A50001 */ addiu $a1, $a1, 1 -/* 7EDD4 800E5924 28A20005 */ slti $v0, $a1, 5 -/* 7EDD8 800E5928 1440FFFA */ bnez $v0, .L800E5914 -/* 7EDDC 800E592C 24630002 */ addiu $v1, $v1, 2 -/* 7EDE0 800E5930 03E00008 */ jr $ra -/* 7EDE4 800E5934 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/7bb60_len_41b0/phys_get_spin_history.s b/ver/us/asm/nonmatchings/7bb60_len_41b0/phys_get_spin_history.s deleted file mode 100644 index 7886e5e1d3..0000000000 --- a/ver/us/asm/nonmatchings/7bb60_len_41b0/phys_get_spin_history.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel phys_get_spin_history -/* 7EDE8 800E5938 3C088011 */ lui $t0, %hi(D_8010C944) -/* 7EDEC 800E593C 8D08C944 */ lw $t0, %lo(D_8010C944)($t0) -/* 7EDF0 800E5940 01044023 */ subu $t0, $t0, $a0 -/* 7EDF4 800E5944 05020001 */ bltzl $t0, .L800E594C -/* 7EDF8 800E5948 25080005 */ addiu $t0, $t0, 5 -.L800E594C: -/* 7EDFC 800E594C 00081880 */ sll $v1, $t0, 2 -/* 7EE00 800E5950 3C028011 */ lui $v0, %hi(D_8010EF28) -/* 7EE04 800E5954 00431021 */ addu $v0, $v0, $v1 -/* 7EE08 800E5958 8C42EF28 */ lw $v0, %lo(D_8010EF28)($v0) -/* 7EE0C 800E595C ACA20000 */ sw $v0, ($a1) -/* 7EE10 800E5960 3C028011 */ lui $v0, %hi(D_8010EF10) -/* 7EE14 800E5964 00431021 */ addu $v0, $v0, $v1 -/* 7EE18 800E5968 8C42EF10 */ lw $v0, %lo(D_8010EF10)($v0) -/* 7EE1C 800E596C ACC20000 */ sw $v0, ($a2) -/* 7EE20 800E5970 3C028011 */ lui $v0, %hi(D_8010EF40) -/* 7EE24 800E5974 00431021 */ addu $v0, $v0, $v1 -/* 7EE28 800E5978 8C42EF40 */ lw $v0, %lo(D_8010EF40)($v0) -/* 7EE2C 800E597C ACE20000 */ sw $v0, ($a3) -/* 7EE30 800E5980 00081040 */ sll $v0, $t0, 1 -/* 7EE34 800E5984 3C018011 */ lui $at, %hi(D_8010F6B8) -/* 7EE38 800E5988 00220821 */ addu $at, $at, $v0 -/* 7EE3C 800E598C 8422F6B8 */ lh $v0, %lo(D_8010F6B8)($at) -/* 7EE40 800E5990 44820000 */ mtc1 $v0, $f0 -/* 7EE44 800E5994 00000000 */ nop -/* 7EE48 800E5998 03E00008 */ jr $ra -/* 7EE4C 800E599C 46800020 */ cvt.s.w $f0, $f0 diff --git a/ver/us/asm/nonmatchings/7bb60_len_41b0/phys_is_on_sloped_ground.s b/ver/us/asm/nonmatchings/7bb60_len_41b0/phys_is_on_sloped_ground.s deleted file mode 100644 index d4ddb2a5dc..0000000000 --- a/ver/us/asm/nonmatchings/7bb60_len_41b0/phys_is_on_sloped_ground.s +++ /dev/null @@ -1,43 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -glabel D_8010BEE8 -.double 180.0 - -.section .text - -glabel phys_is_on_sloped_ground -/* 7DB78 800E46C8 3C048011 */ lui $a0, %hi(gPlayerStatus+0xCC) -/* 7DB7C 800E46CC 8C84F094 */ lw $a0, %lo(gPlayerStatus+0xCC)($a0) -/* 7DB80 800E46D0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 7DB84 800E46D4 AFBF0010 */ sw $ra, 0x10($sp) -/* 7DB88 800E46D8 0C044181 */ jal get_shadow_by_index -/* 7DB8C 800E46DC 00000000 */ nop -/* 7DB90 800E46E0 C4400030 */ lwc1 $f0, 0x30($v0) -/* 7DB94 800E46E4 3C018011 */ lui $at, %hi(D_8010BEE8) -/* 7DB98 800E46E8 D424BEE8 */ ldc1 $f4, %lo(D_8010BEE8)($at) -/* 7DB9C 800E46EC C4420028 */ lwc1 $f2, 0x28($v0) -/* 7DBA0 800E46F0 46000021 */ cvt.d.s $f0, $f0 -/* 7DBA4 800E46F4 46240000 */ add.d $f0, $f0, $f4 -/* 7DBA8 800E46F8 24020001 */ addiu $v0, $zero, 1 -/* 7DBAC 800E46FC 460010A1 */ cvt.d.s $f2, $f2 -/* 7DBB0 800E4700 46241080 */ add.d $f2, $f2, $f4 -/* 7DBB4 800E4704 3C0141A0 */ lui $at, 0x41a0 -/* 7DBB8 800E4708 44812000 */ mtc1 $at, $f4 -/* 7DBBC 800E470C 46200020 */ cvt.s.d $f0, $f0 -/* 7DBC0 800E4710 46000005 */ abs.s $f0, $f0 -/* 7DBC4 800E4714 4604003C */ c.lt.s $f0, $f4 -/* 7DBC8 800E4718 00000000 */ nop -/* 7DBCC 800E471C 45000006 */ bc1f .L800E4738 -/* 7DBD0 800E4720 46201020 */ cvt.s.d $f0, $f2 -/* 7DBD4 800E4724 46000005 */ abs.s $f0, $f0 -/* 7DBD8 800E4728 4604003C */ c.lt.s $f0, $f4 -/* 7DBDC 800E472C 00000000 */ nop -/* 7DBE0 800E4730 45030001 */ bc1tl .L800E4738 -/* 7DBE4 800E4734 0000102D */ daddu $v0, $zero, $zero -.L800E4738: -/* 7DBE8 800E4738 8FBF0010 */ lw $ra, 0x10($sp) -/* 7DBEC 800E473C 03E00008 */ jr $ra -/* 7DBF0 800E4740 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/7bb60_len_41b0/phys_main_collision_below.s b/ver/us/asm/nonmatchings/7bb60_len_41b0/phys_main_collision_below.s index a0da7f23f0..6e55442e60 100644 --- a/ver/us/asm/nonmatchings/7bb60_len_41b0/phys_main_collision_below.s +++ b/ver/us/asm/nonmatchings/7bb60_len_41b0/phys_main_collision_below.s @@ -53,8 +53,8 @@ glabel phys_main_collision_below /* 7DCB4 800E4804 0040882D */ daddu $s1, $v0, $zero /* 7DCB8 800E4808 4614C502 */ mul.s $f20, $f24, $f20 /* 7DCBC 800E480C 00000000 */ nop -/* 7DCC0 800E4810 3C138011 */ lui $s3, %hi(D_8010EBB0) -/* 7DCC4 800E4814 2673EBB0 */ addiu $s3, $s3, %lo(D_8010EBB0) +/* 7DCC0 800E4810 3C138011 */ lui $s3, %hi(gPartnerActionStatus) +/* 7DCC4 800E4814 2673EBB0 */ addiu $s3, $s3, %lo(gPartnerActionStatus) /* 7DCC8 800E4818 C7A20034 */ lwc1 $f2, 0x34($sp) /* 7DCCC 800E481C 4614B500 */ add.s $f20, $f22, $f20 /* 7DCD0 800E4820 3C148016 */ lui $s4, %hi(gCollisionStatus) diff --git a/ver/us/asm/nonmatchings/7bb60_len_41b0/phys_reset_spin_history.s b/ver/us/asm/nonmatchings/7bb60_len_41b0/phys_reset_spin_history.s deleted file mode 100644 index 350ae272e9..0000000000 --- a/ver/us/asm/nonmatchings/7bb60_len_41b0/phys_reset_spin_history.s +++ /dev/null @@ -1,40 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel phys_reset_spin_history -/* 7EE50 800E59A0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 7EE54 800E59A4 3C048011 */ lui $a0, %hi(D_8010F250) -/* 7EE58 800E59A8 2484F250 */ addiu $a0, $a0, %lo(D_8010F250) -/* 7EE5C 800E59AC AFBF0010 */ sw $ra, 0x10($sp) -/* 7EE60 800E59B0 0C00A580 */ jal mem_clear -/* 7EE64 800E59B4 24050034 */ addiu $a1, $zero, 0x34 -/* 7EE68 800E59B8 0000382D */ daddu $a3, $zero, $zero -/* 7EE6C 800E59BC 3C068011 */ lui $a2, %hi(D_8010EF40) -/* 7EE70 800E59C0 24C6EF40 */ addiu $a2, $a2, %lo(D_8010EF40) -/* 7EE74 800E59C4 3C058011 */ lui $a1, %hi(D_8010EF10) -/* 7EE78 800E59C8 24A5EF10 */ addiu $a1, $a1, %lo(D_8010EF10) -/* 7EE7C 800E59CC 3C048011 */ lui $a0, %hi(D_8010EF28) -/* 7EE80 800E59D0 2484EF28 */ addiu $a0, $a0, %lo(D_8010EF28) -/* 7EE84 800E59D4 3C038011 */ lui $v1, %hi(D_8010F6B8) -/* 7EE88 800E59D8 2463F6B8 */ addiu $v1, $v1, %lo(D_8010F6B8) -/* 7EE8C 800E59DC 3C018011 */ lui $at, %hi(D_8010C944) -/* 7EE90 800E59E0 AC20C944 */ sw $zero, %lo(D_8010C944)($at) -.L800E59E4: -/* 7EE94 800E59E4 A4600000 */ sh $zero, ($v1) -/* 7EE98 800E59E8 AC800000 */ sw $zero, ($a0) -/* 7EE9C 800E59EC ACA00000 */ sw $zero, ($a1) -/* 7EEA0 800E59F0 ACC00000 */ sw $zero, ($a2) -/* 7EEA4 800E59F4 24C60004 */ addiu $a2, $a2, 4 -/* 7EEA8 800E59F8 24A50004 */ addiu $a1, $a1, 4 -/* 7EEAC 800E59FC 24840004 */ addiu $a0, $a0, 4 -/* 7EEB0 800E5A00 24E70001 */ addiu $a3, $a3, 1 -/* 7EEB4 800E5A04 28E20005 */ slti $v0, $a3, 5 -/* 7EEB8 800E5A08 1440FFF6 */ bnez $v0, .L800E59E4 -/* 7EEBC 800E5A0C 24630002 */ addiu $v1, $v1, 2 -/* 7EEC0 800E5A10 8FBF0010 */ lw $ra, 0x10($sp) -/* 7EEC4 800E5A14 3C018011 */ lui $at, %hi(D_8010C964) -/* 7EEC8 800E5A18 AC20C964 */ sw $zero, %lo(D_8010C964)($at) -/* 7EECC 800E5A1C 3C018011 */ lui $at, %hi(D_8010C924) -/* 7EED0 800E5A20 AC20C924 */ sw $zero, %lo(D_8010C924)($at) -/* 7EED4 800E5A24 03E00008 */ jr $ra -/* 7EED8 800E5A28 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/7bb60_len_41b0/phys_update_action_state.s b/ver/us/asm/nonmatchings/7bb60_len_41b0/phys_update_action_state.s index 1a8ee0b60c..8351797678 100644 --- a/ver/us/asm/nonmatchings/7bb60_len_41b0/phys_update_action_state.s +++ b/ver/us/asm/nonmatchings/7bb60_len_41b0/phys_update_action_state.s @@ -6,8 +6,8 @@ glabel phys_update_action_state /* 7EEE0 800E5A30 3C04800B */ lui $a0, %hi(gCameras) /* 7EEE4 800E5A34 24841D80 */ addiu $a0, $a0, %lo(gCameras) /* 7EEE8 800E5A38 AFB40020 */ sw $s4, 0x20($sp) -/* 7EEEC 800E5A3C 3C148011 */ lui $s4, %hi(D_8010EBB0) -/* 7EEF0 800E5A40 2694EBB0 */ addiu $s4, $s4, %lo(D_8010EBB0) +/* 7EEEC 800E5A3C 3C148011 */ lui $s4, %hi(gPartnerActionStatus) +/* 7EEF0 800E5A40 2694EBB0 */ addiu $s4, $s4, %lo(gPartnerActionStatus) /* 7EEF4 800E5A44 AFB00010 */ sw $s0, 0x10($sp) /* 7EEF8 800E5A48 3C108011 */ lui $s0, %hi(gPlayerStatus) /* 7EEFC 800E5A4C 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) diff --git a/ver/us/asm/nonmatchings/7fd10_len_b40/can_pause.s b/ver/us/asm/nonmatchings/7fd10_len_b40/can_pause.s index 57b1cb73db..21a0b58a6b 100644 --- a/ver/us/asm/nonmatchings/7fd10_len_b40/can_pause.s +++ b/ver/us/asm/nonmatchings/7fd10_len_b40/can_pause.s @@ -4,8 +4,8 @@ glabel can_pause /* 7FE8C 800E69DC 27BDFFE0 */ addiu $sp, $sp, -0x20 /* 7FE90 800E69E0 AFB20018 */ sw $s2, 0x18($sp) -/* 7FE94 800E69E4 3C128011 */ lui $s2, %hi(D_8010EBB0) -/* 7FE98 800E69E8 2652EBB0 */ addiu $s2, $s2, %lo(D_8010EBB0) +/* 7FE94 800E69E4 3C128011 */ lui $s2, %hi(gPartnerActionStatus) +/* 7FE98 800E69E8 2652EBB0 */ addiu $s2, $s2, %lo(gPartnerActionStatus) /* 7FE9C 800E69EC AFB10014 */ sw $s1, 0x14($sp) /* 7FEA0 800E69F0 3C118011 */ lui $s1, %hi(gPlayerStatus) /* 7FEA4 800E69F4 2631EFC8 */ addiu $s1, $s1, %lo(gPlayerStatus) diff --git a/ver/us/asm/nonmatchings/7fd10_len_b40/check_input_open_menus.s b/ver/us/asm/nonmatchings/7fd10_len_b40/check_input_open_menus.s index 772ae8b8d6..858f0497d1 100644 --- a/ver/us/asm/nonmatchings/7fd10_len_b40/check_input_open_menus.s +++ b/ver/us/asm/nonmatchings/7fd10_len_b40/check_input_open_menus.s @@ -13,8 +13,8 @@ glabel check_input_open_menus /* 80198 800E6CE8 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) /* 8019C 800E6CEC 27BDFFD8 */ addiu $sp, $sp, -0x28 /* 801A0 800E6CF0 AFB3001C */ sw $s3, 0x1c($sp) -/* 801A4 800E6CF4 3C138011 */ lui $s3, %hi(D_8010EBB0) -/* 801A8 800E6CF8 2673EBB0 */ addiu $s3, $s3, %lo(D_8010EBB0) +/* 801A4 800E6CF4 3C138011 */ lui $s3, %hi(gPartnerActionStatus) +/* 801A8 800E6CF8 2673EBB0 */ addiu $s3, $s3, %lo(gPartnerActionStatus) /* 801AC 800E6CFC AFB40020 */ sw $s4, 0x20($sp) /* 801B0 800E6D00 3C148011 */ lui $s4, %hi(gPlayerStatus) /* 801B4 800E6D04 2694EFC8 */ addiu $s4, $s4, %lo(gPlayerStatus) diff --git a/ver/us/asm/nonmatchings/7fd10_len_b40/func_800E6904.s b/ver/us/asm/nonmatchings/7fd10_len_b40/func_800E6904.s index 54411d859d..a277d3c39e 100644 --- a/ver/us/asm/nonmatchings/7fd10_len_b40/func_800E6904.s +++ b/ver/us/asm/nonmatchings/7fd10_len_b40/func_800E6904.s @@ -4,8 +4,8 @@ glabel func_800E6904 /* 7FDB4 800E6904 27BDFFE0 */ addiu $sp, $sp, -0x20 /* 7FDB8 800E6908 AFB10014 */ sw $s1, 0x14($sp) -/* 7FDBC 800E690C 3C118011 */ lui $s1, %hi(D_8010EBB0) -/* 7FDC0 800E6910 2631EBB0 */ addiu $s1, $s1, %lo(D_8010EBB0) +/* 7FDBC 800E690C 3C118011 */ lui $s1, %hi(gPartnerActionStatus) +/* 7FDC0 800E6910 2631EBB0 */ addiu $s1, $s1, %lo(gPartnerActionStatus) /* 7FDC4 800E6914 3C028011 */ lui $v0, %hi(gPlayerStatus) /* 7FDC8 800E6918 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) /* 7FDCC 800E691C 0040202D */ daddu $a0, $v0, $zero diff --git a/ver/us/asm/nonmatchings/C50A0/test_item_player_collision.s b/ver/us/asm/nonmatchings/C50A0/test_item_player_collision.s index 458207c84d..52435a3e64 100644 --- a/ver/us/asm/nonmatchings/C50A0/test_item_player_collision.s +++ b/ver/us/asm/nonmatchings/C50A0/test_item_player_collision.s @@ -9,8 +9,8 @@ glabel test_item_player_collision /* CA21C 80133B1C 3C118011 */ lui $s1, %hi(gPlayerStatus) /* CA220 80133B20 2631EFC8 */ addiu $s1, $s1, %lo(gPlayerStatus) /* CA224 80133B24 AFB40038 */ sw $s4, 0x38($sp) -/* CA228 80133B28 3C148011 */ lui $s4, %hi(D_8010EBB0) -/* CA22C 80133B2C 2694EBB0 */ addiu $s4, $s4, %lo(D_8010EBB0) +/* CA228 80133B28 3C148011 */ lui $s4, %hi(gPartnerActionStatus) +/* CA22C 80133B2C 2694EBB0 */ addiu $s4, $s4, %lo(gPartnerActionStatus) /* CA230 80133B30 3C038007 */ lui $v1, %hi(gCurrentCameraID) /* CA234 80133B34 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) /* CA238 80133B38 3C04800B */ lui $a0, %hi(gCameras) diff --git a/ver/us/asm/nonmatchings/E225B0/func_802B735C_E2290C.s b/ver/us/asm/nonmatchings/E225B0/func_802B735C_E2290C.s index 9937ff1253..fcf0151c9f 100644 --- a/ver/us/asm/nonmatchings/E225B0/func_802B735C_E2290C.s +++ b/ver/us/asm/nonmatchings/E225B0/func_802B735C_E2290C.s @@ -27,8 +27,8 @@ glabel func_802B735C_E2290C /* E22964 802B73B4 8C830024 */ lw $v1, 0x24($a0) /* E22968 802B73B8 E4820004 */ swc1 $f2, 4($a0) /* E2296C 802B73BC C4A00028 */ lwc1 $f0, 0x28($a1) -/* E22970 802B73C0 3C068011 */ lui $a2, %hi(D_8010EBB0) -/* E22974 802B73C4 24C6EBB0 */ addiu $a2, $a2, %lo(D_8010EBB0) +/* E22970 802B73C0 3C068011 */ lui $a2, %hi(gPartnerActionStatus) +/* E22974 802B73C4 24C6EBB0 */ addiu $a2, $a2, %lo(gPartnerActionStatus) /* E22978 802B73C8 E4800000 */ swc1 $f0, ($a0) /* E2297C 802B73CC C4A00030 */ lwc1 $f0, 0x30($a1) /* E22980 802B73D0 24020001 */ addiu $v0, $zero, 1 diff --git a/ver/us/asm/nonmatchings/camera/func_80032970.s b/ver/us/asm/nonmatchings/camera/func_80032970.s index fe415c8305..3cd7112043 100644 --- a/ver/us/asm/nonmatchings/camera/func_80032970.s +++ b/ver/us/asm/nonmatchings/camera/func_80032970.s @@ -40,8 +40,8 @@ glabel func_80032970 /* DDCC 800329CC 00431024 */ and $v0, $v0, $v1 /* DDD0 800329D0 10400007 */ beqz $v0, .L800329F0 /* DDD4 800329D4 00000000 */ nop -/* DDD8 800329D8 3C028011 */ lui $v0, %hi(D_8010EBB0+0x4) -/* DDDC 800329DC 8442EBB4 */ lh $v0, %lo(D_8010EBB0+0x4)($v0) +/* DDD8 800329D8 3C028011 */ lui $v0, %hi(gPartnerActionStatus+0x4) +/* DDDC 800329DC 8442EBB4 */ lh $v0, %lo(gPartnerActionStatus+0x4)($v0) /* DDE0 800329E0 44824000 */ mtc1 $v0, $f8 /* DDE4 800329E4 00000000 */ nop /* DDE8 800329E8 0800CA7E */ j .L800329F8 diff --git a/ver/us/asm/nonmatchings/entity/jan_iwa/E2D730/func_802BB9E0_E2E310.s b/ver/us/asm/nonmatchings/entity/jan_iwa/E2D730/func_802BB9E0_E2E310.s index beeb7e724d..faa12ce076 100644 --- a/ver/us/asm/nonmatchings/entity/jan_iwa/E2D730/func_802BB9E0_E2E310.s +++ b/ver/us/asm/nonmatchings/entity/jan_iwa/E2D730/func_802BB9E0_E2E310.s @@ -16,8 +16,8 @@ glabel func_802BB9E0_E2E310 /* E2E320 802BB9F0 AFB10024 */ sw $s1, 0x24($sp) /* E2E324 802BB9F4 AFB00020 */ sw $s0, 0x20($sp) /* E2E328 802BB9F8 8E500040 */ lw $s0, 0x40($s2) -/* E2E32C 802BB9FC 3C048011 */ lui $a0, %hi(D_8010EBB0) -/* E2E330 802BBA00 2484EBB0 */ addiu $a0, $a0, %lo(D_8010EBB0) +/* E2E32C 802BB9FC 3C048011 */ lui $a0, %hi(gPartnerActionStatus) +/* E2E330 802BBA00 2484EBB0 */ addiu $a0, $a0, %lo(gPartnerActionStatus) /* E2E334 802BBA04 92030000 */ lbu $v1, ($s0) /* E2E338 802BBA08 3C118011 */ lui $s1, %hi(gPlayerStatus) /* E2E33C 802BBA0C 2631EFC8 */ addiu $s1, $s1, %lo(gPlayerStatus) diff --git a/ver/us/asm/nonmatchings/entity/sbk_omo/E2F750/func_802BBA60_E303B0.s b/ver/us/asm/nonmatchings/entity/sbk_omo/E2F750/func_802BBA60_E303B0.s index e81657111a..36aa9d8b21 100644 --- a/ver/us/asm/nonmatchings/entity/sbk_omo/E2F750/func_802BBA60_E303B0.s +++ b/ver/us/asm/nonmatchings/entity/sbk_omo/E2F750/func_802BBA60_E303B0.s @@ -19,8 +19,8 @@ glabel func_802BBA60_E303B0 /* E303C0 802BBA70 3C128011 */ lui $s2, %hi(gPlayerStatus) /* E303C4 802BBA74 2652EFC8 */ addiu $s2, $s2, %lo(gPlayerStatus) /* E303C8 802BBA78 AFB3001C */ sw $s3, 0x1c($sp) -/* E303CC 802BBA7C 3C138011 */ lui $s3, %hi(D_8010EBB0) -/* E303D0 802BBA80 2673EBB0 */ addiu $s3, $s3, %lo(D_8010EBB0) +/* E303CC 802BBA7C 3C138011 */ lui $s3, %hi(gPartnerActionStatus) +/* E303D0 802BBA80 2673EBB0 */ addiu $s3, $s3, %lo(gPartnerActionStatus) /* E303D4 802BBA84 AFBF0020 */ sw $ra, 0x20($sp) /* E303D8 802BBA88 AFB00010 */ sw $s0, 0x10($sp) /* E303DC 802BBA8C 0C009C64 */ jal get_time_freeze_mode diff --git a/ver/us/asm/nonmatchings/npc/func_8003D660.s b/ver/us/asm/nonmatchings/npc/func_8003D660.s index a2a3f24ad3..cc5773a62c 100644 --- a/ver/us/asm/nonmatchings/npc/func_8003D660.s +++ b/ver/us/asm/nonmatchings/npc/func_8003D660.s @@ -18,8 +18,8 @@ glabel func_8003D660 /* 18A78 8003D678 AFBF001C */ sw $ra, 0x1c($sp) /* 18A7C 8003D67C AFB20018 */ sw $s2, 0x18($sp) /* 18A80 8003D680 8E030000 */ lw $v1, ($s0) -/* 18A84 8003D684 3C128011 */ lui $s2, %hi(D_8010EBB0) -/* 18A88 8003D688 2652EBB0 */ addiu $s2, $s2, %lo(D_8010EBB0) +/* 18A84 8003D684 3C128011 */ lui $s2, %hi(gPartnerActionStatus) +/* 18A88 8003D688 2652EBB0 */ addiu $s2, $s2, %lo(gPartnerActionStatus) /* 18A8C 8003D68C 00621824 */ and $v1, $v1, $v0 /* 18A90 8003D690 3C020040 */ lui $v0, 0x40 /* 18A94 8003D694 14620036 */ bne $v1, $v0, .L8003D770 diff --git a/ver/us/asm/nonmatchings/npc/npc_do_other_npc_collision.s b/ver/us/asm/nonmatchings/npc/npc_do_other_npc_collision.s index 3a958d495b..36879fd379 100644 --- a/ver/us/asm/nonmatchings/npc/npc_do_other_npc_collision.s +++ b/ver/us/asm/nonmatchings/npc/npc_do_other_npc_collision.s @@ -110,8 +110,8 @@ glabel npc_do_other_npc_collision /* 145A8 800391A8 00531024 */ and $v0, $v0, $s3 /* 145AC 800391AC 10400005 */ beqz $v0, .L800391C4 /* 145B0 800391B0 0000182D */ daddu $v1, $zero, $zero -/* 145B4 800391B4 3C028011 */ lui $v0, %hi(D_8010EBB0) -/* 145B8 800391B8 8042EBB0 */ lb $v0, %lo(D_8010EBB0)($v0) +/* 145B4 800391B4 3C028011 */ lui $v0, %hi(gPartnerActionStatus) +/* 145B8 800391B8 8042EBB0 */ lb $v0, %lo(gPartnerActionStatus)($v0) /* 145BC 800391BC 0800E479 */ j .L800391E4 /* 145C0 800391C0 2C430001 */ sltiu $v1, $v0, 1 .L800391C4: @@ -119,8 +119,8 @@ glabel npc_do_other_npc_collision /* 145C8 800391C8 00531024 */ and $v0, $v0, $s3 /* 145CC 800391CC 50400005 */ beql $v0, $zero, .L800391E4 /* 145D0 800391D0 24030001 */ addiu $v1, $zero, 1 -/* 145D4 800391D4 3C028011 */ lui $v0, %hi(D_8010EBB0) -/* 145D8 800391D8 8042EBB0 */ lb $v0, %lo(D_8010EBB0)($v0) +/* 145D4 800391D4 3C028011 */ lui $v0, %hi(gPartnerActionStatus) +/* 145D8 800391D8 8042EBB0 */ lb $v0, %lo(gPartnerActionStatus)($v0) /* 145DC 800391DC 50400001 */ beql $v0, $zero, .L800391E4 /* 145E0 800391E0 24030001 */ addiu $v1, $zero, 1 .L800391E4: diff --git a/ver/us/asm/nonmatchings/world/action/encounter/func_802B6000_E28A30.s b/ver/us/asm/nonmatchings/world/action/encounter/func_802B6000_E28A30.s index 020df43306..c0a7e91c74 100644 --- a/ver/us/asm/nonmatchings/world/action/encounter/func_802B6000_E28A30.s +++ b/ver/us/asm/nonmatchings/world/action/encounter/func_802B6000_E28A30.s @@ -25,8 +25,8 @@ glabel func_802B6000_E28A30 /* E28A7C 802B604C 00431024 */ and $v0, $v0, $v1 /* E28A80 802B6050 1040000F */ beqz $v0, .L802B6090 /* E28A84 802B6054 00000000 */ nop -/* E28A88 802B6058 3C028011 */ lui $v0, %hi(D_8010EBB0) -/* E28A8C 802B605C 2442EBB0 */ addiu $v0, $v0, %lo(D_8010EBB0) +/* E28A88 802B6058 3C028011 */ lui $v0, %hi(gPartnerActionStatus) +/* E28A8C 802B605C 2442EBB0 */ addiu $v0, $v0, %lo(gPartnerActionStatus) /* E28A90 802B6060 80430003 */ lb $v1, 3($v0) /* E28A94 802B6064 24020008 */ addiu $v0, $zero, 8 /* E28A98 802B6068 14620005 */ bne $v1, $v0, .L802B6080 diff --git a/ver/us/asm/nonmatchings/world/action/spin/func_802B6000_E25D60.s b/ver/us/asm/nonmatchings/world/action/spin/func_802B6000_E25D60.s index 1c12ecc13a..2ef0e8e703 100644 --- a/ver/us/asm/nonmatchings/world/action/spin/func_802B6000_E25D60.s +++ b/ver/us/asm/nonmatchings/world/action/spin/func_802B6000_E25D60.s @@ -199,19 +199,19 @@ glabel func_802B6000_E25D60 /* E26010 802B62B0 E6200080 */ swc1 $f0, 0x80($s1) /* E26014 802B62B4 E602001C */ swc1 $f2, 0x1c($s0) .L802B62B8: -/* E26018 802B62B8 3C058011 */ lui $a1, %hi(D_8010C944) -/* E2601C 802B62BC 24A5C944 */ addiu $a1, $a1, %lo(D_8010C944) -/* E26020 802B62C0 3C068011 */ lui $a2, %hi(D_8010F6B8) -/* E26024 802B62C4 24C6F6B8 */ addiu $a2, $a2, %lo(D_8010F6B8) +/* E26018 802B62B8 3C058011 */ lui $a1, %hi(gSpinHistoryBufferPos) +/* E2601C 802B62BC 24A5C944 */ addiu $a1, $a1, %lo(gSpinHistoryBufferPos) +/* E26020 802B62C0 3C068011 */ lui $a2, %hi(gSpinHistoryPosAngle) +/* E26024 802B62C4 24C6F6B8 */ addiu $a2, $a2, %lo(gSpinHistoryPosAngle) /* E26028 802B62C8 8CA20000 */ lw $v0, ($a1) /* E2602C 802B62CC C62000A8 */ lwc1 $f0, 0xa8($s1) /* E26030 802B62D0 00022040 */ sll $a0, $v0, 1 /* E26034 802B62D4 24420001 */ addiu $v0, $v0, 1 /* E26038 802B62D8 4600018D */ trunc.w.s $f6, $f0 /* E2603C 802B62DC 44033000 */ mfc1 $v1, $f6 -/* E26040 802B62E0 3C018011 */ lui $at, %hi(D_8010F6B8) +/* E26040 802B62E0 3C018011 */ lui $at, %hi(gSpinHistoryPosAngle) /* E26044 802B62E4 00240821 */ addu $at, $at, $a0 -/* E26048 802B62E8 A423F6B8 */ sh $v1, %lo(D_8010F6B8)($at) +/* E26048 802B62E8 A423F6B8 */ sh $v1, %lo(gSpinHistoryPosAngle)($at) /* E2604C 802B62EC ACA20000 */ sw $v0, ($a1) /* E26050 802B62F0 28420006 */ slti $v0, $v0, 6 /* E26054 802B62F4 50400001 */ beql $v0, $zero, .L802B62FC @@ -221,23 +221,23 @@ glabel func_802B6000_E25D60 /* E26060 802B6300 C6200028 */ lwc1 $f0, 0x28($s1) /* E26064 802B6304 00031080 */ sll $v0, $v1, 2 /* E26068 802B6308 4600018D */ trunc.w.s $f6, $f0 -/* E2606C 802B630C 3C018011 */ lui $at, %hi(D_8010EF28) +/* E2606C 802B630C 3C018011 */ lui $at, %hi(gSpinHistoryPosX) /* E26070 802B6310 00220821 */ addu $at, $at, $v0 -/* E26074 802B6314 E426EF28 */ swc1 $f6, %lo(D_8010EF28)($at) +/* E26074 802B6314 E426EF28 */ swc1 $f6, %lo(gSpinHistoryPosX)($at) /* E26078 802B6318 24640001 */ addiu $a0, $v1, 1 /* E2607C 802B631C C620002C */ lwc1 $f0, 0x2c($s1) /* E26080 802B6320 00031840 */ sll $v1, $v1, 1 /* E26084 802B6324 4600018D */ trunc.w.s $f6, $f0 -/* E26088 802B6328 3C018011 */ lui $at, %hi(D_8010EF10) +/* E26088 802B6328 3C018011 */ lui $at, %hi(gSpinHistoryPosY) /* E2608C 802B632C 00220821 */ addu $at, $at, $v0 -/* E26090 802B6330 E426EF10 */ swc1 $f6, %lo(D_8010EF10)($at) +/* E26090 802B6330 E426EF10 */ swc1 $f6, %lo(gSpinHistoryPosY)($at) /* E26094 802B6334 C6200030 */ lwc1 $f0, 0x30($s1) /* E26098 802B6338 00661821 */ addu $v1, $v1, $a2 /* E2609C 802B633C ACA40000 */ sw $a0, ($a1) /* E260A0 802B6340 4600018D */ trunc.w.s $f6, $f0 -/* E260A4 802B6344 3C018011 */ lui $at, %hi(D_8010EF40) +/* E260A4 802B6344 3C018011 */ lui $at, %hi(gSpinHistoryPosZ) /* E260A8 802B6348 00220821 */ addu $at, $at, $v0 -/* E260AC 802B634C E426EF40 */ swc1 $f6, %lo(D_8010EF40)($at) +/* E260AC 802B634C E426EF40 */ swc1 $f6, %lo(gSpinHistoryPosZ)($at) /* E260B0 802B6350 C62000A8 */ lwc1 $f0, 0xa8($s1) /* E260B4 802B6354 28840006 */ slti $a0, $a0, 6 /* E260B8 802B6358 4600018D */ trunc.w.s $f6, $f0 diff --git a/ver/us/asm/nonmatchings/world/action/ultra_boots/func_802B6000_E26710.s b/ver/us/asm/nonmatchings/world/action/ultra_boots/func_802B6000_E26710.s index 07c59ea484..795dcb7e1e 100644 --- a/ver/us/asm/nonmatchings/world/action/ultra_boots/func_802B6000_E26710.s +++ b/ver/us/asm/nonmatchings/world/action/ultra_boots/func_802B6000_E26710.s @@ -126,26 +126,26 @@ glabel func_802B6000_E26710 /* E268C8 802B61B8 00000000 */ nop /* E268CC 802B61BC 45000009 */ bc1f .L802B61E4 /* E268D0 802B61C0 00000000 */ nop -/* E268D4 802B61C4 3C028011 */ lui $v0, %hi(D_8010C944) -/* E268D8 802B61C8 8C42C944 */ lw $v0, %lo(D_8010C944)($v0) +/* E268D4 802B61C4 3C028011 */ lui $v0, %hi(gSpinHistoryBufferPos) +/* E268D8 802B61C8 8C42C944 */ lw $v0, %lo(gSpinHistoryBufferPos)($v0) /* E268DC 802B61CC C600002C */ lwc1 $f0, 0x2c($s0) /* E268E0 802B61D0 00021080 */ sll $v0, $v0, 2 /* E268E4 802B61D4 4600020D */ trunc.w.s $f8, $f0 -/* E268E8 802B61D8 3C018011 */ lui $at, %hi(D_8010EF10) +/* E268E8 802B61D8 3C018011 */ lui $at, %hi(gSpinHistoryPosY) /* E268EC 802B61DC 00220821 */ addu $at, $at, $v0 -/* E268F0 802B61E0 E428EF10 */ swc1 $f8, %lo(D_8010EF10)($at) +/* E268F0 802B61E0 E428EF10 */ swc1 $f8, %lo(gSpinHistoryPosY)($at) .L802B61E4: -/* E268F4 802B61E4 3C058011 */ lui $a1, %hi(D_8010C944) -/* E268F8 802B61E8 24A5C944 */ addiu $a1, $a1, %lo(D_8010C944) +/* E268F4 802B61E4 3C058011 */ lui $a1, %hi(gSpinHistoryBufferPos) +/* E268F8 802B61E8 24A5C944 */ addiu $a1, $a1, %lo(gSpinHistoryBufferPos) /* E268FC 802B61EC 8CA20000 */ lw $v0, ($a1) /* E26900 802B61F0 C60000A8 */ lwc1 $f0, 0xa8($s0) /* E26904 802B61F4 00022040 */ sll $a0, $v0, 1 /* E26908 802B61F8 24420001 */ addiu $v0, $v0, 1 /* E2690C 802B61FC 4600020D */ trunc.w.s $f8, $f0 /* E26910 802B6200 44034000 */ mfc1 $v1, $f8 -/* E26914 802B6204 3C018011 */ lui $at, %hi(D_8010F6B8) +/* E26914 802B6204 3C018011 */ lui $at, %hi(gSpinHistoryPosAngle) /* E26918 802B6208 00240821 */ addu $at, $at, $a0 -/* E2691C 802B620C A423F6B8 */ sh $v1, %lo(D_8010F6B8)($at) +/* E2691C 802B620C A423F6B8 */ sh $v1, %lo(gSpinHistoryPosAngle)($at) /* E26920 802B6210 ACA20000 */ sw $v0, ($a1) /* E26924 802B6214 28420006 */ slti $v0, $v0, 6 /* E26928 802B6218 50400001 */ beql $v0, $zero, .L802B6220 diff --git a/ver/us/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80240520_90FBD0.s b/ver/us/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80240520_90FBD0.s index 35fceb78aa..fe8aa62e6e 100644 --- a/ver/us/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80240520_90FBD0.s +++ b/ver/us/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80240520_90FBD0.s @@ -99,8 +99,8 @@ glabel func_80240520_90FBD0 /* 90FD1C 8024066C 00000000 */ nop /* 90FD20 80240670 4501001F */ bc1t .L802406F0 /* 90FD24 80240674 2402FFFF */ addiu $v0, $zero, -1 -/* 90FD28 80240678 3C038011 */ lui $v1, %hi(D_8010EBB0+0x3) -/* 90FD2C 8024067C 8063EBB3 */ lb $v1, %lo(D_8010EBB0+0x3)($v1) +/* 90FD28 80240678 3C038011 */ lui $v1, %hi(gPartnerActionStatus+0x3) +/* 90FD2C 8024067C 8063EBB3 */ lb $v1, %lo(gPartnerActionStatus+0x3)($v1) /* 90FD30 80240680 24020009 */ addiu $v0, $zero, 9 /* 90FD34 80240684 10620019 */ beq $v1, $v0, .L802406EC /* 90FD38 80240688 24020007 */ addiu $v0, $zero, 7 diff --git a/ver/us/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80241414_910AC4.s b/ver/us/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80241414_910AC4.s index e46359a07d..3cb31d7700 100644 --- a/ver/us/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80241414_910AC4.s +++ b/ver/us/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80241414_910AC4.s @@ -116,8 +116,8 @@ glabel func_80241414_910AC4 /* 910C4C 8024159C 45030001 */ bc1tl .L802415A4 /* 910C50 802415A0 0000802D */ daddu $s0, $zero, $zero .L802415A4: -/* 910C54 802415A4 3C038011 */ lui $v1, %hi(D_8010EBB0+0x3) -/* 910C58 802415A8 8063EBB3 */ lb $v1, %lo(D_8010EBB0+0x3)($v1) +/* 910C54 802415A4 3C038011 */ lui $v1, %hi(gPartnerActionStatus+0x3) +/* 910C58 802415A8 8063EBB3 */ lb $v1, %lo(gPartnerActionStatus+0x3)($v1) /* 910C5C 802415AC 24020009 */ addiu $v0, $zero, 9 /* 910C60 802415B0 50620001 */ beql $v1, $v0, .L802415B8 /* 910C64 802415B4 0000802D */ daddu $s0, $zero, $zero diff --git a/ver/us/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_802422C4_911974.s b/ver/us/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_802422C4_911974.s index 7930d2801b..7285cc2314 100644 --- a/ver/us/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_802422C4_911974.s +++ b/ver/us/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_802422C4_911974.s @@ -90,8 +90,8 @@ glabel func_802422C4_911974 /* 911A98 802423E8 45030001 */ bc1tl .L802423F0 /* 911A9C 802423EC 0000802D */ daddu $s0, $zero, $zero .L802423F0: -/* 911AA0 802423F0 3C038011 */ lui $v1, %hi(D_8010EBB0+0x3) -/* 911AA4 802423F4 8063EBB3 */ lb $v1, %lo(D_8010EBB0+0x3)($v1) +/* 911AA0 802423F0 3C038011 */ lui $v1, %hi(gPartnerActionStatus+0x3) +/* 911AA4 802423F4 8063EBB3 */ lb $v1, %lo(gPartnerActionStatus+0x3)($v1) /* 911AA8 802423F8 24020009 */ addiu $v0, $zero, 9 /* 911AAC 802423FC 50620001 */ beql $v1, $v0, .L80242404 /* 911AB0 80242400 0000802D */ daddu $s0, $zero, $zero diff --git a/ver/us/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240000_915D70.s b/ver/us/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240000_915D70.s index 89b485dd8b..25e4e0894f 100644 --- a/ver/us/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240000_915D70.s +++ b/ver/us/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240000_915D70.s @@ -90,8 +90,8 @@ glabel func_80240000_915D70 /* 915E94 80240124 45030001 */ bc1tl .L8024012C /* 915E98 80240128 0000802D */ daddu $s0, $zero, $zero .L8024012C: -/* 915E9C 8024012C 3C038011 */ lui $v1, %hi(D_8010EBB0+0x3) -/* 915EA0 80240130 8063EBB3 */ lb $v1, %lo(D_8010EBB0+0x3)($v1) +/* 915E9C 8024012C 3C038011 */ lui $v1, %hi(gPartnerActionStatus+0x3) +/* 915EA0 80240130 8063EBB3 */ lb $v1, %lo(gPartnerActionStatus+0x3)($v1) /* 915EA4 80240134 24020009 */ addiu $v0, $zero, 9 /* 915EA8 80240138 50620001 */ beql $v1, $v0, .L80240140 /* 915EAC 8024013C 0000802D */ daddu $s0, $zero, $zero diff --git a/ver/us/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80240340_918EF0.s b/ver/us/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80240340_918EF0.s index a63e05e199..6d74562216 100644 --- a/ver/us/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80240340_918EF0.s +++ b/ver/us/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80240340_918EF0.s @@ -90,8 +90,8 @@ glabel func_80240340_918EF0 /* 919014 80240464 45030001 */ bc1tl .L8024046C /* 919018 80240468 0000802D */ daddu $s0, $zero, $zero .L8024046C: -/* 91901C 8024046C 3C038011 */ lui $v1, %hi(D_8010EBB0+0x3) -/* 919020 80240470 8063EBB3 */ lb $v1, %lo(D_8010EBB0+0x3)($v1) +/* 91901C 8024046C 3C038011 */ lui $v1, %hi(gPartnerActionStatus+0x3) +/* 919020 80240470 8063EBB3 */ lb $v1, %lo(gPartnerActionStatus+0x3)($v1) /* 919024 80240474 24020009 */ addiu $v0, $zero, 9 /* 919028 80240478 50620001 */ beql $v1, $v0, .L80240480 /* 91902C 8024047C 0000802D */ daddu $s0, $zero, $zero diff --git a/ver/us/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240080_91B960.s b/ver/us/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240080_91B960.s index 9a727b4fdf..d2445cb6f8 100644 --- a/ver/us/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240080_91B960.s +++ b/ver/us/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240080_91B960.s @@ -90,8 +90,8 @@ glabel func_80240080_91B960 /* 91BA84 802401A4 45030001 */ bc1tl .L802401AC /* 91BA88 802401A8 0000802D */ daddu $s0, $zero, $zero .L802401AC: -/* 91BA8C 802401AC 3C038011 */ lui $v1, %hi(D_8010EBB0+0x3) -/* 91BA90 802401B0 8063EBB3 */ lb $v1, %lo(D_8010EBB0+0x3)($v1) +/* 91BA8C 802401AC 3C038011 */ lui $v1, %hi(gPartnerActionStatus+0x3) +/* 91BA90 802401B0 8063EBB3 */ lb $v1, %lo(gPartnerActionStatus+0x3)($v1) /* 91BA94 802401B4 24020009 */ addiu $v0, $zero, 9 /* 91BA98 802401B8 50620001 */ beql $v1, $v0, .L802401C0 /* 91BA9C 802401BC 0000802D */ daddu $s0, $zero, $zero diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_11/B70860/func_80240000_B70860.s b/ver/us/asm/nonmatchings/world/area_jan/jan_11/B70860/func_80240000_B70860.s index 5125752ae9..9c203321b1 100644 --- a/ver/us/asm/nonmatchings/world/area_jan/jan_11/B70860/func_80240000_B70860.s +++ b/ver/us/asm/nonmatchings/world/area_jan/jan_11/B70860/func_80240000_B70860.s @@ -34,8 +34,8 @@ glabel func_80240000_B70860 /* B708D0 80240070 44073000 */ mfc1 $a3, $f6 /* B708D4 80240074 0C04DFB0 */ jal set_screen_overlay_center_worldpos /* B708D8 80240078 0080282D */ daddu $a1, $a0, $zero -/* B708DC 8024007C 3C028011 */ lui $v0, %hi(D_8010EBB0) -/* B708E0 80240080 8042EBB0 */ lb $v0, %lo(D_8010EBB0)($v0) +/* B708DC 8024007C 3C028011 */ lui $v0, %hi(gPartnerActionStatus) +/* B708E0 80240080 8042EBB0 */ lb $v0, %lo(gPartnerActionStatus)($v0) /* B708E4 80240084 10400012 */ beqz $v0, .L802400D0 /* B708E8 80240088 24020006 */ addiu $v0, $zero, 6 /* B708EC 8024008C 82230012 */ lb $v1, 0x12($s1) 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 index 978858922d..29085f36dc 100644 --- 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 @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_802407DC_B7103C -/* B7103C 802407DC 3C038011 */ lui $v1, %hi(D_8010EBB0+0x3) -/* B71040 802407E0 8063EBB3 */ lb $v1, %lo(D_8010EBB0+0x3)($v1) +/* 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) diff --git a/ver/us/asm/nonmatchings/world/area_kgr/kgr_01/8A9A10/func_80240000_8A9A10.s b/ver/us/asm/nonmatchings/world/area_kgr/kgr_01/8A9A10/func_80240000_8A9A10.s index 8f05f61876..f726ebec93 100644 --- a/ver/us/asm/nonmatchings/world/area_kgr/kgr_01/8A9A10/func_80240000_8A9A10.s +++ b/ver/us/asm/nonmatchings/world/area_kgr/kgr_01/8A9A10/func_80240000_8A9A10.s @@ -34,8 +34,8 @@ glabel func_80240000_8A9A10 /* 8A9A80 80240070 44073000 */ mfc1 $a3, $f6 /* 8A9A84 80240074 0C04DFB0 */ jal set_screen_overlay_center_worldpos /* 8A9A88 80240078 0080282D */ daddu $a1, $a0, $zero -/* 8A9A8C 8024007C 3C028011 */ lui $v0, %hi(D_8010EBB0) -/* 8A9A90 80240080 8042EBB0 */ lb $v0, %lo(D_8010EBB0)($v0) +/* 8A9A8C 8024007C 3C028011 */ lui $v0, %hi(gPartnerActionStatus) +/* 8A9A90 80240080 8042EBB0 */ lb $v0, %lo(gPartnerActionStatus)($v0) /* 8A9A94 80240084 10400012 */ beqz $v0, .L802400D0 /* 8A9A98 80240088 24020006 */ addiu $v0, $zero, 6 /* 8A9A9C 8024008C 82230012 */ lb $v1, 0x12($s1) diff --git a/ver/us/asm/nonmatchings/world/area_kgr/kgr_02/8AA450/func_80240000_8AA450.s b/ver/us/asm/nonmatchings/world/area_kgr/kgr_02/8AA450/func_80240000_8AA450.s index 3713f34d44..1103cda0e6 100644 --- a/ver/us/asm/nonmatchings/world/area_kgr/kgr_02/8AA450/func_80240000_8AA450.s +++ b/ver/us/asm/nonmatchings/world/area_kgr/kgr_02/8AA450/func_80240000_8AA450.s @@ -34,8 +34,8 @@ glabel func_80240000_8AA450 /* 8AA4C0 80240070 44073000 */ mfc1 $a3, $f6 /* 8AA4C4 80240074 0C04DFB0 */ jal set_screen_overlay_center_worldpos /* 8AA4C8 80240078 0080282D */ daddu $a1, $a0, $zero -/* 8AA4CC 8024007C 3C028011 */ lui $v0, %hi(D_8010EBB0) -/* 8AA4D0 80240080 8042EBB0 */ lb $v0, %lo(D_8010EBB0)($v0) +/* 8AA4CC 8024007C 3C028011 */ lui $v0, %hi(gPartnerActionStatus) +/* 8AA4D0 80240080 8042EBB0 */ lb $v0, %lo(gPartnerActionStatus)($v0) /* 8AA4D4 80240084 10400012 */ beqz $v0, .L802400D0 /* 8AA4D8 80240088 24020006 */ addiu $v0, $zero, 6 /* 8AA4DC 8024008C 82230012 */ lb $v1, 0x12($s1) diff --git a/ver/us/asm/nonmatchings/world/area_kgr/kgr_02/8AAB80/func_80240730_8AAB80.s b/ver/us/asm/nonmatchings/world/area_kgr/kgr_02/8AAB80/func_80240730_8AAB80.s index 6511155f5e..231a5cd7b4 100644 --- a/ver/us/asm/nonmatchings/world/area_kgr/kgr_02/8AAB80/func_80240730_8AAB80.s +++ b/ver/us/asm/nonmatchings/world/area_kgr/kgr_02/8AAB80/func_80240730_8AAB80.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_80240730_8AAB80 -/* 8AAB80 80240730 3C028011 */ lui $v0, %hi(D_8010EBB0+0x3) -/* 8AAB84 80240734 8042EBB3 */ lb $v0, %lo(D_8010EBB0+0x3)($v0) +/* 8AAB80 80240730 3C028011 */ lui $v0, %hi(gPartnerActionStatus+0x3) +/* 8AAB84 80240734 8042EBB3 */ lb $v0, %lo(gPartnerActionStatus+0x3)($v0) /* 8AAB88 80240738 38420006 */ xori $v0, $v0, 6 /* 8AAB8C 8024073C 2C420001 */ sltiu $v0, $v0, 1 /* 8AAB90 80240740 03E00008 */ jr $ra diff --git a/ver/us/asm/nonmatchings/world/area_kgr/kgr_02/8AAB80/func_80240748_8AAB98.s b/ver/us/asm/nonmatchings/world/area_kgr/kgr_02/8AAB80/func_80240748_8AAB98.s index 98dc0cd663..657329f6cc 100644 --- a/ver/us/asm/nonmatchings/world/area_kgr/kgr_02/8AAB80/func_80240748_8AAB98.s +++ b/ver/us/asm/nonmatchings/world/area_kgr/kgr_02/8AAB80/func_80240748_8AAB98.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_80240748_8AAB98 -/* 8AAB98 80240748 3C028011 */ lui $v0, %hi(D_8010EBB0+0x3) -/* 8AAB9C 8024074C 8042EBB3 */ lb $v0, %lo(D_8010EBB0+0x3)($v0) +/* 8AAB98 80240748 3C028011 */ lui $v0, %hi(gPartnerActionStatus+0x3) +/* 8AAB9C 8024074C 8042EBB3 */ lb $v0, %lo(gPartnerActionStatus+0x3)($v0) /* 8AABA0 80240750 38420006 */ xori $v0, $v0, 6 /* 8AABA4 80240754 0002102B */ sltu $v0, $zero, $v0 /* 8AABA8 80240758 03E00008 */ jr $ra diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_01/A46F60/func_80240000_A46F60.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_01/A46F60/func_80240000_A46F60.s index db9a87ba13..bc5a8e6642 100644 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_01/A46F60/func_80240000_A46F60.s +++ b/ver/us/asm/nonmatchings/world/area_kpa/kpa_01/A46F60/func_80240000_A46F60.s @@ -34,8 +34,8 @@ glabel func_80240000_A46F60 /* A46FD0 80240070 44073000 */ mfc1 $a3, $f6 /* A46FD4 80240074 0C04DFB0 */ jal set_screen_overlay_center_worldpos /* A46FD8 80240078 0080282D */ daddu $a1, $a0, $zero -/* A46FDC 8024007C 3C028011 */ lui $v0, %hi(D_8010EBB0) -/* A46FE0 80240080 8042EBB0 */ lb $v0, %lo(D_8010EBB0)($v0) +/* A46FDC 8024007C 3C028011 */ lui $v0, %hi(gPartnerActionStatus) +/* A46FE0 80240080 8042EBB0 */ lb $v0, %lo(gPartnerActionStatus)($v0) /* A46FE4 80240084 10400012 */ beqz $v0, .L802400D0 /* A46FE8 80240088 24020006 */ addiu $v0, $zero, 6 /* A46FEC 8024008C 82230012 */ lb $v1, 0x12($s1) diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_03/A485C0/func_80240000_A485C0.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_03/A485C0/func_80240000_A485C0.s index 5baa056594..d81b0a193b 100644 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_03/A485C0/func_80240000_A485C0.s +++ b/ver/us/asm/nonmatchings/world/area_kpa/kpa_03/A485C0/func_80240000_A485C0.s @@ -34,8 +34,8 @@ glabel func_80240000_A485C0 /* A48630 80240070 44073000 */ mfc1 $a3, $f6 /* A48634 80240074 0C04DFB0 */ jal set_screen_overlay_center_worldpos /* A48638 80240078 0080282D */ daddu $a1, $a0, $zero -/* A4863C 8024007C 3C028011 */ lui $v0, %hi(D_8010EBB0) -/* A48640 80240080 8042EBB0 */ lb $v0, %lo(D_8010EBB0)($v0) +/* A4863C 8024007C 3C028011 */ lui $v0, %hi(gPartnerActionStatus) +/* A48640 80240080 8042EBB0 */ lb $v0, %lo(gPartnerActionStatus)($v0) /* A48644 80240084 10400012 */ beqz $v0, .L802400D0 /* A48648 80240088 24020006 */ addiu $v0, $zero, 6 /* A4864C 8024008C 82230012 */ lb $v1, 0x12($s1) diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_80240A48_A49008.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_80240A48_A49008.s index 07ef79f1b2..40ca725084 100644 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_80240A48_A49008.s +++ b/ver/us/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_80240A48_A49008.s @@ -113,8 +113,8 @@ glabel func_80240A48_A49008 /* A49174 80240BB4 00000000 */ nop /* A49178 80240BB8 4501000F */ bc1t .L80240BF8 /* A4917C 80240BBC 2402FFFF */ addiu $v0, $zero, -1 -/* A49180 80240BC0 3C038011 */ lui $v1, %hi(D_8010EBB0+0x3) -/* A49184 80240BC4 8063EBB3 */ lb $v1, %lo(D_8010EBB0+0x3)($v1) +/* A49180 80240BC0 3C038011 */ lui $v1, %hi(gPartnerActionStatus+0x3) +/* A49184 80240BC4 8063EBB3 */ lb $v1, %lo(gPartnerActionStatus+0x3)($v1) /* A49188 80240BC8 24020009 */ addiu $v0, $zero, 9 /* A4918C 80240BCC 10620009 */ beq $v1, $v0, .L80240BF4 /* A49190 80240BD0 24020007 */ addiu $v0, $zero, 7 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_802400A0_A4CAC0.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_802400A0_A4CAC0.s index 15937e3bf4..e5e1aaf0bb 100644 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_802400A0_A4CAC0.s +++ b/ver/us/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_802400A0_A4CAC0.s @@ -113,8 +113,8 @@ glabel func_802400A0_A4CAC0 /* A4CC2C 8024020C 00000000 */ nop /* A4CC30 80240210 4501000F */ bc1t .L80240250 /* A4CC34 80240214 2402FFFF */ addiu $v0, $zero, -1 -/* A4CC38 80240218 3C038011 */ lui $v1, %hi(D_8010EBB0+0x3) -/* A4CC3C 8024021C 8063EBB3 */ lb $v1, %lo(D_8010EBB0+0x3)($v1) +/* A4CC38 80240218 3C038011 */ lui $v1, %hi(gPartnerActionStatus+0x3) +/* A4CC3C 8024021C 8063EBB3 */ lb $v1, %lo(gPartnerActionStatus+0x3)($v1) /* A4CC40 80240220 24020009 */ addiu $v0, $zero, 9 /* A4CC44 80240224 10620009 */ beq $v1, $v0, .L8024024C /* A4CC48 80240228 24020007 */ addiu $v0, $zero, 7 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_802400A0_A4F0A0.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_802400A0_A4F0A0.s index 2009056510..9ac04533db 100644 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_802400A0_A4F0A0.s +++ b/ver/us/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_802400A0_A4F0A0.s @@ -99,8 +99,8 @@ glabel func_802400A0_A4F0A0 /* A4F1EC 802401EC 00000000 */ nop /* A4F1F0 802401F0 4501001F */ bc1t .L80240270 /* A4F1F4 802401F4 2402FFFF */ addiu $v0, $zero, -1 -/* A4F1F8 802401F8 3C038011 */ lui $v1, %hi(D_8010EBB0+0x3) -/* A4F1FC 802401FC 8063EBB3 */ lb $v1, %lo(D_8010EBB0+0x3)($v1) +/* A4F1F8 802401F8 3C038011 */ lui $v1, %hi(gPartnerActionStatus+0x3) +/* A4F1FC 802401FC 8063EBB3 */ lb $v1, %lo(gPartnerActionStatus+0x3)($v1) /* A4F200 80240200 24020009 */ addiu $v0, $zero, 9 /* A4F204 80240204 10620019 */ beq $v1, $v0, .L8024026C /* A4F208 80240208 24020007 */ addiu $v0, $zero, 7 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80240310_A93A50.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80240310_A93A50.s index eb86d6c0c4..50d3adad9e 100644 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80240310_A93A50.s +++ b/ver/us/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80240310_A93A50.s @@ -99,8 +99,8 @@ glabel func_80240310_A93A50 /* A93B9C 8024045C 00000000 */ nop /* A93BA0 80240460 4501001F */ bc1t .L802404E0 /* A93BA4 80240464 2402FFFF */ addiu $v0, $zero, -1 -/* A93BA8 80240468 3C038011 */ lui $v1, %hi(D_8010EBB0+0x3) -/* A93BAC 8024046C 8063EBB3 */ lb $v1, %lo(D_8010EBB0+0x3)($v1) +/* A93BA8 80240468 3C038011 */ lui $v1, %hi(gPartnerActionStatus+0x3) +/* A93BAC 8024046C 8063EBB3 */ lb $v1, %lo(gPartnerActionStatus+0x3)($v1) /* A93BB0 80240470 24020009 */ addiu $v0, $zero, 9 /* A93BB4 80240474 10620019 */ beq $v1, $v0, .L802404DC /* A93BB8 80240478 24020007 */ addiu $v0, $zero, 7 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80241D30_A95470.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80241D30_A95470.s index 4d38ded26f..aeda759778 100644 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80241D30_A95470.s +++ b/ver/us/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80241D30_A95470.s @@ -113,8 +113,8 @@ glabel func_80241D30_A95470 /* A955DC 80241E9C 00000000 */ nop /* A955E0 80241EA0 4501000F */ bc1t .L80241EE0 /* A955E4 80241EA4 2402FFFF */ addiu $v0, $zero, -1 -/* A955E8 80241EA8 3C038011 */ lui $v1, %hi(D_8010EBB0+0x3) -/* A955EC 80241EAC 8063EBB3 */ lb $v1, %lo(D_8010EBB0+0x3)($v1) +/* A955E8 80241EA8 3C038011 */ lui $v1, %hi(gPartnerActionStatus+0x3) +/* A955EC 80241EAC 8063EBB3 */ lb $v1, %lo(gPartnerActionStatus+0x3)($v1) /* A955F0 80241EB0 24020009 */ addiu $v0, $zero, 9 /* A955F4 80241EB4 10620009 */ beq $v1, $v0, .L80241EDC /* A955F8 80241EB8 24020007 */ addiu $v0, $zero, 7 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_80240170_A99700.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_80240170_A99700.s index 5d7db4f2e2..2e4a3c402a 100644 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_80240170_A99700.s +++ b/ver/us/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_80240170_A99700.s @@ -99,8 +99,8 @@ glabel func_80240170_A99700 /* A9984C 802402BC 00000000 */ nop /* A99850 802402C0 4501001F */ bc1t .L80240340 /* A99854 802402C4 2402FFFF */ addiu $v0, $zero, -1 -/* A99858 802402C8 3C038011 */ lui $v1, %hi(D_8010EBB0+0x3) -/* A9985C 802402CC 8063EBB3 */ lb $v1, %lo(D_8010EBB0+0x3)($v1) +/* A99858 802402C8 3C038011 */ lui $v1, %hi(gPartnerActionStatus+0x3) +/* A9985C 802402CC 8063EBB3 */ lb $v1, %lo(gPartnerActionStatus+0x3)($v1) /* A99860 802402D0 24020009 */ addiu $v0, $zero, 9 /* A99864 802402D4 10620019 */ beq $v1, $v0, .L8024033C /* A99868 802402D8 24020007 */ addiu $v0, $zero, 7 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_80240170_A9EEB0.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_80240170_A9EEB0.s index 711f0bfb3f..bd106b9988 100644 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_80240170_A9EEB0.s +++ b/ver/us/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_80240170_A9EEB0.s @@ -99,8 +99,8 @@ glabel func_80240170_A9EEB0 /* A9EFFC 802402BC 00000000 */ nop /* A9F000 802402C0 4501001F */ bc1t .L80240340 /* A9F004 802402C4 2402FFFF */ addiu $v0, $zero, -1 -/* A9F008 802402C8 3C038011 */ lui $v1, %hi(D_8010EBB0+0x3) -/* A9F00C 802402CC 8063EBB3 */ lb $v1, %lo(D_8010EBB0+0x3)($v1) +/* A9F008 802402C8 3C038011 */ lui $v1, %hi(gPartnerActionStatus+0x3) +/* A9F00C 802402CC 8063EBB3 */ lb $v1, %lo(gPartnerActionStatus+0x3)($v1) /* A9F010 802402D0 24020009 */ addiu $v0, $zero, 9 /* A9F014 802402D4 10620019 */ beq $v1, $v0, .L8024033C /* A9F018 802402D8 24020007 */ addiu $v0, $zero, 7 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 index 13cd221e9f..0d9f39d0a8 100644 --- 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 @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_80240444_A54D94 -/* A54D94 80240444 3C038011 */ lui $v1, %hi(D_8010EBB0+0x3) -/* A54D98 80240448 8063EBB3 */ lb $v1, %lo(D_8010EBB0+0x3)($v1) +/* 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) 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 index 42ca452250..701d1480a8 100644 --- 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 @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_80240444_A56364 -/* A56364 80240444 3C038011 */ lui $v1, %hi(D_8010EBB0+0x3) -/* A56368 80240448 8063EBB3 */ lb $v1, %lo(D_8010EBB0+0x3)($v1) +/* 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) diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_14/A574F0/func_8024034C_A577FC.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_14/A574F0/func_8024034C_A577FC.s index 6d039b2f5f..23845f5b4a 100644 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_14/A574F0/func_8024034C_A577FC.s +++ b/ver/us/asm/nonmatchings/world/area_kpa/kpa_14/A574F0/func_8024034C_A577FC.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_8024034C_A577FC -/* A577FC 8024034C 3C038011 */ lui $v1, %hi(D_8010EBB0) -/* A57800 80240350 2463EBB0 */ addiu $v1, $v1, %lo(D_8010EBB0) +/* A577FC 8024034C 3C038011 */ lui $v1, %hi(gPartnerActionStatus) +/* A57800 80240350 2463EBB0 */ addiu $v1, $v1, %lo(gPartnerActionStatus) /* A57804 80240354 80620000 */ lb $v0, ($v1) /* A57808 80240358 10400004 */ beqz $v0, .L8024036C /* A5780C 8024035C 2402FFFF */ addiu $v0, $zero, -1 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 index d952675d70..8dc67b3b4c 100644 --- 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 @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_80240840_A57CF0 -/* A57CF0 80240840 3C038011 */ lui $v1, %hi(D_8010EBB0+0x3) -/* A57CF4 80240844 8063EBB3 */ lb $v1, %lo(D_8010EBB0+0x3)($v1) +/* 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) diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_80240000_A609D0.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_80240000_A609D0.s index b021a8dd27..5a13a2fc0c 100644 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_80240000_A609D0.s +++ b/ver/us/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_80240000_A609D0.s @@ -99,8 +99,8 @@ glabel func_80240000_A609D0 /* A60B1C 8024014C 00000000 */ nop /* A60B20 80240150 4501001F */ bc1t .L802401D0 /* A60B24 80240154 2402FFFF */ addiu $v0, $zero, -1 -/* A60B28 80240158 3C038011 */ lui $v1, %hi(D_8010EBB0+0x3) -/* A60B2C 8024015C 8063EBB3 */ lb $v1, %lo(D_8010EBB0+0x3)($v1) +/* A60B28 80240158 3C038011 */ lui $v1, %hi(gPartnerActionStatus+0x3) +/* A60B2C 8024015C 8063EBB3 */ lb $v1, %lo(gPartnerActionStatus+0x3)($v1) /* A60B30 80240160 24020009 */ addiu $v0, $zero, 9 /* A60B34 80240164 10620019 */ beq $v1, $v0, .L802401CC /* A60B38 80240168 24020007 */ addiu $v0, $zero, 7 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_80240050_A640E0.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_80240050_A640E0.s index 2986a07e1f..c2ce34feed 100644 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_80240050_A640E0.s +++ b/ver/us/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_80240050_A640E0.s @@ -113,8 +113,8 @@ glabel func_80240050_A640E0 /* A6424C 802401BC 00000000 */ nop /* A64250 802401C0 4501000F */ bc1t .L80240200 /* A64254 802401C4 2402FFFF */ addiu $v0, $zero, -1 -/* A64258 802401C8 3C038011 */ lui $v1, %hi(D_8010EBB0+0x3) -/* A6425C 802401CC 8063EBB3 */ lb $v1, %lo(D_8010EBB0+0x3)($v1) +/* A64258 802401C8 3C038011 */ lui $v1, %hi(gPartnerActionStatus+0x3) +/* A6425C 802401CC 8063EBB3 */ lb $v1, %lo(gPartnerActionStatus+0x3)($v1) /* A64260 802401D0 24020009 */ addiu $v0, $zero, 9 /* A64264 802401D4 10620009 */ beq $v1, $v0, .L802401FC /* A64268 802401D8 24020007 */ addiu $v0, $zero, 7 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_802400E0_A671E0.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_802400E0_A671E0.s index 6cf514880a..092117719a 100644 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_802400E0_A671E0.s +++ b/ver/us/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_802400E0_A671E0.s @@ -99,8 +99,8 @@ glabel func_802400E0_A671E0 /* A6732C 8024022C 00000000 */ nop /* A67330 80240230 4501001F */ bc1t .L802402B0 /* A67334 80240234 2402FFFF */ addiu $v0, $zero, -1 -/* A67338 80240238 3C038011 */ lui $v1, %hi(D_8010EBB0+0x3) -/* A6733C 8024023C 8063EBB3 */ lb $v1, %lo(D_8010EBB0+0x3)($v1) +/* A67338 80240238 3C038011 */ lui $v1, %hi(gPartnerActionStatus+0x3) +/* A6733C 8024023C 8063EBB3 */ lb $v1, %lo(gPartnerActionStatus+0x3)($v1) /* A67340 80240240 24020009 */ addiu $v0, $zero, 9 /* A67344 80240244 10620019 */ beq $v1, $v0, .L802402AC /* A67348 80240248 24020007 */ addiu $v0, $zero, 7 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_80240AE4_A6EEC4.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_80240AE4_A6EEC4.s index 0cb3de91c2..87ea93d1ad 100644 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_80240AE4_A6EEC4.s +++ b/ver/us/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_80240AE4_A6EEC4.s @@ -113,8 +113,8 @@ glabel func_80240AE4_A6EEC4 /* A6F030 80240C50 00000000 */ nop /* A6F034 80240C54 4501000F */ bc1t .L80240C94 /* A6F038 80240C58 2402FFFF */ addiu $v0, $zero, -1 -/* A6F03C 80240C5C 3C038011 */ lui $v1, %hi(D_8010EBB0+0x3) -/* A6F040 80240C60 8063EBB3 */ lb $v1, %lo(D_8010EBB0+0x3)($v1) +/* A6F03C 80240C5C 3C038011 */ lui $v1, %hi(gPartnerActionStatus+0x3) +/* A6F040 80240C60 8063EBB3 */ lb $v1, %lo(gPartnerActionStatus+0x3)($v1) /* A6F044 80240C64 24020009 */ addiu $v0, $zero, 9 /* A6F048 80240C68 10620009 */ beq $v1, $v0, .L80240C90 /* A6F04C 80240C6C 24020007 */ addiu $v0, $zero, 7 diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_02/C5AA50/func_802403B0_C5AAF0.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_02/C5AA50/func_802403B0_C5AAF0.s index da7709abf2..cc8f5101d1 100644 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_02/C5AA50/func_802403B0_C5AAF0.s +++ b/ver/us/asm/nonmatchings/world/area_kzn/kzn_02/C5AA50/func_802403B0_C5AAF0.s @@ -5,8 +5,8 @@ glabel func_802403B0_C5AAF0 /* C5AAF0 802403B0 27BDFFE8 */ addiu $sp, $sp, -0x18 /* C5AAF4 802403B4 AFBF0010 */ sw $ra, 0x10($sp) /* C5AAF8 802403B8 8C82000C */ lw $v0, 0xc($a0) -/* C5AAFC 802403BC 3C068011 */ lui $a2, %hi(D_8010EBB0+0x3) -/* C5AB00 802403C0 80C6EBB3 */ lb $a2, %lo(D_8010EBB0+0x3)($a2) +/* C5AAFC 802403BC 3C068011 */ lui $a2, %hi(gPartnerActionStatus+0x3) +/* C5AB00 802403C0 80C6EBB3 */ lb $a2, %lo(gPartnerActionStatus+0x3)($a2) /* C5AB04 802403C4 0C0B2026 */ jal set_variable /* C5AB08 802403C8 8C450000 */ lw $a1, ($v0) /* C5AB0C 802403CC 8FBF0010 */ lw $ra, 0x10($sp) diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_04/C69180/func_80241050_C69180.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_04/C69180/func_80241050_C69180.s index 9dfd86bc60..cb399c2a7d 100644 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_04/C69180/func_80241050_C69180.s +++ b/ver/us/asm/nonmatchings/world/area_kzn/kzn_04/C69180/func_80241050_C69180.s @@ -30,8 +30,8 @@ glabel func_80241050_C69180 /* C691E4 802410B4 2404FFFC */ addiu $a0, $zero, -4 /* C691E8 802410B8 3C138011 */ lui $s3, %hi(gPlayerStatus) /* C691EC 802410BC 2673EFC8 */ addiu $s3, $s3, %lo(gPlayerStatus) -/* C691F0 802410C0 3C168011 */ lui $s6, %hi(D_8010EBB0) -/* C691F4 802410C4 26D6EBB0 */ addiu $s6, $s6, %lo(D_8010EBB0) +/* C691F0 802410C0 3C168011 */ lui $s6, %hi(gPartnerActionStatus) +/* C691F4 802410C4 26D6EBB0 */ addiu $s6, $s6, %lo(gPartnerActionStatus) /* C691F8 802410C8 1200001C */ beqz $s0, .L8024113C /* C691FC 802410CC 0040B82D */ daddu $s7, $v0, $zero /* C69200 802410D0 0C00AB39 */ jal heap_malloc diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80243EE0_C75360.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80243EE0_C75360.s index 20310ef778..a2c9e4f705 100644 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80243EE0_C75360.s +++ b/ver/us/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80243EE0_C75360.s @@ -92,8 +92,8 @@ glabel func_80243EE0_C75360 /* C754B0 80244030 0809103C */ j .L802440F0 /* C754B4 80244034 00000000 */ nop .L80244038: -/* C754B8 80244038 3C028011 */ lui $v0, %hi(D_8010EBB0) -/* C754BC 8024403C 8042EBB0 */ lb $v0, %lo(D_8010EBB0)($v0) +/* C754B8 80244038 3C028011 */ lui $v0, %hi(gPartnerActionStatus) +/* C754BC 8024403C 8042EBB0 */ lb $v0, %lo(gPartnerActionStatus)($v0) /* C754C0 80244040 10400012 */ beqz $v0, .L8024408C /* C754C4 80244044 24020006 */ addiu $v0, $zero, 6 /* C754C8 80244048 82230012 */ lb $v1, 0x12($s1) diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_10/C7E4B0/func_80240350_C7E4D0.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_10/C7E4B0/func_80240350_C7E4D0.s index 0a6b929bc6..462eabfad0 100644 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_10/C7E4B0/func_80240350_C7E4D0.s +++ b/ver/us/asm/nonmatchings/world/area_kzn/kzn_10/C7E4B0/func_80240350_C7E4D0.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_80240350_C7E4D0 -/* C7E4D0 80240350 3C038011 */ lui $v1, %hi(D_8010EBB0) -/* C7E4D4 80240354 2463EBB0 */ addiu $v1, $v1, %lo(D_8010EBB0) +/* C7E4D0 80240350 3C038011 */ lui $v1, %hi(gPartnerActionStatus) +/* C7E4D4 80240354 2463EBB0 */ addiu $v1, $v1, %lo(gPartnerActionStatus) /* C7E4D8 80240358 80620000 */ lb $v0, ($v1) /* C7E4DC 8024035C 10400004 */ beqz $v0, .L80240370 /* C7E4E0 80240360 2402FFFF */ addiu $v0, $zero, -1 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 index 4f544d581f..fbc45afc6c 100644 --- 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 @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_80240434_C805D4 -/* C805D4 80240434 3C038011 */ lui $v1, %hi(D_8010EBB0+0x3) -/* C805D8 80240438 8063EBB3 */ lb $v1, %lo(D_8010EBB0+0x3)($v1) +/* 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) diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80241F4C_C820EC.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80241F4C_C820EC.s index a2e523c407..27e514239c 100644 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80241F4C_C820EC.s +++ b/ver/us/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80241F4C_C820EC.s @@ -30,8 +30,8 @@ glabel func_80241F4C_C820EC /* C82150 80241FB0 2404FFFC */ addiu $a0, $zero, -4 /* C82154 80241FB4 3C138011 */ lui $s3, %hi(gPlayerStatus) /* C82158 80241FB8 2673EFC8 */ addiu $s3, $s3, %lo(gPlayerStatus) -/* C8215C 80241FBC 3C168011 */ lui $s6, %hi(D_8010EBB0) -/* C82160 80241FC0 26D6EBB0 */ addiu $s6, $s6, %lo(D_8010EBB0) +/* C8215C 80241FBC 3C168011 */ lui $s6, %hi(gPartnerActionStatus) +/* C82160 80241FC0 26D6EBB0 */ addiu $s6, $s6, %lo(gPartnerActionStatus) /* C82164 80241FC4 1200001C */ beqz $s0, .L80242038 /* C82168 80241FC8 0040B82D */ daddu $s7, $v0, $zero /* C8216C 80241FCC 0C00AB39 */ jal heap_malloc diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_17/C887B0/func_80242D20_C887D0.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_17/C887B0/func_80242D20_C887D0.s index fa058a0cd3..771450eeba 100644 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_17/C887B0/func_80242D20_C887D0.s +++ b/ver/us/asm/nonmatchings/world/area_kzn/kzn_17/C887B0/func_80242D20_C887D0.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_80242D20_C887D0 -/* C887D0 80242D20 3C038011 */ lui $v1, %hi(D_8010EBB0) -/* C887D4 80242D24 2463EBB0 */ addiu $v1, $v1, %lo(D_8010EBB0) +/* C887D0 80242D20 3C038011 */ lui $v1, %hi(gPartnerActionStatus) +/* C887D4 80242D24 2463EBB0 */ addiu $v1, $v1, %lo(gPartnerActionStatus) /* C887D8 80242D28 80620000 */ lb $v0, ($v1) /* C887DC 80242D2C 10400004 */ beqz $v0, .L80242D40 /* C887E0 80242D30 2402FFFF */ addiu $v0, $zero, -1 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 index c6c7cb609c..7ea43a4067 100644 --- 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 @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_802419AC_84457C -/* 84457C 802419AC 3C038011 */ lui $v1, %hi(D_8010EBB0+0x3) -/* 844580 802419B0 8063EBB3 */ lb $v1, %lo(D_8010EBB0+0x3)($v1) +/* 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) diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80241948_D9EE18.s b/ver/us/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80241948_D9EE18.s index bc283ad27e..b7d3711384 100644 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80241948_D9EE18.s +++ b/ver/us/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80241948_D9EE18.s @@ -99,8 +99,8 @@ glabel func_80241948_D9EE18 /* D9EF64 80241A94 00000000 */ nop /* D9EF68 80241A98 4501001F */ bc1t .L80241B18 /* D9EF6C 80241A9C 2402FFFF */ addiu $v0, $zero, -1 -/* D9EF70 80241AA0 3C038011 */ lui $v1, %hi(D_8010EBB0+0x3) -/* D9EF74 80241AA4 8063EBB3 */ lb $v1, %lo(D_8010EBB0+0x3)($v1) +/* D9EF70 80241AA0 3C038011 */ lui $v1, %hi(gPartnerActionStatus+0x3) +/* D9EF74 80241AA4 8063EBB3 */ lb $v1, %lo(gPartnerActionStatus+0x3)($v1) /* D9EF78 80241AA8 24020009 */ addiu $v0, $zero, 9 /* D9EF7C 80241AAC 10620019 */ beq $v1, $v0, .L80241B14 /* D9EF80 80241AB0 24020007 */ addiu $v0, $zero, 7 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_09/DCCCD0/func_80240000_DCCCD0.s b/ver/us/asm/nonmatchings/world/area_omo/omo_09/DCCCD0/func_80240000_DCCCD0.s index d8257d5aaf..ca78714ac7 100644 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_09/DCCCD0/func_80240000_DCCCD0.s +++ b/ver/us/asm/nonmatchings/world/area_omo/omo_09/DCCCD0/func_80240000_DCCCD0.s @@ -11,8 +11,8 @@ glabel func_80240000_DCCCD0 /* DCCCE4 80240014 03E00008 */ jr $ra /* DCCCE8 80240018 24020001 */ addiu $v0, $zero, 1 .L8024001C: -/* DCCCEC 8024001C 3C028011 */ lui $v0, %hi(D_8010EBB0) -/* DCCCF0 80240020 8042EBB0 */ lb $v0, %lo(D_8010EBB0)($v0) +/* DCCCEC 8024001C 3C028011 */ lui $v0, %hi(gPartnerActionStatus) +/* DCCCF0 80240020 8042EBB0 */ lb $v0, %lo(gPartnerActionStatus)($v0) /* DCCCF4 80240024 10400009 */ beqz $v0, .L8024004C /* DCCCF8 80240028 00000000 */ nop /* DCCCFC 8024002C 3C028011 */ lui $v0, %hi(gPlayerData) diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_09/DCCCD0/func_80240078_DCCD48.s b/ver/us/asm/nonmatchings/world/area_omo/omo_09/DCCCD0/func_80240078_DCCD48.s index d036f0b81c..97a79f7022 100644 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_09/DCCCD0/func_80240078_DCCD48.s +++ b/ver/us/asm/nonmatchings/world/area_omo/omo_09/DCCCD0/func_80240078_DCCD48.s @@ -19,8 +19,8 @@ glabel func_80240078_DCCD48 /* DCCD80 802400B0 3C158011 */ lui $s5, %hi(gPlayerStatus) /* DCCD84 802400B4 26B5EFC8 */ addiu $s5, $s5, %lo(gPlayerStatus) /* DCCD88 802400B8 0040982D */ daddu $s3, $v0, $zero -/* DCCD8C 802400BC 3C148011 */ lui $s4, %hi(D_8010EBB0) -/* DCCD90 802400C0 2694EBB0 */ addiu $s4, $s4, %lo(D_8010EBB0) +/* DCCD8C 802400BC 3C148011 */ lui $s4, %hi(gPartnerActionStatus) +/* DCCD90 802400C0 2694EBB0 */ addiu $s4, $s4, %lo(gPartnerActionStatus) /* DCCD94 802400C4 0C090000 */ jal func_80240000_DCCCD0 /* DCCD98 802400C8 AE000084 */ sw $zero, 0x84($s0) /* DCCD9C 802400CC 14400073 */ bnez $v0, .L8024029C diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80242358_DCF028.s b/ver/us/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80242358_DCF028.s index 3258a90e37..1f0eec3c12 100644 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80242358_DCF028.s +++ b/ver/us/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80242358_DCF028.s @@ -99,8 +99,8 @@ glabel func_80242358_DCF028 /* DCF174 802424A4 00000000 */ nop /* DCF178 802424A8 4501001F */ bc1t .L80242528 /* DCF17C 802424AC 2402FFFF */ addiu $v0, $zero, -1 -/* DCF180 802424B0 3C038011 */ lui $v1, %hi(D_8010EBB0+0x3) -/* DCF184 802424B4 8063EBB3 */ lb $v1, %lo(D_8010EBB0+0x3)($v1) +/* DCF180 802424B0 3C038011 */ lui $v1, %hi(gPartnerActionStatus+0x3) +/* DCF184 802424B4 8063EBB3 */ lb $v1, %lo(gPartnerActionStatus+0x3)($v1) /* DCF188 802424B8 24020009 */ addiu $v0, $zero, 9 /* DCF18C 802424BC 10620019 */ beq $v1, $v0, .L80242524 /* DCF190 802424C0 24020007 */ addiu $v0, $zero, 7 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_12/DDF310/func_80240184_DDF494.s b/ver/us/asm/nonmatchings/world/area_omo/omo_12/DDF310/func_80240184_DDF494.s index 7a80fb0840..94bc58c947 100644 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_12/DDF310/func_80240184_DDF494.s +++ b/ver/us/asm/nonmatchings/world/area_omo/omo_12/DDF310/func_80240184_DDF494.s @@ -34,8 +34,8 @@ glabel func_80240184_DDF494 /* DDF504 802401F4 44073000 */ mfc1 $a3, $f6 /* DDF508 802401F8 0C04DFB0 */ jal set_screen_overlay_center_worldpos /* DDF50C 802401FC 0080282D */ daddu $a1, $a0, $zero -/* DDF510 80240200 3C028011 */ lui $v0, %hi(D_8010EBB0) -/* DDF514 80240204 8042EBB0 */ lb $v0, %lo(D_8010EBB0)($v0) +/* DDF510 80240200 3C028011 */ lui $v0, %hi(gPartnerActionStatus) +/* DDF514 80240204 8042EBB0 */ lb $v0, %lo(gPartnerActionStatus)($v0) /* DDF518 80240208 10400012 */ beqz $v0, .L80240254 /* DDF51C 8024020C 24020006 */ addiu $v0, $zero, 6 /* DDF520 80240210 82230012 */ lb $v1, 0x12($s1) diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_14/DE56B0/func_80240000_DE56B0.s b/ver/us/asm/nonmatchings/world/area_omo/omo_14/DE56B0/func_80240000_DE56B0.s index 447ea80d76..afdcf7c006 100644 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_14/DE56B0/func_80240000_DE56B0.s +++ b/ver/us/asm/nonmatchings/world/area_omo/omo_14/DE56B0/func_80240000_DE56B0.s @@ -34,8 +34,8 @@ glabel func_80240000_DE56B0 /* DE5720 80240070 44073000 */ mfc1 $a3, $f6 /* DE5724 80240074 0C04DFB0 */ jal set_screen_overlay_center_worldpos /* DE5728 80240078 0080282D */ daddu $a1, $a0, $zero -/* DE572C 8024007C 3C028011 */ lui $v0, %hi(D_8010EBB0) -/* DE5730 80240080 8042EBB0 */ lb $v0, %lo(D_8010EBB0)($v0) +/* DE572C 8024007C 3C028011 */ lui $v0, %hi(gPartnerActionStatus) +/* DE5730 80240080 8042EBB0 */ lb $v0, %lo(gPartnerActionStatus)($v0) /* DE5734 80240084 10400012 */ beqz $v0, .L802400D0 /* DE5738 80240088 24020006 */ addiu $v0, $zero, 6 /* DE573C 8024008C 82230012 */ lb $v1, 0x12($s1) diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_14/DE5810/func_80240564_DE5C14.s b/ver/us/asm/nonmatchings/world/area_omo/omo_14/DE5810/func_80240564_DE5C14.s index 46be91c2e0..72ee6808ed 100644 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_14/DE5810/func_80240564_DE5C14.s +++ b/ver/us/asm/nonmatchings/world/area_omo/omo_14/DE5810/func_80240564_DE5C14.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_80240564_DE5C14 -/* DE5C14 80240564 3C038011 */ lui $v1, %hi(D_8010EBB0) -/* DE5C18 80240568 2463EBB0 */ addiu $v1, $v1, %lo(D_8010EBB0) +/* DE5C14 80240564 3C038011 */ lui $v1, %hi(gPartnerActionStatus) +/* DE5C18 80240568 2463EBB0 */ addiu $v1, $v1, %lo(gPartnerActionStatus) /* DE5C1C 8024056C 80620000 */ lb $v0, ($v1) /* DE5C20 80240570 10400004 */ beqz $v0, .L80240584 /* DE5C24 80240574 2402FFFF */ addiu $v0, $zero, -1 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 index 375494fb62..1140e3b564 100644 --- 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 @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_80240590_DE5C40 -/* DE5C40 80240590 3C038011 */ lui $v1, %hi(D_8010EBB0+0x3) -/* DE5C44 80240594 8063EBB3 */ lb $v1, %lo(D_8010EBB0+0x3)($v1) +/* 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) diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802424AC_DF134C.s b/ver/us/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802424AC_DF134C.s index 3006cc6a84..4d200d00df 100644 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802424AC_DF134C.s +++ b/ver/us/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802424AC_DF134C.s @@ -99,8 +99,8 @@ glabel func_802424AC_DF134C /* DF1498 802425F8 00000000 */ nop /* DF149C 802425FC 4501001F */ bc1t .L8024267C /* DF14A0 80242600 2402FFFF */ addiu $v0, $zero, -1 -/* DF14A4 80242604 3C038011 */ lui $v1, %hi(D_8010EBB0+0x3) -/* DF14A8 80242608 8063EBB3 */ lb $v1, %lo(D_8010EBB0+0x3)($v1) +/* DF14A4 80242604 3C038011 */ lui $v1, %hi(gPartnerActionStatus+0x3) +/* DF14A8 80242608 8063EBB3 */ lb $v1, %lo(gPartnerActionStatus+0x3)($v1) /* DF14AC 8024260C 24020009 */ addiu $v0, $zero, 9 /* DF14B0 80242610 10620019 */ beq $v1, $v0, .L80242678 /* DF14B4 80242614 24020007 */ addiu $v0, $zero, 7 diff --git a/ver/us/asm/nonmatchings/world/area_trd/trd_08/9BB5B0/func_80240310_9BB5B0.s b/ver/us/asm/nonmatchings/world/area_trd/trd_08/9BB5B0/func_80240310_9BB5B0.s index 770fb18ad4..bee2676fb3 100644 --- a/ver/us/asm/nonmatchings/world/area_trd/trd_08/9BB5B0/func_80240310_9BB5B0.s +++ b/ver/us/asm/nonmatchings/world/area_trd/trd_08/9BB5B0/func_80240310_9BB5B0.s @@ -30,8 +30,8 @@ glabel func_80240310_9BB5B0 /* 9BB614 80240374 2404FFFC */ addiu $a0, $zero, -4 /* 9BB618 80240378 3C138011 */ lui $s3, %hi(gPlayerStatus) /* 9BB61C 8024037C 2673EFC8 */ addiu $s3, $s3, %lo(gPlayerStatus) -/* 9BB620 80240380 3C168011 */ lui $s6, %hi(D_8010EBB0) -/* 9BB624 80240384 26D6EBB0 */ addiu $s6, $s6, %lo(D_8010EBB0) +/* 9BB620 80240380 3C168011 */ lui $s6, %hi(gPartnerActionStatus) +/* 9BB624 80240384 26D6EBB0 */ addiu $s6, $s6, %lo(gPartnerActionStatus) /* 9BB628 80240388 1200001C */ beqz $s0, .L802403FC /* 9BB62C 8024038C 0040B82D */ daddu $s7, $v0, $zero /* 9BB630 80240390 0C00AB39 */ jal heap_malloc diff --git a/ver/us/asm/nonmatchings/world/partner/bombette/func_802BD720_318470.s b/ver/us/asm/nonmatchings/world/partner/bombette/func_802BD720_318470.s index 13099cfbf8..f5858cd566 100644 --- a/ver/us/asm/nonmatchings/world/partner/bombette/func_802BD720_318470.s +++ b/ver/us/asm/nonmatchings/world/partner/bombette/func_802BD720_318470.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_802BD720_318470 -/* 318470 802BD720 3C028011 */ lui $v0, %hi(D_8010EBB0) -/* 318474 802BD724 8042EBB0 */ lb $v0, %lo(D_8010EBB0)($v0) +/* 318470 802BD720 3C028011 */ lui $v0, %hi(gPartnerActionStatus) +/* 318474 802BD724 8042EBB0 */ lb $v0, %lo(gPartnerActionStatus)($v0) /* 318478 802BD728 10400005 */ beqz $v0, .L802BD740 /* 31847C 802BD72C 24020001 */ addiu $v0, $zero, 1 /* 318480 802BD730 3C01802C */ lui $at, %hi(D_802BE934) diff --git a/ver/us/asm/nonmatchings/world/partner/bombette/func_802BD758_3184A8.s b/ver/us/asm/nonmatchings/world/partner/bombette/func_802BD758_3184A8.s index 538d2f445f..507875c8cd 100644 --- a/ver/us/asm/nonmatchings/world/partner/bombette/func_802BD758_3184A8.s +++ b/ver/us/asm/nonmatchings/world/partner/bombette/func_802BD758_3184A8.s @@ -14,8 +14,8 @@ glabel func_802BD758_3184A8 /* 3184CC 802BD77C 3C148016 */ lui $s4, %hi(gCollisionStatus) /* 3184D0 802BD780 2694A550 */ addiu $s4, $s4, %lo(gCollisionStatus) /* 3184D4 802BD784 AFB50044 */ sw $s5, 0x44($sp) -/* 3184D8 802BD788 3C158011 */ lui $s5, %hi(D_8010EBB0) -/* 3184DC 802BD78C 26B5EBB0 */ addiu $s5, $s5, %lo(D_8010EBB0) +/* 3184D8 802BD788 3C158011 */ lui $s5, %hi(gPartnerActionStatus) +/* 3184DC 802BD78C 26B5EBB0 */ addiu $s5, $s5, %lo(gPartnerActionStatus) /* 3184E0 802BD790 AFBF0048 */ sw $ra, 0x48($sp) /* 3184E4 802BD794 AFB10034 */ sw $s1, 0x34($sp) /* 3184E8 802BD798 AFB00030 */ sw $s0, 0x30($sp) diff --git a/ver/us/asm/nonmatchings/world/partner/bombette/func_802BE6E8_319438.s b/ver/us/asm/nonmatchings/world/partner/bombette/func_802BE6E8_319438.s index df09c68611..4b11b49c0c 100644 --- a/ver/us/asm/nonmatchings/world/partner/bombette/func_802BE6E8_319438.s +++ b/ver/us/asm/nonmatchings/world/partner/bombette/func_802BE6E8_319438.s @@ -8,8 +8,8 @@ glabel func_802BE6E8_319438 /* 319444 802BE6F4 AFB10014 */ sw $s1, 0x14($sp) /* 319448 802BE6F8 3C118011 */ lui $s1, %hi(gPlayerStatus) /* 31944C 802BE6FC 2631EFC8 */ addiu $s1, $s1, %lo(gPlayerStatus) -/* 319450 802BE700 3C028011 */ lui $v0, %hi(D_8010EBB0) -/* 319454 802BE704 2442EBB0 */ addiu $v0, $v0, %lo(D_8010EBB0) +/* 319450 802BE700 3C028011 */ lui $v0, %hi(gPartnerActionStatus) +/* 319454 802BE704 2442EBB0 */ addiu $v0, $v0, %lo(gPartnerActionStatus) /* 319458 802BE708 AFBF0020 */ sw $ra, 0x20($sp) /* 31945C 802BE70C AFB3001C */ sw $s3, 0x1c($sp) /* 319460 802BE710 AFB20018 */ sw $s2, 0x18($sp) diff --git a/ver/us/asm/nonmatchings/world/partner/bow/func_802BD694_323FE4.s b/ver/us/asm/nonmatchings/world/partner/bow/func_802BD694_323FE4.s index a11cade76b..f4b13172e5 100644 --- a/ver/us/asm/nonmatchings/world/partner/bow/func_802BD694_323FE4.s +++ b/ver/us/asm/nonmatchings/world/partner/bow/func_802BD694_323FE4.s @@ -16,8 +16,8 @@ glabel func_802BD694_323FE4 /* 323FF4 802BD6A4 3C138011 */ lui $s3, %hi(gPlayerStatus) /* 323FF8 802BD6A8 2673EFC8 */ addiu $s3, $s3, %lo(gPlayerStatus) /* 323FFC 802BD6AC AFB50034 */ sw $s5, 0x34($sp) -/* 324000 802BD6B0 3C158011 */ lui $s5, %hi(D_8010EBB0) -/* 324004 802BD6B4 26B5EBB0 */ addiu $s5, $s5, %lo(D_8010EBB0) +/* 324000 802BD6B0 3C158011 */ lui $s5, %hi(gPartnerActionStatus) +/* 324004 802BD6B4 26B5EBB0 */ addiu $s5, $s5, %lo(gPartnerActionStatus) /* 324008 802BD6B8 AFB10024 */ sw $s1, 0x24($sp) /* 32400C 802BD6BC 3C118016 */ lui $s1, %hi(gCollisionStatus) /* 324010 802BD6C0 2631A550 */ addiu $s1, $s1, %lo(gCollisionStatus) diff --git a/ver/us/asm/nonmatchings/world/partner/bow/func_802BDDF0_324740.s b/ver/us/asm/nonmatchings/world/partner/bow/func_802BDDF0_324740.s index c818cd09bb..05b40ddbd7 100644 --- a/ver/us/asm/nonmatchings/world/partner/bow/func_802BDDF0_324740.s +++ b/ver/us/asm/nonmatchings/world/partner/bow/func_802BDDF0_324740.s @@ -31,8 +31,8 @@ glabel func_802BDDF0_324740 /* 3247A8 802BDE58 00031842 */ srl $v1, $v1, 1 /* 3247AC 802BDE5C A0430005 */ sb $v1, 5($v0) /* 3247B0 802BDE60 8E420000 */ lw $v0, ($s2) -/* 3247B4 802BDE64 3C138011 */ lui $s3, %hi(D_8010EBB0) -/* 3247B8 802BDE68 2673EBB0 */ addiu $s3, $s3, %lo(D_8010EBB0) +/* 3247B4 802BDE64 3C138011 */ lui $s3, %hi(gPartnerActionStatus) +/* 3247B8 802BDE68 2673EBB0 */ addiu $s3, $s3, %lo(gPartnerActionStatus) /* 3247BC 802BDE6C 10400003 */ beqz $v0, .L802BDE7C /* 3247C0 802BDE70 0200A02D */ daddu $s4, $s0, $zero /* 3247C4 802BDE74 0C038069 */ jal enable_player_input diff --git a/ver/us/asm/nonmatchings/world/partner/bow/func_802BDF64_3248B4.s b/ver/us/asm/nonmatchings/world/partner/bow/func_802BDF64_3248B4.s index 88b4efaf4f..cee1200342 100644 --- a/ver/us/asm/nonmatchings/world/partner/bow/func_802BDF64_3248B4.s +++ b/ver/us/asm/nonmatchings/world/partner/bow/func_802BDF64_3248B4.s @@ -10,8 +10,8 @@ glabel func_802BDF64_3248B4 /* 3248C8 802BDF78 AFBF001C */ sw $ra, 0x1c($sp) /* 3248CC 802BDF7C AFB10014 */ sw $s1, 0x14($sp) /* 3248D0 802BDF80 8E420000 */ lw $v0, ($s2) -/* 3248D4 802BDF84 3C118011 */ lui $s1, %hi(D_8010EBB0) -/* 3248D8 802BDF88 2631EBB0 */ addiu $s1, $s1, %lo(D_8010EBB0) +/* 3248D4 802BDF84 3C118011 */ lui $s1, %hi(gPartnerActionStatus) +/* 3248D8 802BDF88 2631EBB0 */ addiu $s1, $s1, %lo(gPartnerActionStatus) /* 3248DC 802BDF8C 1040000E */ beqz $v0, .L802BDFC8 /* 3248E0 802BDF90 0080802D */ daddu $s0, $a0, $zero /* 3248E4 802BDF94 0C038069 */ jal enable_player_input diff --git a/ver/us/asm/nonmatchings/world/partner/goombario/func_802BD5D8_3174F8.s b/ver/us/asm/nonmatchings/world/partner/goombario/func_802BD5D8_3174F8.s index 01d82738a1..62c11c1d6b 100644 --- a/ver/us/asm/nonmatchings/world/partner/goombario/func_802BD5D8_3174F8.s +++ b/ver/us/asm/nonmatchings/world/partner/goombario/func_802BD5D8_3174F8.s @@ -134,8 +134,8 @@ glabel func_802BD5D8_3174F8 /* 3176B0 802BD790 0C00A6C9 */ jal clamp_angle /* 3176B4 802BD794 46006301 */ sub.s $f12, $f12, $f0 /* 3176B8 802BD798 E640000C */ swc1 $f0, 0xc($s2) -/* 3176BC 802BD79C 3C018011 */ lui $at, %hi(D_8010EBB0) -/* 3176C0 802BD7A0 A033EBB0 */ sb $s3, %lo(D_8010EBB0)($at) +/* 3176BC 802BD79C 3C018011 */ lui $at, %hi(gPartnerActionStatus) +/* 3176C0 802BD7A0 A033EBB0 */ sb $s3, %lo(gPartnerActionStatus)($at) /* 3176C4 802BD7A4 0C03A5EE */ jal close_status_menu /* 3176C8 802BD7A8 00000000 */ nop /* 3176CC 802BD7AC 3C02802C */ lui $v0, %hi(D_802BDF30) diff --git a/ver/us/asm/nonmatchings/world/partner/goombario/func_802BDB30_317A50.s b/ver/us/asm/nonmatchings/world/partner/goombario/func_802BDB30_317A50.s index bbcf02a1d1..16afaa5de5 100644 --- a/ver/us/asm/nonmatchings/world/partner/goombario/func_802BDB30_317A50.s +++ b/ver/us/asm/nonmatchings/world/partner/goombario/func_802BDB30_317A50.s @@ -10,8 +10,8 @@ glabel func_802BDB30_317A50 /* 317A64 802BDB44 3C03802C */ lui $v1, %hi(func_802BDF64_3248B4) /* 317A68 802BDB48 2463DF64 */ addiu $v1, $v1, %lo(func_802BDF64_3248B4) /* 317A6C 802BDB4C 8C620000 */ lw $v0, ($v1) -/* 317A70 802BDB50 3C108011 */ lui $s0, %hi(D_8010EBB0) -/* 317A74 802BDB54 2610EBB0 */ addiu $s0, $s0, %lo(D_8010EBB0) +/* 317A70 802BDB50 3C108011 */ lui $s0, %hi(gPartnerActionStatus) +/* 317A74 802BDB54 2610EBB0 */ addiu $s0, $s0, %lo(gPartnerActionStatus) /* 317A78 802BDB58 50400004 */ beql $v0, $zero, .L802BDB6C /* 317A7C 802BDB5C A2000000 */ sb $zero, ($s0) /* 317A80 802BDB60 0C038069 */ jal enable_player_input diff --git a/ver/us/asm/nonmatchings/world/partner/kooper/func_802BD638_31B658.s b/ver/us/asm/nonmatchings/world/partner/kooper/func_802BD638_31B658.s index 16e947d6cf..6d284b38cc 100644 --- a/ver/us/asm/nonmatchings/world/partner/kooper/func_802BD638_31B658.s +++ b/ver/us/asm/nonmatchings/world/partner/kooper/func_802BD638_31B658.s @@ -30,8 +30,8 @@ glabel func_802BD638_31B658 /* 31B670 802BD650 3C148011 */ lui $s4, %hi(gPlayerStatus) /* 31B674 802BD654 2694EFC8 */ addiu $s4, $s4, %lo(gPlayerStatus) /* 31B678 802BD658 AFB60048 */ sw $s6, 0x48($sp) -/* 31B67C 802BD65C 3C168011 */ lui $s6, %hi(D_8010EBB0) -/* 31B680 802BD660 26D6EBB0 */ addiu $s6, $s6, %lo(D_8010EBB0) +/* 31B67C 802BD65C 3C168011 */ lui $s6, %hi(gPartnerActionStatus) +/* 31B680 802BD660 26D6EBB0 */ addiu $s6, $s6, %lo(gPartnerActionStatus) /* 31B684 802BD664 AFBF004C */ sw $ra, 0x4c($sp) /* 31B688 802BD668 AFB3003C */ sw $s3, 0x3c($sp) /* 31B68C 802BD66C AFB20038 */ sw $s2, 0x38($sp) diff --git a/ver/us/asm/nonmatchings/world/partner/kooper/func_802BEA24_31CA44.s b/ver/us/asm/nonmatchings/world/partner/kooper/func_802BEA24_31CA44.s index 5705f4e3e9..fc1a46a4cb 100644 --- a/ver/us/asm/nonmatchings/world/partner/kooper/func_802BEA24_31CA44.s +++ b/ver/us/asm/nonmatchings/world/partner/kooper/func_802BEA24_31CA44.s @@ -10,8 +10,8 @@ glabel func_802BEA24_31CA44 /* 31CA58 802BEA38 AFB20018 */ sw $s2, 0x18($sp) /* 31CA5C 802BEA3C 3C128011 */ lui $s2, %hi(gPlayerStatus) /* 31CA60 802BEA40 2652EFC8 */ addiu $s2, $s2, %lo(gPlayerStatus) -/* 31CA64 802BEA44 3C028011 */ lui $v0, %hi(D_8010EBB0) -/* 31CA68 802BEA48 2442EBB0 */ addiu $v0, $v0, %lo(D_8010EBB0) +/* 31CA64 802BEA44 3C028011 */ lui $v0, %hi(gPartnerActionStatus) +/* 31CA68 802BEA48 2442EBB0 */ addiu $v0, $v0, %lo(gPartnerActionStatus) /* 31CA6C 802BEA4C AFBF0020 */ sw $ra, 0x20($sp) /* 31CA70 802BEA50 AFB3001C */ sw $s3, 0x1c($sp) /* 31CA74 802BEA54 AFB00010 */ sw $s0, 0x10($sp) diff --git a/ver/us/asm/nonmatchings/world/partner/lakilester/func_802BD6BC_32120C.s b/ver/us/asm/nonmatchings/world/partner/lakilester/func_802BD6BC_32120C.s index cb6831512d..fa88e63611 100644 --- a/ver/us/asm/nonmatchings/world/partner/lakilester/func_802BD6BC_32120C.s +++ b/ver/us/asm/nonmatchings/world/partner/lakilester/func_802BD6BC_32120C.s @@ -9,8 +9,8 @@ glabel func_802BD6BC_32120C /* 32121C 802BD6CC 00A0882D */ daddu $s1, $a1, $zero /* 321220 802BD6D0 F7B40020 */ sdc1 $f20, 0x20($sp) /* 321224 802BD6D4 4480A000 */ mtc1 $zero, $f20 -/* 321228 802BD6D8 3C038011 */ lui $v1, %hi(D_8010EBB0) -/* 32122C 802BD6DC 2463EBB0 */ addiu $v1, $v1, %lo(D_8010EBB0) +/* 321228 802BD6D8 3C038011 */ lui $v1, %hi(gPartnerActionStatus) +/* 32122C 802BD6DC 2463EBB0 */ addiu $v1, $v1, %lo(gPartnerActionStatus) /* 321230 802BD6E0 AFBF0018 */ sw $ra, 0x18($sp) /* 321234 802BD6E4 F7BA0038 */ sdc1 $f26, 0x38($sp) /* 321238 802BD6E8 F7B80030 */ sdc1 $f24, 0x30($sp) diff --git a/ver/us/asm/nonmatchings/world/partner/lakilester/func_802BDDD8_321928.s b/ver/us/asm/nonmatchings/world/partner/lakilester/func_802BDDD8_321928.s index 433bd17b8a..29f6dfabab 100644 --- a/ver/us/asm/nonmatchings/world/partner/lakilester/func_802BDDD8_321928.s +++ b/ver/us/asm/nonmatchings/world/partner/lakilester/func_802BDDD8_321928.s @@ -131,8 +131,8 @@ glabel func_802BDDD8_321928 /* 321B08 802BDFB8 27A70038 */ addiu $a3, $sp, 0x38 /* 321B0C 802BDFBC 1040000D */ beqz $v0, .L802BDFF4 /* 321B10 802BDFC0 00000000 */ nop -/* 321B14 802BDFC4 3C028011 */ lui $v0, %hi(D_8010EBB0) -/* 321B18 802BDFC8 2442EBB0 */ addiu $v0, $v0, %lo(D_8010EBB0) +/* 321B14 802BDFC4 3C028011 */ lui $v0, %hi(gPartnerActionStatus) +/* 321B18 802BDFC8 2442EBB0 */ addiu $v0, $v0, %lo(gPartnerActionStatus) /* 321B1C 802BDFCC 8C42000C */ lw $v0, 0xc($v0) /* 321B20 802BDFD0 30428000 */ andi $v0, $v0, 0x8000 /* 321B24 802BDFD4 10400005 */ beqz $v0, .L802BDFEC diff --git a/ver/us/asm/nonmatchings/world/partner/lakilester/func_802BE724_322274.s b/ver/us/asm/nonmatchings/world/partner/lakilester/func_802BE724_322274.s index e40702a29e..4f55cc53d5 100644 --- a/ver/us/asm/nonmatchings/world/partner/lakilester/func_802BE724_322274.s +++ b/ver/us/asm/nonmatchings/world/partner/lakilester/func_802BE724_322274.s @@ -11,8 +11,8 @@ glabel func_802BE724_322274 /* 32228C 802BE73C 3C128011 */ lui $s2, %hi(gPlayerStatus) /* 322290 802BE740 2652EFC8 */ addiu $s2, $s2, %lo(gPlayerStatus) /* 322294 802BE744 AFB50044 */ sw $s5, 0x44($sp) -/* 322298 802BE748 3C158011 */ lui $s5, %hi(D_8010EBB0) -/* 32229C 802BE74C 26B5EBB0 */ addiu $s5, $s5, %lo(D_8010EBB0) +/* 322298 802BE748 3C158011 */ lui $s5, %hi(gPartnerActionStatus) +/* 32229C 802BE74C 26B5EBB0 */ addiu $s5, $s5, %lo(gPartnerActionStatus) /* 3222A0 802BE750 AFBF0048 */ sw $ra, 0x48($sp) /* 3222A4 802BE754 AFB3003C */ sw $s3, 0x3c($sp) /* 3222A8 802BE758 AFB10034 */ sw $s1, 0x34($sp) diff --git a/ver/us/asm/nonmatchings/world/partner/lakilester/func_802BF4F0_323040.s b/ver/us/asm/nonmatchings/world/partner/lakilester/func_802BF4F0_323040.s index a98d9df68c..3864f460a5 100644 --- a/ver/us/asm/nonmatchings/world/partner/lakilester/func_802BF4F0_323040.s +++ b/ver/us/asm/nonmatchings/world/partner/lakilester/func_802BF4F0_323040.s @@ -7,8 +7,8 @@ glabel func_802BF4F0_323040 /* 323048 802BF4F8 3C128011 */ lui $s2, %hi(gPlayerStatus) /* 32304C 802BF4FC 2652EFC8 */ addiu $s2, $s2, %lo(gPlayerStatus) /* 323050 802BF500 AFB3003C */ sw $s3, 0x3c($sp) -/* 323054 802BF504 3C138011 */ lui $s3, %hi(D_8010EBB0) -/* 323058 802BF508 2673EBB0 */ addiu $s3, $s3, %lo(D_8010EBB0) +/* 323054 802BF504 3C138011 */ lui $s3, %hi(gPartnerActionStatus) +/* 323058 802BF508 2673EBB0 */ addiu $s3, $s3, %lo(gPartnerActionStatus) /* 32305C 802BF50C AFBF0040 */ sw $ra, 0x40($sp) /* 323060 802BF510 AFB10034 */ sw $s1, 0x34($sp) /* 323064 802BF514 AFB00030 */ sw $s0, 0x30($sp) diff --git a/ver/us/asm/nonmatchings/world/partner/lakilester/func_802BFA00_323550.s b/ver/us/asm/nonmatchings/world/partner/lakilester/func_802BFA00_323550.s index 73977b02fb..eb36e089a3 100644 --- a/ver/us/asm/nonmatchings/world/partner/lakilester/func_802BFA00_323550.s +++ b/ver/us/asm/nonmatchings/world/partner/lakilester/func_802BFA00_323550.s @@ -8,8 +8,8 @@ glabel func_802BFA00_323550 /* 32355C 802BFA0C AFB00010 */ sw $s0, 0x10($sp) /* 323560 802BFA10 0080802D */ daddu $s0, $a0, $zero /* 323564 802BFA14 AFB10014 */ sw $s1, 0x14($sp) -/* 323568 802BFA18 3C118011 */ lui $s1, %hi(D_8010EBB0) -/* 32356C 802BFA1C 2631EBB0 */ addiu $s1, $s1, %lo(D_8010EBB0) +/* 323568 802BFA18 3C118011 */ lui $s1, %hi(gPartnerActionStatus) +/* 32356C 802BFA1C 2631EBB0 */ addiu $s1, $s1, %lo(gPartnerActionStatus) /* 323570 802BFA20 10400018 */ beqz $v0, .L802BFA84 /* 323574 802BFA24 AFBF0018 */ sw $ra, 0x18($sp) /* 323578 802BFA28 26230018 */ addiu $v1, $s1, 0x18 diff --git a/ver/us/asm/nonmatchings/world/partner/lakilester/func_802BFAA8_3235F8.s b/ver/us/asm/nonmatchings/world/partner/lakilester/func_802BFAA8_3235F8.s index 700d889364..7234e7b6f6 100644 --- a/ver/us/asm/nonmatchings/world/partner/lakilester/func_802BFAA8_3235F8.s +++ b/ver/us/asm/nonmatchings/world/partner/lakilester/func_802BFAA8_3235F8.s @@ -4,8 +4,8 @@ glabel func_802BFAA8_3235F8 /* 3235F8 802BFAA8 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 3235FC 802BFAAC AFB00010 */ sw $s0, 0x10($sp) -/* 323600 802BFAB0 3C108011 */ lui $s0, %hi(D_8010EBB0) -/* 323604 802BFAB4 2610EBB0 */ addiu $s0, $s0, %lo(D_8010EBB0) +/* 323600 802BFAB0 3C108011 */ lui $s0, %hi(gPartnerActionStatus) +/* 323604 802BFAB4 2610EBB0 */ addiu $s0, $s0, %lo(gPartnerActionStatus) /* 323608 802BFAB8 AFBF0014 */ sw $ra, 0x14($sp) /* 32360C 802BFABC 82020001 */ lb $v0, 1($s0) /* 323610 802BFAC0 1040001C */ beqz $v0, .L802BFB34 diff --git a/ver/us/asm/nonmatchings/world/partner/lakilester/func_802BFBA0_3236F0.s b/ver/us/asm/nonmatchings/world/partner/lakilester/func_802BFBA0_3236F0.s index 81a3c93c5f..6af36dcd24 100644 --- a/ver/us/asm/nonmatchings/world/partner/lakilester/func_802BFBA0_3236F0.s +++ b/ver/us/asm/nonmatchings/world/partner/lakilester/func_802BFBA0_3236F0.s @@ -13,8 +13,8 @@ glabel func_802BFBA0_3236F0 /* 323710 802BFBC0 AFB20018 */ sw $s2, 0x18($sp) /* 323714 802BFBC4 0C00EABB */ jal get_npc_unsafe /* 323718 802BFBC8 AFB10014 */ sw $s1, 0x14($sp) -/* 32371C 802BFBCC 3C148011 */ lui $s4, %hi(D_8010EBB0) -/* 323720 802BFBD0 2694EBB0 */ addiu $s4, $s4, %lo(D_8010EBB0) +/* 32371C 802BFBCC 3C148011 */ lui $s4, %hi(gPartnerActionStatus) +/* 323720 802BFBD0 2694EBB0 */ addiu $s4, $s4, %lo(gPartnerActionStatus) /* 323724 802BFBD4 3C128011 */ lui $s2, %hi(gPlayerStatus) /* 323728 802BFBD8 2652EFC8 */ addiu $s2, $s2, %lo(gPlayerStatus) /* 32372C 802BFBDC 12000002 */ beqz $s0, .L802BFBE8 diff --git a/ver/us/asm/nonmatchings/world/partner/parakarry/func_802BD660_319BD0.s b/ver/us/asm/nonmatchings/world/partner/parakarry/func_802BD660_319BD0.s index 69a4075846..70f9ddbe08 100644 --- a/ver/us/asm/nonmatchings/world/partner/parakarry/func_802BD660_319BD0.s +++ b/ver/us/asm/nonmatchings/world/partner/parakarry/func_802BD660_319BD0.s @@ -27,8 +27,8 @@ glabel func_802BD660_319BD0 /* 319BE8 802BD678 3C118011 */ lui $s1, %hi(gPlayerStatus) /* 319BEC 802BD67C 2631EFC8 */ addiu $s1, $s1, %lo(gPlayerStatus) /* 319BF0 802BD680 AFB70054 */ sw $s7, 0x54($sp) -/* 319BF4 802BD684 3C178011 */ lui $s7, %hi(D_8010EBB0) -/* 319BF8 802BD688 26F7EBB0 */ addiu $s7, $s7, %lo(D_8010EBB0) +/* 319BF4 802BD684 3C178011 */ lui $s7, %hi(gPartnerActionStatus) +/* 319BF8 802BD688 26F7EBB0 */ addiu $s7, $s7, %lo(gPartnerActionStatus) /* 319BFC 802BD68C AFBF005C */ sw $ra, 0x5c($sp) /* 319C00 802BD690 AFBE0058 */ sw $fp, 0x58($sp) /* 319C04 802BD694 AFB60050 */ sw $s6, 0x50($sp) diff --git a/ver/us/asm/nonmatchings/world/partner/parakarry/func_802BE90C_31AE7C.s b/ver/us/asm/nonmatchings/world/partner/parakarry/func_802BE90C_31AE7C.s index 73286bbc19..dd03a052b9 100644 --- a/ver/us/asm/nonmatchings/world/partner/parakarry/func_802BE90C_31AE7C.s +++ b/ver/us/asm/nonmatchings/world/partner/parakarry/func_802BE90C_31AE7C.s @@ -8,8 +8,8 @@ glabel func_802BE90C_31AE7C /* 31AE88 802BE918 AFB00010 */ sw $s0, 0x10($sp) /* 31AE8C 802BE91C 0080802D */ daddu $s0, $a0, $zero /* 31AE90 802BE920 AFB10014 */ sw $s1, 0x14($sp) -/* 31AE94 802BE924 3C118011 */ lui $s1, %hi(D_8010EBB0) -/* 31AE98 802BE928 2631EBB0 */ addiu $s1, $s1, %lo(D_8010EBB0) +/* 31AE94 802BE924 3C118011 */ lui $s1, %hi(gPartnerActionStatus) +/* 31AE98 802BE928 2631EBB0 */ addiu $s1, $s1, %lo(gPartnerActionStatus) /* 31AE9C 802BE92C 10400021 */ beqz $v0, .L802BE9B4 /* 31AEA0 802BE930 AFBF0018 */ sw $ra, 0x18($sp) /* 31AEA4 802BE934 3C02802C */ lui $v0, %hi(D_802BEBB8) diff --git a/ver/us/asm/nonmatchings/world/partner/parakarry/func_802BE9D0_31AF40.s b/ver/us/asm/nonmatchings/world/partner/parakarry/func_802BE9D0_31AF40.s index 4e3958aa21..8494ec0c61 100644 --- a/ver/us/asm/nonmatchings/world/partner/parakarry/func_802BE9D0_31AF40.s +++ b/ver/us/asm/nonmatchings/world/partner/parakarry/func_802BE9D0_31AF40.s @@ -4,8 +4,8 @@ glabel func_802BE9D0_31AF40 /* 31AF40 802BE9D0 27BDFFE0 */ addiu $sp, $sp, -0x20 /* 31AF44 802BE9D4 AFB00010 */ sw $s0, 0x10($sp) -/* 31AF48 802BE9D8 3C108011 */ lui $s0, %hi(D_8010EBB0) -/* 31AF4C 802BE9DC 2610EBB0 */ addiu $s0, $s0, %lo(D_8010EBB0) +/* 31AF48 802BE9D8 3C108011 */ lui $s0, %hi(gPartnerActionStatus) +/* 31AF4C 802BE9DC 2610EBB0 */ addiu $s0, $s0, %lo(gPartnerActionStatus) /* 31AF50 802BE9E0 AFBF0018 */ sw $ra, 0x18($sp) /* 31AF54 802BE9E4 AFB10014 */ sw $s1, 0x14($sp) /* 31AF58 802BE9E8 82020001 */ lb $v0, 1($s0) diff --git a/ver/us/asm/nonmatchings/world/partner/sushie/func_802BD20C_31DF7C.s b/ver/us/asm/nonmatchings/world/partner/sushie/func_802BD20C_31DF7C.s index d82e761955..90928e0452 100644 --- a/ver/us/asm/nonmatchings/world/partner/sushie/func_802BD20C_31DF7C.s +++ b/ver/us/asm/nonmatchings/world/partner/sushie/func_802BD20C_31DF7C.s @@ -9,8 +9,8 @@ glabel func_802BD20C_31DF7C /* 31DF8C 802BD21C 00A0982D */ daddu $s3, $a1, $zero /* 31DF90 802BD220 F7B40028 */ sdc1 $f20, 0x28($sp) /* 31DF94 802BD224 4480A000 */ mtc1 $zero, $f20 -/* 31DF98 802BD228 3C038011 */ lui $v1, %hi(D_8010EBB0) -/* 31DF9C 802BD22C 2463EBB0 */ addiu $v1, $v1, %lo(D_8010EBB0) +/* 31DF98 802BD228 3C038011 */ lui $v1, %hi(gPartnerActionStatus) +/* 31DF9C 802BD22C 2463EBB0 */ addiu $v1, $v1, %lo(gPartnerActionStatus) /* 31DFA0 802BD230 AFB00010 */ sw $s0, 0x10($sp) /* 31DFA4 802BD234 3C10802C */ lui $s0, %hi(D_802BFDB0_320B20) /* 31DFA8 802BD238 2610FDB0 */ addiu $s0, $s0, %lo(D_802BFDB0_320B20) diff --git a/ver/us/asm/nonmatchings/world/partner/sushie/func_802BD414_31E184.s b/ver/us/asm/nonmatchings/world/partner/sushie/func_802BD414_31E184.s index 8d84897136..a2c02d9e72 100644 --- a/ver/us/asm/nonmatchings/world/partner/sushie/func_802BD414_31E184.s +++ b/ver/us/asm/nonmatchings/world/partner/sushie/func_802BD414_31E184.s @@ -33,8 +33,8 @@ glabel func_802BD414_31E184 /* 31E1C0 802BD450 27A50024 */ addiu $a1, $sp, 0x24 /* 31E1C4 802BD454 3C148011 */ lui $s4, %hi(gPlayerStatus) /* 31E1C8 802BD458 2694EFC8 */ addiu $s4, $s4, %lo(gPlayerStatus) -/* 31E1CC 802BD45C 3C158011 */ lui $s5, %hi(D_8010EBB0) -/* 31E1D0 802BD460 26B5EBB0 */ addiu $s5, $s5, %lo(D_8010EBB0) +/* 31E1CC 802BD45C 3C158011 */ lui $s5, %hi(gPartnerActionStatus) +/* 31E1D0 802BD460 26B5EBB0 */ addiu $s5, $s5, %lo(gPartnerActionStatus) /* 31E1D4 802BD464 3C118016 */ lui $s1, %hi(gCollisionStatus) /* 31E1D8 802BD468 2631A550 */ addiu $s1, $s1, %lo(gCollisionStatus) /* 31E1DC 802BD46C 3C02802C */ lui $v0, %hi(D_802BFEE4) diff --git a/ver/us/asm/nonmatchings/world/partner/sushie/func_802BE3A4_31F114.s b/ver/us/asm/nonmatchings/world/partner/sushie/func_802BE3A4_31F114.s index ab0adec17a..8c9974e8ab 100644 --- a/ver/us/asm/nonmatchings/world/partner/sushie/func_802BE3A4_31F114.s +++ b/ver/us/asm/nonmatchings/world/partner/sushie/func_802BE3A4_31F114.s @@ -25,8 +25,8 @@ glabel func_802BE3A4_31F114 /* 31F13C 802BE3CC 3C168016 */ lui $s6, %hi(gCollisionStatus) /* 31F140 802BE3D0 26D6A550 */ addiu $s6, $s6, %lo(gCollisionStatus) /* 31F144 802BE3D4 AFB40058 */ sw $s4, 0x58($sp) -/* 31F148 802BE3D8 3C148011 */ lui $s4, %hi(D_8010EBB0) -/* 31F14C 802BE3DC 2694EBB0 */ addiu $s4, $s4, %lo(D_8010EBB0) +/* 31F148 802BE3D8 3C148011 */ lui $s4, %hi(gPartnerActionStatus) +/* 31F14C 802BE3DC 2694EBB0 */ addiu $s4, $s4, %lo(gPartnerActionStatus) /* 31F150 802BE3E0 AFBF0064 */ sw $ra, 0x64($sp) /* 31F154 802BE3E4 AFB30054 */ sw $s3, 0x54($sp) /* 31F158 802BE3E8 AFB1004C */ sw $s1, 0x4c($sp) diff --git a/ver/us/asm/nonmatchings/world/partner/sushie/func_802BF9B8_320728.s b/ver/us/asm/nonmatchings/world/partner/sushie/func_802BF9B8_320728.s index 36f297f739..8687ad7cf1 100644 --- a/ver/us/asm/nonmatchings/world/partner/sushie/func_802BF9B8_320728.s +++ b/ver/us/asm/nonmatchings/world/partner/sushie/func_802BF9B8_320728.s @@ -8,8 +8,8 @@ glabel func_802BF9B8_320728 /* 320734 802BF9C4 AFB00010 */ sw $s0, 0x10($sp) /* 320738 802BF9C8 0080802D */ daddu $s0, $a0, $zero /* 32073C 802BF9CC AFB10014 */ sw $s1, 0x14($sp) -/* 320740 802BF9D0 3C118011 */ lui $s1, %hi(D_8010EBB0) -/* 320744 802BF9D4 2631EBB0 */ addiu $s1, $s1, %lo(D_8010EBB0) +/* 320740 802BF9D0 3C118011 */ lui $s1, %hi(gPartnerActionStatus) +/* 320744 802BF9D4 2631EBB0 */ addiu $s1, $s1, %lo(gPartnerActionStatus) /* 320748 802BF9D8 10400018 */ beqz $v0, .L802BFA3C /* 32074C 802BF9DC AFBF0018 */ sw $ra, 0x18($sp) /* 320750 802BF9E0 26230018 */ addiu $v1, $s1, 0x18 diff --git a/ver/us/asm/nonmatchings/world/partner/sushie/func_802BFA58_3207C8.s b/ver/us/asm/nonmatchings/world/partner/sushie/func_802BFA58_3207C8.s index 9ac3b63a41..8b98a8fe4e 100644 --- a/ver/us/asm/nonmatchings/world/partner/sushie/func_802BFA58_3207C8.s +++ b/ver/us/asm/nonmatchings/world/partner/sushie/func_802BFA58_3207C8.s @@ -3,8 +3,8 @@ glabel func_802BFA58_3207C8 /* 3207C8 802BFA58 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 3207CC 802BFA5C 3C038011 */ lui $v1, %hi(D_8010EBB0) -/* 3207D0 802BFA60 2463EBB0 */ addiu $v1, $v1, %lo(D_8010EBB0) +/* 3207CC 802BFA5C 3C038011 */ lui $v1, %hi(gPartnerActionStatus) +/* 3207D0 802BFA60 2463EBB0 */ addiu $v1, $v1, %lo(gPartnerActionStatus) /* 3207D4 802BFA64 AFBF0010 */ sw $ra, 0x10($sp) /* 3207D8 802BFA68 80620001 */ lb $v0, 1($v1) /* 3207DC 802BFA6C 1040000F */ beqz $v0, .L802BFAAC diff --git a/ver/us/asm/nonmatchings/world/partner/watt/func_802BD2B4_31CE24.s b/ver/us/asm/nonmatchings/world/partner/watt/func_802BD2B4_31CE24.s index 037db619f1..750d894074 100644 --- a/ver/us/asm/nonmatchings/world/partner/watt/func_802BD2B4_31CE24.s +++ b/ver/us/asm/nonmatchings/world/partner/watt/func_802BD2B4_31CE24.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_802BD2B4_31CE24 -/* 31CE24 802BD2B4 3C028011 */ lui $v0, %hi(D_8010EBB0+0x1) -/* 31CE28 802BD2B8 8042EBB1 */ lb $v0, %lo(D_8010EBB0+0x1)($v0) +/* 31CE24 802BD2B4 3C028011 */ lui $v0, %hi(gPartnerActionStatus+0x1) +/* 31CE28 802BD2B8 8042EBB1 */ lb $v0, %lo(gPartnerActionStatus+0x1)($v0) /* 31CE2C 802BD2BC 27BDFFC8 */ addiu $sp, $sp, -0x38 /* 31CE30 802BD2C0 AFB00018 */ sw $s0, 0x18($sp) /* 31CE34 802BD2C4 3C108011 */ lui $s0, %hi(gPlayerData) diff --git a/ver/us/asm/nonmatchings/world/partner/watt/func_802BD754_31D2C4.s b/ver/us/asm/nonmatchings/world/partner/watt/func_802BD754_31D2C4.s index 8e912c0427..38e54f6296 100644 --- a/ver/us/asm/nonmatchings/world/partner/watt/func_802BD754_31D2C4.s +++ b/ver/us/asm/nonmatchings/world/partner/watt/func_802BD754_31D2C4.s @@ -9,8 +9,8 @@ glabel func_802BD754_31D2C4 /* 31D2D4 802BD764 3C128011 */ lui $s2, %hi(gPlayerStatus) /* 31D2D8 802BD768 2652EFC8 */ addiu $s2, $s2, %lo(gPlayerStatus) /* 31D2DC 802BD76C AFB50024 */ sw $s5, 0x24($sp) -/* 31D2E0 802BD770 3C158011 */ lui $s5, %hi(D_8010EBB0) -/* 31D2E4 802BD774 26B5EBB0 */ addiu $s5, $s5, %lo(D_8010EBB0) +/* 31D2E0 802BD770 3C158011 */ lui $s5, %hi(gPartnerActionStatus) +/* 31D2E4 802BD774 26B5EBB0 */ addiu $s5, $s5, %lo(gPartnerActionStatus) /* 31D2E8 802BD778 AFBF0028 */ sw $ra, 0x28($sp) /* 31D2EC 802BD77C AFB40020 */ sw $s4, 0x20($sp) /* 31D2F0 802BD780 AFB10014 */ sw $s1, 0x14($sp) diff --git a/ver/us/asm/nonmatchings/world/partner/watt/func_802BDD0C_31D87C.s b/ver/us/asm/nonmatchings/world/partner/watt/func_802BDD0C_31D87C.s index d530e786b3..e11ebbedef 100644 --- a/ver/us/asm/nonmatchings/world/partner/watt/func_802BDD0C_31D87C.s +++ b/ver/us/asm/nonmatchings/world/partner/watt/func_802BDD0C_31D87C.s @@ -7,8 +7,8 @@ glabel func_802BDD0C_31D87C /* 31D884 802BDD14 3C128011 */ lui $s2, %hi(gPlayerStatus) /* 31D888 802BDD18 2652EFC8 */ addiu $s2, $s2, %lo(gPlayerStatus) /* 31D88C 802BDD1C AFB10014 */ sw $s1, 0x14($sp) -/* 31D890 802BDD20 3C118011 */ lui $s1, %hi(D_8010EBB0) -/* 31D894 802BDD24 2631EBB0 */ addiu $s1, $s1, %lo(D_8010EBB0) +/* 31D890 802BDD20 3C118011 */ lui $s1, %hi(gPartnerActionStatus) +/* 31D894 802BDD24 2631EBB0 */ addiu $s1, $s1, %lo(gPartnerActionStatus) /* 31D898 802BDD28 AFBF001C */ sw $ra, 0x1c($sp) /* 31D89C 802BDD2C AFB00010 */ sw $s0, 0x10($sp) /* 31D8A0 802BDD30 10A00011 */ beqz $a1, .L802BDD78 diff --git a/ver/us/asm/nonmatchings/world/partner/watt/func_802BDD9C_31D90C.s b/ver/us/asm/nonmatchings/world/partner/watt/func_802BDD9C_31D90C.s index 4c43abdf5f..d5dcf91a5a 100644 --- a/ver/us/asm/nonmatchings/world/partner/watt/func_802BDD9C_31D90C.s +++ b/ver/us/asm/nonmatchings/world/partner/watt/func_802BDD9C_31D90C.s @@ -5,8 +5,8 @@ glabel func_802BDD9C_31D90C /* 31D90C 802BDD9C 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 31D910 802BDDA0 3C02802C */ lui $v0, %hi(D_802BE30C) /* 31D914 802BDDA4 8C42E30C */ lw $v0, %lo(D_802BE30C)($v0) -/* 31D918 802BDDA8 3C068011 */ lui $a2, %hi(D_8010EBB0) -/* 31D91C 802BDDAC 24C6EBB0 */ addiu $a2, $a2, %lo(D_8010EBB0) +/* 31D918 802BDDA8 3C068011 */ lui $a2, %hi(gPartnerActionStatus) +/* 31D91C 802BDDAC 24C6EBB0 */ addiu $a2, $a2, %lo(gPartnerActionStatus) /* 31D920 802BDDB0 10400012 */ beqz $v0, .L802BDDFC /* 31D924 802BDDB4 AFBF0010 */ sw $ra, 0x10($sp) /* 31D928 802BDDB8 24C30018 */ addiu $v1, $a2, 0x18 diff --git a/ver/us/asm/nonmatchings/world/partner/watt/func_802BDE10_31D980.s b/ver/us/asm/nonmatchings/world/partner/watt/func_802BDE10_31D980.s index 939a736530..5d60ff19db 100644 --- a/ver/us/asm/nonmatchings/world/partner/watt/func_802BDE10_31D980.s +++ b/ver/us/asm/nonmatchings/world/partner/watt/func_802BDE10_31D980.s @@ -5,8 +5,8 @@ glabel func_802BDE10_31D980 /* 31D980 802BDE10 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 31D984 802BDE14 AFB00010 */ sw $s0, 0x10($sp) /* 31D988 802BDE18 0080802D */ daddu $s0, $a0, $zero -/* 31D98C 802BDE1C 3C048011 */ lui $a0, %hi(D_8010EBB0) -/* 31D990 802BDE20 2484EBB0 */ addiu $a0, $a0, %lo(D_8010EBB0) +/* 31D98C 802BDE1C 3C048011 */ lui $a0, %hi(gPartnerActionStatus) +/* 31D990 802BDE20 2484EBB0 */ addiu $a0, $a0, %lo(gPartnerActionStatus) /* 31D994 802BDE24 AFBF0014 */ sw $ra, 0x14($sp) /* 31D998 802BDE28 80820001 */ lb $v0, 1($a0) /* 31D99C 802BDE2C 10400012 */ beqz $v0, .L802BDE78 diff --git a/ver/us/asm/nonmatchings/world/partner/watt/func_802BDE88_31D9F8.s b/ver/us/asm/nonmatchings/world/partner/watt/func_802BDE88_31D9F8.s index d09d52d7a1..f5c8042575 100644 --- a/ver/us/asm/nonmatchings/world/partner/watt/func_802BDE88_31D9F8.s +++ b/ver/us/asm/nonmatchings/world/partner/watt/func_802BDE88_31D9F8.s @@ -13,8 +13,8 @@ glabel func_802BDE88_31D9F8 /* 31DA18 802BDEA8 AFB3001C */ sw $s3, 0x1c($sp) /* 31DA1C 802BDEAC 0C00EABB */ jal get_npc_unsafe /* 31DA20 802BDEB0 AFB20018 */ sw $s2, 0x18($sp) -/* 31DA24 802BDEB4 3C148011 */ lui $s4, %hi(D_8010EBB0) -/* 31DA28 802BDEB8 2694EBB0 */ addiu $s4, $s4, %lo(D_8010EBB0) +/* 31DA24 802BDEB4 3C148011 */ lui $s4, %hi(gPartnerActionStatus) +/* 31DA28 802BDEB8 2694EBB0 */ addiu $s4, $s4, %lo(gPartnerActionStatus) /* 31DA2C 802BDEBC 3C138011 */ lui $s3, %hi(gPlayerStatus) /* 31DA30 802BDEC0 2673EFC8 */ addiu $s3, $s3, %lo(gPlayerStatus) /* 31DA34 802BDEC4 12000002 */ beqz $s0, .L802BDED0 diff --git a/ver/us/asm/nonmatchings/world/partner/watt/func_802BE070_31DBE0.s b/ver/us/asm/nonmatchings/world/partner/watt/func_802BE070_31DBE0.s index 0cc6280b07..ab79189bda 100644 --- a/ver/us/asm/nonmatchings/world/partner/watt/func_802BE070_31DBE0.s +++ b/ver/us/asm/nonmatchings/world/partner/watt/func_802BE070_31DBE0.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_802BE070_31DBE0 -/* 31DBE0 802BE070 3C028011 */ lui $v0, %hi(D_8010EBB0) -/* 31DBE4 802BE074 8042EBB0 */ lb $v0, %lo(D_8010EBB0)($v0) +/* 31DBE0 802BE070 3C028011 */ lui $v0, %hi(gPartnerActionStatus) +/* 31DBE4 802BE074 8042EBB0 */ lb $v0, %lo(gPartnerActionStatus)($v0) /* 31DBE8 802BE078 27BDFFC8 */ addiu $sp, $sp, -0x38 /* 31DBEC 802BE07C AFBF0024 */ sw $ra, 0x24($sp) /* 31DBF0 802BE080 AFB40020 */ sw $s4, 0x20($sp) diff --git a/ver/us/asm/nonmatchings/world/partners/_use_partner_ability.s b/ver/us/asm/nonmatchings/world/partners/_use_partner_ability.s index fefd0c8990..b073b80e63 100644 --- a/ver/us/asm/nonmatchings/world/partners/_use_partner_ability.s +++ b/ver/us/asm/nonmatchings/world/partners/_use_partner_ability.s @@ -13,8 +13,8 @@ glabel _use_partner_ability /* 83B80 800EA6D0 AFB3001C */ sw $s3, 0x1c($sp) /* 83B84 800EA6D4 3C138011 */ lui $s3, %hi(gPlayerData) /* 83B88 800EA6D8 2673F290 */ addiu $s3, $s3, %lo(gPlayerData) -/* 83B8C 800EA6DC 3C058011 */ lui $a1, %hi(D_8010EBB0) -/* 83B90 800EA6E0 24A5EBB0 */ addiu $a1, $a1, %lo(D_8010EBB0) +/* 83B8C 800EA6DC 3C058011 */ lui $a1, %hi(gPartnerActionStatus) +/* 83B90 800EA6E0 24A5EBB0 */ addiu $a1, $a1, %lo(gPartnerActionStatus) /* 83B94 800EA6E4 AFBF0020 */ sw $ra, 0x20($sp) /* 83B98 800EA6E8 AFB20018 */ sw $s2, 0x18($sp) /* 83B9C 800EA6EC AFB10014 */ sw $s1, 0x14($sp) diff --git a/ver/us/asm/nonmatchings/world/partners/partner_flying_update_motion.s b/ver/us/asm/nonmatchings/world/partners/partner_flying_update_motion.s index fe6f9df3d3..e2dad58fba 100644 --- a/ver/us/asm/nonmatchings/world/partners/partner_flying_update_motion.s +++ b/ver/us/asm/nonmatchings/world/partners/partner_flying_update_motion.s @@ -16,8 +16,8 @@ glabel partner_flying_update_motion /* 86AAC 800ED5FC AFB3003C */ sw $s3, 0x3c($sp) /* 86AB0 800ED600 AFB10034 */ sw $s1, 0x34($sp) /* 86AB4 800ED604 80420081 */ lb $v0, 0x81($v0) -/* 86AB8 800ED608 3C118011 */ lui $s1, %hi(D_8010EBB0) -/* 86ABC 800ED60C 2631EBB0 */ addiu $s1, $s1, %lo(D_8010EBB0) +/* 86AB8 800ED608 3C118011 */ lui $s1, %hi(gPartnerActionStatus) +/* 86ABC 800ED60C 2631EBB0 */ addiu $s1, $s1, %lo(gPartnerActionStatus) /* 86AC0 800ED610 1040000B */ beqz $v0, .L800ED640 /* 86AC4 800ED614 0080802D */ daddu $s0, $a0, $zero /* 86AC8 800ED618 8E420000 */ lw $v0, ($s2) diff --git a/ver/us/main_bss_syms.txt b/ver/us/main_bss_syms.txt index 2435c3c73c..d445ccedb1 100644 --- a/ver/us/main_bss_syms.txt +++ b/ver/us/main_bss_syms.txt @@ -341,7 +341,7 @@ D_8010C934 = 0x8010C934; D_8010C938 = 0x8010C938; D_8010C93C = 0x8010C93C; D_8010C940 = 0x8010C940; -D_8010C944 = 0x8010C944; +gSpinHistoryBufferPos = 0x8010C944; D_8010C94C = 0x8010C94C; D_8010C950 = 0x8010C950; D_8010C954 = 0x8010C954; @@ -436,10 +436,10 @@ D_8010D69C = 0x8010D69C; D_8010D6A0 = 0x8010D6A0; D_8010D6A4 = 0x8010D6A4; D_8010D6B0 = 0x8010D6B0; -D_8010EBB0 = 0x8010EBB0; -D_8010EF10 = 0x8010EF10; -D_8010EF28 = 0x8010EF28; -D_8010EF40 = 0x8010EF40; +gPartnerActionStatus = 0x8010EBB0; +gSpinHistoryPosY = 0x8010EF10; +gSpinHistoryPosX = 0x8010EF28; +gSpinHistoryPosZ = 0x8010EF40; gUIStatus = 0x8010EF58; D_8010EF92 = 0x8010EF92; D_8010EF9C = 0x8010EF9C; @@ -450,4 +450,4 @@ gPlayerActionState = 0x8010F07C; gPlayerAnimation = 0x8010F080; D_8010F250 = 0x8010F250; gPlayerData = 0x8010F290; -D_8010F6B8 = 0x8010F6B8; +gSpinHistoryPosAngle = 0x8010F6B8; diff --git a/ver/us/splat.yaml b/ver/us/splat.yaml index 583ab66562..9a521aa5e4 100644 --- a/ver/us/splat.yaml +++ b/ver/us/splat.yaml @@ -256,9 +256,28 @@ segments: - [0x4F660, .data, rumble] - [0x4F670, .data, 43F0] - [0x4F9D0, .data, fio] - - [0x4F9E0, data, 6e40_beginning_data] - - [0x51540, ia8, ui/no_controller, 128, 32] - - [0x52540, .data, curtains] + - start: 0x4F9E0 + type: .data + name: curtains + subsegments: + - [0x4F9E0, .data, curtains] + - [0x4F9E0, i4, sprite/unk_checkers, 16, 32] + - [0x4FAE0] + - [0x4FB30, rgba32, sprite/curtains, 32, 32] + - [0x50B30] + - [0x50B80, ci4, sprite/checkers, 32, 16] + - [0x50C80, palette, sprite/checkers] + - [0x50CA0] + - [0x50D20, vtx, vtx/curtains1] + - [0x50D80, vtx, vtx/curtains2] + - [0x50DE0, vtx, vtx/curtains3] + - [0x50F70, vtx, vtx/curtains4] + - [0x50FB0, vtx, vtx/curtains5] + - [0x50FF0, vtx, vtx/curtains6] + - [0x511E0, vtx, vtx/curtains7] + - [0x51260] + - [0x51540, ia8, ui/no_controller, 128, 32] + - [0x52540] - [0x52610, .data, crash] - [0x527F0, .data, os/nusys/nuGfxTaskMgr] - [0x52800, .data, os/nusys/nuSiMgr] @@ -346,6 +365,7 @@ segments: - [0x77480, c, 77480] - [0x7B440, c, 7B440] - [0x7BB60, c, 7bb60_len_41b0] + - [0x7E9D0, c, 7E9D0] - [0x7FD10, c, 7fd10_len_b40] - [0x80850, c, 80850_len_3060] - [0x838B0, c, world/actions] # DUMMY ROM diff --git a/ver/us/symbol_addrs.txt b/ver/us/symbol_addrs.txt index 08a83ab55e..24e257ceb7 100644 --- a/ver/us/symbol_addrs.txt +++ b/ver/us/symbol_addrs.txt @@ -18690,7 +18690,7 @@ D_8010C934 = 0x8010C934; // type:data D_8010C938 = 0x8010C938; // type:data D_8010C93C = 0x8010C93C; // type:data D_8010C940 = 0x8010C940; // type:data -D_8010C944 = 0x8010C944; // type:data +gSpinHistoryBufferPos = 0x8010C944; // type:data D_8010C94C = 0x8010C94C; // type:data D_8010C950 = 0x8010C950; // type:data D_8010C954 = 0x8010C954; // type:data @@ -18785,10 +18785,10 @@ D_8010D69C = 0x8010D69C; // type:data D_8010D6A0 = 0x8010D6A0; // type:data D_8010D6A4 = 0x8010D6A4; // type:data D_8010D6B0 = 0x8010D6B0; // type:data -D_8010EBB0 = 0x8010EBB0; // type:data size:0x35C -D_8010EF10 = 0x8010EF10; // type:data -D_8010EF28 = 0x8010EF28; // type:data -D_8010EF40 = 0x8010EF40; // type:data +gPartnerActionStatus = 0x8010EBB0; // type:data size:0x35C +gSpinHistoryPosY = 0x8010EF10; // type:data +gSpinHistoryPosX = 0x8010EF28; // type:data +gSpinHistoryPosZ = 0x8010EF40; // type:data gUIStatus = 0x8010EF58; // D_8010EF92 = 0x8010EF92; // type:data D_8010EF9C = 0x8010EF9C; // type:data @@ -18799,7 +18799,7 @@ gPlayerActionState = 0x8010F07C; // gPlayerAnimation = 0x8010F080; // D_8010F250 = 0x8010F250; // type:data gPlayerData = 0x8010F290; // size:0x340 -D_8010F6B8 = 0x8010F6B8; // type:data +gSpinHistoryPosAngle = 0x8010F6B8; // type:data D_80117160 = 0x80117160; // type:data D_80117163 = 0x80117163; // type:data D_80117578 = 0x80117578; // type:data diff --git a/ver/us/undefined_syms.txt b/ver/us/undefined_syms.txt index 98aebac64f..e787c79dfc 100644 --- a/ver/us/undefined_syms.txt +++ b/ver/us/undefined_syms.txt @@ -58,3 +58,5 @@ B_80240FD0_tst_04 = 0x80240FD0; D_802EF0D0 = 0x802EF0D0; D_800FBB60 = 0x800FBB60; D_800FBBE0 = 0x800FBBE0; +D_7012BC11 = 0x7012BC11; +D_7012ACA1 = 0x7012ACA1;