From 41c304137d08efac26bef220f4c2b3ca3bb999c4 Mon Sep 17 00:00:00 2001 From: HailSanta <53960937+HailSanta@users.noreply.github.com> Date: Fri, 14 Jan 2022 13:54:45 -0500 Subject: [PATCH] hud and item script names (#617) * hud script names 1 * more hud elements! * battle hud scripts * names for some item globals * hud elem scripts for items * item entity names * cleanup and missing struct in partners * more partner cleanup * battle stuff * fix some warnings? * resolve stuff * fix symbol_addrs * minor fixes * splat pause_icon_table.data.s * glabel -> dlabel * rom addrs * fix splat stuff * data splits, warnings * split more hud scripts * added symbols for battle menu * finished hud scripts fot 415D90 * entity documentation * entity documentation * more consistent name Co-authored-by: HailSanta Co-authored-by: Ethan Roseman --- include/common_structs.h | 36 +- include/dead.h | 2 +- include/enums.h | 76 +- include/functions.h | 99 +- include/macros.h | 2 + include/variables.h | 36 +- src/104730.c | 111 +- src/16c8e0.c | 26 +- src/17D6A0.c | 1 - src/182B30.c | 65 +- src/18F340.c | 10 +- src/1AF230.c | 2 +- src/415D90.c | 278 ++- src/77480.c | 16 +- src/80850_len_3060.c | 80 +- src/8a860_len_3f30.c | 44 +- src/C50A0.c | 6 +- src/a5dd0_len_114e0.c | 64 +- src/battle/action_cmd/07.c | 12 +- src/battle/action_cmd/0A.c | 14 +- src/battle/action_cmd/air_lift.c | 12 +- src/battle/action_cmd/air_raid.c | 12 +- src/battle/action_cmd/body_slam.c | 16 +- src/battle/action_cmd/bomb.c | 16 +- src/battle/action_cmd/break_free.c | 16 +- src/battle/action_cmd/dizzy_shell.c | 12 +- src/battle/action_cmd/fire_shell.c | 12 +- src/battle/action_cmd/flee.c | 24 +- src/battle/action_cmd/hammer.c | 28 +- src/battle/action_cmd/hurricane.c | 16 +- src/battle/action_cmd/jump.c | 14 +- src/battle/action_cmd/mega_shock.c | 24 +- src/battle/action_cmd/power_shock.c | 20 +- src/battle/action_cmd/smack.c | 16 +- src/battle/action_cmd/spiny_surge.c | 12 +- src/battle/action_cmd/spook.c | 12 +- src/battle/action_cmd/squirt.c | 8 +- src/battle/action_cmd/stop_leech.c | 12 +- src/battle/action_cmd/tidal_wave.c | 8 +- src/battle/action_cmd/whirlwind.c | 4 +- src/battle/area_kkj/6DBDA0.c | 2 +- .../actor/spiked_para_jr_troopa.c | 2 +- src/battle/item/ItemRefund.inc.c | 2 +- src/battle/item/mystery.c | 4 +- src/bss2.c | 8 +- src/entity.c | 36 +- src/entity/ItemBlock.c | 59 +- src/evt/fa4c0_len_3bf0.c | 2 +- src/hud_element.h | 8 +- src/npc.c | 4 +- src/status_icons.c | 132 +- src/world/area_arn/arn_03/events.c | 2 +- src/world/area_dgb/dgb_00/BFA100.c | 2 +- src/world/area_dgb/dgb_04/C36530.c | 12 +- src/world/area_dgb/dgb_17/C55A60.c | 2 +- src/world/area_dro/dro_01/95B7E0.c | 2 +- src/world/area_flo/flo_08/CAED40.c | 14 +- src/world/area_flo/flo_16/CD1F10.c | 14 +- src/world/common/UnkFunc19.inc.c | 4 +- src/world/partner/bow.c | 4 +- src/world/partners.c | 298 ++- src/world/partners.h | 4 +- src/world/script_api/7E0E80.c | 8 +- ver/us/asm/data/10B610.data.s | 6 +- ver/us/asm/data/1AF2D0.data.s | 162 +- ver/us/asm/data/5B320.data.s | 1946 +++++++++-------- ver/us/asm/data/9DE60.data.s | 531 +++-- .../asm/data/battle/action_cmd/42CEB0.data.s | 4 +- ver/us/asm/data/pause/1422A0.data.s | 12 +- ver/us/asm/data/pause_icon_table.data.s | 228 ++ .../data/world/area_arn/arn_03/BE3570.data.s | 2 +- .../data/world/area_flo/flo_00/CA7050.data.s | 2 +- .../data/world/area_hos/hos_03/A26E00.data.s | 2 +- .../data/world/area_isk/isk_01/9785C0.data.s | 2 +- .../data/world/area_isk/isk_19/999BA0.data.s | 2 +- .../data/world/area_iwa/iwa_01/912990.data.s | 2 +- .../data/world/area_iwa/iwa_10/923FD0.data.s | 2 +- .../data/world/area_jan/jan_03/B435D0.data.s | 2 +- .../data/world/area_jan/jan_17/B83B20.data.s | 2 +- .../data/world/area_kkj/kkj_24/B069B0.data.s | 2 +- .../data/world/area_kkj/kkj_25/B0F280.data.s | 2 +- .../data/world/area_kmr/kmr_02/8C4A40.data.s | 2 +- .../data/world/area_kmr/kmr_04/8CB160.data.s | 2 +- .../data/world/area_kmr/kmr_07/8D49A0.data.s | 2 +- .../data/world/area_kmr/kmr_11/8DFBB0.data.s | 2 +- .../data/world/area_kpa/kpa_08/A4E250.data.s | 2 +- .../data/world/area_kpa/kpa_09/A506D0.data.s | 2 +- .../data/world/area_kpa/kpa_10/A51D90.data.s | 2 +- .../data/world/area_kpa/kpa_11/A53D80.data.s | 2 +- .../data/world/area_kpa/kpa_113/A9DA60.data.s | 2 +- .../data/world/area_kpa/kpa_13/A56BD0.data.s | 2 +- .../data/world/area_kpa/kpa_133/AA8290.data.s | 2 +- .../data/world/area_kpa/kpa_134/AAC3B0.data.s | 2 +- .../data/world/area_kpa/kpa_16/A5A3D0.data.s | 2 +- .../data/world/area_kpa/kpa_32/A5E4C0.data.s | 2 +- .../data/world/area_kpa/kpa_33/A5F480.data.s | 2 +- .../data/world/area_kpa/kpa_63/A738E0.data.s | 2 +- .../data/world/area_kzn/kzn_03/C66FC0.data.s | 2 +- .../data/world/area_kzn/kzn_18/C8C460.data.s | 2 +- .../data/world/area_mac/mac_01/807C00.data.s | 2 +- .../data/world/area_mac/mac_05/8564E0.data.s | 2 +- .../data/world/area_mac/machi/7E7A30.data.s | 2 +- .../data/world/area_mim/mim_10/BB5EB0.data.s | 2 +- .../data/world/area_mim/mim_11/BBA180.data.s | 2 +- .../data/world/area_nok/nok_01/9C8920.data.s | 2 +- .../data/world/area_nok/nok_12/9FC970.data.s | 2 +- .../data/world/area_nok/nok_14/A052F0.data.s | 2 +- .../data/world/area_obk/obk_03/BC5A00.data.s | 6 +- .../data/world/area_omo/omo_03/DA6050.data.s | 2 +- .../data/world/area_omo/omo_06/DBCFD0.data.s | 2 +- .../data/world/area_omo/omo_08/DC8100.data.s | 2 +- .../data/world/area_omo/omo_10/DDC720.data.s | 2 +- .../data/world/area_osr/osr_02/AB2B00.data.s | 2 +- .../data/world/area_pra/pra_03/D543C0.data.s | 2 +- .../data/world/area_pra/pra_29/D7DE90.data.s | 2 +- .../data/world/area_pra/pra_33/D8B060.data.s | 2 +- .../data/world/area_pra/pra_40/D9AE80.data.s | 2 +- .../data/world/area_sam/sam_02/D09AD0.data.s | 2 +- .../data/world/area_sam/sam_06/D2BC50.data.s | 2 +- .../data/world/area_sam/sam_07/D2E0B0.data.s | 2 +- .../data/world/area_sam/sam_08/D314C0.data.s | 2 +- .../data/world/area_sam/sam_10/D38840.data.s | 2 +- .../data/world/area_sbk/sbk_99/95B190.data.s | 2 +- .../data/world/area_tik/tik_01/86BC00.data.s | 2 +- .../data/world/area_tik/tik_06/879860.data.s | 2 +- .../data/world/area_tik/tik_08/881770.data.s | 2 +- .../data/world/area_tik/tik_09/8856E0.data.s | 2 +- .../data/world/area_trd/trd_00/99AFB0.data.s | 2 +- .../data/world/area_trd/trd_01/99F960.data.s | 2 +- .../data/world/area_trd/trd_02/9A3870.data.s | 2 +- .../data/world/area_trd/trd_03/9A5FF0.data.s | 2 +- .../data/world/area_trd/trd_04/9ABD70.data.s | 2 +- .../data/world/area_trd/trd_09/9BDD80.data.s | 2 +- .../data/world/area_tst/tst_03/B1B240.data.s | 2 +- .../data/world/area_tst/tst_04/B1C1E0.data.s | 2 +- .../16c8e0/btl_draw_enemy_health_bars.s | 12 +- .../16c8e0/btl_update_starpoints_display.s | 12 +- .../nonmatchings/16c8e0/initialize_battle.s | 16 +- .../asm/nonmatchings/17D6A0/func_8024FB3C.s | 244 +-- .../18C790/btl_state_update_celebration.s | 12 +- .../415D90/btl_state_draw_select_target.s | 16 +- .../415D90/btl_state_update_partner_menu.s | 80 +- .../415D90/btl_state_update_peach_menu.s | 8 +- .../415D90/btl_state_update_player_menu.s | 124 +- .../415D90/btl_state_update_select_target.s | 12 +- .../415D90/btl_state_update_twink_menu.s | 8 +- .../asm/nonmatchings/415D90/func_802A11B0.s | 32 +- .../asm/nonmatchings/415D90/func_802A2C84.s | 48 +- .../asm/nonmatchings/415D90/func_802A3C98.s | 8 +- .../asm/nonmatchings/415D90/func_802A4A54.s | 16 +- .../7fd10_len_b40/setup_item_popup.s | 4 +- .../7fd10_len_b40/setup_partner_popup.s | 12 +- .../80850_len_3060/status_menu_draw_number.s | 8 +- .../80850_len_3060/status_menu_draw_stat.s | 12 +- .../80850_len_3060/update_status_menu.s | 40 +- .../8a860_len_3f30/func_800F16CC.s | 4 +- .../asm/nonmatchings/C50A0/item_entity_load.s | 4 +- .../asm/nonmatchings/C50A0/make_item_entity.s | 4 +- ...ot_item.s => make_item_entity_at_player.s} | 6 +- .../nonmatchings/C50A0/update_item_entities.s | 4 +- .../C50A0/update_item_entity_temp.s | 12 +- .../action_cmd/07/func_802A9228_425D78.s | 4 +- .../action_cmd/0A/func_802A928C_42763C.s | 4 +- .../air_lift/func_802A9278_428CE8.s | 4 +- .../air_raid/func_802A9294_4295B4.s | 4 +- .../body_slam/func_802A92D4_4285B4.s | 12 +- .../break_free/func_802A92DC_4236CC.s | 4 +- .../dizzy_shell/func_802A928C_4263FC.s | 4 +- .../fire_shell/func_802A9294_426C64.s | 4 +- .../action_cmd/hammer/func_802A936C_42236C.s | 20 +- .../hurricane/func_802A92A0_42F980.s | 8 +- .../power_shock/func_802A9310_42D220.s | 4 +- .../spiny_surge/func_802A9254_42F074.s | 4 +- .../action_cmd/spook/func_802A9298_4302B8.s | 4 +- .../action_cmd/squirt/func_802A9208_429F28.s | 12 +- .../water_block/func_802A9000_42A4F0.s | 24 +- .../water_block/func_802A948C_42A97C.s | 92 +- .../whirlwind/func_802A9000_423C70.s | 8 +- .../whirlwind/func_802A92F0_423F60.s | 4 +- ...battle_item_mystery_func_802A13E4_72C994.s | 4 +- .../partner/lakilester/func_8023803C_70BD4C.s | 16 +- .../partner/parakarry/func_80238000_6FFD80.s | 68 +- .../ShowConsumableChoicePopup.s | 4 +- .../evt/fa4c0_len_3bf0/ShowKeyChoicePopup.s | 4 +- .../msg/msg_copy_to_print_buffer.s | 8 +- ver/us/asm/nonmatchings/msg/msg_draw_frame.s | 4 +- .../pause/138CC0/pause_badges_draw_contents.s | 12 +- .../pause/138CC0/pause_stats_draw_contents.s | 32 +- .../pause/13E120/pause_partners_draw_title.s | 4 +- .../pause_items/pause_items_draw_contents.s | 8 +- .../C36530/dgb_04_func_8024259C_C38ACC.s | 16 +- .../CAED40/flo_08_func_802401CC_CAEF0C.s | 16 +- .../CD1F10/flo_16_func_802402AC_CD20DC.s | 16 +- .../hos_06/A397F0/func_80240AD0_A39FB0.s | 4 +- .../hos_06/A3B4B0/func_8024228C_A3B76C.s | 4 +- .../isk_10/988B60/func_802401CC_988D2C.s | 16 +- .../iwa_10/91E6D0/func_802404BC_91EA2C.s | 16 +- .../jan_08/B5E910/func_8024082C_B5EADC.s | 16 +- .../kkj_17/AF1C60/func_802402BC_AF1F1C.s | 4 +- .../kkj_19/AF7C00/func_802406C4_AF8014.s | 12 +- .../kmr_06/8D2A10/func_802417E0_8D2CF0.s | 8 +- .../kmr_20/8EBE50/func_802406C8_8EC4E8.s | 8 +- .../kmr_20/8EBE50/func_80240B54_8EC974.s | 8 +- .../kzn_04/C68440/func_802404DC_C6860C.s | 16 +- .../kzn_09/C76CE0/func_802401CC_C76EAC.s | 16 +- .../mac_01/8017D0/func_80245028_8058A8.s | 12 +- .../mac_01/8017D0/func_8024522C_805AAC.s | 4 +- .../mgm_01/E12930/func_802415EC_E13D4C.s | 4 +- .../mgm_02/E15D80/func_80240468_E161E8.s | 8 +- .../mgm_02/E15D80/func_80240BB0_E16930.s | 12 +- .../obk_07/BCF0F0/func_80240A6C_BCF65C.s | 4 +- .../obk_07/BCF0F0/func_80241168_BCFD58.s | 12 +- .../omo_11/DDCFC0/func_8024095C_DDD18C.s | 16 +- .../sam_08/D2FC80/func_802401CC_D2FE4C.s | 16 +- .../sbk_56/953FC0/func_8024024C_95420C.s | 16 +- .../tik_07/879BE0/func_802404AC_87A08C.s | 16 +- .../tik_10/8866D0/func_8024084C_886C0C.s | 16 +- .../tik_12/8891C0/func_80240DE8_8899B8.s | 16 +- .../tik_17/892A50/func_802401FC_892C1C.s | 16 +- .../tik_19/897BD0/func_802407BC_897D9C.s | 16 +- .../world/partners/_use_partner_ability.s | 140 +- .../partners/partner_clear_player_tracking.s | 16 +- .../world/partners/partner_flying_enable.s | 20 +- .../partners/partner_flying_follow_player.s | 44 +- .../partners/partner_flying_update_motion.s | 12 +- .../world/partners/partner_walking_enable.s | 20 +- .../partners/partner_walking_follow_player.s | 44 +- .../world/script_api/7E0E80/MakeShop.s | 4 +- .../7E0E80/shop_open_item_select_popup.s | 4 +- ver/us/splat.yaml | 6 +- ver/us/symbol_addrs.txt | 639 ++++-- ver/us/undefined_syms.txt | 2 +- 232 files changed, 4294 insertions(+), 3081 deletions(-) create mode 100644 ver/us/asm/data/pause_icon_table.data.s rename ver/us/asm/nonmatchings/C50A0/{init_got_item.s => make_item_entity_at_player.s} (98%) diff --git a/include/common_structs.h b/include/common_structs.h index 13038dca22..b78df2b317 100644 --- a/include/common_structs.h +++ b/include/common_structs.h @@ -413,16 +413,16 @@ typedef DynamicEntity* DynamicEntityList[MAX_DYNAMIC_ENTITIES]; typedef struct StaticEntityData { /* 0x00 */ s16 flags; - /* 0x02 */ s16 argSize; - /* 0x04 */ UNK_PTR unk_04; - /* 0x08 */ char unk_08[4]; - /* 0x0C */ UNK_FUN_PTR(unk_data_func); - /* 0x10 */ UNK_PTR unk_data_ptr1; - /* 0x14 */ EntityCallback unk_data_ptr2; + /* 0x02 */ s16 typeDataSize; + /* 0x04 */ UNK_PTR renderCommandList; + /* 0x08 */ UNK_PTR modelAnimationNodes; + /* 0x0C */ EntityCallback(fpInit); + /* 0x10 */ UNK_PTR updateEntityScript; + /* 0x14 */ EntityCallback fpHandleCollision; /* 0x18 */ s32 dmaStart; /* 0x1C */ s32 dmaEnd; /* 0x20 */ u8 entityType; - /* 0x21 */ char unk_21[3]; + /* 0x21 */ char aabbSize[3]; } StaticEntityData; // size = 0x24 typedef struct MusicSettings { @@ -443,17 +443,17 @@ typedef struct MusicSettings { } MusicSettings; // size = 0x30 typedef struct UiStatus { - /* 0x00 */ s32 hpIconIndexes[2]; - /* 0x08 */ s32 fpIconIndexes[2]; + /* 0x00 */ s32 hpIconIndices[2]; + /* 0x08 */ s32 fpIconIndices[2]; /* 0x10 */ s32 coinIconIndex; - /* 0x14 */ s32 coinIconIndex2; /* purpose? */ + /* 0x14 */ s32 coinSparkleIconIndex; /* 0x18 */ s32 starpointsIconIndex; - /* 0x1C */ s32 starpointsIconIndex2; /* purpose? */ + /* 0x1C */ s32 starpointsShineIconIndex; /* 0x20 */ s32 iconIndex8; /* 0x24 */ s32 iconIndex9; /* 0x28 */ s32 iconIndexA; /* 0x2C */ s32 iconIndexB; - /* 0x30 */ s32 iconIndexC; + /* 0x30 */ s32 starIconIndex; /* 0x34 */ s16 drawPosX; /* overall x-offset for whole UI */ /* 0x36 */ s16 drawPosY; /* modulated as it appears, goes away */ /* 0x38 */ s16 showTimer; @@ -1245,13 +1245,13 @@ typedef struct GameStatus { // PartnerAnims typedef struct PartnerAnimations { - /* 0x00 */ UNK_PTR anims[9]; + /* 0x00 */ s32 anims[9]; } PartnerAnimations; // size = 0x24 typedef struct Shadow { /* 0x00 */ s32 flags; /* 0x04 */ u8 listIndex; - /* 0x05 */ u8 unk_05; + /* 0x05 */ u8 alpha; /* 0x06 */ u8 unk_06; /* 0x07 */ char unk_07; /* 0x08 */ s16 entityModelID; @@ -1266,14 +1266,16 @@ typedef struct Shadow { typedef Shadow* ShadowList[MAX_SHADOWS]; +// same as StaticEntityData typedef struct StaticShadowData { /* 0x00 */ u16 flags; - /* 0x02 */ char unk_02[0x2]; - /* 0x04 */ s32* unk_04; + /* 0x02 */ s16 typeDataSize; + /* 0x04 */ UNK_PTR renderCommandList; /* 0x08 */ StaticAnimatorNode** animModelNode; /* 0x0C */ void (*onCreateCallback)(Shadow* shadow); /* 0x10 */ char unk_10[0x10]; - /* 0x20 */ s32 unk_20; + /* 0x20 */ u8 entityType; + /* 0x21 */ char aabbSize[3]; } StaticShadowData; // size = 0x24 typedef struct PushBlockGrid { diff --git a/include/dead.h b/include/dead.h index 65636530eb..6413653307 100644 --- a/include/dead.h +++ b/include/dead.h @@ -80,7 +80,7 @@ #define gOverrideFlags dead_gOverrideFlags #define set_message_msg dead_set_message_msg #define gPlayerData dead_gPlayerData -#define D_8008EF20 D_80094900 +#define gPartnerPopupProperties D_80094900 #define increment_status_menu_disabled dead_increment_status_menu_disabled #define decrement_status_menu_disabled dead_decrement_status_menu_disabled #define sync_status_menu dead_sync_status_menu diff --git a/include/enums.h b/include/enums.h index 38c0409421..e09f9ed18f 100644 --- a/include/enums.h +++ b/include/enums.h @@ -1481,6 +1481,70 @@ enum NpcIDs { NPC_BTL_MERLEE = -10, }; +enum EntityTypes { + ENTITY_TYPE_SHADOW = 0x01, + ENTITY_TYPE_PADLOCK = 0x03, + ENTITY_TYPE_PADLOCK_RED_FRAME = 0x04, + ENTITY_TYPE_PADLOCK_RED_FACE = 0x05, + ENTITY_TYPE_PADLOCK_BLUE_FACE = 0x06, + ENTITY_TYPE_BLUE_SWITCH = 0x07, + ENTITY_TYPE_RED_SWITCH = 0x08, + ENTITY_TYPE_HUGE_BLUE_SWITCH = 0x09, + ENTITY_TYPE_GREEN_STOMP_SWITCH = 0x0A, + ENTITY_TYPE_MULTI_TRIGGER_BLOCK = 0x0B, + ENTITY_TYPE_PUSH_BLOCK = 0x0C, + ENTITY_TYPE_BRICK_BLOCK = 0x0D, + ENTITY_TYPE_MULTI_COIN_BRICK = 0x0E, + ENTITY_TYPE_YELLOW_BLOCK = 0x0F, + ENTITY_TYPE_SINGLE_TRIGGER_BLOCK = 0x10, + ENTITY_TYPE_HIDDEN_YELLOW_BLOCK = 0x11, + ENTITY_TYPE_HIDDEN_RED_BLOCK = 0x12, + ENTITY_TYPE_INACTIVE_BLOCK = 0x13, + ENTITY_TYPE_RED_BLOCK = 0x14, + ENTITY_TYPE_HAMMER1_BLOCK = 0x15, + ENTITY_TYPE_HAMMER2_BLOCK = 0x16, + ENTITY_TYPE_HAMMER3_BLOCK = 0x17, + ENTITY_TYPE_HAMMER1_BLOCK_TINY = 0x18, + ENTITY_TYPE_HAMMER2_BLOCK_TINY = 0x19, + ENTITY_TYPE_HAMMER3_BLOCK_TINY = 0x1A, + ENTITY_TYPE_HEALING_BLOCK = 0x1B, + ENTITY_TYPE_HEALING_BLOCK_FRAME = 0x1F, + ENTITY_TYPE_SAVE_POINT = 0x20, + ENTITY_TYPE_POW_BLOCK = 0x21, + ENTITY_TYPE_SUPER_BLOCK = 0x22, + ENTITY_TYPE_ULTRA_BLOCK = 0x23, + ENTITY_TYPE_WOODEN_CRATE = 0x24, + ENTITY_TYPE_BOARDED_FLOOR = 0x25, + ENTITY_TYPE_BOMBABLE_ROCK = 0x26, + ENTITY_TYPE_BLUE_WARP_PIPE = 0x2B, + ENTITY_TYPE_SIMPLE_SPRING = 0x2E, + ENTITY_TYPE_SCRIPT_SPRING = 0x2F, + ENTITY_TYPE_HIDDEN_PANEL = 0x30, + ENTITY_TYPE_STAR_BOX_LAUCHER = 0x31, + ENTITY_TYPE_CHEST = 0x32, + ENTITY_TYPE_SIGNPOST = 0x33, + ENTITY_TYPE_RED_ARROW_SIGNS = 0x34, + ENTITY_TYPE_BELLBELL_PLANT = 0x35, + ENTITY_TYPE_TRUMPET_PLANT = 0x36, + ENTITY_TYPE_MUNCHLESIA = 0x37, + ENTITY_TYPE_CYMBAL_PLANT = 0x38, + ENTITY_TYPE_PINK_FLOWER = 0x39, + ENTITY_TYPE_SPINNING_FLOWER = 0x3A, + ENTITY_TYPE_3B = 0x3B, + ENTITY_TYPE_TWEESTER = 0x3C, + ENTITY_TYPE_HEALING_BLOCK_CONTENT = 0x3F, + ENTITY_TYPE_SUPER_BLOCK_HIT_EFFECT = 0x41, + ENTITY_TYPE_ULTRA_BLOCK_HIT_EFFECT = 0x42, + ENTITY_TYPE_RESET_MUNCHLESIA = 0x43, + ENTITY_TYPE_MUNCHLESIA_GRAB = 0x44, + ENTITY_TYPE_MUNCHLESIA_ENVELOP = 0x45, + ENTITY_TYPE_MUNCHLESIA_BEGIN_CHEW = 0x46, + ENTITY_TYPE_MUNCHLESIA_CHEWING = 0x47, + ENTITY_TYPE_MUNCHLESIA_SPIT_OUT = 0x48, + ENTITY_TYPE_MUNCHLESIA_RESET1 = 0x49, + ENTITY_TYPE_MUNCHLESIA_RESET2 = 0x4A +}; + enum Triggers { TRIGGER_WALL_PUSH = 0x00000040, TRIGGER_FLOOR_TOUCH = 0x00000080, @@ -2707,10 +2771,10 @@ enum ModelAnimatorFlags { }; enum ShadowFlags { - SHADOW_FLAGS_1 = 0x00000001, + SHADOW_FLAGS_HIDDEN = 0x00000001, SHADOW_FLAGS_2 = 0x00000002, SHADOW_FLAGS_4 = 0x00000004, - SHADOW_FLAGS_8 = 0x00000008, + SHADOW_FLAGS_COMPLEX_MODEL = 0x00000008, SHADOW_FLAGS_10 = 0x00000010, SHADOW_FLAGS_20 = 0x00000020, SHADOW_FLAGS_40 = 0x00000040, @@ -2720,7 +2784,7 @@ enum ShadowFlags { SHADOW_FLAGS_400 = 0x00000400, SHADOW_FLAGS_800 = 0x00000800, SHADOW_FLAGS_1000 = 0x00001000, - SHADOW_FLAGS_2000 = 0x00002000, + SHADOW_FLAGS_ALIGNED_TO_CAMERA = 0x00002000, SHADOW_FLAGS_4000 = 0x00004000, SHADOW_FLAGS_8000 = 0x00008000, SHADOW_FLAGS_10000 = 0x00010000, @@ -2729,14 +2793,14 @@ enum ShadowFlags { SHADOW_FLAGS_80000 = 0x00080000, SHADOW_FLAGS_100000 = 0x00100000, SHADOW_FLAGS_200000 = 0x00200000, - SHADOW_FLAGS_400000 = 0x00400000, + SHADOW_FLAGS_POSITION_DIRTY = 0x00400000, SHADOW_FLAGS_800000 = 0x00800000, SHADOW_FLAGS_1000000 = 0x01000000, SHADOW_FLAGS_2000000 = 0x02000000, SHADOW_FLAGS_4000000 = 0x04000000, SHADOW_FLAGS_8000000 = 0x08000000, - SHADOW_FLAGS_10000000 = 0x10000000, - SHADOW_FLAGS_20000000 = 0x20000000, + SHADOW_FLAGS_FADING_AWAY = 0x10000000, + SHADOW_FLAGS_READY_TO_DELETE = 0x20000000, SHADOW_FLAGS_40000000 = 0x40000000, SHADOW_FLAGS_80000000 = 0x80000000, }; diff --git a/include/functions.h b/include/functions.h index 424655a832..a5d97d6397 100644 --- a/include/functions.h +++ b/include/functions.h @@ -82,16 +82,19 @@ void filemenu_set_cursor_goal_pos(s32 windowIndex, s32 posX, s32 posY); s8* filemenu_get_menu_message(s32 idx); void filemenu_draw_message(s8*, s32 posX, s32 posY, s32 alpha, s32 color, s32 flags); +void update_enemy_shadows(void); +void update_hero_shadows(void); + // append gfx funcs -void func_80257B28(s32); -void func_8025595C(Actor*); -void func_80257B68(Actor*); -void func_80257B48(s32); -void func_8025599C(Actor*); -void func_80257B88(void); -void func_80257DA4(void); +void func_80257B28(void*); +void func_8025595C(void*); +void func_80257B68(void*); +void func_80257B48(void*); +void func_8025599C(void*); +void func_80257B88(void*); +void func_80257DA4(void*); void func_80254C50(Actor*); -void func_80258E14(void); +void func_80258E14(void*); f32 func_800E34D8(void); void func_800E4AD8(s32 arg0); @@ -249,7 +252,87 @@ void reset_model_animators(void); void init_virtual_entity_list(void); void init_model_animators(void); s32 heap_free(void* ptr); + +void btl_state_update_normal_start(void); +void btl_state_draw_normal_start(void); +void btl_state_update_begin_turn(void); +void btl_state_draw_begin_turn(void); +void btl_state_update_begin_player_turn(void); +void btl_state_draw_begin_player_turn(void); +void btl_state_update_switch_to_player(void); +void btl_state_draw_switch_to_player(void); +void btl_state_update_begin_partner_turn(void); +void btl_state_draw_begin_partner_turn(void); void btl_state_update_switch_to_partner(void); +void btl_state_draw_switch_to_partner(void); +void func_80242FE0(void); +void func_80243910(void); +void btl_state_update_prepare_menu(void); +void btl_state_draw_prepare_menu(void); +void btl_state_update_end_turn(void); +void btl_state_draw_end_turn(void); +void btl_state_update_1C(void); +void btl_state_draw_1C(void); +void btl_state_update_victory(void); +void btl_state_draw_victory(void); +void btl_state_update_end_training_battle(void); +void btl_state_draw_end_training_battle(void); +void btl_state_update_end_battle(void); +void btl_state_draw_end_battle(void); +void btl_state_update_defend(void); +void btl_state_draw_defend(void); +void btl_state_update_run_away(void); +void btl_state_draw_run_away(void); +void btl_state_update_defeat(void); +void btl_state_draw_defeat(void); +void btl_state_update_change_partner(void); +void btl_state_draw_change_partner(void); +void btl_state_update_player_move(void); +void btl_state_draw_player_move(void); +void btl_state_update_end_player_turn(void); +void btl_state_update_partner_move(void); +void btl_state_draw_partner_move(void); +void btl_state_update_end_partner_turn(void); +void btl_state_draw_end_partner_turn(void); +void btl_state_update_next_enemy(void); +void btl_state_draw_next_enemy(void); +void btl_state_update_enemy_move(void); +void btl_state_draw_enemy_move(void); +void btl_state_update_first_strike(void); +void btl_state_draw_first_stike(void); +void btl_state_update_partner_striking_first(void); +void btl_state_draw_partner_striking_first(void); +void btl_state_update_enemy_striking_first(void); +void btl_state_draw_enemy_striking_first(void); +void btl_state_update_end_demo_battle(void); +void btl_state_draw_end_demo_battle(void); + +void btl_state_update_player_menu(void); +void btl_state_draw_player_menu(void); +void btl_state_update_partner_menu(void); +void btl_state_draw_partner_menu(void); +void btl_state_update_peach_menu(void); +void btl_state_draw_peach_menu(void); +void btl_state_update_twink_menu(void); +void btl_state_draw_twink_menu(void); +void btl_state_update_select_target(void); +void btl_state_draw_select_target(void); +void btl_state_update_22(void); +void btl_state_draw_22(void); + +void btl_state_update_celebration(void); +void btl_draw_upgrade_windows(void); +void btl_state_draw_celebration(void); + +void func_8024F7C8(void); +void func_80266978(void); +void func_80266B14(void); +void func_8024EE48(void); +void func_8024EEA8(void); +void func_80255FD8(void); + +void func_80266EE8(Actor* actor, s32 arg1); + void btl_set_popup_duration(s32 duration); void switch_to_partner(s32 arg0); diff --git a/include/macros.h b/include/macros.h index ef0deacc99..edb4568123 100644 --- a/include/macros.h +++ b/include/macros.h @@ -67,6 +67,8 @@ #define SPRITE_WORLD_SCALE 0.71428573f +#define BATTLE_ENTITY_ID_MASK 0x800 + #define PACK_FILL_COLOR(r, g, b, a) (GPACK_RGBA5551(r, g, b, a) << 0x10) | GPACK_RGBA5551(r, g, b, a) #define SQ(x) (x*x) diff --git a/include/variables.h b/include/variables.h index 594147a654..7ce6ceffc6 100644 --- a/include/variables.h +++ b/include/variables.h @@ -95,9 +95,9 @@ extern MessagePrintState* gCurrentPrintContext; extern s32 D_802DB264; extern MessagePrintState* D_802DB268; -extern StaticShadowData D_802E98BC; -extern StaticShadowData D_802E98E0; -extern StaticShadowData D_802E9904; +extern StaticShadowData CircularShadowA; +extern StaticShadowData CircularShadowB; +extern StaticShadowData SquareShadow; extern s32 D_802EB390; extern s32 D_802EB394; extern MessagePrintState* D_802EB398; @@ -312,9 +312,9 @@ extern UNK_TYPE D_00000094_2; // two symbols resolve to the same addr. Required extern UNK_TYPE D_802EA0A0; extern StaticEntityData D_802EA07C; extern UNK_TYPE D_802EA310; -extern UNK_TYPE D_802EA618; -extern UNK_TYPE D_802EA63C; -extern UNK_TYPE D_802EA660; +extern StaticEntityData Entity_HitGroundedYellowBlock; +extern StaticEntityData Entity_HitFloatingYellowBlock; +extern StaticEntityData Entity_HitRedBlock; extern s16 D_8015C7D2; extern UNK_TYPE D_0A000328; @@ -388,18 +388,18 @@ extern s32 bMarioDefendAnims[]; extern s32 bPeachIdleAnims[]; // TODO: name these entity symbols -extern StaticEntityData D_802E9A18; // entitySaveBlock -extern StaticEntityData D_802E9BB0; -extern StaticEntityData D_802E9BD4; // entityBlueSwitch -extern StaticEntityData D_802E9BF8; // entityHugeBlueSwitch -extern StaticEntityData D_802E9C1C; -extern StaticEntityData D_802E9C8C; -extern StaticEntityData D_802E9CB0; -extern StaticEntityData D_802E9CD4; -extern StaticEntityData D_802E9CF8; -extern StaticEntityData D_802E9D1C; -extern StaticEntityData D_802E9D40; -extern StaticEntityData D_802E9D64; +extern StaticEntityData Entity_SavePoint; // entitySaveBlock +extern StaticEntityData Entity_RedSwitch; +extern StaticEntityData Entity_BlueSwitch; // entityBlueSwitch +extern StaticEntityData Entity_HugeBlueSwitch; // entityHugeBlueSwitch +extern StaticEntityData Entity_GreenStompSwitch; +extern StaticEntityData Entity_ShatteringHammer1Block; +extern StaticEntityData Entity_ShatteringHammer2Block; +extern StaticEntityData Entity_ShatteringHammer3Block; +extern StaticEntityData Entity_ShatteringHammer1BlockTiny; +extern StaticEntityData Entity_ShatteringHammer2BlockTiny; +extern StaticEntityData Entity_ShatteringHammer3BlockTiny; +extern StaticEntityData Entity_ShatteringBrickBlock; // Temporary dead stuff extern PartnerActionStatus dead_gPartnerActionStatus2; diff --git a/src/104730.c b/src/104730.c index 9c991dd8ef..f4baf44460 100644 --- a/src/104730.c +++ b/src/104730.c @@ -90,28 +90,31 @@ s32 D_802E9898[9] = { 0x00000000, }; -StaticShadowData D_802E98BC = { +StaticShadowData CircularShadowA = { .flags = SHADOW_FLAGS_20, - .unk_04 = D_802E9850, + .renderCommandList = D_802E9850, .animModelNode = NULL, .onCreateCallback = entity_Shadow_init, - .unk_20 = 0x01190A19, + .entityType = ENTITY_TYPE_SHADOW, + .aabbSize = { 25, 10, 25 } }; -StaticShadowData D_802E98E0 = { +StaticShadowData CircularShadowB = { .flags = SHADOW_FLAGS_20, - .unk_04 = D_802E9874, + .renderCommandList = D_802E9874, .animModelNode = NULL, .onCreateCallback = entity_Shadow_init, - .unk_20 = 0x01190A19, + .entityType = ENTITY_TYPE_SHADOW, + .aabbSize = { 25, 10, 25 } }; -StaticShadowData D_802E9904 = { +StaticShadowData SquareShadow = { .flags = SHADOW_FLAGS_20, - .unk_04 = D_802E9898, + .renderCommandList = D_802E9898, .animModelNode = NULL, .onCreateCallback = entity_Shadow_init, - .unk_20 = 0x01190A19, + .entityType = ENTITY_TYPE_SHADOW, + .aabbSize = { 25, 10, 25 } }; s32 D_802E9928[2] = { @@ -139,7 +142,7 @@ s32 D_802E99FC[7] = { &D_0A003508, 0x00000002, 0x00000000, }; -StaticEntityData D_802E9A18 = { 0x4200, 0x0020, &D_802E99FC, {0, 0, 0, 0}, entity_SaveBlock_init, &D_802E9930, entity_block_handle_collision, E4B2E0_ROM_START, E4B2E0_ROM_END, 32, {0x19, 0x19, 0x19}}; +StaticEntityData Entity_SavePoint = { 0x4200, 0x0020, &D_802E99FC, {0, 0, 0, 0}, entity_SaveBlock_init, &D_802E9930, entity_block_handle_collision, E4B2E0_ROM_START, E4B2E0_ROM_END, 32, {0x19, 0x19, 0x19}}; // potential file split(?) s32 D_802E9A3C[1] = { @@ -195,10 +198,10 @@ s32 D_802E9B94[7] = { (s32) &D_0A000740, 0x00000002, 0x00000000, }; -StaticEntityData D_802E9BB0 = { 0xA000, 0x002C, &D_802E9B78, {0, 0, 0, 0}, entity_base_switch_init, &D_802E9A40, NULL, E62AC0_ROM_START, E62AC0_ROM_END, 8, {0x16, 0x17, 0x16} }; -StaticEntityData D_802E9BD4 = { 0xAA04, 0x002C, &D_802E9B40, {0, 0, 0, 0}, entity_BlueSwitch_init, &D_802E9AC4, NULL, E639C0_ROM_START, E639C0_ROM_END, 7, {0x16, 0x17, 0x16} }; -StaticEntityData D_802E9BF8 = { 0xAA04, 0x002C, &D_802E9B5C, {0, 0, 0, 0}, entity_HugeBlueSwitch_init, &D_802E9A88, NULL, E639C0_ROM_START, E639C0_ROM_END, 9, {0x42, 0x4B, 0x42} }; -StaticEntityData D_802E9C1C = { 0xC000, 0x002C, &D_802E9B94, {0, 0, 0, 0}, entity_base_switch_init, &D_802E9B00, NULL, E62370_ROM_START, E62370_ROM_END, 10, {0x32, 0x0F, 0x32} }; +StaticEntityData Entity_RedSwitch = { 0xA000, 0x002C, &D_802E9B78, {0, 0, 0, 0}, entity_base_switch_init, &D_802E9A40, NULL, E62AC0_ROM_START, E62AC0_ROM_END, ENTITY_TYPE_RED_SWITCH, {0x16, 0x17, 0x16} }; +StaticEntityData Entity_BlueSwitch = { 0xAA04, 0x002C, &D_802E9B40, {0, 0, 0, 0}, entity_BlueSwitch_init, &D_802E9AC4, NULL, E639C0_ROM_START, E639C0_ROM_END, ENTITY_TYPE_BLUE_SWITCH, {0x16, 0x17, 0x16} }; +StaticEntityData Entity_HugeBlueSwitch = { 0xAA04, 0x002C, &D_802E9B5C, {0, 0, 0, 0}, entity_HugeBlueSwitch_init, &D_802E9A88, NULL, E639C0_ROM_START, E639C0_ROM_END, ENTITY_TYPE_HUGE_BLUE_SWITCH, {0x42, 0x4B, 0x42} }; +StaticEntityData Entity_GreenStompSwitch = { 0xC000, 0x002C, &D_802E9B94, {0, 0, 0, 0}, entity_base_switch_init, &D_802E9B00, NULL, E62370_ROM_START, E62370_ROM_END, ENTITY_TYPE_GREEN_STOMP_SWITCH, {0x32, 0x0F, 0x32} }; s32 D_802E9C40[12] = { 0x00000007, 0x00000020, 0x00000003, 0x00000000, @@ -211,13 +214,13 @@ s32 D_802E9C70[7] = { (s32) &D_802E9828, 0x00000002, 0x00000000 }; -StaticEntityData D_802E9C8C = { 0x0000, 0x0250, &D_802E9C70, {0, 0, 0, 0}, entity_shattering_block_init, &D_802E9C40, NULL, E32420_ROM_START, E32420_ROM_END, 21, {0x10, 0x10, 0x10}}; -StaticEntityData D_802E9CB0 = { 0x0000, 0x0250, &D_802E9C70, {0, 0, 0, 0}, entity_shattering_block_init, &D_802E9C40, NULL, E35670_ROM_START, E35670_ROM_END, 22, {0x10, 0x10, 0x10}}; -StaticEntityData D_802E9CD4 = { 0x0000, 0x0250, &D_802E9C70, {0, 0, 0, 0}, entity_shattering_block_init, &D_802E9C40, NULL, E38890_ROM_START, E38890_ROM_END, 23, {0x10, 0x10, 0x10}}; -StaticEntityData D_802E9CF8 = { 0x0000, 0x0250, &D_802E9C70, {0, 0, 0, 0}, entity_shattering_block_init, &D_802E9C40, NULL, E32420_ROM_START, E32420_ROM_END, 24, {0x08, 0x08, 0x08}}; -StaticEntityData D_802E9D1C = { 0x0000, 0x0250, &D_802E9C70, {0, 0, 0, 0}, entity_shattering_block_init, &D_802E9C40, NULL, E35670_ROM_START, E35670_ROM_END, 25, {0x08, 0x08, 0x08}}; -StaticEntityData D_802E9D40 = { 0x0000, 0x0250, &D_802E9C70, {0, 0, 0, 0}, entity_shattering_block_init, &D_802E9C40, NULL, E38890_ROM_START, E38890_ROM_END, 26, {0x08, 0x08, 0x08}}; -StaticEntityData D_802E9D64 = { 0x0000, 0x0250, &D_802E9C70, {0, 0, 0, 0}, entity_shattering_block_init, &D_802E9C40, NULL, E3E260_ROM_START, E3E260_ROM_END, 13, {0x08, 0x08, 0x08}}; +StaticEntityData Entity_ShatteringHammer1Block = { 0x0000, 0x0250, &D_802E9C70, {0, 0, 0, 0}, entity_shattering_block_init, &D_802E9C40, NULL, E32420_ROM_START, E32420_ROM_END, ENTITY_TYPE_HAMMER1_BLOCK, {0x10, 0x10, 0x10}}; +StaticEntityData Entity_ShatteringHammer2Block = { 0x0000, 0x0250, &D_802E9C70, {0, 0, 0, 0}, entity_shattering_block_init, &D_802E9C40, NULL, E35670_ROM_START, E35670_ROM_END, ENTITY_TYPE_HAMMER2_BLOCK, {0x10, 0x10, 0x10}}; +StaticEntityData Entity_ShatteringHammer3Block = { 0x0000, 0x0250, &D_802E9C70, {0, 0, 0, 0}, entity_shattering_block_init, &D_802E9C40, NULL, E38890_ROM_START, E38890_ROM_END, ENTITY_TYPE_HAMMER3_BLOCK, {0x10, 0x10, 0x10}}; +StaticEntityData Entity_ShatteringHammer1BlockTiny = { 0x0000, 0x0250, &D_802E9C70, {0, 0, 0, 0}, entity_shattering_block_init, &D_802E9C40, NULL, E32420_ROM_START, E32420_ROM_END, ENTITY_TYPE_HAMMER1_BLOCK_TINY, {0x08, 0x08, 0x08}}; +StaticEntityData Entity_ShatteringHammer2BlockTiny = { 0x0000, 0x0250, &D_802E9C70, {0, 0, 0, 0}, entity_shattering_block_init, &D_802E9C40, NULL, E35670_ROM_START, E35670_ROM_END, ENTITY_TYPE_HAMMER2_BLOCK_TINY, {0x08, 0x08, 0x08}}; +StaticEntityData Entity_ShatteringHammer3BlockTiny = { 0x0000, 0x0250, &D_802E9C70, {0, 0, 0, 0}, entity_shattering_block_init, &D_802E9C40, NULL, E38890_ROM_START, E38890_ROM_END, ENTITY_TYPE_HAMMER3_BLOCK_TINY, {0x08, 0x08, 0x08}}; +StaticEntityData Entity_ShatteringBrickBlock = { 0x0000, 0x0250, &D_802E9C70, {0, 0, 0, 0}, entity_shattering_block_init, &D_802E9C40, NULL, E3E260_ROM_START, E3E260_ROM_END, ENTITY_TYPE_BRICK_BLOCK, {0x08, 0x08, 0x08}}; void entity_shattering_block_init(Entity* entity) { u32 type; @@ -234,32 +237,32 @@ void entity_shattering_block_init(Entity* entity) { } switch (type) { - case 21: - case 24: + case ENTITY_TYPE_HAMMER1_BLOCK: + case ENTITY_TYPE_HAMMER1_BLOCK_TINY: a1 = &D_0A0031E0; a2 = &D_0A001508; break; - case 22: - case 25: + case ENTITY_TYPE_HAMMER2_BLOCK: + case ENTITY_TYPE_HAMMER2_BLOCK_TINY: a1 = &D_0A0031B0; a2 = &D_0A0014D8; break; - case 23: - case 26: + case ENTITY_TYPE_HAMMER3_BLOCK: + case ENTITY_TYPE_HAMMER3_BLOCK_TINY: a1 = &D_0A002F78; a2 = &D_0A001218; break; - case 13: + case ENTITY_TYPE_BRICK_BLOCK: sfx_play_sound_at_position(0x158, 0, entity->position.x, entity->position.y, entity->position.z); a1 = &D_0A003F70; a2 = &D_0A002318; break; - case 14: - case 15: - case 16: - case 17: - case 18: - case 19: + case ENTITY_TYPE_MULTI_COIN_BRICK: + case ENTITY_TYPE_YELLOW_BLOCK: + case ENTITY_TYPE_SINGLE_TRIGGER_BLOCK: + case ENTITY_TYPE_HIDDEN_YELLOW_BLOCK: + case ENTITY_TYPE_HIDDEN_RED_BLOCK: + case ENTITY_TYPE_INACTIVE_BLOCK: break; } @@ -277,33 +280,33 @@ void entity_breakable_block_create_shattering_entity(Entity* entity) { type = get_entity_type(entity->listIndex); switch (type) { - case 21: - addr = &D_802E9C8C; + case ENTITY_TYPE_HAMMER1_BLOCK: + addr = &Entity_ShatteringHammer1Block; break; - case 24: - addr = &D_802E9CF8; + case ENTITY_TYPE_HAMMER1_BLOCK_TINY: + addr = &Entity_ShatteringHammer1BlockTiny; break; - case 22: - addr = &D_802E9CB0; + case ENTITY_TYPE_HAMMER2_BLOCK: + addr = &Entity_ShatteringHammer2Block; break; - case 25: - addr = &D_802E9D1C; + case ENTITY_TYPE_HAMMER2_BLOCK_TINY: + addr = &Entity_ShatteringHammer2BlockTiny; break; - case 23: - addr = &D_802E9CD4; + case ENTITY_TYPE_HAMMER3_BLOCK: + addr = &Entity_ShatteringHammer3Block; break; - case 26: - addr = &D_802E9D40; + case ENTITY_TYPE_HAMMER3_BLOCK_TINY: + addr = &Entity_ShatteringHammer3BlockTiny; break; - case 13: - addr = &D_802E9D64; + case ENTITY_TYPE_BRICK_BLOCK: + addr = &Entity_ShatteringBrickBlock; break; - case 14: - case 15: - case 16: - case 17: - case 18: - case 19: + case ENTITY_TYPE_MULTI_COIN_BRICK: + case ENTITY_TYPE_YELLOW_BLOCK: + case ENTITY_TYPE_SINGLE_TRIGGER_BLOCK: + case ENTITY_TYPE_HIDDEN_YELLOW_BLOCK: + case ENTITY_TYPE_HIDDEN_RED_BLOCK: + case ENTITY_TYPE_INACTIVE_BLOCK: break; } diff --git a/src/16c8e0.c b/src/16c8e0.c index 8538dc3796..acc0de5c38 100644 --- a/src/16c8e0.c +++ b/src/16c8e0.c @@ -1,6 +1,9 @@ #include "common.h" +#include "hud_element.h" #include "battle/battle.h" #include "script_api/battle.h" +#include "sprite.h" +#include "effects.h" f32 D_802809F0 = 0.0f; s8 D_802809F4 = 0; @@ -9,8 +12,19 @@ s16 D_802809F6 = -1; s16 D_802809F8 = 0; u16 D_802809FA = 0; -void* D_802809FC[] = { - D_80291FA8, D_80291FD0, D_80291FF8, D_80292020, D_80292048, D_80292070, D_80292098, D_802920C0, D_802920E8, D_80292110, NULL, NULL, NULL, +extern HudElementAnim HudScript_HPDigit0; +extern HudElementAnim HudScript_HPDigit1; +extern HudElementAnim HudScript_HPDigit2; +extern HudElementAnim HudScript_HPDigit3; +extern HudElementAnim HudScript_HPDigit4; +extern HudElementAnim HudScript_HPDigit5; +extern HudElementAnim HudScript_HPDigit6; +extern HudElementAnim HudScript_HPDigit7; +extern HudElementAnim HudScript_HPDigit8; +extern HudElementAnim HudScript_HPDigit9; + +void* bHPDigitHudScripts[] = { + HudScript_HPDigit0, HudScript_HPDigit1, HudScript_HPDigit2, HudScript_HPDigit3, HudScript_HPDigit4, HudScript_HPDigit5, HudScript_HPDigit6, HudScript_HPDigit7, HudScript_HPDigit8, HudScript_HPDigit9, NULL, NULL, NULL, }; s32 D_80280A30 = 0xFF; @@ -28,7 +42,7 @@ EvtSource BtlPutPartnerAway = { EVT_SETF(EVT_VAR(0), EVT_FIXED(1.0)) EVT_LOOP(10) EVT_CALL(SetActorScale, 256, EVT_VAR(0), EVT_VAR(0), EVT_FIXED(1.0)) - EVT_SUBF(EVT_VAR(0), EVT_FIXED(0.1005859375)) + EVT_SUBF(EVT_VAR(0), EVT_FIXED(0.1)) EVT_WAIT_FRAMES(1) EVT_END_LOOP EVT_END_CHILD_THREAD @@ -46,7 +60,7 @@ EvtSource BtlPutPartnerAway = { EvtSource BtlBringPartnerOut = { EVT_CHILD_THREAD - EVT_SETF(EVT_VAR(0), EVT_FIXED(0.1005859375)) + EVT_SETF(EVT_VAR(0), EVT_FIXED(0.1)) EVT_LOOP(20) EVT_CALL(SetActorScale, 256, EVT_VAR(0), EVT_VAR(0), EVT_FIXED(1.0)) EVT_ADDF(EVT_VAR(0), EVT_FIXED(0.05078125)) @@ -382,7 +396,7 @@ void func_8023ED5C(void) { actor = battleStatus->enemyActors[i]; if (actor != NULL && !(actor->flags & ACTOR_FLAG_DISABLED)) { - renderTaskPtr->appendGfxArg = i; + renderTaskPtr->appendGfxArg = (void*)i; renderTaskPtr->appendGfx = func_80257B28; renderTaskPtr->distance = actor->currentPos.z; renderTaskPtr->renderMode = actor->renderMode; @@ -561,7 +575,7 @@ void btl_delete_actor(Actor* actor) { delete_shadow(actor->shadow); remove_all_status_icons(actor->hudElementDataIndex); - remove_effect(actor->ptrDefuffIcon); + remove_effect(actor->ptrDefuffIcon); // ??? if (actor->unk_200 != NULL) { actor->unk_200[3][9] = 0; diff --git a/src/17D6A0.c b/src/17D6A0.c index 7485709877..44dc36c91d 100644 --- a/src/17D6A0.c +++ b/src/17D6A0.c @@ -100,7 +100,6 @@ INCLUDE_ASM(s32, "17D6A0", func_8024F5AC); INCLUDE_ASM(s32, "17D6A0", func_8024F768); -void func_8024F7C8(void); INCLUDE_ASM(s32, "17D6A0", func_8024F7C8); ApiStatus func_8024F84C(Evt* script, s32 isInitialCall) { diff --git a/src/182B30.c b/src/182B30.c index 0ba4880e0a..615169c063 100644 --- a/src/182B30.c +++ b/src/182B30.c @@ -3,6 +3,14 @@ #include "effects.h" #include "battle/battle.h" +void func_80255FE0(s32, void*); +void func_802571F0(s32, Actor*); +void update_player_actor_shadow(void); +void func_8025950C(ActorPart*, s32, s32); +void func_802597B0(ActorPart*, s32, s32); +void func_8025C918(void); +void func_8025CD40(void); + s32 func_80254250(void) { s32 ret; @@ -19,13 +27,12 @@ s32 func_80254250(void) { return ret; } -void mtx_mirror_y(Matrix4f arg0) { - - guMtxIdentF(arg0); - (arg0)[0][0] = 1.0f; - (arg0)[1][1] = -1.0f; - (arg0)[2][2] = 1.0f; - (arg0)[3][3] = 1.0f; +void mtx_mirror_y(Matrix4f mtx) { + guMtxIdentF(mtx); + mtx[0][0] = 1.0f; + mtx[1][1] = -1.0f; + mtx[2][2] = 1.0f; + mtx[3][3] = 1.0f; } void enable_actor_blur(Actor* actor) { @@ -517,7 +524,9 @@ void func_8025593C(Actor* actor) { func_802550BC(0, actor); } -void func_8025595C(Actor* actor) { +void func_8025595C(void* data) { + Actor* actor = data; + func_802552EC(0, actor); } @@ -525,7 +534,9 @@ void func_8025597C(Actor* actor) { func_802550BC(1, actor); } -void func_8025599C(Actor* actor) { +void func_8025599C(void* data) { + Actor* actor = data; + func_802552EC(1, actor); } @@ -543,7 +554,7 @@ void update_actor_shadow(s32 arg0, Actor* actor) { if (actor != NULL) { shadow = get_shadow_by_index((s32) actor->shadow); - shadow->flags |= SHADOW_FLAGS_1; + shadow->flags |= SHADOW_FLAGS_HIDDEN; if (!(actor->flags & ACTOR_FLAG_DISABLED)) { if (actor->flags & ACTOR_FLAG_10000000) { if (arg0 == 0) { @@ -591,9 +602,9 @@ void update_actor_shadow(s32 arg0, Actor* actor) { actorPart->currentPos.y = y2; actorPart->currentPos.z = z2; - if (!(actorPart->flags & SHADOW_FLAGS_4)) { + if (!(actorPart->flags & ACTOR_PART_FLAG_4)) { shadow = get_shadow_by_index(actorPart->shadowIndex); - shadow->flags &= ~SHADOW_FLAGS_1; + shadow->flags &= ~SHADOW_FLAGS_HIDDEN; x1 = actorPart->currentPos.x; if (!(actor->flags & ACTOR_FLAG_HP_OFFSET_BELOW)) { y1 = actorPart->currentPos.y + 12.0; @@ -606,7 +617,7 @@ void update_actor_shadow(s32 arg0, Actor* actor) { npc_raycast_down_sides(0, &x1, &y1, &z1, &dist); if (200.0f < dist) { - shadow->flags |= SHADOW_FLAGS_1; + shadow->flags |= SHADOW_FLAGS_HIDDEN; } shadow->position.x = x1; shadow->position.y = y1; @@ -639,7 +650,7 @@ void update_actor_shadow(s32 arg0, Actor* actor) { npc_raycast_down_sides(0, &x1, &y1, &z1, &dist); if (200.0f < dist) { - shadow->flags |= SHADOW_FLAGS_1; + shadow->flags |= SHADOW_FLAGS_HIDDEN; } shadow->position.x = x1; shadow->position.y = y1; @@ -651,7 +662,7 @@ void update_actor_shadow(s32 arg0, Actor* actor) { } } -s32 update_enemy_shadows(void) { +void update_enemy_shadows(void) { BattleStatus* battleStatus = &gBattleStatus; s32 i; @@ -660,8 +671,6 @@ s32 update_enemy_shadows(void) { } } -void update_player_actor_shadow(void); - void update_hero_shadows(void) { update_actor_shadow(1, gBattleStatus.partnerActor); update_player_actor_shadow(); @@ -674,19 +683,21 @@ INCLUDE_ASM(s32, "182B30", func_80255FE0); INCLUDE_ASM(s32, "182B30", func_802571F0); -void func_80257B28(s32 arg0) { - func_80255FE0(0, arg0); +void func_80257B28(void* data) { + func_80255FE0(0, data); } -void func_80257B48(s32 arg0) { - func_80255FE0(1, arg0); +void func_80257B48(void* data) { + func_80255FE0(1, data); } -void func_80257B68(Actor* actor) { +void func_80257B68(void* data) { + Actor* actor = data; + func_802571F0(0, actor); } -void func_80257B88(void) { +void func_80257B88(void* data) { func_802571F0(1, gBattleStatus.partnerActor); } @@ -705,12 +716,12 @@ void update_player_actor_shadow(void) { } shadow = get_shadow_by_index((s32) player->shadow); - shadow->flags &= ~SHADOW_FLAGS_1; + shadow->flags &= ~SHADOW_FLAGS_HIDDEN; if (!battleStatus->outtaSightActive) { - shadow->unk_05 = 128; + shadow->alpha = 128; } else { - shadow->unk_05 = 40; + shadow->alpha = 40; } distance = 32767.0f; @@ -720,7 +731,7 @@ void update_player_actor_shadow(void) { npc_raycast_down_sides(0, &x, &y, &z, &distance); if (distance > 200.0f) { - shadow->flags |= SHADOW_FLAGS_1; + shadow->flags |= SHADOW_FLAGS_HIDDEN; } shadow->position.x = x; shadow->position.y = y; diff --git a/src/18F340.c b/src/18F340.c index 90ef7b622f..13f5340cb7 100644 --- a/src/18F340.c +++ b/src/18F340.c @@ -2,8 +2,8 @@ #include "effects.h" #include "hud_element.h" -extern HudElementAnim D_80108AAC[]; -extern HudElementAnim D_80108AD4[]; +extern HudElementAnim HudScript_Happy[]; +extern HudElementAnim HudScript_HPDrain[]; extern s32 D_8029FB90; extern f32 D_8029FB94; @@ -135,7 +135,7 @@ ApiStatus N(GiveRefund)(Evt* script, s32 isInitialCall) { posY = player->currentPos.y; posZ = player->currentPos.z; get_screen_coords(gCurrentCameraID, posX, posY, posZ, &iconPosX, &iconPosY, &iconPosZ); - D_8029FBA0 = create_hud_element(D_80108A64); + D_8029FBA0 = create_hud_element(HudScript_Refund); set_hud_element_render_pos(D_8029FBA0, iconPosX + 36, iconPosY - 63); } @@ -410,13 +410,13 @@ ApiStatus func_802619E8(Evt* script, s32 isInitialCall) { screenY -= 19; if (script->varTable[10] > 0) { - D_8029FBAC = create_hud_element(D_80108AD4); + D_8029FBAC = create_hud_element(HudScript_HPDrain); set_hud_element_render_pos(D_8029FBAC, screenX, screenY); screenY += 9; } if (script->varTable[11] > 0 || script->varTable[12] > 0) { - D_8029FBA8 = create_hud_element(D_80108AAC); + D_8029FBA8 = create_hud_element(HudScript_Happy); set_hud_element_render_pos(D_8029FBA8, screenX, screenY); } return ApiStatus_DONE2; diff --git a/src/1AF230.c b/src/1AF230.c index 1b0f6b59c5..e392932ee2 100644 --- a/src/1AF230.c +++ b/src/1AF230.c @@ -58,7 +58,7 @@ StarPowerEntry D_8029C7D0[] = { }; s32 D_8029C890[10][5] = { - { 0x1001F, 0x1002C, 0x1002A, 0x10005, 0, }, // Junk? These ID's should be in world_goombario, but don't exist. + { 0x1001F, 0x1002C, 0x1002A, 0x10005, 0, }, // Junk? These IDs should be in world_goombario, but don't exist. { NPC_ANIM_battle_goombario_default_run, NPC_ANIM_battle_goombario_default_sleep, NPC_ANIM_battle_goombario_default_sleep, NPC_ANIM_battle_goombario_default_run, NPC_ANIM_battle_goombario_default_idle, }, { NPC_ANIM_battle_kooper_Palette_00_Anim_6, NPC_ANIM_battle_kooper_Palette_00_Anim_1B, NPC_ANIM_battle_kooper_Palette_00_Anim_1B, NPC_ANIM_battle_kooper_Palette_00_Anim_6, NPC_ANIM_battle_kooper_Palette_00_Anim_4, }, { NPC_ANIM_battle_bombette_Palette_00_Anim_8, NPC_ANIM_battle_bombette_Palette_00_Anim_1D, NPC_ANIM_battle_bombette_Palette_00_Anim_1D, NPC_ANIM_battle_bombette_Palette_00_Anim_8, NPC_ANIM_battle_bombette_Palette_00_Anim_4, }, diff --git a/src/415D90.c b/src/415D90.c index 1e70e91c68..7f04fb6090 100644 --- a/src/415D90.c +++ b/src/415D90.c @@ -1,27 +1,87 @@ #include "common.h" #include "hud_element.h" -extern s32 D_80107D48; -extern s32 D_80107D98; -extern s32 D_80107CA8; -extern s32 D_80107CD0; -extern s32 D_80107CF8; -extern s32 D_80107D20; -extern s32 D_80107D70; -extern s32 D_80107DC0; -extern s32 D_80107DE8; -extern s32 D_80107E10; -extern s32 D_80107E38; -extern s32 D_80107E60; -extern s32 D_80107E88; -extern s32 D_80107EB0; -extern s32 D_80107ED8; -extern s32 D_80107F00; -extern s32 D_80107F28; -extern s32 D_80107F50; -extern s32 D_80107FC8; -extern s32 D_80107FF0; -extern s32 D_80108974; +extern HudElementAnim HudScript_YellowArrow[]; + +extern HudElementAnim HudScript_MenuFlee[]; +extern HudElementAnim HudScript_MenuFleeDisabled[]; +extern HudElementAnim HudScript_MenuDefend[]; +extern HudElementAnim HudScript_MenuDefendDisabled[]; +extern HudElementAnim HudScript_MenuStrategies[]; +extern HudElementAnim HudScript_MenuStrategiesDisabled[]; +extern HudElementAnim HudScript_MenuPouch[]; +extern HudElementAnim HudScript_MenuPouchDisabled[]; +extern HudElementAnim HudScript_MenuDoNothing[]; +extern HudElementAnim HudScript_MenuDoNothingDisabled[]; + +extern HudElementAnim HudScript_Kooper[]; +extern HudElementAnim HudScript_Bombette[]; +extern HudElementAnim HudScript_Partner0[]; +extern HudElementAnim HudScript_Partner0Disabled[]; +extern HudElementAnim HudScript_Goombario[]; +extern HudElementAnim HudScript_GoombarioDisabled[]; +extern HudElementAnim HudScript_KooperDisabled[]; +extern HudElementAnim HudScript_BombetteDisabled[]; +extern HudElementAnim HudScript_Parakarry[]; +extern HudElementAnim HudScript_ParakarryDisabled[]; +extern HudElementAnim HudScript_Bow[]; +extern HudElementAnim HudScript_BowDisabled[]; +extern HudElementAnim HudScript_Watt[]; +extern HudElementAnim HudScript_WattDisabled[]; +extern HudElementAnim HudScript_Sushie[]; +extern HudElementAnim HudScript_SushieDisabled[]; +extern HudElementAnim HudScript_Lakilester[]; +extern HudElementAnim HudScript_LakilesterDisabled[]; +extern HudElementAnim HudScript_PartnerA[]; +extern HudElementAnim HudScript_PartnerADisabled[]; + +extern HudElementAnim HudScript_MenuBoots1[]; +extern HudElementAnim HudScript_MenuBoots1Disabled[]; +extern HudElementAnim HudScript_MenuBoots2[]; +extern HudElementAnim HudScript_MenuBoots2Disabled[]; +extern HudElementAnim HudScript_MenuBoots3[]; +extern HudElementAnim HudScript_MenuBoots3Disabled[]; + +extern HudElementAnim HudScript_MenuHammer1[]; +extern HudElementAnim HudScript_MenuHammer1Disabled[]; +extern HudElementAnim HudScript_MenuHammer2[]; +extern HudElementAnim HudScript_MenuHammer2Disabled[]; +extern HudElementAnim HudScript_MenuHammer3[]; +extern HudElementAnim HudScript_MenuHammer3Disabled[]; + +extern HudElementAnim HudScript_MenuItem[]; +extern HudElementAnim HudScript_MenuItemDisabled[]; + +extern HudElementAnim HudScript_MenuStarPower[]; +extern HudElementAnim HudScript_MenuStarPowerDisabled[]; + +extern HudElementAnim HudScript_Eldstar[]; +extern HudElementAnim HudScript_EldstarDisabled[]; +extern HudElementAnim HudScript_Mamar[]; +extern HudElementAnim HudScript_MamarDisabled[]; +extern HudElementAnim HudScript_Skolar[]; +extern HudElementAnim HudScript_SkolarDisabled[]; +extern HudElementAnim HudScript_Muskular[]; +extern HudElementAnim HudScript_MuskularDisabled[]; +extern HudElementAnim HudScript_Misstar[]; +extern HudElementAnim HudScript_MisstarDisabled[]; +extern HudElementAnim HudScript_Klevar[]; +extern HudElementAnim HudScript_KlevarDisabled[]; +extern HudElementAnim HudScript_Kalmar[]; +extern HudElementAnim HudScript_KalmarDisabled[]; +extern HudElementAnim HudScript_StarBeam[]; +extern HudElementAnim HudScript_StarBeamDisabled[]; +extern HudElementAnim HudScript_PeachBeam[]; +extern HudElementAnim HudScript_PeachBeamDisabled[]; + +extern HudElementAnim HudScript_MoveDiamond[]; +extern HudElementAnim HudScript_MoveBlueOrb[]; +extern HudElementAnim HudScript_MoveGreenOrb[]; +extern HudElementAnim HudScript_MoveRedOrb[]; +extern HudElementAnim HudScript_MoveDiamondDisabled[]; +extern HudElementAnim HudScript_MoveBlueOrbDisabled[]; +extern HudElementAnim HudScript_MoveGreenOrbDisabled[]; +extern HudElementAnim HudScript_MoveRedOrbDisabled[]; extern u8 D_802AD000; extern u8 D_802AD001; @@ -93,43 +153,69 @@ s16 D_802AB340[] = { 0x001C, 0x0028 }; s16 D_802AB344[] = { 0, -2 }; -s32 battle_menu_iconScripts[] = { 0x8010876C, 0x8010876C, 0x80108744, 0x8010876C, 0x80108794, 0x801087BC, 0x801087E4, 0x8010880C }; +HudElementAnim* battle_menu_JumpHudScripts[] = { + HudScript_MenuBoots1Disabled, HudScript_MenuBoots1Disabled, + HudScript_MenuBoots1,HudScript_MenuBoots1Disabled, + HudScript_MenuBoots2, HudScript_MenuBoots2Disabled, + HudScript_MenuBoots3, HudScript_MenuBoots3Disabled }; -s32 D_802AB368[] = { 0x8010885C, 0x8010885C, 0x80108834, 0x8010885C, 0x80108884, 0x801088AC, 0x801088D4, 0x801088FC }; +HudElementAnim* battle_menu_HammerHudScripts[] = { + HudScript_MenuHammer1Disabled, HudScript_MenuHammer1Disabled, + HudScript_MenuHammer1, HudScript_MenuHammer1Disabled, + HudScript_MenuHammer2, HudScript_MenuHammer2Disabled, + HudScript_MenuHammer3, HudScript_MenuHammer3Disabled }; -s32 D_802AB388[] = { 0x80108924, 0x8010894C }; +HudElementAnim* battle_menu_ItemHudScripts[] = { HudScript_MenuItem, HudScript_MenuItemDisabled }; -s32 D_802AB390[] = { &D_80108974, 0x8010899C }; +HudElementAnim* battle_menu_StarPowerHudScripts[] = { HudScript_MenuStarPower, HudScript_MenuStarPowerDisabled }; -s32 D_802AB398[] = { &D_80108974, 0x8010899C, 0x80107990, 0x801079BC, 0x801079E8, 0x80107A14, 0x80107A40, 0x80107A6C, 0x80107A98, 0x80107AC4, 0x80107AF0, 0x80107B1C, 0x80107B48, 0x80107B74, 0x80107BA0, 0x80107BCC, 0x80107BF8, 0x80107C24, 0x80107C50, 0x80107C7C, &D_80108974, 0x8010899C, &D_80108974, 0x8010899C }; +HudElementAnim* battle_menu_StarPowerMovesHudScripts[] = { HudScript_MenuStarPower, HudScript_MenuStarPowerDisabled, HudScript_Eldstar, HudScript_EldstarDisabled, + HudScript_Mamar, HudScript_MamarDisabled, HudScript_Skolar, HudScript_SkolarDisabled, + HudScript_Muskular, HudScript_MuskularDisabled, HudScript_Misstar, HudScript_MisstarDisabled, + HudScript_Klevar, HudScript_KlevarDisabled, HudScript_Kalmar, HudScript_KalmarDisabled, + HudScript_StarBeam, HudScript_StarBeamDisabled, HudScript_PeachBeam, HudScript_PeachBeamDisabled, + HudScript_MenuStarPower, HudScript_MenuStarPowerDisabled, HudScript_MenuStarPower, HudScript_MenuStarPowerDisabled }; -s32* D_802AB3F8[] = { &D_80107CA8, &D_80107CF8, &D_80107D48, &D_80107D98, &D_80107DE8, &D_80107CA8, &D_80107E88, &D_80107ED8, &D_80107F28, &D_80107E38, &D_80107FC8, &D_80107FC8, &D_80107FC8, &D_80107FC8, &D_80107FC8, &D_80107FC8 }; +HudElementAnim* battle_menu_PartnerHudScripts[] = { HudScript_Partner0, HudScript_Goombario, HudScript_Kooper, HudScript_Bombette, + HudScript_Parakarry, HudScript_Partner0, HudScript_Watt, HudScript_Sushie, + HudScript_Lakilester, HudScript_Bow, HudScript_PartnerA, HudScript_PartnerA, + HudScript_PartnerA, HudScript_PartnerA, HudScript_PartnerA, HudScript_PartnerA }; -s32* D_802AB438[] = { &D_80107CD0, &D_80107D20, &D_80107D70, &D_80107DC0, &D_80107E10, &D_80107CD0, &D_80107EB0, &D_80107F00, &D_80107F50, &D_80107E60, &D_80107FF0, &D_80107FF0, &D_80107FF0, &D_80107FF0, &D_80107FF0, &D_80107FF0 }; +HudElementAnim* battle_menu_DisabledPartnerHudScripts[] = { HudScript_Partner0Disabled, HudScript_GoombarioDisabled, HudScript_KooperDisabled, HudScript_BombetteDisabled, + HudScript_ParakarryDisabled, HudScript_Partner0Disabled, HudScript_WattDisabled, HudScript_SushieDisabled, + HudScript_LakilesterDisabled, HudScript_BowDisabled, HudScript_PartnerADisabled, HudScript_PartnerADisabled, + HudScript_PartnerADisabled, HudScript_PartnerADisabled, HudScript_PartnerADisabled, HudScript_PartnerADisabled }; -s32 D_802AB478[] = { 0x80292200 }; +HudElementAnim* battle_menu_StrategiesHudScript[] = { HudScript_MenuStrategies }; -s32 D_802AB47C[] = { 0x80292228 }; +HudElementAnim* battle_menu_DisabledStrategiesHudScript[] = { HudScript_MenuStrategiesDisabled }; -s32 D_802AB480[] = { 0x802922A0, 0x802922C8 }; +HudElementAnim* battle_menu_DoNothingHudScripts[] = { HudScript_MenuDoNothing, HudScript_MenuDoNothingDisabled }; -s32 D_802AB488[] = { 0x80292160, 0x80292188 }; +HudElementAnim* battle_menu_FleeHudScripts[] = { HudScript_MenuFlee, HudScript_MenuFleeDisabled }; -s32 battle_menu_leftJustfiedMessages[] = { 0x001D0039, 0x001D0038, 0x001D003F, 0x001D003B, 0x001D0044 }; +// Jump, Hammer, Items, RunAway, Defense +s32 battle_menu_leftJustfiedMessagesA[] = { 0x001D0039, 0x001D0038, 0x001D003F, 0x001D003B, 0x001D0044 }; -s32 D_802AB4A4[] = { 0x001D003E, 0x001D0045, 0x001D0043, 0x001D003A }; +// Change Member, Abilities, Strategies, Star Spirits +s32 battle_menu_leftJustfiedMessagesB[] = { 0x001D003E, 0x001D0045, 0x001D0043, 0x001D003A }; -s32 D_802AB4B4[] = { 0x001D003C, 0x001D0046, 0x001D0048 }; +// Do Nothing, Act Later, Focus +s32 battle_menu_leftJustfiedMessagesC[] = { 0x001D003C, 0x001D0046, 0x001D0048 }; -s32 battle_menu_centeredMessages[] = { 0x001D004B, 0x001D004A }; +// Jump, Hammer +s32 battle_menu_centeredMessagesA[] = { 0x001D004B, 0x001D004A }; -s32 D_802AB4C8[] = { 0x001D0050, 0x001D004D, 0x001D0052, 0x001D004F, 0x001D0053 }; +// Items, RunAway, Defense, Change Member, Abilities +s32 battle_menu_centeredMessagesB[] = { 0x001D0050, 0x001D004D, 0x001D0052, 0x001D004F, 0x001D0053 }; -s32 D_802AB4DC[] = { 0x001D0051 }; +// Strategies +s32 battle_menu_centeredMessagesC[] = { 0x001D0051 }; -s32 D_802AB4E0[] = { 0x001D004C, 0x001D004E, 0x001D0056, 0x001D0055 }; +// Star Spirits, Do Nothing, Act Later, Focus +s32 battle_menu_centeredMessagesD[] = { 0x001D004C, 0x001D004E, 0x001D0056, 0x001D0055 }; -s8 D_802AB4F0[] = { 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x1A, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x34, 0x00, 0x00, 0x00, 0x39, 0x00, 0x00, 0x00, 0x31, 0x00, 0x00, 0x00, 0x37, }; +s32 D_802AB4F0[] = { 0x2, 0x1, 0x4, 0x6, 0x3, 0x5, 0x1A, 0x3, 0x34, 0x39, 0x31, 0x37 }; // s8 D_802AB513 @@ -137,14 +223,26 @@ s32 D_802AB520[] = { 0x00000000, 0x00090012, 0x000A001A, 0x000B001C, 0x000C0017, s32 D_802AB558[] = { 0x00000000, 0x00090002, 0x000A0005, 0x000B0006, 0x000C0002, 0x009D0002, 0x000E0002, 0x000F0002, 0x00100002, 0x000D0002, 0x00000000, 0x00000000, 0x00000000, 0x00000000 }; -s32 D_802AB590[] = { 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, &D_80107CF8, &D_80107D20, 0x80109338, 0x801093D8, 0x80109360, 0x80109400, 0x80109388, 0x80109428, 0x801093B0, 0x80109450, &D_80107D48, &D_80107D70, 0x80109338, 0x801093D8, 0x80109360, 0x80109400, 0x80109388, 0x80109428, 0x801093B0, 0x80109450, &D_80107D98, &D_80107DC0, 0x80109338, 0x801093D8, 0x80109360, 0x80109400, 0x80109388, 0x80109428, 0x801093B0, 0x80109450, &D_80107DE8, &D_80107E10, 0x80109338, 0x801093D8, 0x80109360, 0x80109400, 0x80109388, 0x80109428, 0x801093B0, 0x80109450, &D_80107CA8, &D_80107CD0, 0x80109338, 0x801093D8, 0x80109360, 0x80109400, 0x80109388, 0x80109428, 0x801093B0, 0x80109450, &D_80107E88, &D_80107EB0, 0x80109338, 0x801093D8, 0x80109360, 0x80109400, 0x80109388, 0x80109428, 0x801093B0, 0x80109450, &D_80107ED8, &D_80107F00, 0x80109338, 0x801093D8, 0x80109360, 0x80109400, 0x80109388, 0x80109428, 0x801093B0, 0x80109450, &D_80107F28, &D_80107F50, 0x80109338, 0x801093D8, 0x80109360, 0x80109400, 0x80109388, 0x80109428, 0x801093B0, 0x80109450, &D_80107E38, &D_80107E60, 0x80109338, 0x801093D8, 0x80109360, 0x80109400, 0x80109388, 0x80109428, 0x801093B0, 0x80109450 }; +HudElementAnim* battle_menu_PartnerMoveHudScripts[] = { + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + HudScript_Goombario, HudScript_GoombarioDisabled, HudScript_MoveDiamond, HudScript_MoveDiamondDisabled, HudScript_MoveBlueOrb, HudScript_MoveBlueOrbDisabled, HudScript_MoveGreenOrb, HudScript_MoveGreenOrbDisabled, HudScript_MoveRedOrb, HudScript_MoveRedOrbDisabled, + HudScript_Kooper, HudScript_KooperDisabled, HudScript_MoveDiamond, HudScript_MoveDiamondDisabled, HudScript_MoveBlueOrb, HudScript_MoveBlueOrbDisabled, HudScript_MoveGreenOrb, HudScript_MoveGreenOrbDisabled, HudScript_MoveRedOrb, HudScript_MoveRedOrbDisabled, + HudScript_Bombette, HudScript_BombetteDisabled, HudScript_MoveDiamond, HudScript_MoveDiamondDisabled, HudScript_MoveBlueOrb, HudScript_MoveBlueOrbDisabled, HudScript_MoveGreenOrb, HudScript_MoveGreenOrbDisabled, HudScript_MoveRedOrb, HudScript_MoveRedOrbDisabled, + HudScript_Parakarry, HudScript_ParakarryDisabled, HudScript_MoveDiamond, HudScript_MoveDiamondDisabled, HudScript_MoveBlueOrb, HudScript_MoveBlueOrbDisabled, HudScript_MoveGreenOrb, HudScript_MoveGreenOrbDisabled, HudScript_MoveRedOrb, HudScript_MoveRedOrbDisabled, + HudScript_Partner0, HudScript_Partner0Disabled, HudScript_MoveDiamond, HudScript_MoveDiamondDisabled, HudScript_MoveBlueOrb, HudScript_MoveBlueOrbDisabled, HudScript_MoveGreenOrb, HudScript_MoveGreenOrbDisabled, HudScript_MoveRedOrb, HudScript_MoveRedOrbDisabled, + HudScript_Watt, HudScript_WattDisabled, HudScript_MoveDiamond, HudScript_MoveDiamondDisabled, HudScript_MoveBlueOrb, HudScript_MoveBlueOrbDisabled, HudScript_MoveGreenOrb, HudScript_MoveGreenOrbDisabled, HudScript_MoveRedOrb, HudScript_MoveRedOrbDisabled, + HudScript_Sushie, HudScript_SushieDisabled, HudScript_MoveDiamond, HudScript_MoveDiamondDisabled, HudScript_MoveBlueOrb, HudScript_MoveBlueOrbDisabled, HudScript_MoveGreenOrb, HudScript_MoveGreenOrbDisabled, HudScript_MoveRedOrb, HudScript_MoveRedOrbDisabled, + HudScript_Lakilester, HudScript_LakilesterDisabled, HudScript_MoveDiamond, HudScript_MoveDiamondDisabled, HudScript_MoveBlueOrb, HudScript_MoveBlueOrbDisabled, HudScript_MoveGreenOrb, HudScript_MoveGreenOrbDisabled, HudScript_MoveRedOrb, HudScript_MoveRedOrbDisabled, + HudScript_Bow, HudScript_BowDisabled, HudScript_MoveDiamond, HudScript_MoveDiamondDisabled, HudScript_MoveBlueOrb, HudScript_MoveBlueOrbDisabled, HudScript_MoveGreenOrb, HudScript_MoveGreenOrbDisabled, HudScript_MoveRedOrb, HudScript_MoveRedOrbDisabled }; -s32 D_802AB720[] = { &D_80108974, 0x8010899C }; +HudElementAnim* battle_menu_PeachStarPowerHudScripts[] = { HudScript_MenuStarPower, HudScript_MenuStarPowerDisabled }; +// Focus s32 D_802AB728[] = { 0x001D0055 }; -s32 D_802AB72C[] = { &D_80108974, 0x8010899C }; +HudElementAnim* battle_menu_TwinkStarPowerHudScripts[] = { HudScript_MenuStarPower, HudScript_MenuStarPowerDisabled }; +// Dash s32 D_802AB734[] = { 0x001D0057 }; s32 D_802AB738[] = { 0x00000000, 0x001D0007, 0x001D0008, 0x001D0009, 0x001D000A, 0x001D000B, 0x001D000C, 0x001D000D, 0x001D000E, 0x001D000F, 0x001D0010, 0x001D0011, 0x001D0012, 0x00000000 }; @@ -299,7 +397,7 @@ void func_802A2910(void) { set_hud_element_tint(moveOptionCostUnitIconIDs[i], 255, 255, 255); } - set_hud_element_anim(battle_menu_moveCursorIcon, D_80104A28); + set_hud_element_anim(battle_menu_moveCursorIcon, HudScript_AnimatedHandPointer); set_window_update(1, 5); if (!battle_menu_hasSpiritsMenu) { @@ -350,7 +448,7 @@ void func_802A2AB8(void) { set_hud_element_tint(moveOptionCostUnitIconIDs[i], 255, 255, 255); } - set_hud_element_anim(battle_menu_moveCursorIcon, D_80104A28); + set_hud_element_anim(battle_menu_moveCursorIcon, HudScript_AnimatedHandPointer); battle_menu_moveTextColor = 10; D_802AD10F = 1; battle_menu_moveState = 20; @@ -501,7 +599,7 @@ void func_802A47E0(void) { set_hud_element_tint(D_802AD618, 0xFF, 0xFF, 0xFF); set_hud_element_tint(D_802AD61C, 0xFF, 0xFF, 0xFF); set_hud_element_tint(D_802AD620, 0xFF, 0xFF, 0xFF); - set_hud_element_anim(D_802AD618, D_80104A28); + set_hud_element_anim(D_802AD618, HudScript_AnimatedHandPointer); set_window_update(6, 5); set_window_update(7, 5); set_window_update(8, 1); @@ -525,7 +623,7 @@ void func_802A48FC(void) { set_hud_element_tint(D_802AD618, 0xFF, 0xFF, 0xFF); set_hud_element_tint(D_802AD61C, 0xFF, 0xFF, 0xFF); set_hud_element_tint(D_802AD620, 0xFF, 0xFF, 0xFF); - set_hud_element_anim(D_802AD618, D_80104A28); + set_hud_element_anim(D_802AD618, HudScript_AnimatedHandPointer); D_802AD614 = 10; D_802AD60B = 1; D_802AD604 = 20; @@ -677,43 +775,43 @@ s32 can_btl_state_update_switch_to_player(void) { BattleStatus* battleStatus = &gBattleStatus; Actor* player = battleStatus->playerActor; - if (battleStatus->flags2 & 2) { + if (battleStatus->flags2 & BS_FLAGS2_2) { return FALSE; } else { s8 debuff = player->debuff; - s32 ret = player->koStatus == 0xD; + s32 playerCantMove = player->koStatus == STATUS_DAZE; - if (debuff == 9) { - ret = FALSE; + if (debuff == STATUS_POISON) { + playerCantMove = FALSE; } - if (debuff == 10) { - ret = FALSE; + if (debuff == STATUS_SHRINK) { + playerCantMove = FALSE; } - if (debuff == 6) { - ret = TRUE; + if (debuff == STATUS_SLEEP) { + playerCantMove = TRUE; } - if (debuff == 3) { - ret = TRUE; + if (debuff == STATUS_FEAR) { + playerCantMove = TRUE; } - if (debuff == 4) { - ret = TRUE; + if (debuff == STATUS_DIZZY) { + playerCantMove = TRUE; } - if (debuff == 5) { - ret = TRUE; + if (debuff == STATUS_PARALYZE) { + playerCantMove = TRUE; } - if (debuff == 7) { - ret = TRUE; + if (debuff == STATUS_FROZEN) { + playerCantMove = TRUE; } - if (debuff == 8) { - ret = TRUE; + if (debuff == STATUS_STOP) { + playerCantMove = TRUE; } - if (player->stoneStatus == 0xC) { - ret = TRUE; + if (player->stoneStatus == STATUS_STONE) { + playerCantMove = TRUE; } if (battleStatus->outtaSightActive) { - ret = TRUE; + playerCantMove = TRUE; } - return !ret; + return !playerCantMove; } } @@ -721,40 +819,40 @@ s32 func_802A58D0(void) { BattleStatus* battleStatus = &gBattleStatus; Actor* partner = battleStatus->partnerActor; s8 partnerDebuff; - s32 ret; + s32 partnerCantMove; - if (battleStatus->flags2 & 4 || partner == PARTNER_NONE || partner->flags & 0x200000) { + if (battleStatus->flags2 & BS_FLAGS2_4 || partner == PARTNER_NONE || partner->flags & 0x200000) { return FALSE; } partnerDebuff = partner->debuff; - ret = partner->koStatus == 0xD; + partnerCantMove = partner->koStatus == STATUS_DAZE; - if (partnerDebuff == 9) { - ret = FALSE; + if (partnerDebuff == STATUS_POISON) { + partnerCantMove = FALSE; } - if (partnerDebuff == 10) { - ret = FALSE; + if (partnerDebuff == STATUS_SHRINK) { + partnerCantMove = FALSE; } - if (partnerDebuff == 6) { - ret = TRUE; + if (partnerDebuff == STATUS_SLEEP) { + partnerCantMove = TRUE; } - if (partnerDebuff == 3) { - ret = TRUE; + if (partnerDebuff == STATUS_FEAR) { + partnerCantMove = TRUE; } - if (partnerDebuff == 5) { - ret = TRUE; + if (partnerDebuff == STATUS_PARALYZE) { + partnerCantMove = TRUE; } - if (partnerDebuff == 7) { - ret = TRUE; + if (partnerDebuff == STATUS_FROZEN) { + partnerCantMove = TRUE; } - if (partnerDebuff == 8) { - ret = TRUE; + if (partnerDebuff == STATUS_STOP) { + partnerCantMove = TRUE; } - if (partner->stoneStatus == 0xC) { - ret = TRUE; + if (partner->stoneStatus == STATUS_STONE) { + partnerCantMove = TRUE; } - return !ret; + return !partnerCantMove; } INCLUDE_ASM(s32, "415D90", btl_state_update_player_menu); @@ -881,7 +979,7 @@ void btl_state_draw_partner_menu(void) { } s32 func_802A9B30(void) { - return (gBattleStatus.flags2 & 4) <= 0; + return (gBattleStatus.flags2 & BS_FLAGS2_4) <= 0; } INCLUDE_ASM(s32, "415D90", btl_state_update_peach_menu); diff --git a/src/77480.c b/src/77480.c index 282450ef57..68f32da121 100644 --- a/src/77480.c +++ b/src/77480.c @@ -1066,13 +1066,13 @@ void check_for_interactables(void) { phi_s2 = 1; phi_s0 = floor; switch (get_entity_type(floor)) { - case 0x3: - case 0x4: - case 0x5: - case 0x6: - case 0xC: - case 0x32: - case 0x33: + case ENTITY_TYPE_PADLOCK: + case ENTITY_TYPE_PADLOCK_RED_FRAME: + case ENTITY_TYPE_PADLOCK_RED_FACE: + case ENTITY_TYPE_PADLOCK_BLUE_FACE: + case ENTITY_TYPE_PUSH_BLOCK: + case ENTITY_TYPE_CHEST: + case ENTITY_TYPE_SIGNPOST: phi_s0 = -1; break; } @@ -1429,7 +1429,7 @@ void update_player_shadow(void) { } shadow->position.y = y; - shadow->unk_05 = (f64)playerStatus->alpha1 / 2; + shadow->alpha = (f64)playerStatus->alpha1 / 2; if (!(gGameStatusPtr->peachFlags & 1)) { set_standard_shadow_scale(shadow, shadowScale); diff --git a/src/80850_len_3060.c b/src/80850_len_3060.c index a408371dd0..121ca9c35c 100644 --- a/src/80850_len_3060.c +++ b/src/80850_len_3060.c @@ -1,18 +1,18 @@ #include "common.h" #include "hud_element.h" -extern s32 D_800F7FA8; -extern s32 D_800F7F80[10]; +extern s32 TimesHudScript; +extern s32 DigitHudScripts[10]; -extern HudElementAnim D_80108248[]; -extern HudElementAnim D_80108518[]; -extern HudElementAnim D_80108270[]; -extern HudElementAnim D_80108538[]; -extern HudElementAnim D_80080FC4[]; -extern HudElementAnim D_801086AC[]; -extern HudElementAnim D_801083D8[]; -extern HudElementAnim D_80108068[]; -extern HudElementAnim D_80104BEC[]; +extern HudElementAnim HudScript_StatusHP[]; +extern HudElementAnim HudScript_StatusHeart[]; +extern HudElementAnim HudScript_StatusFP[]; +extern HudElementAnim HudScript_StatusFlower[]; +extern HudElementAnim HudScript_Item_CoinSparkleRandom[]; +extern HudElementAnim HudScript_StatusStarPoint[]; +extern HudElementAnim HudScript_StatusStar1[]; +extern HudElementAnim HudScript_StatusTimes[]; +extern HudElementAnim HudScript_StatusSPShine[]; void clear_player_data(void) { PlayerData* playerData = &gPlayerData; @@ -330,69 +330,69 @@ void initialize_status_menu(void) { close_status_menu(); - iconIndex = create_hud_element(D_80108248); - uiStatus->hpIconIndexes[0] = iconIndex; + iconIndex = create_hud_element(HudScript_StatusHP); + uiStatus->hpIconIndices[0] = iconIndex; set_hud_element_flags(iconIndex, 0x80); clear_hud_element_flags(iconIndex, 0x8000); - iconIndex = create_hud_element(D_80108518); - uiStatus->hpIconIndexes[1] = iconIndex; + iconIndex = create_hud_element(HudScript_StatusHeart); + uiStatus->hpIconIndices[1] = iconIndex; set_hud_element_flags(iconIndex, 0x80); clear_hud_element_flags(iconIndex, 0x8000); - iconIndex = create_hud_element(D_80108270); - uiStatus->fpIconIndexes[0] = iconIndex; + iconIndex = create_hud_element(HudScript_StatusFP); + uiStatus->fpIconIndices[0] = iconIndex; set_hud_element_flags(iconIndex, 0x80); clear_hud_element_flags(iconIndex, 0x8000); - iconIndex = create_hud_element(D_80108538); - uiStatus->fpIconIndexes[1] = iconIndex; + iconIndex = create_hud_element(HudScript_StatusFlower); + uiStatus->fpIconIndices[1] = iconIndex; set_hud_element_flags(iconIndex, 0x80); clear_hud_element_flags(iconIndex, 0x8000); - iconIndex = create_hud_element(D_80108558); + iconIndex = create_hud_element(HudScript_StatusCoin); uiStatus->coinIconIndex = iconIndex; set_hud_element_flags(iconIndex, 0x80); clear_hud_element_flags(iconIndex, 0x8000); - iconIndex = create_hud_element(D_80080FC4); - uiStatus->coinIconIndex2 = iconIndex; + iconIndex = create_hud_element(HudScript_Item_CoinSparkleRandom); + uiStatus->coinSparkleIconIndex = iconIndex; set_hud_element_flags(iconIndex, 0x80); clear_hud_element_flags(iconIndex, 0x8000); - iconIndex = create_hud_element(D_801086AC); + iconIndex = create_hud_element(HudScript_StatusStarPoint); uiStatus->starpointsIconIndex = iconIndex; set_hud_element_flags(iconIndex, 0x80); clear_hud_element_flags(iconIndex, 0x8000); - iconIndex = create_hud_element(D_80104BEC); - uiStatus->starpointsIconIndex2 = iconIndex; + iconIndex = create_hud_element(HudScript_StatusSPShine); + uiStatus->starpointsShineIconIndex = iconIndex; set_hud_element_flags(iconIndex, 0x80); clear_hud_element_flags(iconIndex, 0x8000); - newVar = create_hud_element(D_80108068); + newVar = create_hud_element(HudScript_StatusTimes); iconIndex = newVar; uiStatus->iconIndex8 = iconIndex; set_hud_element_flags(iconIndex, 0x82); clear_hud_element_flags(iconIndex, 0x8000); - iconIndex = create_hud_element(D_80108068); + iconIndex = create_hud_element(HudScript_StatusTimes); uiStatus->iconIndex9 = iconIndex; set_hud_element_flags(iconIndex, 0x82); clear_hud_element_flags(iconIndex, 0x8000); - iconIndex = create_hud_element(D_80108068); + iconIndex = create_hud_element(HudScript_StatusTimes); uiStatus->iconIndexA = iconIndex; set_hud_element_flags(iconIndex, 0x82); clear_hud_element_flags(iconIndex, 0x8000); - iconIndex = create_hud_element(D_80108068); + iconIndex = create_hud_element(HudScript_StatusTimes); uiStatus->iconIndexB = iconIndex; set_hud_element_flags(iconIndex, 0x82); clear_hud_element_flags(iconIndex, 0x8000); - iconIndex = create_hud_element(D_801083D8); - uiStatus->iconIndexC = iconIndex; + iconIndex = create_hud_element(HudScript_StatusStar1); + uiStatus->starIconIndex = iconIndex; set_hud_element_flags(iconIndex, 0x80); clear_hud_element_flags(iconIndex, 0x8000); @@ -409,7 +409,7 @@ void status_menu_draw_number(s32 iconID, s32 x, s32 y, s32 value, s32 numDigits) s32 digit; s32 place; - set_hud_element_anim(iconID, D_800F7FA8); + set_hud_element_anim(iconID, TimesHudScript); x += 8; y2 = y + 8; set_hud_element_render_pos(iconID, x, y + 7); @@ -434,7 +434,7 @@ void status_menu_draw_number(s32 iconID, s32 x, s32 y, s32 value, s32 numDigits) // Once we have encountered our first non-zero digit, we need to keep drawing the remaining digits if (digit != 0 || keepDrawing || (i == numDigits - 1)) { keepDrawing = TRUE; - set_hud_element_anim(iconID, D_800F7F80[digit]); + set_hud_element_anim(iconID, DigitHudScripts[digit]); set_hud_element_render_pos(iconID, x, y2); clear_hud_element_flags(iconID, 2); draw_hud_element_2(iconID); @@ -528,11 +528,11 @@ void show_coin_counter(void) { if (uiStatus->unk_6C[0] == 0) { set_window_properties(0x14, 0x20, 0xa4, 0x40, 0x14, 0x15, coin_counter_draw_content, 0, -1); set_window_update(0x14, basic_window_update); - index = create_hud_element(D_80109270); + index = create_hud_element(HudScript_MenuTimes); uiStatus->iconIndex10 = index; set_hud_element_flags(index, 0x80); set_hud_element_tint(index, 0xff, 0xff, 0xff); - index = create_hud_element(D_80108558); + index = create_hud_element(HudScript_StatusCoin); uiStatus->iconIndex11 = index; set_hud_element_flags(index, 0x80); set_hud_element_tint(index, 0xff, 0xff, 0xff); @@ -862,22 +862,22 @@ void reset_status_menu(void) { uiStatus->unk_3B[1] = 0; for (i = 0; i < 2; i++) { - copy_world_hud_element_ref_to_battle(uiStatus->hpIconIndexes[i], uiStatus->hpIconIndexes[i]); + copy_world_hud_element_ref_to_battle(uiStatus->hpIconIndices[i], uiStatus->hpIconIndices[i]); } for (i = 0; i < 2; i++) { - copy_world_hud_element_ref_to_battle(uiStatus->fpIconIndexes[i], uiStatus->fpIconIndexes[i]); + copy_world_hud_element_ref_to_battle(uiStatus->fpIconIndices[i], uiStatus->fpIconIndices[i]); } copy_world_hud_element_ref_to_battle(uiStatus->coinIconIndex, uiStatus->coinIconIndex); - copy_world_hud_element_ref_to_battle(uiStatus->coinIconIndex2, uiStatus->coinIconIndex2); + copy_world_hud_element_ref_to_battle(uiStatus->coinSparkleIconIndex, uiStatus->coinSparkleIconIndex); copy_world_hud_element_ref_to_battle(uiStatus->starpointsIconIndex, uiStatus->starpointsIconIndex); - copy_world_hud_element_ref_to_battle(uiStatus->starpointsIconIndex2, uiStatus->starpointsIconIndex2); + copy_world_hud_element_ref_to_battle(uiStatus->starpointsShineIconIndex, uiStatus->starpointsShineIconIndex); copy_world_hud_element_ref_to_battle(uiStatus->iconIndex8, uiStatus->iconIndex8); copy_world_hud_element_ref_to_battle(uiStatus->iconIndex9, uiStatus->iconIndex9); copy_world_hud_element_ref_to_battle(uiStatus->iconIndexA, uiStatus->iconIndexA); copy_world_hud_element_ref_to_battle(uiStatus->iconIndexB, uiStatus->iconIndexB); - copy_world_hud_element_ref_to_battle(uiStatus->iconIndexC, uiStatus->iconIndexC); + copy_world_hud_element_ref_to_battle(uiStatus->starIconIndex, uiStatus->starIconIndex); } // Weird order of loading stuff diff --git a/src/8a860_len_3f30.c b/src/8a860_len_3f30.c index 27605b3477..1c059761e2 100644 --- a/src/8a860_len_3f30.c +++ b/src/8a860_len_3f30.c @@ -1,18 +1,18 @@ #include "common.h" #include "hud_element.h" -extern HudElementAnim D_80104A00[0]; -extern HudElementAnim D_80104C10[0]; -extern HudElementAnim D_80107798[0]; -extern HudElementAnim D_801077E4[0]; -extern HudElementAnim D_8010790C[0]; -extern HudElementAnim D_80109298; -extern HudElementAnim D_801092C0; -extern HudElementAnim D_801092E8; -extern HudElementAnim D_80109310; +extern HudElementAnim HudScript_HandPointer[0]; +extern HudElementAnim HudScript_StatusStarPiece[0]; +extern HudElementAnim HudScript_GreenArrowDown[0]; +extern HudElementAnim HudScript_GreenArrowUp[0]; +extern HudElementAnim HudScript_EmptyBar[0]; +extern HudElementAnim HudScript_PartnerRank1A; +extern HudElementAnim HudScript_PartnerRank1B; +extern HudElementAnim HudScript_PartnerRank2A; +extern HudElementAnim HudScript_PartnerRank2B; -HudElementAnim* D_80109890[] = { &D_80109298, &D_801092E8 }; -HudElementAnim* D_80109898[] = { &D_801092C0, &D_80109310 }; +HudElementAnim* D_80109890[] = { &HudScript_PartnerRank1A, &HudScript_PartnerRank2A }; +HudElementAnim* D_80109898[] = { &HudScript_PartnerRank1B, &HudScript_PartnerRank2B }; s16 D_801098A0[] = { 0x008C, 0x008C, 0x008D, 0x007C, 0x0086, 0x0077, 0x008D, 0x008D, 0x006C, 0x008D, 0x0084, 0x0084, 0x008D, 0x008C, }; @@ -161,7 +161,7 @@ s32 popup_menu_update(void) { D_8010D67E = 62; } D_8010D68C = 0; - elementID = create_hud_element(D_8010790C); + elementID = create_hud_element(HudScript_EmptyBar); D_8010D65C = elementID; set_hud_element_flags(elementID, 0x80); set_hud_element_tint(elementID, 255, 255, 255); @@ -175,38 +175,38 @@ s32 popup_menu_update(void) { set_hud_element_scale(elementID, 0.45f); set_hud_element_flags(elementID, 0x8080); - elementID = create_hud_element(D_80104A28); + elementID = create_hud_element(HudScript_AnimatedHandPointer); D_8010D66C = elementID; set_hud_element_flags(elementID, 0x20000080); - elementID = create_hud_element(D_801077E4); + elementID = create_hud_element(HudScript_GreenArrowUp); D_8010D670 = elementID; set_hud_element_flags(elementID, 0x20000080); - elementID = create_hud_element(D_80107798); + elementID = create_hud_element(HudScript_GreenArrowDown); D_8010D674 = elementID; set_hud_element_flags(elementID, 0x20000080); if (gPopupMenu->popupType == 3) { - D_8010D660 = create_hud_element(D_80104C10); + D_8010D660 = create_hud_element(HudScript_StatusStarPiece); elementID = D_8010D660; set_hud_element_flags(elementID, 0x80); set_hud_element_tint(elementID, 255, 255, 255); } if (gPopupMenu->popupType == 4) { - D_8010D660 = create_hud_element(D_80104C10); + D_8010D660 = create_hud_element(HudScript_StatusStarPiece); elementID = D_8010D660; set_hud_element_flags(elementID, 0x8080); set_hud_element_tint(elementID, 255, 255, 255); } if (gPopupMenu->popupType == 5) { - D_8010D660 = create_hud_element(D_80108558); + D_8010D660 = create_hud_element(HudScript_StatusCoin); elementID = D_8010D660; set_hud_element_flags(elementID, 0x80); set_hud_element_tint(elementID, 255, 255, 255); } if (gPopupMenu->popupType == 3 || gPopupMenu->popupType == 4) { - D_8010D664 = create_hud_element(D_80109270); + D_8010D664 = create_hud_element(HudScript_MenuTimes); elementID = D_8010D664; set_hud_element_flags(elementID, 0x80); set_hud_element_tint(elementID, 255, 255, 255); @@ -603,7 +603,7 @@ s32 popup_menu_update(void) { set_hud_element_tint(D_8010D66C, 160, 160, 160); set_hud_element_tint(D_8010D670, 160, 160, 160); set_hud_element_tint(D_8010D674, 160, 160, 160); - set_hud_element_anim(D_8010D66C, D_80104A00); + set_hud_element_anim(D_8010D66C, HudScript_HandPointer); if (gPopupMenu->popupType == 3) { set_hud_element_tint(D_8010D660, 160, 160, 160); set_hud_element_tint(D_8010D664, 160, 160, 160); @@ -722,7 +722,7 @@ s32 popup_menu_update(void) { set_hud_element_tint(D_8010D66C, 160, 160, 160); set_hud_element_tint(D_8010D670, 160, 160, 160); set_hud_element_tint(D_8010D674, 160, 160, 160); - set_hud_element_anim(D_8010D66C, D_80104A00); + set_hud_element_anim(D_8010D66C, HudScript_HandPointer); if (gPopupMenu->popupType == 3) { set_hud_element_tint(D_8010D660, 160, 160, 160); @@ -813,7 +813,7 @@ s32 popup_menu_update(void) { if (gPopupMenu->popupType == 5) { set_hud_element_tint(D_8010D660, 160, 160, 160); } - set_hud_element_anim(D_8010D66C, D_80104A00); + set_hud_element_anim(D_8010D66C, HudScript_HandPointer); switch (gPopupMenu->popupType) { case 0: diff --git a/src/C50A0.c b/src/C50A0.c index 9d4be4dcaa..9a335eb4ea 100644 --- a/src/C50A0.c +++ b/src/C50A0.c @@ -105,7 +105,7 @@ void item_entity_disable_shadow(ItemEntity* itemEntity) { itemEntity->flags |= ENTITY_FLAGS_CONTINUOUS_COLLISION; if (itemEntity->shadowIndex >= 0) { shadow = get_shadow_by_index(itemEntity->shadowIndex); - shadow->flags |= SHADOW_FLAGS_1; + shadow->flags |= SHADOW_FLAGS_HIDDEN; } } @@ -115,7 +115,7 @@ void item_entity_enable_shadow(ItemEntity* itemEntity) { itemEntity->flags &= ~ENTITY_FLAGS_CONTINUOUS_COLLISION; if (itemEntity->shadowIndex >= 0) { shadow = get_shadow_by_index(itemEntity->shadowIndex); - shadow->flags &= ~SHADOW_FLAGS_1; + shadow->flags &= ~SHADOW_FLAGS_HIDDEN; } } @@ -174,7 +174,7 @@ s32 make_item_entity_delayed(s32 itemID, f32 x, f32 y, f32 z, s32 itemSpawnMode, return make_item_entity(itemID, x, y, z, itemSpawnMode, pickupDelay, -1, pickupVar); } -INCLUDE_ASM(s32, "C50A0", init_got_item); +INCLUDE_ASM(s32, "C50A0", make_item_entity_at_player); INCLUDE_ASM(s32, "C50A0", item_entity_update); diff --git a/src/a5dd0_len_114e0.c b/src/a5dd0_len_114e0.c index d20135c77b..1fe3009213 100644 --- a/src/a5dd0_len_114e0.c +++ b/src/a5dd0_len_114e0.c @@ -1084,7 +1084,7 @@ void update_entities(void) { entity->collisionFlags = entity_get_collision_flags(entity); if (entity->collisionFlags) { - EntityCallback entityCallback = entity->staticData->unk_data_ptr2; + EntityCallback entityCallback = entity->staticData->fpHandleCollision; if (entityCallback != NULL && entityCallback(entity) != 0) { entity->unk_07 = 0xA; @@ -1170,19 +1170,19 @@ void update_shadows(void) { D_80151324++; if (!(shadow->flags & SHADOW_FLAGS_40000000)) { - if (shadow->flags & SHADOW_FLAGS_2000) { + if (shadow->flags & SHADOW_FLAGS_ALIGNED_TO_CAMERA) { shadow->rotation.y = -gCameras[gCurrentCameraID].currentYaw; } update_shadow_transform_matrix(shadow); - if (shadow->flags & SHADOW_FLAGS_8) { + if (shadow->flags & SHADOW_FLAGS_COMPLEX_MODEL) { update_model_animator(shadow->entityModelID); } else { exec_entity_model_commandlist(shadow->entityModelID); } - if (shadow->flags & SHADOW_FLAGS_20000000) { + if (shadow->flags & SHADOW_FLAGS_READY_TO_DELETE) { _delete_shadow(shadow->listIndex); } } @@ -1379,14 +1379,14 @@ void render_shadows(void) { Shadow* shadow = get_shadow_by_index(i); if (shadow != NULL) { - if (shadow->flags & SHADOW_FLAGS_1) { - if (shadow->flags & SHADOW_FLAGS_10000000) { - shadow->unk_05 -= 20; - if (shadow->unk_05 <= 20) { - shadow->flags |= SHADOW_FLAGS_20000000; + if (shadow->flags & SHADOW_FLAGS_HIDDEN) { + if (shadow->flags & SHADOW_FLAGS_FADING_AWAY) { + shadow->alpha -= 20; + if (shadow->alpha <= 20) { + shadow->flags |= SHADOW_FLAGS_READY_TO_DELETE; } } - } else if (shadow->flags & SHADOW_FLAGS_8) { + } else if (shadow->flags & SHADOW_FLAGS_COMPLEX_MODEL) { if (shadow->vertexArray == NULL) { render_animated_model(shadow->entityModelID, &shadow->transformMatrix); } else { @@ -1396,14 +1396,14 @@ void render_shadows(void) { shadow->vertexArray); } } else { - if (shadow->flags & SHADOW_FLAGS_10000000) { - shadow->unk_05 -= 20; - if (shadow->unk_05 <= 20) { - shadow->flags |= SHADOW_FLAGS_20000000; + if (shadow->flags & SHADOW_FLAGS_FADING_AWAY) { + shadow->alpha -= 20; + if (shadow->alpha <= 20) { + shadow->flags |= SHADOW_FLAGS_READY_TO_DELETE; } } - bind_entity_model_setupGfx(shadow->entityModelID, shadow->unk_05, entity_model_set_shadow_color); + bind_entity_model_setupGfx(shadow->entityModelID, shadow->alpha, entity_model_set_shadow_color); if (shadow->vertexArray == NULL) { draw_entity_model_A(shadow->entityModelID, &shadow->transformMatrix); @@ -1542,7 +1542,7 @@ void delete_entity(s32 entityIndex) { if (entity->shadowIndex >= 0) { Shadow* shadow = get_shadow_by_index(entity->shadowIndex); - shadow->flags |= SHADOW_FLAGS_10000000; + shadow->flags |= SHADOW_FLAGS_FADING_AWAY; } heap_free((*gCurrentEntityListPtr)[entityIndex]); @@ -1567,7 +1567,7 @@ void delete_entity_and_unload_data(s32 entityIndex) { if (entity->shadowIndex >= 0) { Shadow* shadow = get_shadow_by_index(entity->shadowIndex); - shadow->flags |= SHADOW_FLAGS_10000000; + shadow->flags |= SHADOW_FLAGS_FADING_AWAY; } heap_free((*gCurrentEntityListPtr)[entityIndex]); @@ -1792,7 +1792,7 @@ s32 create_shadow_from_data(StaticShadowData* data, f32 x, f32 y, f32 z) { mem_clear(shadow, sizeof(*shadow)); shadow->listIndex = i; shadow->flags = data->flags | SHADOW_FLAGS_80000000; - shadow->unk_05 = 0x80; + shadow->alpha = 0x80; shadow->unk_06 = 0x80; shadow->position.x = x; shadow->position.y = y; @@ -1802,11 +1802,11 @@ s32 create_shadow_from_data(StaticShadowData* data, f32 x, f32 y, f32 z) { shadow->scale.z = 1.0f; if (data->animModelNode != NULL) { - shadow->flags |= SHADOW_FLAGS_8; - shadow->entityModelID = create_model_animator(data->unk_04); + shadow->flags |= SHADOW_FLAGS_COMPLEX_MODEL; + shadow->entityModelID = create_model_animator(data->renderCommandList); load_model_animator_tree(shadow->entityModelID, data->animModelNode); } else { - shadow->entityModelID = load_entity_model(data->unk_04); + shadow->entityModelID = load_entity_model(data->renderCommandList); } if (data->onCreateCallback != NULL) { @@ -1883,7 +1883,7 @@ ApiStatus UseDynamicShadow(Evt* script, s32 isInitialCall) { entity->flags |= ENTITY_FLAGS_HAS_DYNAMIC_SHADOW; shadow = get_shadow_by_index(entity->shadowIndex); - shadow->flags |= SHADOW_FLAGS_400000; + shadow->flags |= SHADOW_FLAGS_POSITION_DIRTY; } else { entity->flags &= ~ENTITY_FLAGS_HAS_DYNAMIC_SHADOW; } @@ -2003,24 +2003,24 @@ s32 create_entity_shadow(Entity* entity, f32 x, f32 y, f32 z) { s32 create_shadow_type(s32 type, f32 x, f32 y, f32 z) { s32 setFlag200 = FALSE; - StaticShadowData* data = &D_802E98BC; + StaticShadowData* data = &CircularShadowA; s32 shadowIndex; switch (type) { case 2: setFlag200 = TRUE; case 0: - data = &D_802E98BC; + data = &CircularShadowA; break; case 3: setFlag200 = TRUE; case 1: - data = &D_802E9904; + data = &SquareShadow; break; case 5: setFlag200 = TRUE; case 4: - data = &D_802E98E0; + data = &CircularShadowB; break; } @@ -2050,7 +2050,7 @@ void update_entity_shadow_position(Entity* entity) { f32 origHitLength; if (entity->alpha < 255) { - shadow->unk_05 = entity->alpha / 2; + shadow->alpha = entity->alpha / 2; } else { u8 alphaTemp; @@ -2059,12 +2059,12 @@ void update_entity_shadow_position(Entity* entity) { } else { alphaTemp = 128; } - shadow->unk_05 = alphaTemp; + shadow->alpha = alphaTemp; } if (!(entity->flags & ENTITY_FLAGS_HAS_DYNAMIC_SHADOW)) { - if (shadow->flags & SHADOW_FLAGS_400000) { - shadow->flags &= ~SHADOW_FLAGS_400000; + if (shadow->flags & SHADOW_FLAGS_POSITION_DIRTY) { + shadow->flags &= ~SHADOW_FLAGS_POSITION_DIRTY; } else { return; } @@ -2105,9 +2105,9 @@ void update_entity_shadow_position(Entity* entity) { shadow->flags &= ~SHADOW_FLAGS_40000000; } - shadow->flags = (shadow->flags & ~SHADOW_FLAGS_1) | ((u16)entity->flags & ENTITY_FLAGS_HIDDEN); + shadow->flags = (shadow->flags & ~SHADOW_FLAGS_HIDDEN) | ((u16)entity->flags & ENTITY_FLAGS_HIDDEN); if (!(entity->flags & ENTITY_FLAGS_400) && origHitLength == 0.0f) { - shadow->flags |= SHADOW_FLAGS_1; + shadow->flags |= SHADOW_FLAGS_HIDDEN; } } else { entity->shadowPosY = 0.0f; diff --git a/src/battle/action_cmd/07.c b/src/battle/action_cmd/07.c index 3436f22efb..a0b3a2695b 100644 --- a/src/battle/action_cmd/07.c +++ b/src/battle/action_cmd/07.c @@ -5,9 +5,9 @@ extern s32 D_80294280; extern s32 D_802A9620; -extern HudElementAnim D_80108AFC; -extern HudElementAnim D_80108B28; -extern HudElementAnim D_80109244; +extern HudElementAnim HudScript_BlueMeter; +extern HudElementAnim HudScript_AButton; +extern HudElementAnim HudScript_RunAwayOK; s32 func_8024FAFC(s32); @@ -31,7 +31,7 @@ ApiStatus func_802A9000_425B50(Evt* script, s32 isInitialCall) { D_802A9620 = 0; actionCommandStatus->hudElementY = 80; - hudElement = create_hud_element(&D_80108B28); + hudElement = create_hud_element(HudScript_AButton); actionCommandStatus->hudElements[0] = hudElement; set_hud_element_flags(hudElement, 0x82); set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, @@ -39,7 +39,7 @@ ApiStatus func_802A9000_425B50(Evt* script, s32 isInitialCall) { set_hud_element_render_depth(hudElement, 0); // Weird use of an extra temp settles regalloc here. - hudElementTemp = create_hud_element(&D_80108AFC); + hudElementTemp = create_hud_element(HudScript_BlueMeter); hudElement = hudElementTemp; actionCommandStatus->hudElements[1] = hudElement; set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, @@ -47,7 +47,7 @@ ApiStatus func_802A9000_425B50(Evt* script, s32 isInitialCall) { set_hud_element_render_depth(hudElement, 0); set_hud_element_flags(hudElement, 0x82); - hudElement = create_hud_element(&D_80109244); + hudElement = create_hud_element(HudScript_RunAwayOK); actionCommandStatus->hudElements[2] = hudElement; set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); diff --git a/src/battle/action_cmd/0A.c b/src/battle/action_cmd/0A.c index 07ee9f0537..eaf10fc479 100644 --- a/src/battle/action_cmd/0A.c +++ b/src/battle/action_cmd/0A.c @@ -4,10 +4,10 @@ #define NAMESPACE action_command_0A extern s32 D_802942E0; -extern s32 D_80108B80; -extern HudElementAnim D_80292974; -extern HudElementAnim D_80108AFC; -extern HudElementAnim D_80108B28; +extern s32 HudScript_MashAButton; +extern HudElementAnim HudScript_100pct; +extern HudElementAnim HudScript_BlueMeter; +extern HudElementAnim HudScript_AButton; ApiStatus func_802A9000_4273B0(Evt* script, s32 isInitialCall) { ActionCommandStatus* actionCommandStatus = &gActionCommandStatus; @@ -36,19 +36,19 @@ ApiStatus func_802A9000_4273B0(Evt* script, s32 isInitialCall) { actionCommandStatus->hudElementX = -48; actionCommandStatus->hudElementY = 80; - hudElement = create_hud_element(&D_80108B28); + hudElement = create_hud_element(HudScript_AButton); actionCommandStatus->hudElements[0] = hudElement; set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); set_hud_element_render_depth(hudElement, 0); set_hud_element_flags(hudElement, 0x82); - hudElement = create_hud_element(&D_80108AFC); + hudElement = create_hud_element(HudScript_BlueMeter); actionCommandStatus->hudElements[1] = hudElement; set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); set_hud_element_render_depth(hudElement, 0); set_hud_element_flags(hudElement, 0x82); - hudElement = create_hud_element(&D_80292974); + hudElement = create_hud_element(HudScript_100pct); actionCommandStatus->hudElements[2] = hudElement; set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); set_hud_element_render_depth(hudElement, 0); diff --git a/src/battle/action_cmd/air_lift.c b/src/battle/action_cmd/air_lift.c index 0205d7066d..38d21dd095 100644 --- a/src/battle/action_cmd/air_lift.c +++ b/src/battle/action_cmd/air_lift.c @@ -7,9 +7,9 @@ void func_80268834(s32, s32, s16, s32); -extern HudElementAnim D_80108AFC; -extern HudElementAnim D_80108B28; -extern HudElementAnim D_80292974; +extern HudElementAnim HudScript_BlueMeter; +extern HudElementAnim HudScript_AButton; +extern HudElementAnim HudScript_100pct; extern s32 D_80294340; BSS s32 air_lift_bss_0; @@ -38,19 +38,19 @@ ApiStatus func_802A9000_428A70(Evt* script, s32 isInitialCall) { air_lift_bss_0 = 0; actionCommandStatus->hudElementY = 80; - hudElement = create_hud_element(&D_80108B28); + hudElement = create_hud_element(HudScript_AButton); actionCommandStatus->hudElements[0] = hudElement; set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); set_hud_element_render_depth(hudElement, 0); set_hud_element_flags(hudElement, 0x82); - hudElement = create_hud_element(&D_80108AFC); + hudElement = create_hud_element(HudScript_BlueMeter); actionCommandStatus->hudElements[1] = hudElement; set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); set_hud_element_render_depth(hudElement, 0); set_hud_element_flags(hudElement, 0x82); - hudElement = create_hud_element(&D_80292974); + hudElement = create_hud_element(HudScript_100pct); actionCommandStatus->hudElements[2] = hudElement; set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); set_hud_element_render_depth(hudElement, 0); diff --git a/src/battle/action_cmd/air_raid.c b/src/battle/action_cmd/air_raid.c index f5112d448b..fa3e05435f 100644 --- a/src/battle/action_cmd/air_raid.c +++ b/src/battle/action_cmd/air_raid.c @@ -3,9 +3,9 @@ #define NAMESPACE action_command_air_raid -extern HudElementAnim D_80108AFC; -extern HudElementAnim D_80108E1C; -extern HudElementAnim D_80292974; +extern HudElementAnim HudScript_BlueMeter; +extern HudElementAnim HudScript_StickNeutral; +extern HudElementAnim HudScript_100pct; extern s32 D_80294360; @@ -37,19 +37,19 @@ ApiStatus func_802A9000_429320(void) { actionCommandStatus->hudElementX = -48; actionCommandStatus->hudElementY = 80; - hudElement = create_hud_element(&D_80108E1C); + hudElement = create_hud_element(HudScript_StickNeutral); actionCommandStatus->hudElements[0] = hudElement; set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); set_hud_element_render_depth(hudElement, 0); set_hud_element_flags(hudElement, 0x82); - hudElement = create_hud_element(&D_80108AFC); + hudElement = create_hud_element(HudScript_BlueMeter); actionCommandStatus->hudElements[1] = hudElement; set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); set_hud_element_render_depth(hudElement, 0); set_hud_element_flags(hudElement, 0x82); - hudElement = create_hud_element(&D_80292974); + hudElement = create_hud_element(HudScript_100pct); actionCommandStatus->hudElements[2] = hudElement; set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); set_hud_element_render_depth(hudElement, 0); diff --git a/src/battle/action_cmd/body_slam.c b/src/battle/action_cmd/body_slam.c index bec0b3dc9c..ae5abcdf21 100644 --- a/src/battle/action_cmd/body_slam.c +++ b/src/battle/action_cmd/body_slam.c @@ -3,10 +3,10 @@ #define NAMESPACE action_command_body_slam -extern HudElementAnim D_80108AFC[]; -extern HudElementAnim D_80108B28[]; -extern HudElementAnim D_8029275C[]; -extern HudElementAnim D_80292BAC[]; +extern HudElementAnim HudScript_BlueMeter[]; +extern HudElementAnim HudScript_AButton[]; +extern HudElementAnim HudScript_TimingWait[]; +extern HudElementAnim HudScript_FillGaugeResult[]; extern s32 D_80294320; ApiStatus N(CreateHudElements)(Evt* script, s32 isInitialCall) { @@ -34,25 +34,25 @@ ApiStatus N(CreateHudElements)(Evt* script, s32 isInitialCall) { actionCommandStatus->hudElementX = -48; actionCommandStatus->hudElementY = 80; - hudElement = create_hud_element(D_80108B28); + hudElement = create_hud_element(HudScript_AButton); actionCommandStatus->hudElements[0] = hudElement; set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); set_hud_element_render_depth(hudElement, 0); set_hud_element_flags(hudElement, 0x82); - hudElement = create_hud_element(D_80108AFC); + hudElement = create_hud_element(HudScript_BlueMeter); actionCommandStatus->hudElements[1] = hudElement; set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); set_hud_element_render_depth(hudElement, 0); set_hud_element_flags(hudElement, 0x82); - hudElement = create_hud_element(D_80292BAC); + hudElement = create_hud_element(HudScript_FillGaugeResult); actionCommandStatus->hudElements[3] = hudElement; set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); set_hud_element_render_depth(hudElement, 0); set_hud_element_flags(hudElement, 0x82); - hudElement = create_hud_element(D_8029275C); + hudElement = create_hud_element(HudScript_TimingWait); actionCommandStatus->hudElements[2] = hudElement; set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX + 41, actionCommandStatus->hudElementY + 22); set_hud_element_render_depth(hudElement, 0); diff --git a/src/battle/action_cmd/bomb.c b/src/battle/action_cmd/bomb.c index 85f45edd5a..7b6fd24bd5 100644 --- a/src/battle/action_cmd/bomb.c +++ b/src/battle/action_cmd/bomb.c @@ -5,12 +5,12 @@ void sfx_adjust_env_sound_params(s32, s32, s32, s32); -extern HudElementAnim D_80108AFC; -extern HudElementAnim D_80108B28; -extern HudElementAnim D_80292974; +extern HudElementAnim HudScript_BlueMeter; +extern HudElementAnim HudScript_AButton; +extern HudElementAnim HudScript_100pct; extern s32 D_80294300; -extern HudElementAnim D_80108B80; +extern HudElementAnim HudScript_MashAButton; typedef struct UnkVec2s { /* 0x00 */ s16 unk_0; @@ -55,19 +55,19 @@ ApiStatus func_802A9000_427A70(Evt* script, s32 isInitialCall) { actionCommandStatus->hudElementX = -48; actionCommandStatus->hudElementY = 80; - hudElement = create_hud_element(&D_80108B28); + hudElement = create_hud_element(HudScript_AButton); actionCommandStatus->hudElements[0] = hudElement; set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); set_hud_element_render_depth(hudElement, 0); set_hud_element_flags(hudElement, 0x82); - hudElement = create_hud_element(&D_80108AFC); + hudElement = create_hud_element(HudScript_BlueMeter); actionCommandStatus->hudElements[1] = hudElement; set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); set_hud_element_render_depth(hudElement, 0); set_hud_element_flags(hudElement, 0x82); - hudElement = create_hud_element(&D_80292974); + hudElement = create_hud_element(HudScript_100pct); actionCommandStatus->hudElements[2] = hudElement; set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); set_hud_element_render_depth(hudElement, 0); @@ -122,7 +122,7 @@ void func_802A928C_427CFC(void) { break; } - set_hud_element_anim(actionCommandStatus->hudElements[0], &D_80108B80); + set_hud_element_anim(actionCommandStatus->hudElements[0], &HudScript_MashAButton); actionCommandStatus->barFillLevel = 0; actionCommandStatus->unk_54 = actionCommandStatus->unk_52; sfx_play_sound_with_params(0x80000041, 0, 0, 0); diff --git a/src/battle/action_cmd/break_free.c b/src/battle/action_cmd/break_free.c index 73beba5962..495724c6dc 100644 --- a/src/battle/action_cmd/break_free.c +++ b/src/battle/action_cmd/break_free.c @@ -4,10 +4,10 @@ #define NAMESPACE action_command_break_free extern s32 D_80294220; -extern HudElementAnim D_80108B28; -extern HudElementAnim D_80108AFC; -extern HudElementAnim D_802928F8; -extern HudElementAnim D_80109244; +extern HudElementAnim HudScript_AButton; +extern HudElementAnim HudScript_BlueMeter; +extern HudElementAnim HudScript_RunningAway; +extern HudElementAnim HudScript_RunAwayOK; ApiStatus func_802A9000_4233F0(Evt* script, s32 isInitialCall) { ActionCommandStatus* actionCommandStatus = &gActionCommandStatus; @@ -35,25 +35,25 @@ ApiStatus func_802A9000_4233F0(Evt* script, s32 isInitialCall) { actionCommandStatus->hudElementX = -48; actionCommandStatus->hudElementY = 80; - hudElement = create_hud_element(&D_80108B28); + hudElement = create_hud_element(HudScript_AButton); actionCommandStatus->hudElements[0] = hudElement; set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); set_hud_element_render_depth(hudElement, 0); set_hud_element_flags(hudElement, 0x82); - hudElement = create_hud_element(&D_80108AFC); + hudElement = create_hud_element(HudScript_BlueMeter); actionCommandStatus->hudElements[1] = hudElement; set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); set_hud_element_render_depth(hudElement, 0); set_hud_element_flags(hudElement, 0x82); - hudElement = create_hud_element(&D_802928F8); + hudElement = create_hud_element(HudScript_RunningAway); actionCommandStatus->hudElements[2] = hudElement; set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); set_hud_element_render_depth(hudElement, 0); set_hud_element_flags(hudElement, 0x82); - hudElement = create_hud_element(&D_80109244); + hudElement = create_hud_element(HudScript_RunAwayOK); actionCommandStatus->hudElements[3] = hudElement; set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); set_hud_element_render_depth(hudElement, 0); diff --git a/src/battle/action_cmd/dizzy_shell.c b/src/battle/action_cmd/dizzy_shell.c index 55aab0bc29..7836f687cd 100644 --- a/src/battle/action_cmd/dizzy_shell.c +++ b/src/battle/action_cmd/dizzy_shell.c @@ -4,9 +4,9 @@ #define NAMESPACE action_command_dizzy_shell extern s32 D_802942A0; -extern HudElementAnim D_80108AFC; -extern HudElementAnim D_80108B28; -extern HudElementAnim D_80292974; +extern HudElementAnim HudScript_BlueMeter; +extern HudElementAnim HudScript_AButton; +extern HudElementAnim HudScript_100pct; ApiStatus func_802A9000_426170(void) { ActionCommandStatus* actionCommandStatus = &gActionCommandStatus; @@ -34,19 +34,19 @@ ApiStatus func_802A9000_426170(void) { actionCommandStatus->hudElementX = -48; actionCommandStatus->hudElementY = 80; - hudElement = create_hud_element(&D_80108B28); + hudElement = create_hud_element(HudScript_AButton); actionCommandStatus->hudElements[0] = hudElement; set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); set_hud_element_render_depth(hudElement, 0); set_hud_element_flags(hudElement, 0x82); - hudElement = create_hud_element(&D_80108AFC); + hudElement = create_hud_element(HudScript_BlueMeter); actionCommandStatus->hudElements[1] = hudElement; set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); set_hud_element_render_depth(hudElement, 0); set_hud_element_flags(hudElement, 0x82); - hudElement = create_hud_element(&D_80292974); + hudElement = create_hud_element(HudScript_100pct); actionCommandStatus->hudElements[2] = hudElement; set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); set_hud_element_render_depth(hudElement, 0); diff --git a/src/battle/action_cmd/fire_shell.c b/src/battle/action_cmd/fire_shell.c index 3b8ac7e320..a15abe2862 100644 --- a/src/battle/action_cmd/fire_shell.c +++ b/src/battle/action_cmd/fire_shell.c @@ -4,9 +4,9 @@ #define NAMESPACE action_command_fire_shell extern s32 D_802942C0; -extern HudElementAnim D_80108E1C; -extern HudElementAnim D_80108AFC; -extern HudElementAnim D_80292974; +extern HudElementAnim HudScript_StickNeutral; +extern HudElementAnim HudScript_BlueMeter; +extern HudElementAnim HudScript_100pct; ApiStatus func_802A9000_4269D0(void) { ActionCommandStatus* actionCommandStatus = &gActionCommandStatus; @@ -35,19 +35,19 @@ ApiStatus func_802A9000_4269D0(void) { actionCommandStatus->hudElementX = -48; actionCommandStatus->hudElementY = 80; - hudElement = create_hud_element(&D_80108E1C); + hudElement = create_hud_element(HudScript_StickNeutral); actionCommandStatus->hudElements[0] = hudElement; set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); set_hud_element_render_depth(hudElement, 0); set_hud_element_flags(hudElement, 0x82); - hudElement = create_hud_element(&D_80108AFC); + hudElement = create_hud_element(HudScript_BlueMeter); actionCommandStatus->hudElements[1] = hudElement; set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); set_hud_element_render_depth(hudElement, 0); set_hud_element_flags(hudElement, 0x82); - hudElement = create_hud_element(&D_80292974); + hudElement = create_hud_element(HudScript_100pct); actionCommandStatus->hudElements[2] = hudElement; set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); set_hud_element_render_depth(hudElement, 0); diff --git a/src/battle/action_cmd/flee.c b/src/battle/action_cmd/flee.c index 593c023eea..a39e31fc4e 100644 --- a/src/battle/action_cmd/flee.c +++ b/src/battle/action_cmd/flee.c @@ -3,14 +3,14 @@ #define NAMESPACE action_command_flee -extern HudElementAnim D_80108AFC[]; -extern HudElementAnim D_80108B28[]; -extern HudElementAnim D_80109244[]; -extern HudElementAnim D_802928F8[]; -extern HudElementAnim D_80292974[]; +extern HudElementAnim HudScript_BlueMeter[]; +extern HudElementAnim HudScript_AButton[]; +extern HudElementAnim HudScript_RunAwayOK[]; +extern HudElementAnim HudScript_RunningAway[]; +extern HudElementAnim HudScript_100pct[]; extern s32 D_80294200; extern s32 D_802A9920; -extern HudElementAnim D_80108B80[]; +extern HudElementAnim HudScript_MashAButton[]; ApiStatus func_802A9000_422AD0(Evt* script, s32 isInitialCall) { ActionCommandStatus* actionCommandStatus = &gActionCommandStatus; @@ -38,25 +38,25 @@ ApiStatus func_802A9000_422AD0(Evt* script, s32 isInitialCall) { D_802A9920 = 0; actionCommandStatus->hudElementY = 80; - hudElement = create_hud_element(D_80108B28); + hudElement = create_hud_element(HudScript_AButton); actionCommandStatus->hudElements[0] = hudElement; set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); set_hud_element_render_depth(hudElement, 0); set_hud_element_flags(hudElement, 0x82); - hudElement = create_hud_element(D_80108AFC); + hudElement = create_hud_element(HudScript_BlueMeter); actionCommandStatus->hudElements[1] = hudElement; set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); set_hud_element_render_depth(hudElement, 0); set_hud_element_flags(hudElement, 0x82); - hudElement = create_hud_element(D_802928F8); + hudElement = create_hud_element(HudScript_RunningAway); actionCommandStatus->hudElements[2] = hudElement; set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); set_hud_element_render_depth(hudElement, 0); set_hud_element_flags(hudElement, 0x82); - hudElement = create_hud_element(D_80109244); + hudElement = create_hud_element(HudScript_RunAwayOK); actionCommandStatus->hudElements[3] = hudElement; set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); set_hud_element_render_depth(hudElement, 0); @@ -66,7 +66,7 @@ ApiStatus func_802A9000_422AD0(Evt* script, s32 isInitialCall) { set_hud_element_render_pos(actionCommandStatus->hudElements[3], actionCommandStatus->hudElementX - xOffset, actionCommandStatus->hudElementY + 17); set_hud_element_render_pos(actionCommandStatus->hudElements[2], actionCommandStatus->hudElementX - xOffset, actionCommandStatus->hudElementY - 1); - hudElement = create_hud_element(D_80292974); + hudElement = create_hud_element(HudScript_100pct); actionCommandStatus->hudElements[4] = hudElement; set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); set_hud_element_render_depth(hudElement, 0); @@ -142,7 +142,7 @@ void func_802A9378_422E48(void) { break; } - set_hud_element_anim(actionCommandStatus->hudElements[0], D_80108B80); + set_hud_element_anim(actionCommandStatus->hudElements[0], HudScript_MashAButton); D_802A9920 = 1; actionCommandStatus->state = 11; actionCommandStatus->unk_54 = actionCommandStatus->unk_52; diff --git a/src/battle/action_cmd/hammer.c b/src/battle/action_cmd/hammer.c index 5f55f7cb64..9fced2956e 100644 --- a/src/battle/action_cmd/hammer.c +++ b/src/battle/action_cmd/hammer.c @@ -4,13 +4,13 @@ #define NAMESPACE action_command_hammer // icon indexes for hud elements -extern HudElementAnim D_802922F0[]; -extern HudElementAnim D_8029275C[]; -extern HudElementAnim D_802927F0[]; -extern HudElementAnim D_80292848[]; -extern HudElementAnim D_802928A0[]; -extern HudElementAnim D_80108E48[]; -extern HudElementAnim D_80292A2C[]; +extern HudElementAnim HudScript_TimingBar1Chance[]; +extern HudElementAnim HudScript_TimingWait[]; +extern HudElementAnim HudScript_TimingCharge4a[]; +extern HudElementAnim HudScript_TimingCharge4b[]; +extern HudElementAnim HudScript_TimingCharge4c[]; +extern HudElementAnim HudScript_StickHoldLeft[]; +extern HudElementAnim HudScript_RightOn[]; extern s32 D_802941E0; @@ -36,43 +36,43 @@ ApiStatus N(CreateHudElements)(Evt* script, s32 isInitialCall) { actionCommandStatus->unk_60 = 0; actionCommandStatus->hudElementY = 96; - hudElement = create_hud_element(D_802922F0); + hudElement = create_hud_element(HudScript_TimingBar1Chance); actionCommandStatus->hudElements[0] = hudElement; set_hud_element_flags(hudElement, 0x82); set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); set_hud_element_render_depth(hudElement, 10); - hudElement = create_hud_element(D_8029275C); + hudElement = create_hud_element(HudScript_TimingWait); actionCommandStatus->hudElements[1] = hudElement; set_hud_element_flags(hudElement, 0x82); set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); set_hud_element_render_depth(hudElement, 0); - hudElement = create_hud_element(D_802927F0); + hudElement = create_hud_element(HudScript_TimingCharge4a); actionCommandStatus->hudElements[2] = hudElement; set_hud_element_flags(hudElement, 0x82); set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); set_hud_element_render_depth(hudElement, 0); - hudElement = create_hud_element(D_80292848); + hudElement = create_hud_element(HudScript_TimingCharge4b); actionCommandStatus->hudElements[3] = hudElement; set_hud_element_flags(hudElement, 0x82); set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); set_hud_element_render_depth(hudElement, 0); - hudElement = create_hud_element(D_802928A0); + hudElement = create_hud_element(HudScript_TimingCharge4c); actionCommandStatus->hudElements[4] = hudElement; set_hud_element_flags(hudElement, 0x82); set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); set_hud_element_render_depth(hudElement, 0); - hudElement = create_hud_element(D_80108E48); + hudElement = create_hud_element(HudScript_StickHoldLeft); actionCommandStatus->hudElements[5] = hudElement; set_hud_element_flags(hudElement, 0x82); set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); set_hud_element_render_depth(hudElement, 0); - hudElement = create_hud_element(D_80292A2C); + hudElement = create_hud_element(HudScript_RightOn); actionCommandStatus->hudElements[6] = hudElement; set_hud_element_flags(hudElement, 0x82); set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); diff --git a/src/battle/action_cmd/hurricane.c b/src/battle/action_cmd/hurricane.c index cfce09b9b8..733560e30c 100644 --- a/src/battle/action_cmd/hurricane.c +++ b/src/battle/action_cmd/hurricane.c @@ -4,10 +4,10 @@ #define NAMESPACE action_command_hurricane extern s32 D_80294420; -extern HudElementAnim D_80108AFC; -extern HudElementAnim D_80108B28; -extern HudElementAnim D_8029231C; -extern HudElementAnim D_80292974; +extern HudElementAnim HudScript_BlueMeter; +extern HudElementAnim HudScript_AButton; +extern HudElementAnim HudScript_BButton; +extern HudElementAnim HudScript_100pct; ApiStatus func_802A9000_42F6E0(void) { ActionCommandStatus* actionCommandStatus = &gActionCommandStatus; @@ -33,25 +33,25 @@ ApiStatus func_802A9000_42F6E0(void) { actionCommandStatus->unk_68 = 0; actionCommandStatus->hudElementY = 80; - hudElement = create_hud_element(&D_80108B28); + hudElement = create_hud_element(HudScript_AButton); actionCommandStatus->hudElements[0] = hudElement; set_hud_element_flags(hudElement, 0x82); set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); set_hud_element_render_depth(hudElement, 0); - hudElement = create_hud_element(&D_8029231C); + hudElement = create_hud_element(HudScript_BButton); actionCommandStatus->hudElements[2] = hudElement; set_hud_element_flags(hudElement, 0x82); set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); set_hud_element_render_depth(hudElement, 0); - hudElement = create_hud_element(&D_80108AFC); + hudElement = create_hud_element(HudScript_BlueMeter); actionCommandStatus->hudElements[1] = hudElement; set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); set_hud_element_render_depth(hudElement, 0); set_hud_element_flags(hudElement, 0x82); - hudElement = create_hud_element(&D_80292974); + hudElement = create_hud_element(HudScript_100pct); actionCommandStatus->hudElements[4] = hudElement; set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); set_hud_element_render_depth(hudElement, 0); diff --git a/src/battle/action_cmd/jump.c b/src/battle/action_cmd/jump.c index 729857e3fc..40d24c93b9 100644 --- a/src/battle/action_cmd/jump.c +++ b/src/battle/action_cmd/jump.c @@ -5,10 +5,10 @@ extern s32 D_802941C0; -// icon id's for hud elements -extern HudElementAnim D_80108B28[]; -extern HudElementAnim D_80292A2C[]; -extern HudElementAnim D_80108B54[]; +// icon IDs for hud elements +extern HudElementAnim HudScript_AButton[]; +extern HudElementAnim HudScript_RightOn[]; +extern HudElementAnim HudScript_AButtonDown[]; ApiStatus N(CreateHudElements)(Evt* script, s32 isInitialCall) { s32 hudElement; @@ -30,14 +30,14 @@ ApiStatus N(CreateHudElements)(Evt* script, s32 isInitialCall) { actionCommandStatus->unk_60 = 0; actionCommandStatus->hudElementY = 80; - hudElement = create_hud_element(D_80108B28); + hudElement = create_hud_element(HudScript_AButton); actionCommandStatus->hudElements[0] = hudElement; set_hud_element_flags(hudElement, 0x82); set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); set_hud_element_render_depth(hudElement, 0); set_hud_element_alpha(hudElement, 0xFF); - hudElement = create_hud_element(D_80292A2C); + hudElement = create_hud_element(HudScript_RightOn); actionCommandStatus->hudElements[1] = hudElement; set_hud_element_flags(hudElement, 0x82); set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); @@ -126,7 +126,7 @@ void N(update)(void) { temp_s0_3 = battleStatus->unk_434[actionCommandStatus->unk_50]; if (((actionCommandStatus->unk_4E - temp_s0_3) - 2) <= 0) { - set_hud_element_anim(actionCommandStatus->hudElements[0], D_80108B54); + set_hud_element_anim(actionCommandStatus->hudElements[0], HudScript_AButtonDown); } if (((battleStatus->currentButtonsPressed & 0x8000) != 0) && (actionCommandStatus->autoSucceed == 0)) { actionCommandStatus->unk_60 = 1; diff --git a/src/battle/action_cmd/mega_shock.c b/src/battle/action_cmd/mega_shock.c index 8fc6870754..0af2e1c8b4 100644 --- a/src/battle/action_cmd/mega_shock.c +++ b/src/battle/action_cmd/mega_shock.c @@ -3,14 +3,14 @@ #define NAMESPACE action_command_mega_shock -extern HudElementAnim D_80108AFC; -extern HudElementAnim D_80108B28; -extern HudElementAnim D_8029231C; -extern HudElementAnim D_80292974; +extern HudElementAnim HudScript_BlueMeter; +extern HudElementAnim HudScript_AButton; +extern HudElementAnim HudScript_BButton; +extern HudElementAnim HudScript_100pct; extern s32 D_802943C0; -extern HudElementAnim D_80108B80; -extern HudElementAnim D_80292374; +extern HudElementAnim HudScript_MashAButton; +extern HudElementAnim HudScript_MashBButton1; void sfx_adjust_env_sound_params(s32, s32, s32, s32); @@ -51,25 +51,25 @@ ApiStatus func_802A9000_42DA10(Evt* script, s32 isInitialCall) { actionCommandStatus->hudElementX = -0x30; actionCommandStatus->hudElementY = 0x50; - elementID = create_hud_element(&D_80108B28); + elementID = create_hud_element(HudScript_AButton); actionCommandStatus->hudElements[0] = elementID; set_hud_element_flags(elementID, 0x82); set_hud_element_render_pos(elementID, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); set_hud_element_render_depth(elementID, 0); - elementID = create_hud_element(&D_8029231C); + elementID = create_hud_element(HudScript_BButton); actionCommandStatus->hudElements[2] = elementID; set_hud_element_flags(elementID, 0x82); set_hud_element_render_pos(elementID, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); set_hud_element_render_depth(elementID, 0); - elementID = create_hud_element(&D_80108AFC); + elementID = create_hud_element(HudScript_BlueMeter); actionCommandStatus->hudElements[1] = elementID; set_hud_element_render_pos(elementID, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 0x1C); set_hud_element_render_depth(elementID, 0); set_hud_element_flags(elementID, 0x82); - elementID = create_hud_element(&D_80292974); + elementID = create_hud_element(HudScript_100pct); actionCommandStatus->hudElements[4] = elementID; set_hud_element_render_pos(elementID, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 0x1C); set_hud_element_render_depth(elementID, 0); @@ -177,8 +177,8 @@ void func_802A92A0_42DCB0(void) { actionCommandStatus->unk_4E--; break; } - set_hud_element_anim(actionCommandStatus->hudElements[0], &D_80108B80); - set_hud_element_anim(actionCommandStatus->hudElements[2], &D_80292374); + set_hud_element_anim(actionCommandStatus->hudElements[0], &HudScript_MashAButton); + set_hud_element_anim(actionCommandStatus->hudElements[2], &HudScript_MashBButton1); actionCommandStatus->barFillLevel = 0; actionCommandStatus->unk_5C = 0; actionCommandStatus->unk_54 = actionCommandStatus->unk_52; diff --git a/src/battle/action_cmd/power_shock.c b/src/battle/action_cmd/power_shock.c index 9ee888983a..5d622e263c 100644 --- a/src/battle/action_cmd/power_shock.c +++ b/src/battle/action_cmd/power_shock.c @@ -3,11 +3,11 @@ #define NAMESPACE action_command_power_shock -extern const HudElementAnim D_80108AFC[]; -extern const HudElementAnim D_80108B28[]; -extern const HudElementAnim D_80108B80[]; -extern const HudElementAnim D_80109244[]; -extern const HudElementAnim D_80292974[]; +extern const HudElementAnim HudScript_BlueMeter[]; +extern const HudElementAnim HudScript_AButton[]; +extern const HudElementAnim HudScript_MashAButton[]; +extern const HudElementAnim HudScript_RunAwayOK[]; +extern const HudElementAnim HudScript_100pct[]; extern s32 D_802943A0[]; extern s16 D_802A9AA2_42D9B2[]; extern s32 D_802A9B00; @@ -42,25 +42,25 @@ ApiStatus N(CreateHudElements)(Evt* script, s32 isInitialCall) { D_802A9B00 = 0; actionCommandStatus->hudElementY = 80; - hudElement = create_hud_element(D_80108B28); + hudElement = create_hud_element(HudScript_AButton); actionCommandStatus->hudElements[0] = hudElement; set_hud_element_flags(hudElement, 0x82); set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); set_hud_element_render_depth(hudElement, 0); - hudElement = create_hud_element(D_80108AFC); + hudElement = create_hud_element(HudScript_BlueMeter); actionCommandStatus->hudElements[1] = hudElement; set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); set_hud_element_render_depth(hudElement, 0); set_hud_element_flags(hudElement, 0x82); - hudElement = create_hud_element(D_80292974); + hudElement = create_hud_element(HudScript_100pct); actionCommandStatus->hudElements[3] = hudElement; set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); set_hud_element_render_depth(hudElement, 0); set_hud_element_flags(hudElement, 0x82); - hudElement = create_hud_element(D_80109244); + hudElement = create_hud_element(HudScript_RunAwayOK); actionCommandStatus->hudElements[4] = hudElement; set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); set_hud_element_render_depth(hudElement, 0); @@ -162,7 +162,7 @@ void func_802A9310_42D220(void) { actionCommandStatus->unk_4E--; break; } - set_hud_element_anim(actionCommandStatus->hudElements[0], D_80108B80); + set_hud_element_anim(actionCommandStatus->hudElements[0], HudScript_MashAButton); actionCommandStatus->unk_44 = 0; actionCommandStatus->unk_5C = 0; D_802A9B00 = 1; diff --git a/src/battle/action_cmd/smack.c b/src/battle/action_cmd/smack.c index a44247f2a4..aa684f9fb5 100644 --- a/src/battle/action_cmd/smack.c +++ b/src/battle/action_cmd/smack.c @@ -6,10 +6,10 @@ void sfx_adjust_env_sound_params(s32 soundID, u8 volume, u8 pan, s16 pitchShift); -extern HudElementAnim D_80108AFC; -extern HudElementAnim D_80108E1C; -extern HudElementAnim D_80292974; -extern HudElementAnim D_80108F30; +extern HudElementAnim HudScript_BlueMeter; +extern HudElementAnim HudScript_StickNeutral; +extern HudElementAnim HudScript_100pct; +extern HudElementAnim HudScript_StickMashLeft; extern s32 D_802943E0; typedef struct UnkVec2s { @@ -67,19 +67,19 @@ ApiStatus func_802A9000_42E3A0(void) { actionCommandStatus->hudElementX = -48; actionCommandStatus->hudElementY = 80; - hudElement = create_hud_element(&D_80108E1C); + hudElement = create_hud_element(HudScript_StickNeutral); actionCommandStatus->hudElements[0] = hudElement; set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); set_hud_element_render_depth(hudElement, 0); set_hud_element_flags(hudElement, 0x82); - hudElement = create_hud_element(&D_80108AFC); + hudElement = create_hud_element(HudScript_BlueMeter); actionCommandStatus->hudElements[1] = hudElement; set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); set_hud_element_render_depth(hudElement, 0); set_hud_element_flags(hudElement, 0x82); - hudElement = create_hud_element(&D_80292974); + hudElement = create_hud_element(HudScript_100pct); actionCommandStatus->hudElements[2] = hudElement; set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); set_hud_element_render_depth(hudElement, 0); @@ -136,7 +136,7 @@ void func_802A9298_42E638(void) { actionCommandStatus->unk_4E--; break; } - set_hud_element_anim(actionCommandStatus->hudElements[0], &D_80108F30); + set_hud_element_anim(actionCommandStatus->hudElements[0], &HudScript_StickMashLeft); actionCommandStatus->barFillLevel = 0; battleStatus->unk_85 = 0; actionCommandStatus->unk_5C = 0; diff --git a/src/battle/action_cmd/spiny_surge.c b/src/battle/action_cmd/spiny_surge.c index d6f417eede..c3a4d0fd98 100644 --- a/src/battle/action_cmd/spiny_surge.c +++ b/src/battle/action_cmd/spiny_surge.c @@ -4,9 +4,9 @@ #define NAMESPACE action_command_spiny_surge extern s32 D_80294400; -extern HudElementAnim D_80108AFC; -extern HudElementAnim D_80108E1C; -extern HudElementAnim D_80292974; +extern HudElementAnim HudScript_BlueMeter; +extern HudElementAnim HudScript_StickNeutral; +extern HudElementAnim HudScript_100pct; ApiStatus func_802A9000_42EE20(void) { ActionCommandStatus* actionCommandStatus = &gActionCommandStatus; @@ -35,19 +35,19 @@ ApiStatus func_802A9000_42EE20(void) { actionCommandStatus->hudElementX = -48; actionCommandStatus->hudElementY = 80; - hudElement = create_hud_element(&D_80108E1C); + hudElement = create_hud_element(HudScript_StickNeutral); actionCommandStatus->hudElements[0] = hudElement; set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); set_hud_element_render_depth(hudElement, 0); set_hud_element_flags(hudElement, 0x82); - hudElement = create_hud_element(&D_80108AFC); + hudElement = create_hud_element(HudScript_BlueMeter); actionCommandStatus->hudElements[1] = hudElement; set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); set_hud_element_render_depth(hudElement, 0); set_hud_element_flags(hudElement, 0x82); - hudElement = create_hud_element(&D_80292974); + hudElement = create_hud_element(HudScript_100pct); actionCommandStatus->hudElements[2] = hudElement; set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); set_hud_element_render_depth(hudElement, 0); diff --git a/src/battle/action_cmd/spook.c b/src/battle/action_cmd/spook.c index 0159602d82..502964e0af 100644 --- a/src/battle/action_cmd/spook.c +++ b/src/battle/action_cmd/spook.c @@ -3,9 +3,9 @@ #define NAMESPACE action_command_spook -extern HudElementAnim D_80108AFC[]; -extern HudElementAnim D_80108E1C[]; -extern HudElementAnim D_80292974[]; +extern HudElementAnim HudScript_BlueMeter[]; +extern HudElementAnim HudScript_StickNeutral[]; +extern HudElementAnim HudScript_100pct[]; extern s32 D_80294440; ApiStatus func_802A9000_430020(void) { @@ -34,19 +34,19 @@ ApiStatus func_802A9000_430020(void) { actionCommandStatus->hudElementX = -48; actionCommandStatus->hudElementY = 80; - hudElement = create_hud_element(D_80108E1C); + hudElement = create_hud_element(HudScript_StickNeutral); actionCommandStatus->hudElements[0] = hudElement; set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); set_hud_element_render_depth(hudElement, 0); set_hud_element_flags(hudElement, 0x82); - hudElement = create_hud_element(D_80108AFC); + hudElement = create_hud_element(HudScript_BlueMeter); actionCommandStatus->hudElements[1] = hudElement; set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); set_hud_element_render_depth(hudElement, 0); set_hud_element_flags(hudElement, 0x82); - hudElement = create_hud_element(D_80292974); + hudElement = create_hud_element(HudScript_100pct); actionCommandStatus->hudElements[2] = hudElement; set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); set_hud_element_render_depth(hudElement, 0); diff --git a/src/battle/action_cmd/squirt.c b/src/battle/action_cmd/squirt.c index cbcadb5431..2f34780d5b 100644 --- a/src/battle/action_cmd/squirt.c +++ b/src/battle/action_cmd/squirt.c @@ -3,8 +3,8 @@ #define NAMESPACE action_command_squirt -extern HudElementAnim D_80108AFC[]; -extern HudElementAnim D_80108B28[]; +extern HudElementAnim HudScript_BlueMeter[]; +extern HudElementAnim HudScript_AButton[]; extern s32 D_80294380; ApiStatus func_802A9000_429D20(void) { @@ -30,13 +30,13 @@ ApiStatus func_802A9000_429D20(void) { actionCommandStatus->unk_5C = 0; actionCommandStatus->hudElementY = 80; - hudElement = create_hud_element(D_80108B28); + hudElement = create_hud_element(HudScript_AButton); actionCommandStatus->hudElements[0] = hudElement; set_hud_element_flags(hudElement, 0x82); set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); set_hud_element_render_depth(hudElement, 0); - hudElement = create_hud_element(D_80108AFC); + hudElement = create_hud_element(HudScript_BlueMeter); actionCommandStatus->hudElements[1] = hudElement; set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); set_hud_element_render_depth(hudElement, 0); diff --git a/src/battle/action_cmd/stop_leech.c b/src/battle/action_cmd/stop_leech.c index 13a7781d73..bd24d55066 100644 --- a/src/battle/action_cmd/stop_leech.c +++ b/src/battle/action_cmd/stop_leech.c @@ -3,9 +3,9 @@ #define NAMESPACE action_command_stop_leech -extern HudElementAnim D_80108B80[]; -extern HudElementAnim D_80108AFC[]; -extern HudElementAnim D_80108B28[]; +extern HudElementAnim HudScript_MashAButton[]; +extern HudElementAnim HudScript_BlueMeter[]; +extern HudElementAnim HudScript_AButton[]; extern s32 D_80294260; ApiStatus func_802A9000_425590(void) { @@ -29,13 +29,13 @@ ApiStatus func_802A9000_425590(void) { actionCommandStatus->unk_48 = 0; actionCommandStatus->hudElementY = 80; - hudElement = create_hud_element(D_80108B28); + hudElement = create_hud_element(HudScript_AButton); actionCommandStatus->hudElements[0] = hudElement; set_hud_element_flags(hudElement, 0x82); set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); set_hud_element_render_depth(hudElement, 0); - hudElement = create_hud_element(D_80108AFC); + hudElement = create_hud_element(HudScript_BlueMeter); actionCommandStatus->hudElements[1] = hudElement; set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); set_hud_element_render_depth(hudElement, 0); @@ -106,7 +106,7 @@ void func_802A91F8_425788(void) { actionCommandStatus->unk_4E -= 1; break; } - set_hud_element_anim(actionCommandStatus->hudElements[0], D_80108B80); + set_hud_element_anim(actionCommandStatus->hudElements[0], HudScript_MashAButton); actionCommandStatus->barFillLevel = 0; actionCommandStatus->state = 11; actionCommandStatus->unk_54 = actionCommandStatus->unk_52; diff --git a/src/battle/action_cmd/tidal_wave.c b/src/battle/action_cmd/tidal_wave.c index ed32bb0d4e..dfce2701e1 100644 --- a/src/battle/action_cmd/tidal_wave.c +++ b/src/battle/action_cmd/tidal_wave.c @@ -3,8 +3,8 @@ #define NAMESPACE action_command_tidal_wave -extern HudElementAnim D_80108AFC[]; -extern HudElementAnim D_80108B28[]; +extern HudElementAnim HudScript_BlueMeter[]; +extern HudElementAnim HudScript_AButton[]; extern s32 D_802944A0; extern HudElementAnim* D_802A97C0_42CEB0[]; @@ -33,14 +33,14 @@ ApiStatus N(CreateHudElements)(Evt* script, s32 isInitialCall) { actionCommandStatus->hudElementX = -48; actionCommandStatus->hudElementY = 80; - hudElement = create_hud_element(D_80108AFC); + hudElement = create_hud_element(HudScript_BlueMeter); actionCommandStatus->hudElements[0] = hudElement; set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); set_hud_element_render_depth(hudElement, 0); set_hud_element_flags(hudElement, 0x82); for (i = 1; i < ARRAY_COUNT(actionCommandStatus->hudElements); i++) { - hudElement = create_hud_element(D_80108B28); + hudElement = create_hud_element(HudScript_AButton); actionCommandStatus->hudElements[i] = hudElement; set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); set_hud_element_render_depth(hudElement, 0); diff --git a/src/battle/action_cmd/whirlwind.c b/src/battle/action_cmd/whirlwind.c index 0d151b0ac1..fabb927a6f 100644 --- a/src/battle/action_cmd/whirlwind.c +++ b/src/battle/action_cmd/whirlwind.c @@ -35,13 +35,13 @@ ApiStatus func_802A9000_423C70(Evt* script, s32 isInitialCall) { actionCommandStatus->hudElementX = -48; actionCommandStatus->hudElementY = 80; - hudElement = create_hud_element(&D_80108B28); + hudElement = create_hud_element(HudScript_AButton); actionCommandStatus->hudElements[0] = hudElement; set_hud_element_flags(hudElement, 0x82); set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); set_hud_element_render_depth(hudElement, 0); - hudElement = create_hud_element(&D_80108AFC); + hudElement = create_hud_element(HudScript_BlueMeter); actionCommandStatus->hudElements[1] = hudElement; set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); set_hud_element_render_depth(hudElement, 0); diff --git a/src/battle/area_kkj/6DBDA0.c b/src/battle/area_kkj/6DBDA0.c index c4da2ae147..d8201206bb 100644 --- a/src/battle/area_kkj/6DBDA0.c +++ b/src/battle/area_kkj/6DBDA0.c @@ -85,7 +85,7 @@ ApiStatus func_8021849C_6DC23C(Evt* script, s32 isInitialCall) { playerStatus->flags |= 0x1000000; entity->collisionFlags = 0x40; playerStatus->actionState = ACTION_STATE_HAMMER; - entity->staticData->unk_data_ptr2(entity); + entity->staticData->fpHandleCollision(entity); entity->unk_07 = 0xA; entity->flags |= ENTITY_FLAGS_DETECTED_COLLISION; collisionStatus->lastWallHammered = -1; diff --git a/src/battle/area_kmr_part_3/actor/spiked_para_jr_troopa.c b/src/battle/area_kmr_part_3/actor/spiked_para_jr_troopa.c index 78c5c50f12..f01006a7f3 100644 --- a/src/battle/area_kmr_part_3/actor/spiked_para_jr_troopa.c +++ b/src/battle/area_kmr_part_3/actor/spiked_para_jr_troopa.c @@ -545,7 +545,7 @@ ApiStatus func_802189DC_447E1C(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; f32 posX = evt_get_float_variable(script, *args++); f32 posY = evt_get_float_variable(script, *args++); - s32 icon = create_hud_element(D_80104A28); + s32 icon = create_hud_element(HudScript_AnimatedHandPointer); set_hud_element_render_pos(icon, posX, posY); set_hud_element_scale(icon, 1.5f); diff --git a/src/battle/item/ItemRefund.inc.c b/src/battle/item/ItemRefund.inc.c index 9729c91d3e..84488554af 100644 --- a/src/battle/item/ItemRefund.inc.c +++ b/src/battle/item/ItemRefund.inc.c @@ -40,7 +40,7 @@ ApiStatus N(GiveRefund)(Evt* script, s32 isInitialCall) { posZ = player->currentPos.z; get_screen_coords(gCurrentCameraID, posX, posY, posZ, &iconX, &iconY, &iconZ); - itemIcon = create_hud_element(D_80108A64); + itemIcon = create_hud_element(HudScript_Refund); set_hud_element_render_pos(itemIcon, iconX + 36, iconY - 63); } diff --git a/src/battle/item/mystery.c b/src/battle/item/mystery.c index 54c51f5d81..4856e81fd8 100644 --- a/src/battle/item/mystery.c +++ b/src/battle/item/mystery.c @@ -54,7 +54,7 @@ extern s32 D_802A25F4; extern s32 D_802A25F8; extern s16** D_802A25FC; extern HudElement** D_802A25C8; -extern struct N(tempStc) D_8008A680[100]; +extern struct N(tempStc) gItemHudScripts[100]; ApiStatus N(func_802A13E4_72C994)(Evt* script, s32 isInitialCall) { BattleStatus* battleStatus = &gBattleStatus; @@ -88,7 +88,7 @@ ApiStatus N(func_802A13E4_72C994)(Evt* script, s32 isInitialCall) { } i = 0; - ic = &D_8008A680; + ic = &gItemHudScripts; itemTable = gItemTable; iconPtr = &D_802A25C8; for (; i < 7; i++, iconPtr++) { diff --git a/src/bss2.c b/src/bss2.c index 766fa736dc..aa9875d973 100644 --- a/src/bss2.c +++ b/src/bss2.c @@ -63,9 +63,9 @@ BSS s32 D_8010CD20; BSS char D_8010CD24[0xC]; BSS s32 D_8010CD30; BSS s32 D_8010CD34; -BSS s32 D_8010CD38; +BSS s32 PlayerMoveHistory; BSS char D_8010CD3C[0x27C]; -BSS s32 D_8010CFB8; +BSS s32 PlayerMoveHistoryIndex; BSS s32 D_8010CFBC; BSS s32 wPartnerTetherDistance; BSS s32 D_8010CFC4; @@ -74,9 +74,9 @@ BSS s16 D_8010CFCA; BSS s16 D_8010CFCC; BSS s16 D_8010CFCE; BSS s32 D_8010CFD0; -BSS s32 D_8010CFD4; +BSS s32 wPartnerCurrentScript; BSS s32 D_8010CFD8; -BSS s32 D_8010CFDC; +BSS s32 wPartnerCurrentScriptID; BSS s32 D_8010CFE0; BSS s32 D_8010CFE4; BSS s32 D_8010CFE8; diff --git a/src/entity.c b/src/entity.c index 664036475f..81a9dd62af 100644 --- a/src/entity.c +++ b/src/entity.c @@ -94,7 +94,7 @@ s32 load_entity_model(s32* cmdList) { newEntityModel->cmdListSavedPos = newEntityModel->cmdListReadPos; if (gGameStatusPtr->isBattle) { - i |= 0x800; + i |= BATTLE_ENTITY_ID_MASK; } return i; } @@ -136,7 +136,7 @@ s32 ALT_load_entity_model(s32* cmdList) { newEntityModel->cmdListSavedPos = newEntityModel->cmdListReadPos; if (gGameStatusPtr->isBattle) { - i |= 0x800; + i |= BATTLE_ENTITY_ID_MASK; } return i; } @@ -145,8 +145,8 @@ void exec_entity_model_commandlist(s32 idx) { EntityModel* entityModel; void* temp_v0_2; - if (!gGameStatusPtr->isBattle || (idx & 0x800)) { - idx &= ~0x800; + if (!gGameStatusPtr->isBattle || (idx & BATTLE_ENTITY_ID_MASK)) { + idx &= ~BATTLE_ENTITY_ID_MASK; entityModel = (*gCurrentEntityModelList)[idx]; if (entityModel != NULL && (entityModel->flags)) { if (!(entityModel->flags & ENTITY_MODEL_FLAGS_20)) { @@ -228,7 +228,7 @@ INCLUDE_ASM(s32, "entity", draw_entity_model_E); void set_entity_model_render_command_list(s32 idx, u32* commandList) { u32* phi_a1; - EntityModel* entityModel = (*gCurrentEntityModelList)[idx & ~0x800]; + EntityModel* entityModel = (*gCurrentEntityModelList)[idx & ~BATTLE_ENTITY_ID_MASK]; if (entityModel != NULL && entityModel->flags) { phi_a1 = commandList; @@ -243,11 +243,11 @@ void set_entity_model_render_command_list(s32 idx, u32* commandList) { } EntityModel* get_entity_model(s32 listIndex) { - return (*gCurrentEntityModelList)[listIndex & ~0x800]; + return (*gCurrentEntityModelList)[listIndex & ~BATTLE_ENTITY_ID_MASK]; } void free_entity_model_by_index(s32 idx) { - s32 index = idx & ~0x800; + s32 index = idx & ~BATTLE_ENTITY_ID_MASK; EntityModel* entityModel = (*gCurrentEntityModelList)[index]; if (entityModel != NULL && entityModel->flags) { @@ -278,7 +278,7 @@ void free_entity_model_by_ref(EntityModel* entityModel) { } void set_entity_model_flags(s32 idx, s32 newFlags) { - EntityModel* entityModel = (*gCurrentEntityModelList)[idx & ~0x800]; + EntityModel* entityModel = (*gCurrentEntityModelList)[idx & ~BATTLE_ENTITY_ID_MASK]; if (entityModel != NULL && entityModel->flags) { entityModel->flags |= newFlags; @@ -286,7 +286,7 @@ void set_entity_model_flags(s32 idx, s32 newFlags) { } void clear_entity_model_flags(s32 idx, s32 newFlags) { - EntityModel* entityModel = (*gCurrentEntityModelList)[idx & ~0x800]; + EntityModel* entityModel = (*gCurrentEntityModelList)[idx & ~BATTLE_ENTITY_ID_MASK]; if (entityModel != NULL && entityModel->flags) { entityModel->flags &= ~newFlags; @@ -294,20 +294,20 @@ void clear_entity_model_flags(s32 idx, s32 newFlags) { } void bind_entity_model_setupGfx(s32 idx, s32 setupGfxCallbackArg0, UNK_FUN_PTR(fpSetupGfxCallback)) { - EntityModel* entityModel = (*gCurrentEntityModelList)[idx & ~0x800]; + EntityModel* entityModel = (*gCurrentEntityModelList)[idx & ~BATTLE_ENTITY_ID_MASK]; entityModel->fpSetupGfxCallback = fpSetupGfxCallback; entityModel->setupGfxCallbackArg0 = setupGfxCallbackArg0; } void func_80122F8C(s32 idx, s32 newFlags) { - EntityModel* entityModel = (*gCurrentEntityModelList)[idx & ~0x800]; + EntityModel* entityModel = (*gCurrentEntityModelList)[idx & ~BATTLE_ENTITY_ID_MASK]; entityModel->flags |= newFlags; } void func_80122FB8(s32 idx, s32 newFlags) { - EntityModel* entityModel = (*gCurrentEntityModelList)[idx & ~0x800]; + EntityModel* entityModel = (*gCurrentEntityModelList)[idx & ~BATTLE_ENTITY_ID_MASK]; entityModel->flags = (entityModel->flags & ~(ENTITY_MODEL_FLAGS_1 | ENTITY_MODEL_FLAGS_2 | ENTITY_MODEL_FLAGS_4 | ENTITY_MODEL_FLAGS_8)) | newFlags; } @@ -399,7 +399,7 @@ s32 create_generic_entity_world(void (*updateFunc)(Evt*, s32), void (*drawFunc)( } if (gGameStatusPtr->isBattle) { - i |= 0x800; + i |= BATTLE_ENTITY_ID_MASK; } return i; } @@ -430,7 +430,7 @@ s32 create_generic_entity_frontUI(void (*updateFunc)(void), void (*drawFunc)(voi } if (gGameStatusPtr->isBattle) { - i |= 0x800; + i |= BATTLE_ENTITY_ID_MASK; } return i; } @@ -461,7 +461,7 @@ s32 create_generic_entity_backUI(void (*updateFunc)(void), void (*drawFunc)(void } if (gGameStatusPtr->isBattle) { - i |= 0x800; + i |= BATTLE_ENTITY_ID_MASK; } return i; } @@ -518,10 +518,10 @@ void render_generic_entities_backUI(void) { } void free_generic_entity(s32 idx) { - if (!gGameStatusPtr->isBattle || (idx & 0x800)) { + if (!gGameStatusPtr->isBattle || (idx & BATTLE_ENTITY_ID_MASK)) { DynamicEntityList** curDynEntityList = &gCurrentDynamicEntityListPtr; - idx &= ~0x800; + idx &= ~BATTLE_ENTITY_ID_MASK; if ((**curDynEntityList)[idx] != NULL) { heap_free((**curDynEntityList)[idx]); (**curDynEntityList)[idx] = NULL; @@ -530,5 +530,5 @@ void free_generic_entity(s32 idx) { } DynamicEntity* get_generic_entity(s32 idx) { - return (*gCurrentDynamicEntityListPtr)[idx & ~0x800]; + return (*gCurrentDynamicEntityListPtr)[idx & ~BATTLE_ENTITY_ID_MASK]; } diff --git a/src/entity/ItemBlock.c b/src/entity/ItemBlock.c index 550e5a026d..a90f0b6eb5 100644 --- a/src/entity/ItemBlock.c +++ b/src/entity/ItemBlock.c @@ -61,7 +61,7 @@ void entity_HitItemBlock_show_inactive(Entity* entity) { someEntity = get_entity_by_index(temp->unk_12); someEntity->flags &= ~ENTITY_FLAGS_HIDDEN; someShadow = get_shadow_by_index(someEntity->shadowIndex); - someShadow->flags &= ~SHADOW_FLAGS_1; + someShadow->flags &= ~SHADOW_FLAGS_HIDDEN; } void entity_ItemBlock_check_if_inactive(Entity* entity) { @@ -85,11 +85,11 @@ void entity_ItemBlock_check_if_inactive(Entity* entity) { void entity_ItemBlock_replace_with_inactive(Entity* entity) { s32 entityType = get_entity_type(entity->listIndex); UNK_PTR entityData = &D_802EA07C; - s32 entityIndex; - s32 temp_s0; - s32 entityType2; + s32 childEntityIndex; + s32 isBlockOnGround; + s32 parentEntityType; struct802E3F0C* temp; - Entity* entityTemp; + Entity* childEntity; Shadow* shadow; if (entityType < 0x15) { @@ -99,54 +99,53 @@ void entity_ItemBlock_replace_with_inactive(Entity* entity) { } } - entityIndex = create_entity(entityData, entity->position.x, entity->position.y, entity->position.z, entity->rotation.y, - 0x80000000); - entityTemp = get_entity_by_index(entityIndex); - entityTemp->flags |= 1; + childEntityIndex = create_entity(entityData, entity->position.x, entity->position.y, entity->position.z, entity->rotation.y, 0x80000000); + childEntity = get_entity_by_index(childEntityIndex); + childEntity->flags |= 1; if (entity->flags & ENTITY_FLAGS_DRAW_IF_CLOSE_HIDE_MODE2) { - entityTemp->flags |= ENTITY_FLAGS_DRAW_IF_CLOSE_HIDE_MODE2; + childEntity->flags |= ENTITY_FLAGS_DRAW_IF_CLOSE_HIDE_MODE2; } if (entity->flags & ENTITY_FLAGS_HAS_DYNAMIC_SHADOW) { - entityTemp->flags |= ENTITY_FLAGS_HAS_DYNAMIC_SHADOW; + childEntity->flags |= ENTITY_FLAGS_HAS_DYNAMIC_SHADOW; } - shadow = get_shadow_by_index(entityTemp->shadowIndex); - shadow->flags |= (SHADOW_FLAGS_400000 |SHADOW_FLAGS_1); - temp_s0 = is_block_on_ground(entity); + shadow = get_shadow_by_index(childEntity->shadowIndex); + shadow->flags |= (SHADOW_FLAGS_POSITION_DIRTY | SHADOW_FLAGS_HIDDEN); + isBlockOnGround = is_block_on_ground(entity); - entityType2 = get_entity_type(entity->listIndex); - if (entityType2 == 0x12 || entityType2 == 0x14) { - entityData = &D_802EA660; - } else if (temp_s0 != 0) { - entityData = &D_802EA618; + parentEntityType = get_entity_type(entity->listIndex); + if (parentEntityType == ENTITY_TYPE_HIDDEN_RED_BLOCK || parentEntityType == ENTITY_TYPE_RED_BLOCK) { + entityData = &Entity_HitRedBlock; + } else if (isBlockOnGround != 0) { + entityData = &Entity_HitGroundedYellowBlock; } else { - entityData = &D_802EA63C; + entityData = &Entity_HitFloatingYellowBlock; } - entityTemp = get_entity_by_index(create_entity(entityData, entity->position.x, entity->position.y, entity->position.z, + childEntity = get_entity_by_index(create_entity(entityData, entity->position.x, entity->position.y, entity->position.z, entity->rotation.y, 0x80000000)); - entityTemp->alpha = entity->alpha; + childEntity->alpha = entity->alpha; if ((entity->flags & ENTITY_FLAGS_HIDDEN) || (entity->alpha < 0xFF)) { - entityTemp->alpha = 0x20; + childEntity->alpha = 0x20; } if (entity->flags & ENTITY_FLAGS_DRAW_IF_CLOSE_HIDE_MODE2) { - entityTemp->flags |= ENTITY_FLAGS_DRAW_IF_CLOSE_HIDE_MODE2; + childEntity->flags |= ENTITY_FLAGS_DRAW_IF_CLOSE_HIDE_MODE2; } - temp = entityTemp->dataBuf; - temp->unk_12 = entityIndex; + temp = childEntity->dataBuf; + temp->unk_12 = childEntityIndex; if (entity->flags & ENTITY_FLAGS_HAS_DYNAMIC_SHADOW) { - entityTemp->flags |= ENTITY_FLAGS_HAS_DYNAMIC_SHADOW; + childEntity->flags |= ENTITY_FLAGS_HAS_DYNAMIC_SHADOW; } entity->flags &= ~ENTITY_FLAGS_100; shadow = get_shadow_by_index(entity->shadowIndex); - shadow->flags |= (SHADOW_FLAGS_10000000 | SHADOW_FLAGS_1); - shadow = get_shadow_by_index(entityTemp->shadowIndex); - shadow->flags |= SHADOW_FLAGS_400000; + shadow->flags |= (SHADOW_FLAGS_FADING_AWAY | SHADOW_FLAGS_HIDDEN); + shadow = get_shadow_by_index(childEntity->shadowIndex); + shadow->flags |= SHADOW_FLAGS_POSITION_DIRTY; } void entity_HitItemBlock_hide(Entity* entity) { diff --git a/src/evt/fa4c0_len_3bf0.c b/src/evt/fa4c0_len_3bf0.c index 6f7c85fec6..4c3a8a6a7c 100644 --- a/src/evt/fa4c0_len_3bf0.c +++ b/src/evt/fa4c0_len_3bf0.c @@ -523,7 +523,7 @@ ApiStatus ShowGotItem(Evt* script, s32 isInitialCall) { switch (script->functionTemp[0]) { case 0: - script->functionTemp[1] = init_got_item(evt_get_variable(script, *args++), evt_get_variable(script, *args++), *args++); + script->functionTemp[1] = make_item_entity_at_player(evt_get_variable(script, *args++), evt_get_variable(script, *args++), *args++); script->functionTemp[0] = 1; break; case 1: diff --git a/src/hud_element.h b/src/hud_element.h index 165eccb341..1e60cf6911 100644 --- a/src/hud_element.h +++ b/src/hud_element.h @@ -112,10 +112,10 @@ typedef struct HudElement { typedef HudElement* HudElementList[320]; -extern HudElementAnim D_80104A28[]; -extern HudElementAnim D_80108558[]; -extern HudElementAnim D_80108A64[]; -extern HudElementAnim D_80109270[]; +extern HudElementAnim HudScript_AnimatedHandPointer[]; +extern HudElementAnim HudScript_StatusCoin[]; +extern HudElementAnim HudScript_Refund[]; +extern HudElementAnim HudScript_MenuTimes[]; extern HudElementAnim* D_8024FA30[1]; extern HudElementAnim *gBadgeMenuElements[22]; extern HudElement* gItemIcons[20]; diff --git a/src/npc.c b/src/npc.c index 87c6700e77..3097b72d3f 100644 --- a/src/npc.c +++ b/src/npc.c @@ -660,7 +660,7 @@ void enable_npc_shadow(Npc* npc) { if (!(npc->flags & NPC_FLAG_HAS_SHADOW)) { shadow = get_shadow_by_index(npc->shadowIndex); - shadow->flags &= ~SHADOW_FLAGS_1; + shadow->flags &= ~SHADOW_FLAGS_HIDDEN; npc->flags = npc->flags | (NPC_FLAG_DIRTY_SHADOW | NPC_FLAG_HAS_SHADOW); } } @@ -670,7 +670,7 @@ void disable_npc_shadow(Npc* npc) { if (npc->flags & NPC_FLAG_HAS_SHADOW) { shadow = get_shadow_by_index(npc->shadowIndex); - shadow->flags |= SHADOW_FLAGS_1; + shadow->flags |= SHADOW_FLAGS_HIDDEN; npc->flags &= ~NPC_FLAG_HAS_SHADOW; npc->flags &= ~NPC_FLAG_DIRTY_SHADOW; } diff --git a/src/status_icons.c b/src/status_icons.c index 02a11514eb..41808f3daa 100644 --- a/src/status_icons.c +++ b/src/status_icons.c @@ -73,41 +73,41 @@ extern s16 D_80078160[]; extern s16 D_80078164[]; extern s32 D_80078168[]; -extern HudElementAnim D_800804F0; +extern HudElementAnim HudScript_Item_Present; extern PopupMessage D_800A0BC0[32]; extern s32 D_800A0F40; extern HudStatusIcon* D_800A0F44; -extern HudElementAnim D_80104CC4; -extern HudElementAnim D_80104E64; -extern HudElementAnim D_801050A8; -extern HudElementAnim D_801052D8; -extern HudElementAnim D_8010551C; -extern HudElementAnim D_8010574C; -extern HudElementAnim D_80105AA0; -extern HudElementAnim D_80105C54; -extern HudElementAnim D_80105DF4; -extern HudElementAnim D_80105900; -extern HudElementAnim D_80105FA8; -extern HudElementAnim D_80106148; -extern HudElementAnim D_801062A0; -extern HudElementAnim D_801062DC; -extern HudElementAnim D_8010645C; -extern HudElementAnim D_80106610; -extern HudElementAnim D_801067B0; -extern HudElementAnim D_80106964; -extern HudElementAnim D_80106B04; -extern HudElementAnim D_80106CD8; -extern HudElementAnim D_80106E98; -extern HudElementAnim D_8010701C; -extern HudElementAnim D_8010717C; -extern HudElementAnim D_80107314; -extern HudElementAnim D_80107474; -extern HudElementAnim D_801075E0; -extern HudElementAnim D_8010760C; -extern HudElementAnim D_801089C4; -extern HudElementAnim D_80108A14; +extern HudElementAnim HudScript_AsleepBegin; +extern HudElementAnim HudScript_AsleepEnd; +extern HudElementAnim HudScript_ElectrifiedBegin; +extern HudElementAnim HudScript_ElectrifiedEnd; +extern HudElementAnim HudScript_ParalyzedBegin; +extern HudElementAnim HudScript_ParalyzedEnd; +extern HudElementAnim HudScript_DizzyEnd; +extern HudElementAnim HudScript_PoisonedBegin; +extern HudElementAnim HudScript_PoisonedEnd; +extern HudElementAnim HudScript_DizzyBegin; +extern HudElementAnim HudScript_FrozenBegin; +extern HudElementAnim HudScript_FrozenEnd; +extern HudElementAnim HudScript_WeakenedLoop; +extern HudElementAnim HudScript_WeakenedBegin; +extern HudElementAnim HudScript_WeakenedEnd; +extern HudElementAnim HudScript_StoppedBegin; +extern HudElementAnim HudScript_StoppedEnd; +extern HudElementAnim HudScript_ShrunkBegin; +extern HudElementAnim HudScript_ShrunkEnd; +extern HudElementAnim HudScript_TransparentBegin; +extern HudElementAnim HudScript_TransparentEnd; +extern HudElementAnim HudScript_BoostJumpBegin; +extern HudElementAnim HudScript_BoostJumpEnd; +extern HudElementAnim HudScript_BoostHammerBegin; +extern HudElementAnim HudScript_BoostHammerEnd; +extern HudElementAnim HudScript_BoostPartner; +extern HudElementAnim HudScript_Surprise; +extern HudElementAnim HudScript_Peril; +extern HudElementAnim HudScript_Danger; void update_merlee_message(PopupMessage* popup); @@ -310,31 +310,31 @@ void update_all_status_icons(PopupMessage* popup) { if (icon->status1.activeTask == STATUS_ICON_TASK_LOAD) { switch (icon->status1.active) { case STATUS_SLEEP: - elementID = icon->status1.activeElementID = create_hud_element(&D_80104CC4); + elementID = icon->status1.activeElementID = create_hud_element(&HudScript_AsleepBegin); break; case STATUS_PARALYZE: - elementID = icon->status1.activeElementID = create_hud_element(&D_8010551C); + elementID = icon->status1.activeElementID = create_hud_element(&HudScript_ParalyzedBegin); break; case STATUS_DIZZY: - elementID = icon->status1.activeElementID = create_hud_element(&D_80105900); + elementID = icon->status1.activeElementID = create_hud_element(&HudScript_DizzyBegin); break; case STATUS_FEAR: - elementID = icon->status1.activeElementID = create_hud_element(&D_801062A0); + elementID = icon->status1.activeElementID = create_hud_element(&HudScript_WeakenedLoop); break; case STATUS_STOP: - elementID = icon->status1.activeElementID = create_hud_element(&D_80106610); + elementID = icon->status1.activeElementID = create_hud_element(&HudScript_StoppedBegin); break; case STATUS_POISON: - elementID = icon->status1.activeElementID = create_hud_element(&D_80105C54); + elementID = icon->status1.activeElementID = create_hud_element(&HudScript_PoisonedBegin); break; case STATUS_SHRINK: - elementID = icon->status1.activeElementID = create_hud_element(&D_80106964); + elementID = icon->status1.activeElementID = create_hud_element(&HudScript_ShrunkBegin); break; case STATUS_FROZEN: - elementID = icon->status1.activeElementID = create_hud_element(&D_80105FA8); + elementID = icon->status1.activeElementID = create_hud_element(&HudScript_FrozenBegin); break; default: - elementID = icon->status1.activeElementID = create_hud_element(&D_800804F0); + elementID = icon->status1.activeElementID = create_hud_element(&HudScript_Item_Present); break; } set_hud_element_flags(elementID, 2); @@ -348,31 +348,31 @@ void update_all_status_icons(PopupMessage* popup) { case STATUS_ICON_TASK_LOAD: switch (icon->status1.removing) { case STATUS_SLEEP: - set_hud_element_anim(icon->status1.removingElementID, &D_80104E64); + set_hud_element_anim(icon->status1.removingElementID, &HudScript_AsleepEnd); break; case STATUS_PARALYZE: - set_hud_element_anim(icon->status1.removingElementID, &D_8010574C); + set_hud_element_anim(icon->status1.removingElementID, &HudScript_ParalyzedEnd); break; case STATUS_DIZZY: - set_hud_element_anim(icon->status1.removingElementID, &D_80105AA0); + set_hud_element_anim(icon->status1.removingElementID, &HudScript_DizzyEnd); break; case STATUS_FEAR: - set_hud_element_anim(icon->status1.removingElementID, &D_801062A0); + set_hud_element_anim(icon->status1.removingElementID, &HudScript_WeakenedLoop); break; case STATUS_STOP: - set_hud_element_anim(icon->status1.removingElementID, &D_801067B0); + set_hud_element_anim(icon->status1.removingElementID, &HudScript_StoppedEnd); break; case STATUS_POISON: - set_hud_element_anim(icon->status1.removingElementID, &D_80105DF4); + set_hud_element_anim(icon->status1.removingElementID, &HudScript_PoisonedEnd); break; case STATUS_SHRINK: - set_hud_element_anim(icon->status1.removingElementID, &D_80106B04); + set_hud_element_anim(icon->status1.removingElementID, &HudScript_ShrunkEnd); break; case STATUS_FROZEN: - set_hud_element_anim(icon->status1.removingElementID, &D_80106148); + set_hud_element_anim(icon->status1.removingElementID, &HudScript_FrozenEnd); break; default: - set_hud_element_anim(icon->status1.removingElementID, &D_800804F0); + set_hud_element_anim(icon->status1.removingElementID, &HudScript_Item_Present); break; } @@ -394,10 +394,10 @@ void update_all_status_icons(PopupMessage* popup) { if (icon->status2.activeTask == STATUS_ICON_TASK_LOAD) { switch (icon->status2.active) { case STATUS_STATIC: - elementID = icon->status2.activeElementID = create_hud_element(&D_801050A8); + elementID = icon->status2.activeElementID = create_hud_element(&HudScript_ElectrifiedBegin); break; default: - elementID = icon->status2.activeElementID = create_hud_element(&D_800804F0); + elementID = icon->status2.activeElementID = create_hud_element(&HudScript_Item_Present); break; } @@ -412,10 +412,10 @@ void update_all_status_icons(PopupMessage* popup) { case STATUS_ICON_TASK_LOAD: switch (icon->status2.removing) { case STATUS_STATIC: - set_hud_element_anim(icon->status2.removingElementID, &D_801052D8); + set_hud_element_anim(icon->status2.removingElementID, &HudScript_ElectrifiedEnd); break; default: - set_hud_element_anim(icon->status2.removingElementID, &D_800804F0); + set_hud_element_anim(icon->status2.removingElementID, &HudScript_Item_Present); break; } @@ -436,10 +436,10 @@ void update_all_status_icons(PopupMessage* popup) { if (icon->status3.activeTask == STATUS_ICON_TASK_LOAD) { switch (icon->status3.active) { case STATUS_E: - elementID = icon->status3.activeElementID = create_hud_element(&D_80106CD8); + elementID = icon->status3.activeElementID = create_hud_element(&HudScript_TransparentBegin); break; default: - elementID = icon->status3.activeElementID = create_hud_element(&D_800804F0); + elementID = icon->status3.activeElementID = create_hud_element(&HudScript_Item_Present); break; } @@ -454,10 +454,10 @@ void update_all_status_icons(PopupMessage* popup) { case STATUS_ICON_TASK_LOAD: switch (icon->status3.removing) { case STATUS_E: - set_hud_element_anim(icon->status3.removingElementID, &D_80106E98); + set_hud_element_anim(icon->status3.removingElementID, &HudScript_TransparentEnd); break; default: - set_hud_element_anim(icon->status3.removingElementID, &D_800804F0); + set_hud_element_anim(icon->status3.removingElementID, &HudScript_Item_Present); break; } @@ -476,7 +476,7 @@ void update_all_status_icons(PopupMessage* popup) { } if (icon->status4.activeTask == STATUS_ICON_TASK_LOAD) { - elementID = icon->status4.activeElementID = create_hud_element(&D_801062DC); + elementID = icon->status4.activeElementID = create_hud_element(&HudScript_WeakenedBegin); set_hud_element_flags(elementID, 2); set_hud_element_flags(elementID, 0x80); icon->status4.activeTask = STATUS_ICON_TASK_DRAW; @@ -486,7 +486,7 @@ void update_all_status_icons(PopupMessage* popup) { case STATUS_ICON_TASK_NONE: break; case STATUS_ICON_TASK_LOAD: - set_hud_element_anim(icon->status4.removingElementID, &D_8010645C); + set_hud_element_anim(icon->status4.removingElementID, &HudScript_WeakenedEnd); icon->status4.frameCounter = 20; icon->status4.removingTask = STATUS_ICON_TASK_DRAW; break; @@ -1112,7 +1112,7 @@ void create_status_icon_boost_jump(s32 iconID) { statusIcon->flags &= ~STATUS_ICON_FLAG_BOOST_JUMP; if (!statusIcon->boostJump.active) { statusIcon->boostJump.active = TRUE; - hudElement = create_hud_element(&D_8010701C); + hudElement = create_hud_element(&HudScript_BoostJumpBegin); set_hud_element_flags(hudElement, 2); set_hud_element_flags(hudElement, 0x80); statusIcon->boostJump.activeElementID = hudElement; @@ -1127,7 +1127,7 @@ void remove_status_icon_boost_jump(s32 iconID) { statusIcon->boostJump.active = FALSE; statusIcon->boostJump.removing = TRUE; statusIcon->prevIndexBoostJump = hudElemIndex; - set_hud_element_anim(hudElemIndex, &D_8010717C); + set_hud_element_anim(hudElemIndex, &HudScript_BoostJumpEnd); } } @@ -1144,7 +1144,7 @@ void create_status_icon_boost_hammer(s32 iconID) { statusIcon->flags &= ~STATUS_ICON_FLAG_BOOST_HAMMER; if (!statusIcon->boostHammer.active) { statusIcon->boostHammer.active = TRUE; - hudElement = create_hud_element(&D_80107314); + hudElement = create_hud_element(&HudScript_BoostHammerBegin); set_hud_element_flags(hudElement, 2); set_hud_element_flags(hudElement, 0x80); statusIcon->boostHammer.activeElementID = hudElement; @@ -1159,7 +1159,7 @@ void remove_status_icon_boost_hammer(s32 iconID) { statusIcon->boostHammer.active = FALSE; statusIcon->boostHammer.removing = FALSE; statusIcon->prevIndexBoostHammer = hudElemIndex; - set_hud_element_anim(hudElemIndex, &D_80107474); + set_hud_element_anim(hudElemIndex, &HudScript_BoostHammerEnd); } } @@ -1176,7 +1176,7 @@ void create_status_icon_boost_partner(s32 iconID) { statusIcon->flags &= ~STATUS_ICON_FLAG_BOOST_PARTNER; if (!statusIcon->boostPartner.active) { statusIcon->boostPartner.active = TRUE; - hudElement = create_hud_element(&D_801075E0); + hudElement = create_hud_element(&HudScript_BoostPartner); set_hud_element_flags(hudElement, 2); set_hud_element_flags(hudElement, 0x80); statusIcon->boostPartner.activeElementID = hudElement; @@ -1205,7 +1205,7 @@ void create_status_icon_surprise(s32 iconID) { statusIcon->flags &= ~STATUS_ICON_FLAG_SURPRISE; if (!statusIcon->surprise.active) { statusIcon->surprise.active = TRUE; - hudElement = create_hud_element(&D_8010760C); + hudElement = create_hud_element(&HudScript_Surprise); set_hud_element_flags(hudElement, 2); set_hud_element_flags(hudElement, 0x80); statusIcon->surprise.activeElementID = hudElement; @@ -1234,7 +1234,7 @@ void create_status_icon_peril(s32 iconID) { statusIcon->flags &= ~STATUS_ICON_FLAG_PERIL; if (!statusIcon->peril.active) { statusIcon->peril.active = TRUE; - hudElement = create_hud_element(&D_801089C4); + hudElement = create_hud_element(&HudScript_Peril); set_hud_element_flags(hudElement, 2); set_hud_element_flags(hudElement, 0x80); statusIcon->peril.activeElementID = hudElement; @@ -1263,7 +1263,7 @@ void create_status_icon_danger(s32 iconID) { statusIcon->flags &= ~STATUS_ICON_FLAG_DANGER; if (!statusIcon->danger.active) { statusIcon->danger.active = TRUE; - hudElement = create_hud_element(&D_80108A14); + hudElement = create_hud_element(&HudScript_Danger); set_hud_element_flags(hudElement, 2); set_hud_element_flags(hudElement, 0x80); statusIcon->danger.activeElementID = hudElement; diff --git a/src/world/area_arn/arn_03/events.c b/src/world/area_arn/arn_03/events.c index c033a0e8d9..dc797d1983 100644 --- a/src/world/area_arn/arn_03/events.c +++ b/src/world/area_arn/arn_03/events.c @@ -998,7 +998,7 @@ static s32 N(pad_47DC) = { EvtSource N(makeEntities) = { EVT_CALL(MakeEntity, 0x802EA564, 300, 237, 60, 0, 343, MAKE_ENTITY_END) EVT_CALL(AssignBlockFlag, EVT_SAVE_FLAG(1007)) - EVT_CALL(MakeEntity, EVT_PTR(D_802E9A18), 250, 237, 125, 0, MAKE_ENTITY_END) + EVT_CALL(MakeEntity, EVT_PTR(Entity_SavePoint), 250, 237, 125, 0, MAKE_ENTITY_END) EVT_RETURN EVT_END }; diff --git a/src/world/area_dgb/dgb_00/BFA100.c b/src/world/area_dgb/dgb_00/BFA100.c index 5cc559f14e..d113f34971 100644 --- a/src/world/area_dgb/dgb_00/BFA100.c +++ b/src/world/area_dgb/dgb_00/BFA100.c @@ -829,7 +829,7 @@ static s32 N(pad_3758)[] = { }; EvtSource N(makeEntities) = { - EVT_CALL(MakeEntity, EVT_PTR(D_802E9A18), -65, 60, -240, 0, MAKE_ENTITY_END) + EVT_CALL(MakeEntity, EVT_PTR(Entity_SavePoint), -65, 60, -240, 0, MAKE_ENTITY_END) EVT_RETURN EVT_END }; diff --git a/src/world/area_dgb/dgb_04/C36530.c b/src/world/area_dgb/dgb_04/C36530.c index da1075931d..1ee0a415c2 100644 --- a/src/world/area_dgb/dgb_04/C36530.c +++ b/src/world/area_dgb/dgb_04/C36530.c @@ -4,8 +4,8 @@ #include "sprite/npc/sentinel.h" #include "message_ids.h" -extern s32 D_800F7F00[]; -extern s32 D_800F7F40[]; +extern s32 wPartnerHudScripts[]; +extern s32 wDisabledPartnerHudScripts[]; enum { NPC_SENTINEL, @@ -863,14 +863,14 @@ ApiStatus N(func_8024259C_C38ACC)(Evt* script, s32 isInitialCall) { if (playerData->partners[idx].enabled) { ptr->unk_108[i] = idx; - ptr->unk_84[i] = *D_8008EF20[idx]; + ptr->unk_84[i] = *gPartnerPopupProperties[idx]; partnerLevel = N(UnkFunc37)(idx, var); if (partnerLevel >= 0) { - ptr->unk_00[i] = D_800F7F00[idx]; + ptr->unk_00[i] = wPartnerHudScripts[idx]; ptr->unk_18C[i] = 1; ptr->unk_294[i] = N(D_80243D48_C3A278)[i][partnerLevel]; } else { - ptr->unk_00[i] = D_800F7F40[idx]; + ptr->unk_00[i] = wDisabledPartnerHudScripts[idx]; ptr->unk_18C[i] = 0; ptr->unk_294[i] = N(D_80243D30_C3A260)[var]; } @@ -904,7 +904,7 @@ ApiStatus N(func_8024259C_C38ACC)(Evt* script, s32 isInitialCall) { destroy_popup_menu(); if (script->functionTemp[1] != 0xFF) { - script->varTable[0] = D_8008EF20[ptr->unk_108[script->functionTemp[1] - 1]][0]; + script->varTable[0] = gPartnerPopupProperties[ptr->unk_108[script->functionTemp[1] - 1]][0]; script->varTable[1] = ptr->unk_108[script->functionTemp[1] - 1]; } else { script->varTable[0] = -1; diff --git a/src/world/area_dgb/dgb_17/C55A60.c b/src/world/area_dgb/dgb_17/C55A60.c index 3e1425743e..82c9990ca1 100644 --- a/src/world/area_dgb/dgb_17/C55A60.c +++ b/src/world/area_dgb/dgb_17/C55A60.c @@ -108,7 +108,7 @@ EvtSource N(main) = { }; EvtSource N(makeEntities) = { - EVT_CALL(MakeEntity, EVT_PTR(D_802E9A18), -300, 60, 75, 0, MAKE_ENTITY_END) + EVT_CALL(MakeEntity, EVT_PTR(Entity_SavePoint), -300, 60, 75, 0, MAKE_ENTITY_END) EVT_CALL(MakeEntity, 0x802EA7E0, -450, 60, 75, 0, MAKE_ENTITY_END) EVT_RETURN EVT_END diff --git a/src/world/area_dro/dro_01/95B7E0.c b/src/world/area_dro/dro_01/95B7E0.c index d7516c89d9..26ff787f65 100644 --- a/src/world/area_dro/dro_01/95B7E0.c +++ b/src/world/area_dro/dro_01/95B7E0.c @@ -2928,7 +2928,7 @@ EvtSource N(8024D2B0) = { }; EvtSource N(makeEntities) = { - EVT_CALL(MakeEntity, EVT_PTR(D_802E9A18), -211, 60, -50, 30, MAKE_ENTITY_END) + EVT_CALL(MakeEntity, EVT_PTR(Entity_SavePoint), -211, 60, -50, 30, MAKE_ENTITY_END) EVT_IF_EQ(EVT_SAVE_FLAG(1939), 0) EVT_IF_EQ(EVT_SAVE_FLAG(1933), 1) EVT_CALL(GetEntryID, EVT_VAR(0)) diff --git a/src/world/area_flo/flo_08/CAED40.c b/src/world/area_flo/flo_08/CAED40.c index 6fac37cd18..500c1cf540 100644 --- a/src/world/area_flo/flo_08/CAED40.c +++ b/src/world/area_flo/flo_08/CAED40.c @@ -1,8 +1,8 @@ #include "flo_08.h" -extern s32 D_800F7F00[]; -extern s32 D_800F7F40[]; -extern s32 D_8008EF20[11][4]; +extern s32 wPartnerHudScripts[]; +extern s32 wDisabledPartnerHudScripts[]; +extern s32 gPartnerPopupProperties[11][4]; #include "world/common/SetOverrideFlags_40.inc.c" @@ -56,14 +56,14 @@ ApiStatus N(func_802401CC_CAEF0C)(Evt* script, s32 isInitialCall) { if (playerData->partners[idx].enabled) { ptr->unk_108[i] = idx; - ptr->unk_84[i] = *D_8008EF20[idx]; + ptr->unk_84[i] = *gPartnerPopupProperties[idx]; partnerLevel = N(UnkFunc37)(idx, var); if (partnerLevel >= 0) { - ptr->unk_00[i] = D_800F7F00[idx]; + ptr->unk_00[i] = wPartnerHudScripts[idx]; ptr->unk_18C[i] = 1; ptr->unk_294[i] = N(D_80241FC8_CB0D08)[i][partnerLevel]; } else { - ptr->unk_00[i] = D_800F7F40[idx]; + ptr->unk_00[i] = wDisabledPartnerHudScripts[idx]; ptr->unk_18C[i] = 0; ptr->unk_294[i] = N(D_80241FB0_CB0CF0)[var]; } @@ -97,7 +97,7 @@ ApiStatus N(func_802401CC_CAEF0C)(Evt* script, s32 isInitialCall) { destroy_popup_menu(); if (script->functionTemp[1] != 0xFF) { - script->varTable[0] = D_8008EF20[ptr->unk_108[script->functionTemp[1] - 1]][0]; + script->varTable[0] = gPartnerPopupProperties[ptr->unk_108[script->functionTemp[1] - 1]][0]; script->varTable[1] = ptr->unk_108[script->functionTemp[1] - 1]; } else { script->varTable[0] = -1; diff --git a/src/world/area_flo/flo_16/CD1F10.c b/src/world/area_flo/flo_16/CD1F10.c index ed95414ce3..88d43d9e24 100644 --- a/src/world/area_flo/flo_16/CD1F10.c +++ b/src/world/area_flo/flo_16/CD1F10.c @@ -1,9 +1,9 @@ #include "flo_16.h" #include "message_ids.h" -extern s32 D_800F7F00[]; -extern s32 D_800F7F40[]; -extern s32 D_8008EF20[11][4]; +extern s32 wPartnerHudScripts[]; +extern s32 wDisabledPartnerHudScripts[]; +extern s32 gPartnerPopupProperties[11][4]; EntryList N(entryList) = { { -720.0f, 0.0f, 0.0f, 90.0f }, @@ -485,14 +485,14 @@ ApiStatus N(func_802402AC_CD20DC)(Evt* script, s32 isInitialCall) { if (playerData->partners[idx].enabled) { ptr->unk_108[i] = idx; - ptr->unk_84[i] = *D_8008EF20[idx]; + ptr->unk_84[i] = *gPartnerPopupProperties[idx]; partnerLevel = N(UnkFunc37)(idx, var); if (partnerLevel >= 0) { - ptr->unk_00[i] = D_800F7F00[idx]; + ptr->unk_00[i] = wPartnerHudScripts[idx]; ptr->unk_18C[i] = 1; ptr->unk_294[i] = N(D_80243718_CD5548)[i][partnerLevel]; } else { - ptr->unk_00[i] = D_800F7F40[idx]; + ptr->unk_00[i] = wDisabledPartnerHudScripts[idx]; ptr->unk_18C[i] = 0; ptr->unk_294[i] = N(D_80243700_CD5530)[var]; } @@ -526,7 +526,7 @@ ApiStatus N(func_802402AC_CD20DC)(Evt* script, s32 isInitialCall) { destroy_popup_menu(); if (script->functionTemp[1] != 0xFF) { - script->varTable[0] = D_8008EF20[ptr->unk_108[script->functionTemp[1] - 1]][0]; + script->varTable[0] = gPartnerPopupProperties[ptr->unk_108[script->functionTemp[1] - 1]][0]; script->varTable[1] = ptr->unk_108[script->functionTemp[1] - 1]; } else { script->varTable[0] = -1; diff --git a/src/world/common/UnkFunc19.inc.c b/src/world/common/UnkFunc19.inc.c index b67a22b8e6..5026a3dc8d 100644 --- a/src/world/common/UnkFunc19.inc.c +++ b/src/world/common/UnkFunc19.inc.c @@ -1,10 +1,10 @@ #include "common.h" #include "npc.h" -extern s32 D_8008EF20[11][4]; +extern s32 gPartnerPopupProperties[11][4]; ApiStatus N(UnkFunc19)(Evt* script, s32 isInitialCall) { - set_message_msg(D_8008EF20[gPlayerData.currentPartner][0], 0); + set_message_msg(gPartnerPopupProperties[gPlayerData.currentPartner][0], 0); return ApiStatus_DONE2; } diff --git a/src/world/partner/bow.c b/src/world/partner/bow.c index 27a0389fb8..3d0437cd62 100644 --- a/src/world/partner/bow.c +++ b/src/world/partner/bow.c @@ -294,7 +294,7 @@ ApiStatus func_802BD694_323FE4(Evt* script, s32 isInitialCall) { bow->flags |= 0x40; } - get_shadow_by_index(bow->shadowIndex)->unk_05 = playerStatus->alpha1 >> 1; + get_shadow_by_index(bow->shadowIndex)->alpha = playerStatus->alpha1 >> 1; func_8003D624(bow, 7, playerStatus->alpha1, 0, 0, 0, 0); bow->pos.x = playerStatus->position.x - D_802BE0E4; bow->pos.y = playerStatus->position.y - D_802BE0E8; @@ -357,7 +357,7 @@ void func_802BDDF0_324740(Npc* bow) { playerStatus->alpha1 = 255; func_8003D624(bow, 0, 0, 0, 0, 0, 0); bow->renderMode = RENDER_MODE_SURFACE_XLU_LAYER1; - get_shadow_by_index(bow->shadowIndex)->unk_05 = playerStatus->alpha1 >> 1; + get_shadow_by_index(bow->shadowIndex)->alpha = playerStatus->alpha1 >> 1; if (D_802BE0C4) { enable_player_input(); diff --git a/src/world/partners.c b/src/world/partners.c index e661eea27b..5090735711 100644 --- a/src/world/partners.c +++ b/src/world/partners.c @@ -2,6 +2,7 @@ #include "ld_addrs.h" #include "partners.h" #include "npc.h" +#include "hud_element.h" #include "partner/goombario.h" #include "sprite/npc/world_goombario.h" @@ -36,44 +37,101 @@ #include "partner/twink.h" #include "sprite/npc/twink.h" -extern s32 D_80108068[]; -extern s32 D_801083D8[]; +extern HudElementAnim HudScript_Partner0[]; +extern HudElementAnim HudScript_Goombario[]; +extern HudElementAnim HudScript_Kooper[]; +extern HudElementAnim HudScript_Bombette[]; +extern HudElementAnim HudScript_Parakarry[]; +extern HudElementAnim HudScript_Watt[]; +extern HudElementAnim HudScript_Sushie[]; +extern HudElementAnim HudScript_Lakilester[]; +extern HudElementAnim HudScript_Bow[]; +extern HudElementAnim HudScript_PartnerA[]; +extern HudElementAnim HudScript_Partner0Disabled[]; +extern HudElementAnim HudScript_GoombarioDisabled[]; +extern HudElementAnim HudScript_KooperDisabled[]; +extern HudElementAnim HudScript_BombetteDisabled[]; +extern HudElementAnim HudScript_ParakarryDisabled[]; +extern HudElementAnim HudScript_WattDisabled[]; +extern HudElementAnim HudScript_SushieDisabled[]; +extern HudElementAnim HudScript_LakilesterDisabled[]; +extern HudElementAnim HudScript_BowDisabled[]; +extern HudElementAnim HudScript_PartnerADisabled[]; + +extern HudElementAnim HudScript_StatusDigit0[]; +extern HudElementAnim HudScript_StatusDigit1[]; +extern HudElementAnim HudScript_StatusDigit2[]; +extern HudElementAnim HudScript_StatusDigit3[]; +extern HudElementAnim HudScript_StatusDigit4[]; +extern HudElementAnim HudScript_StatusDigit5[]; +extern HudElementAnim HudScript_StatusDigit6[]; +extern HudElementAnim HudScript_StatusDigit7[]; +extern HudElementAnim HudScript_StatusDigit8[]; +extern HudElementAnim HudScript_StatusDigit9[]; +extern HudElementAnim HudScript_StatusTimes[]; +extern HudElementAnim HudScript_StatusSlash[]; + +extern HudElementAnim HudScript_StatusStar1[]; +extern HudElementAnim HudScript_StatusStar2[]; +extern HudElementAnim HudScript_StatusStar3[]; +extern HudElementAnim HudScript_StatusStar4[]; +extern HudElementAnim HudScript_StatusStar5[]; +extern HudElementAnim HudScript_StatusStar6[]; +extern HudElementAnim HudScript_StatusStar7[]; + +extern HudElementAnim HudScript_StatusSPIncrement1[]; +extern HudElementAnim HudScript_StatusSPIncrement2[]; +extern HudElementAnim HudScript_StatusSPIncrement3[]; +extern HudElementAnim HudScript_StatusSPIncrement4[]; +extern HudElementAnim HudScript_StatusSPIncrement5[]; +extern HudElementAnim HudScript_StatusSPIncrement6[]; +extern HudElementAnim HudScript_StatusSPIncrement7[]; + extern f32 wPartnerTetherDistance; extern s16 D_8010CFC8; extern s16 D_8010CFCA; extern s16 D_8010CFCE; extern s32 D_802C0000; -extern s32 D_8010CFB8; +extern s32 PlayerMoveHistoryIndex; extern s32 D_8010CFBC; extern s32 D_8010CFCC; -extern struct Vec3f* D_8010CD38; +extern struct player_path_element PlayerMoveHistory[40]; extern EvtSource D_802C05CC_32579C; -typedef struct struct8010CD38{ - /* 0x00 */ s8 unk_00; +typedef struct player_path_element{ + /* 0x00 */ s8 isJumping; /* 0x03 */ char unk_01[3]; /* 0x04 */ Vec3f position; -}struct8010CD38; // size unknown +}player_path_element; // size unknown s32 partner_is_idle(Npc* partner); s32 world_partner_can_player_pause_default(Npc* partner); void _use_partner_ability(void); // Partner icons -s32 D_800F7F00[] = { - 0x80107CA8, 0x80107CF8, 0x80107D48, 0x80107D98, 0x80107DE8, 0x80107CA8, 0x80107E88, 0x80107ED8, 0x80107F28, 0x80107E38, 0x80107FC8, 0x80107FC8, 0x80107FC8, 0x80107FC8, 0x80107FC8, 0x80107FC8, +HudElementAnim* wPartnerHudScripts[] = { + HudScript_Partner0, HudScript_Goombario, HudScript_Kooper, HudScript_Bombette, + HudScript_Parakarry, HudScript_Partner0, HudScript_Watt, HudScript_Sushie, + HudScript_Lakilester, HudScript_Bow, HudScript_PartnerA, HudScript_PartnerA, + HudScript_PartnerA, HudScript_PartnerA, HudScript_PartnerA, HudScript_PartnerA, }; -s32 D_800F7F40[] = { - 0x80107CD0, 0x80107D20, 0x80107D70, 0x80107DC0, 0x80107E10, 0x80107CD0, 0x80107EB0, 0x80107F00, 0x80107F50, 0x80107E60, 0x80107FF0, 0x80107FF0, 0x80107FF0, 0x80107FF0, 0x80107FF0, 0x80107FF0, +HudElementAnim* wDisabledPartnerHudScripts[] = { + HudScript_Partner0Disabled, HudScript_GoombarioDisabled, HudScript_KooperDisabled, HudScript_BombetteDisabled, + HudScript_ParakarryDisabled, HudScript_Partner0Disabled, HudScript_WattDisabled, HudScript_SushieDisabled, + HudScript_LakilesterDisabled, HudScript_BowDisabled, HudScript_PartnerADisabled, HudScript_PartnerADisabled, + HudScript_PartnerADisabled, HudScript_PartnerADisabled, HudScript_PartnerADisabled, HudScript_PartnerADisabled, }; -s32 D_800F7F80[] = { - 0x801080B8, 0x801080E0, 0x80108108, 0x80108130, 0x80108158, 0x80108180, 0x801081A8, 0x801081D0, 0x801081F8, 0x80108220, +HudElementAnim* DigitHudScripts[] = { + HudScript_StatusDigit0, HudScript_StatusDigit1, HudScript_StatusDigit2, HudScript_StatusDigit3, HudScript_StatusDigit4, + HudScript_StatusDigit5, HudScript_StatusDigit6, HudScript_StatusDigit7, HudScript_StatusDigit8, HudScript_StatusDigit9, }; -s32* D_800F7FA8 = &D_80108068; -s32 D_800F7FAC = 0x80108090; -s32 D_800F7FB0[] = { 0x80108298, 0x801082E8, 0x801082C0, 0x80108310, 0x80108338, 0x80108360, 0x80108388 }; -s32 D_800F7FCC[] = { (s32) &D_801083D8, 0x80108428, 0x80108400, 0x80108450, 0x80108478, 0x801084A0, 0x801084C8 }; +HudElementAnim* TimesHudScript = HudScript_StatusTimes; +HudElementAnim* SlashHudScript = HudScript_StatusSlash; +HudElementAnim* SPIncrementHudScripts[] = { HudScript_StatusSPIncrement1, HudScript_StatusSPIncrement3, HudScript_StatusSPIncrement2, + HudScript_StatusSPIncrement4, HudScript_StatusSPIncrement5, HudScript_StatusSPIncrement6, HudScript_StatusSPIncrement7 }; +HudElementAnim* SPStarHudScripts[] = { HudScript_StatusStar1, HudScript_StatusStar3, HudScript_StatusStar2, HudScript_StatusStar4, + HudScript_StatusStar5, HudScript_StatusStar6, HudScript_StatusStar7 }; s32 D_800F7FE8 = -1; s32 D_800F7FEC = 1; @@ -82,7 +140,7 @@ s32 D_800F7FF4 = 4; s32 D_800F7FF8 = 5; s32 D_800F7FFC = 7; s32 D_800F8000[] = { 8, 0, 0, 0 }; -s32 D_800F8010[] = { _3251D0_ROM_START, _3251D0_ROM_END, (s32) D_802C05CC_32579C, 0x00000000 }; +s32 UseItemDmaArgs[] = { _3251D0_ROM_START, _3251D0_ROM_END, (s32) D_802C05CC_32579C, 0x00000000 }; s32 D_800F8020 = 0; s32 wPartnerMoveGoalX = 0; s32 wPartnerMoveGoalZ = 0; @@ -272,9 +330,9 @@ WorldPartner wPartners[12] = { }, }; -f32 D_800F833C = 0; -f32 D_800F8340 = 0; -f32 D_800F8344 = 0; +f32 SavedPartnerPosX = 0; +f32 SavedPartnerPosY = 0; +f32 SavedPartnerPosZ = 0; PartnerAnimations gPartnerAnimations[] = { {0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000}, @@ -291,16 +349,16 @@ PartnerAnimations gPartnerAnimations[] = { {0x00200000, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200009, 0x00200020}, }; -s32 D_800F84F8 = { 0x00000000, 0x00000000, }; +s32 D_800F84F8 = 0; -s32 use_consumable(s32 arg0) { +s32 use_consumable(s32 invSlot) { Evt* script; - D_8010CD20 = arg0; - arg0 = gPlayerData.invItems[arg0]; - dma_copy(D_800F8010[0], D_800F8010[1], _3251D0_VRAM); - script = start_script(D_800F8010[2], 1, 0); - script->varTable[10] = arg0; + D_8010CD20 = invSlot; + invSlot = gPlayerData.invItems[invSlot]; + dma_copy(UseItemDmaArgs[0], UseItemDmaArgs[1], _3251D0_VRAM); + script = start_script(UseItemDmaArgs[2], 1, 0); + script->varTable[10] = invSlot; return script->id; } @@ -309,31 +367,31 @@ void remove_consumable(void) { sort_items(); } -s32 func_800EA4B0(s32 arg0) { - s32 ret = 1; +s32 func_800EA4B0(s32 collisionID) { + s32 ret = TRUE; - if (arg0 >= 0) { - if (arg0 & 0x4000) { - switch (get_entity_type(arg0)) { - case 0x7: - case 0x8: - case 0x9: - case 0xA: - case 0x2E: - case 0x2F: - case 0x32: - case 0x35: - case 0x36: - case 0x37: - case 0x38: - case 0x39: - case 0x3A: - case 0x3B: - case 0x3C: - ret = 0; + if (collisionID >= 0) { + if (collisionID & 0x4000) { + switch (get_entity_type(collisionID)) { + case ENTITY_TYPE_BLUE_SWITCH: + case ENTITY_TYPE_RED_SWITCH: + case ENTITY_TYPE_HUGE_BLUE_SWITCH: + case ENTITY_TYPE_GREEN_STOMP_SWITCH: + case ENTITY_TYPE_SIMPLE_SPRING: + case ENTITY_TYPE_SCRIPT_SPRING: + case ENTITY_TYPE_CHEST: + case ENTITY_TYPE_BELLBELL_PLANT: + case ENTITY_TYPE_TRUMPET_PLANT: + case ENTITY_TYPE_MUNCHLESIA: + case ENTITY_TYPE_CYMBAL_PLANT: + case ENTITY_TYPE_PINK_FLOWER: + case ENTITY_TYPE_SPINNING_FLOWER: + case ENTITY_TYPE_3B: + case ENTITY_TYPE_TWEESTER: + ret = FALSE; break; default: - ret = 1; + ret = TRUE; break; } } @@ -446,9 +504,9 @@ void switch_to_partner(s32 arg0) { D_8010CFE8 = 4; } else { D_8010CFE8 = 6; - D_800F833C = playerStatus->position.x; - D_800F8340 = playerStatus->position.y; - D_800F8344 = playerStatus->position.z; + SavedPartnerPosX = playerStatus->position.x; + SavedPartnerPosY = playerStatus->position.y; + SavedPartnerPosZ = playerStatus->position.z; } } } @@ -469,9 +527,9 @@ void partner_init_after_battle(s32 arg0) { D_8010CFE8 = 4; } else { D_8010CFE8 = 6; - D_800F833C = playerStatus->position.x; - D_800F8340 = playerStatus->position.y; - D_800F8344 = playerStatus->position.z; + SavedPartnerPosX = playerStatus->position.x; + SavedPartnerPosY = playerStatus->position.y; + SavedPartnerPosZ = playerStatus->position.z; } } } @@ -497,8 +555,8 @@ s32 partner_use_ability(void) { if (!is_starting_conversation() && wPartner != NULL && (wPartner->canUseAbility == NULL || wPartner->canUseAbility(wPartnerNpc))) { - if ((gGameStatusPtr->unk_81 != 0) && (actionStatus->currentButtons & 0x4000)) { - sfx_play_sound(0x21D); + if ((gGameStatusPtr->unk_81 != 0) && (actionStatus->currentButtons & BUTTON_B)) { + sfx_play_sound(SOUND_MENU_BADGE_ERROR); } else if (D_8010CFD8 != 0) { D_8010CFE0 = 1; D_8010CFE8 = 8; @@ -540,9 +598,9 @@ void partner_reset_data(void) { } wPartner = NULL; - D_800F833C = playerStatus->position.x; - D_800F8340 = playerStatus->position.y; - D_800F8344 = playerStatus->position.z; + SavedPartnerPosX = playerStatus->position.x; + SavedPartnerPosY = playerStatus->position.y; + SavedPartnerPosZ = playerStatus->position.z; if (D_8010CFD8 == 0) { D_8010CFE8 = 1; @@ -569,9 +627,9 @@ void partner_initialize_data(void) { actionStatus->unk_358 = 0; actionStatus->actionState.b[2] = 0; wPartner = NULL; - D_800F833C = 0; - D_800F8340 = 0; - D_800F8344 = 0; + SavedPartnerPosX = 0; + SavedPartnerPosY = 0; + SavedPartnerPosZ = 0; } s32 partner_test_enemy_collision(s32 arg0) { @@ -592,7 +650,7 @@ Bytecode* partner_get_ride_script(void) { void partner_handle_before_battle(void) { if (D_8010CFD8 != 0) { - s32* scriptID = &D_8010CFDC; + s32* scriptID = &wPartnerCurrentScriptID; if (does_script_exist(*scriptID)) { kill_script_by_ID(*scriptID); @@ -609,14 +667,14 @@ void partner_handle_after_battle(void) { PlayerData* playerData = &gPlayerData; if (D_8010CFD8 != 0) { - if (does_script_exist(D_8010CFDC) != 0) { - kill_script_by_ID(D_8010CFDC); + if (does_script_exist(wPartnerCurrentScriptID) != 0) { + kill_script_by_ID(wPartnerCurrentScriptID); } - D_8010CFD4 = start_script(wPartner->update, 20, 0x20); - D_8010CFD4->owner2.npc = wPartnerNpc; - D_8010CFDC = D_8010CFD4->id; - D_8010CFD4->groupFlags = 0xA; + wPartnerCurrentScript = start_script(wPartner->update, 20, 0x20); + wPartnerCurrentScript->owner2.npc = wPartnerNpc; + wPartnerCurrentScriptID = wPartnerCurrentScript->id; + wPartnerCurrentScript->groupFlags = 0xA; D_8010CFE8 = 1; @@ -633,7 +691,7 @@ void partner_handle_after_battle(void) { } void partner_kill_ability_script(void) { - s32* scriptID = &D_8010CFDC; + s32* scriptID = &wPartnerCurrentScriptID; D_8010CFE8 = 10; if (does_script_exist(*scriptID)) { @@ -643,7 +701,7 @@ void partner_kill_ability_script(void) { void partner_suspend_ability_script(void) { if (D_8010CFD8 != NULL) { - s32* scriptID = &D_8010CFDC; + s32* scriptID = &wPartnerCurrentScriptID; if (does_script_exist(*scriptID)) { suspend_all_script(*scriptID); @@ -653,7 +711,7 @@ void partner_suspend_ability_script(void) { void partner_resume_ability_script(void) { if (D_8010CFD8 != NULL) { - s32* scriptID = &D_8010CFDC; + s32* scriptID = &wPartnerCurrentScriptID; if (does_script_exist(*scriptID)) { resume_all_script(*scriptID); @@ -665,27 +723,27 @@ INCLUDE_ASM(void, "world/partners", partner_walking_enable, Npc* partner, s32 va void partner_walking_update_player_tracking(Npc* partner) { PlayerStatus* playerStatus = &gPlayerStatus; - s32 tempCondition; - struct8010CD38* tempStruct; + s32 isPlayerJumping; + player_path_element* currentSnapshot; if ((playerStatus->flags & 6) != 0) { - tempCondition = (playerStatus->actionState == ACTION_STATE_LAND || playerStatus->actionState == ACTION_STATE_STEP_DOWN) ^ 1; + isPlayerJumping = (playerStatus->actionState == ACTION_STATE_LAND || playerStatus->actionState == ACTION_STATE_STEP_DOWN) ^ 1; } else { - tempCondition = 0; + isPlayerJumping = FALSE; } - tempStruct = (D_8010CFB8 << 2) + &D_8010CD38; - if (((tempStruct->unk_00 == 0) || (tempCondition == 0)) && - ((tempStruct->position.x != playerStatus->position.x) || (tempStruct->position.y != playerStatus->position.y) - || (tempStruct->position.z != playerStatus->position.z))) { - if (D_8010CFBC != D_8010CFB8 + 1) { - if (++D_8010CFB8 >= 0x28) { - D_8010CFB8 = 0; + currentSnapshot = &PlayerMoveHistory[PlayerMoveHistoryIndex]; + if (((currentSnapshot->isJumping == 0) || (isPlayerJumping == 0)) && + ((currentSnapshot->position.x != playerStatus->position.x) || (currentSnapshot->position.y != playerStatus->position.y) + || (currentSnapshot->position.z != playerStatus->position.z))) { + if (D_8010CFBC != PlayerMoveHistoryIndex + 1) { + if (++PlayerMoveHistoryIndex >= ARRAY_COUNT(PlayerMoveHistory)) { + PlayerMoveHistoryIndex = 0; } - tempStruct = (D_8010CFB8 << 2) + &D_8010CD38; - tempStruct->position.x = playerStatus->position.x; - tempStruct->position.y = playerStatus->position.y; - tempStruct->position.z = playerStatus->position.z; - tempStruct->unk_00 = tempCondition; + currentSnapshot = &PlayerMoveHistory[PlayerMoveHistoryIndex]; + currentSnapshot->position.x = playerStatus->position.x; + currentSnapshot->position.y = playerStatus->position.y; + currentSnapshot->position.z = playerStatus->position.z; + currentSnapshot->isJumping = isPlayerJumping; } } } @@ -694,12 +752,12 @@ void partner_walking_update_motion(Npc* partner) { PlayerStatus* playerStatus = &gPlayerStatus; PartnerActionStatus* actionStatus = &gPartnerActionStatus; - if (gGameStatusPtr->unk_81 == 0 || playerStatus->flags & 0x3000 || actionStatus->inputDisabled != 0 - || actionStatus->actionState.b[2] != 0) { - if (!(playerStatus->animFlags & 0x800)) { + if (gGameStatusPtr->unk_81 == 0 || playerStatus->flags & (PLAYER_STATUS_FLAGS_INPUT_DISABLED | PLAYER_STATUS_FLAGS_1000) + || actionStatus->inputDisabled != 0 || actionStatus->actionState.b[2] != 0) { + if (!(playerStatus->animFlags & PLAYER_STATUS_ANIM_FLAGS_800)) { partner_walking_follow_player(partner); } - if (actionStatus->pressedButtons & 0x6006) { + if (actionStatus->pressedButtons & (BUTTON_Z | BUTTON_B | BUTTON_C_LEFT | BUTTON_C_DOWN)) { actionStatus->actionState.b[2] = 0; } } @@ -710,13 +768,13 @@ void partner_walking_update_motion(Npc* partner) { partner->pos.z = playerStatus->position.z; partner->jumpVelocity = 0.0f; partner->jumpScale = 0.0f; - partner->flags = partner->flags & ~0x800; + partner->flags = partner->flags & ~PLAYER_STATUS_ANIM_FLAGS_800; } partner_do_player_collision(partner); - D_800F833C = partner->pos.x; - D_800F8340 = partner->pos.y; - D_800F8344 = partner->pos.z; + SavedPartnerPosX = partner->pos.x; + SavedPartnerPosY = partner->pos.y; + SavedPartnerPosZ = partner->pos.z; } INCLUDE_ASM(void, "world/partners", partner_walking_follow_player, Npc* partner); @@ -725,26 +783,26 @@ INCLUDE_ASM(void, "world/partners", partner_flying_enable, Npc* partner, s32 val void partner_flying_update_player_tracking(Npc* partner) { PlayerStatus* playerStatus = &gPlayerStatus; - struct8010CD38* tempStruct; - f32 tempY; + player_path_element* currentSnapShot; + f32 effectiveY; s32 zero = 0; // TODO fix this as || zero == 0 is always going to be true as is - tempY = playerStatus->position.y; - if ((playerStatus->actionState == 23) || (playerStatus->actionState == 21)) { - tempY = playerStatus->lastGoodPosition.y + partner->collisionHeight + 5; + effectiveY = playerStatus->position.y; + if ((playerStatus->actionState == ACTION_STATE_HIT_LAVA) || (playerStatus->actionState == ACTION_STATE_HIT_FIRE)) { + effectiveY = playerStatus->lastGoodPosition.y + partner->collisionHeight + 5; } - tempStruct = (D_8010CFB8 << 2) + &D_8010CD38; - if ((!tempStruct->unk_00 || zero == 0) && (tempStruct->position.x != playerStatus->position.x || tempStruct->position.y != tempY - || tempStruct->position.z != playerStatus->position.z)) { - if (D_8010CFBC != D_8010CFB8 + 1) { - if (++D_8010CFB8 >= 0x28) { - D_8010CFB8 = 0; + currentSnapShot = &PlayerMoveHistory[PlayerMoveHistoryIndex]; + if ((!currentSnapShot->isJumping || zero == 0) && (currentSnapShot->position.x != playerStatus->position.x || currentSnapShot->position.y != effectiveY + || currentSnapShot->position.z != playerStatus->position.z)) { + if (D_8010CFBC != PlayerMoveHistoryIndex + 1) { + if (++PlayerMoveHistoryIndex >= ARRAY_COUNT(PlayerMoveHistory)) { + PlayerMoveHistoryIndex = 0; } - tempStruct = (D_8010CFB8 << 2) + &D_8010CD38; - tempStruct->position.x = playerStatus->position.x; - tempStruct->position.y = tempY; - tempStruct->position.z = playerStatus->position.z; - tempStruct->unk_00 = zero; + currentSnapShot = &PlayerMoveHistory[PlayerMoveHistoryIndex]; + currentSnapShot->position.x = playerStatus->position.x; + currentSnapShot->position.y = effectiveY; + currentSnapShot->position.z = playerStatus->position.z; + currentSnapShot->isJumping = zero; } } } @@ -753,10 +811,10 @@ INCLUDE_ASM(void, "world/partners", partner_flying_update_motion, Npc* partner); INCLUDE_ASM(s32, "world/partners", partner_flying_follow_player); -s32 partner_init_put_away(Npc* arg0) { - arg0->collisionChannel = 0x10000; +s32 partner_init_put_away(Npc* partner) { + partner->collisionChannel = 0x10000; D_8010CFC8 = 0; - arg0->flags |= 0x100; + partner->flags |= 0x100; return D_8010CFC8; } @@ -783,9 +841,9 @@ s32 partner_put_away(Npc* partner) { tempPosY = playerStatus->position.y + (playerStatus->colliderHeight / 2); partner->moveToPos.y = playerStatus->position.y + (playerStatus->colliderHeight / 2); tempPosZ = playerStatus->position.z; - D_800F833C = tempMoveToX; - D_800F8340 = tempMoveToY; - D_800F8344 = tempMoveToZ; + SavedPartnerPosX = tempMoveToX; + SavedPartnerPosY = tempMoveToY; + SavedPartnerPosZ = tempMoveToZ; partner->moveSpeed = 4.0f; partner->jumpScale = 1.6f; partner->moveToPos.z = tempPosZ; diff --git a/src/world/partners.h b/src/world/partners.h index 8adf715b90..e8cfbdd768 100644 --- a/src/world/partners.h +++ b/src/world/partners.h @@ -27,9 +27,9 @@ typedef struct WorldPartner { } WorldPartner; // size = 0x40 extern s32 D_8010CFC4; -extern Evt* D_8010CFD4; +extern Evt* wPartnerCurrentScript; extern s32 D_8010CFD8; -extern s32 D_8010CFDC; +extern s32 wPartnerCurrentScriptID; extern s32 D_8010CFE0; extern s32 D_8010CFE4; extern s32 D_8010CFE8; diff --git a/src/world/script_api/7E0E80.c b/src/world/script_api/7E0E80.c index 613a68b262..6606d4cb96 100644 --- a/src/world/script_api/7E0E80.c +++ b/src/world/script_api/7E0E80.c @@ -12,7 +12,7 @@ extern s32 D_80286524; extern s32 D_80286530; extern s32 D_80286534; extern Evt* D_8028652C; -extern HudElementAnim* D_80080868; +extern HudElementAnim* HudScript_Item_Coin; extern s32 D_8014F150[64]; ApiStatus func_802803C8(Evt* script, s32 isInitialCall); @@ -361,7 +361,7 @@ ApiStatus ShowShopPurchaseDialog(Evt* script, s32 isInitialCall) { //dumb stuff #ifdef NON_EQUIVALENT -extern s32 D_8008A680[337][2]; +extern s32 gItemHudScripts[337][2]; void shop_open_item_select_popup(s32 mode) { Shop* shop = gGameStatusPtr->mapShop; @@ -399,7 +399,7 @@ void shop_open_item_select_popup(s32 mode) { } if (itemID != 0) { - menu->ptrIcon[i] = D_8008A680[gItemTable[itemID].iconID][0]; + menu->ptrIcon[i] = gItemHudScripts[gItemTable[itemID].iconID][0]; menu->userIndex[i] = i; menu->enabled[i] = TRUE; menu->nameMsg[i] = gItemTable[itemID].nameMsg; @@ -900,7 +900,7 @@ s32 MakeShop(Evt* script, s32 isInitialCall) { numShopItems++; } - shop->costIconID = create_hud_element(&D_80080868); + shop->costIconID = create_hud_element(&HudScript_Item_Coin); set_hud_element_flags(shop->costIconID, 0x80); clear_hud_element_flags(shop->costIconID, 0x8000); get_generic_entity(create_generic_entity_frontUI(NULL, draw_shop_items)); diff --git a/ver/us/asm/data/10B610.data.s b/ver/us/asm/data/10B610.data.s index 112f67149f..996447f36d 100644 --- a/ver/us/asm/data/10B610.data.s +++ b/ver/us/asm/data/10B610.data.s @@ -101,13 +101,13 @@ dlabel D_802EA52C dlabel D_802EA548 .word 0x00000004, 0x00000016, 0x00000001, 0x0000003C, 0x0A000A90, 0x00000002, 0x00000000, 0x42000020, D_802EA4F4, 0x00000000, entity_ItemBlock_init, D_802EA328, entity_block_handle_collision, 0x00E3B870, 0x00E3C320, 0x0F191919, 0x42000020, D_802EA510, 0x00000000, entity_HiddenItemBlock_init, D_802EA38C, entity_block_handle_collision, 0x00E3B870, 0x00E3C320, 0x11191919, 0x42000020, D_802EA52C, 0x00000000, entity_ItemBlock_init, D_802EA328, entity_block_handle_collision, 0x00E3C320, 0x00E3CDD0, 0x14191919, 0x42000020, D_802EA548, 0x00000000, entity_HiddenItemBlock_init, D_802EA38C, entity_block_handle_collision, 0x00E3C320, 0x00E3CDD0, 0x12191919, 0xC2080020, 0x0000023C, 0x00000084, entity_ItemlessBlock_init, D_802EA440, entity_block_handle_collision, D_802EA4C4, 0x00000000, 0x10191919 -dlabel D_802EA618 +dlabel Entity_HitGroundedYellowBlock .word 0x42080020, 0x0000023C, 0x00000084, entity_ItemlessBlock_init, D_802EA3F0, 0x00000000, D_802EA4C4, 0x00000000, 0x0F191919 -dlabel D_802EA63C +dlabel Entity_HitFloatingYellowBlock .word 0x42080020, 0x0000022C, 0x00000084, entity_ItemlessBlock_init, D_802EA3F0, 0x00000000, D_802EA4D4, 0x00000000, 0x0F191919 -dlabel D_802EA660 +dlabel Entity_HitRedBlock .word 0x42080020, 0x00000094, 0x00000084, entity_ItemlessBlock_init, D_802EA3F0, 0x00000000, D_802EA4E4, 0x00000000, 0x14191919, 0x00000000, 0x00000000, 0x00000000 dlabel D_802EA690 diff --git a/ver/us/asm/data/1AF2D0.data.s b/ver/us/asm/data/1AF2D0.data.s index 7a6f73200b..1a3bfc15e9 100644 --- a/ver/us/asm/data/1AF2D0.data.s +++ b/ver/us/asm/data/1AF2D0.data.s @@ -674,190 +674,226 @@ dlabel D_80290C78 dlabel D_80291C80 .word 0x00000011, 0x66CCEEFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFEECC66, 0x11000000, 0x00000000, 0x00000000, 0x00000000, 0x000022BB, 0xEEFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFEE, 0xBB220000, 0x00000000, 0x00000000, 0x00000000, 0x0022DDFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFDD2200, 0x00000000, 0x00000000, 0x00000000, 0x11BBFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFBB11, 0x00000000, 0x00000000, 0x00000000, 0x66EEFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFEE66, 0x00000000, 0x00000000, 0x00000000, 0xCCEEFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFCC, 0x00000000, 0x00000000, 0x00000000, 0xEEFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFEE, 0x00000000, 0x00000000, 0x00000000, 0xEEFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0xEEFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFEE, 0x00000000, 0x00000000, 0x00000000, 0xCCFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFCC, 0x00000000, 0x00000000, 0x00000000, 0x66EEFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFEE66, 0x00000000, 0x00000000, 0x00000000, 0x11BBFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFBB11, 0x00000000, 0x00000000, 0x00000000, 0x0022DDFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFDD2200, 0x00000000, 0x00000000, 0x00000000, 0x000022BB, 0xEEFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFEE, 0xBB220000, 0x00000000, 0x00000000, 0x00000000, 0x00000011, 0x66CCEEFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFEECC66, 0x11000000, 0x00000000, 0x00000000, 0x00000000 -dlabel D_80291F80 +dlabel HudScript_HPBar .word 0x00000008, 0x00000005, 0x0000000B, 0x00000004, 0x00000002, 0x0000003C, D_8028A840, D_8028A940, 0x00000003, 0x00000000 -dlabel D_80291FA8 +dlabel HudScript_HPDigit0 .word 0x00000008, 0x00000005, 0x00000000, 0x00000004, 0x00000002, 0x0000003C, D_8028A960, D_8028A980, 0x00000003, 0x00000000 -dlabel D_80291FD0 +dlabel HudScript_HPDigit1 .word 0x00000008, 0x00000005, 0x00000000, 0x00000004, 0x00000002, 0x0000003C, D_8028A9A0, D_8028A9C0, 0x00000003, 0x00000000 -dlabel D_80291FF8 +dlabel HudScript_HPDigit2 .word 0x00000008, 0x00000005, 0x00000000, 0x00000004, 0x00000002, 0x0000003C, D_8028A9E0, D_8028AA00, 0x00000003, 0x00000000 -dlabel D_80292020 +dlabel HudScript_HPDigit3 .word 0x00000008, 0x00000005, 0x00000000, 0x00000004, 0x00000002, 0x0000003C, D_8028AA20, D_8028AA40, 0x00000003, 0x00000000 -dlabel D_80292048 +dlabel HudScript_HPDigit4 .word 0x00000008, 0x00000005, 0x00000000, 0x00000004, 0x00000002, 0x0000003C, D_8028AA60, D_8028AA80, 0x00000003, 0x00000000 -dlabel D_80292070 +dlabel HudScript_HPDigit5 .word 0x00000008, 0x00000005, 0x00000000, 0x00000004, 0x00000002, 0x0000003C, D_8028AAA0, D_8028AAC0, 0x00000003, 0x00000000 -dlabel D_80292098 +dlabel HudScript_HPDigit6 .word 0x00000008, 0x00000005, 0x00000000, 0x00000004, 0x00000002, 0x0000003C, D_8028AAE0, D_8028AB00, 0x00000003, 0x00000000 -dlabel D_802920C0 +dlabel HudScript_HPDigit7 .word 0x00000008, 0x00000005, 0x00000000, 0x00000004, 0x00000002, 0x0000003C, D_8028AB20, D_8028AB40, 0x00000003, 0x00000000 -dlabel D_802920E8 +dlabel HudScript_HPDigit8 .word 0x00000008, 0x00000005, 0x00000000, 0x00000004, 0x00000002, 0x0000003C, D_8028AB60, D_8028AB80, 0x00000003, 0x00000000 -dlabel D_80292110 -.word 0x00000008, 0x00000005, 0x00000000, 0x00000004, 0x00000002, 0x0000003C, D_8028ABA0, D_8028ABC0, 0x00000003, 0x00000000, 0x00000008, 0x00000005, 0x00000001, 0x00000004, 0x00000002, 0x0000003C, D_8028A680, D_8028A700, 0x00000003, 0x00000000, 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x00000002, 0x0000003C, D_80289640, D_80289840, 0x00000003, 0x00000000, 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x00000002, 0x0000003C, D_80289640, D_80289860, 0x00000003, 0x00000000, 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x00000002, 0x0000003C, D_80289880, D_80289A80, 0x00000003, 0x00000000, 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x00000002, 0x0000003C, D_80289880, D_80289AA0, 0x00000003, 0x00000000, 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x00000002, 0x0000003C, D_80289AC0, D_80289CC0, 0x00000003, 0x00000000, 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x00000002, 0x0000003C, D_80289AC0, D_80289CE0, 0x00000003, 0x00000000, 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x00000002, 0x0000003C, D_80289F40, D_8028A140, 0x00000003, 0x00000000, 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x00000002, 0x0000003C, D_80289F40, D_8028A160, 0x00000003, 0x00000000, 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x00000002, 0x0000003C, D_80289D00, D_80289F00, 0x00000003, 0x00000000, 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x00000002, 0x0000003C, D_80289D00, D_80289F20, 0x00000003, 0x00000000 +dlabel HudScript_HPDigit9 +.word 0x00000008, 0x00000005, 0x00000000, 0x00000004, 0x00000002, 0x0000003C, D_8028ABA0, D_8028ABC0, 0x00000003, 0x00000000 -dlabel D_802922F0 +dlabel HudScript_YellowArrow +.word 0x00000008, 0x00000005, 0x00000001, 0x00000004, 0x00000002, 0x0000003C, D_8028A680, D_8028A700, 0x00000003, 0x00000000 + +dlabel HudScript_MenuFlee +.word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x00000002, 0x0000003C, D_80289640, D_80289840, 0x00000003, 0x00000000 + +dlabel HudScript_MenuFleeDisabled +.word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x00000002, 0x0000003C, D_80289640, D_80289860, 0x00000003, 0x00000000 + +dlabel HudScript_MenuDefend +.word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x00000002, 0x0000003C, D_80289880, D_80289A80, 0x00000003, 0x00000000 + +dlabel HudScript_MenuDefendDisabled +.word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x00000002, 0x0000003C, D_80289880, D_80289AA0, 0x00000003, 0x00000000 + +dlabel HudScript_MenuStrategies +.word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x00000002, 0x0000003C, D_80289AC0, D_80289CC0, 0x00000003, 0x00000000 + +dlabel HudScript_MenuStrategiesDisabled +.word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x00000002, 0x0000003C, D_80289AC0, D_80289CE0, 0x00000003, 0x00000000 + +dlabel HudScript_MenuPouch +.word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x00000002, 0x0000003C, D_80289F40, D_8028A140, 0x00000003, 0x00000000 + +dlabel HudScript_MenuPouchDisabled +.word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x00000002, 0x0000003C, D_80289F40, D_8028A160, 0x00000003, 0x00000000 + +dlabel HudScript_MenuDoNothing +.word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x00000002, 0x0000003C, D_80289D00, D_80289F00, 0x00000003, 0x00000000 + +dlabel HudScript_MenuDoNothingDisabled +.word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x00000002, 0x0000003C, D_80289D00, D_80289F20, 0x00000003, 0x00000000 + +dlabel HudScript_TimingBar1Chance .word 0x00000008, 0x00000013, 0x00000048, 0x00000018, 0x00000004, 0x00000002, 0x0000003C, D_8028C9E0, D_8028CD40, 0x00000003, 0x00000000 -dlabel D_8029231C -.word 0x00000008, 0x00000013, 0x00000030, 0x00000028, 0x00000004, 0x00000002, 0x0000003C, D_8028ABE0, D_8028AFA0, 0x00000003, 0x00000000, 0x00000008, 0x00000013, 0x00000030, 0x00000028, 0x00000004, 0x00000002, 0x0000003C, D_8028AFC0, D_8028B380, 0x00000003, 0x00000000 +dlabel HudScript_BButton +.word 0x00000008, 0x00000013, 0x00000030, 0x00000028, 0x00000004, 0x00000002, 0x0000003C, D_8028ABE0, D_8028AFA0, 0x00000003, 0x00000000 -dlabel D_80292374 +dlabel HudScript_BButtonHeld +.word 0x00000008, 0x00000013, 0x00000030, 0x00000028, 0x00000004, 0x00000002, 0x0000003C, D_8028AFC0, D_8028B380, 0x00000003, 0x00000000 + +dlabel HudScript_MashBButton1 .word 0x00000008, 0x00000013, 0x00000030, 0x00000028, 0x00000004, 0x00000002, 0x00000002, D_8028ABE0, D_8028AFA0, 0x00000002, 0x00000002, D_8028AFC0, D_8028B380, 0x00000003, 0x00000000 -dlabel D_802923B0 +dlabel HudScript_PressBButton .word 0x00000008, 0x00000013, 0x00000030, 0x00000028, 0x00000004, 0x00000002, 0x00000003, D_8028AFC0, D_8028B380, 0x00000002, 0x0000000A, D_8028ABE0, D_8028AFA0, 0x00000002, 0x00000007, D_8028AFC0, D_8028B380, 0x00000003, 0x00000000 -dlabel D_802923FC +dlabel HudScript_MashBButton2 .word 0x00000008, 0x00000013, 0x00000030, 0x00000028, 0x00000004, 0x00000002, 0x00000002, D_8028AFC0, D_8028B380, 0x00000002, 0x00000002, D_8028ABE0, D_8028AFA0, 0x00000003, 0x00000000 -dlabel D_80292438 +dlabel HudScript_CLeftButton .word 0x00000008, 0x00000013, 0x00000028, 0x00000022, 0x00000004, 0x00000002, 0x0000003C, D_8028B3A0, D_8028B648, 0x00000003, 0x00000000, 0x00000008, 0x00000013, 0x00000028, 0x00000022, 0x00000004, 0x00000002, 0x0000003C, D_8028B668, D_8028B910, 0x00000003, 0x00000000 -dlabel D_80292490 +dlabel HudScript_MashCLeftButton .word 0x00000008, 0x00000013, 0x00000028, 0x00000022, 0x00000004, 0x00000002, 0x00000002, D_8028B3A0, D_8028B648, 0x00000002, 0x00000002, D_8028B668, D_8028B910, 0x00000003, 0x00000000 -dlabel D_802924CC +dlabel HudScript_CRightButton .word 0x00000008, 0x00000013, 0x00000028, 0x00000022, 0x00000004, 0x00000002, 0x0000003C, D_8028B930, D_8028BBD8, 0x00000003, 0x00000000, 0x00000008, 0x00000013, 0x00000028, 0x00000022, 0x00000004, 0x00000002, 0x0000003C, D_8028BBF8, D_8028BEA0, 0x00000003, 0x00000000 -dlabel D_80292524 +dlabel HudScript_MashCRightButton1 .word 0x00000008, 0x00000013, 0x00000028, 0x00000022, 0x00000004, 0x00000002, 0x00000002, D_8028B930, D_8028BBD8, 0x00000002, 0x00000002, D_8028BBF8, D_8028BEA0, 0x00000003, 0x00000000, 0x00000008, 0x00000013, 0x00000028, 0x00000022, 0x00000004, 0x00000002, 0x00000002, D_8028BBF8, D_8028BEA0, 0x00000002, 0x00000002, D_8028B930, D_8028BBD8, 0x00000003, 0x00000000 -dlabel D_8029259C +dlabel HudScript_CUpButton .word 0x00000008, 0x00000013, 0x00000028, 0x00000022, 0x00000004, 0x00000002, 0x0000003C, D_8028BEC0, D_8028C168, 0x00000003, 0x00000000, 0x00000008, 0x00000013, 0x00000028, 0x00000022, 0x00000004, 0x00000002, 0x0000003C, D_8028C188, D_8028C430, 0x00000003, 0x00000000 -dlabel D_802925F4 +dlabel HudScript_MashCUpButton .word 0x00000008, 0x00000013, 0x00000028, 0x00000022, 0x00000004, 0x00000002, 0x00000002, D_8028BEC0, D_8028C168, 0x00000002, 0x00000002, D_8028C188, D_8028C430, 0x00000003, 0x00000000 -dlabel D_80292630 +dlabel HudScript_CDownButton .word 0x00000008, 0x00000013, 0x00000028, 0x00000022, 0x00000004, 0x00000002, 0x0000003C, D_8028C450, D_8028C6F8, 0x00000003, 0x00000000, 0x00000008, 0x00000013, 0x00000028, 0x00000022, 0x00000004, 0x00000002, 0x0000003C, D_8028C718, D_8028C9C0, 0x00000003, 0x00000000 -dlabel D_80292688 +dlabel HudScript_MashCDownButton1 .word 0x00000008, 0x00000013, 0x00000028, 0x00000022, 0x00000004, 0x00000002, 0x00000002, D_8028C450, D_8028C6F8, 0x00000002, 0x00000002, D_8028C718, D_8028C9C0, 0x00000003, 0x00000000 -dlabel D_802926C4 +dlabel HudScript_PressCDownButton .word 0x00000008, 0x00000013, 0x00000028, 0x00000022, 0x00000004, 0x00000002, 0x00000006, D_8028C718, D_8028C9C0, 0x00000002, 0x0000000A, D_8028C450, D_8028C6F8, 0x00000002, 0x00000004, D_8028C718, D_8028C9C0, 0x00000003, 0x00000000, 0x00000008, 0x00000013, 0x00000028, 0x00000022, 0x00000004, 0x00000002, 0x00000001, D_8028C450, D_8028C6F8, 0x00000002, 0x00000002, D_8028C718, D_8028C9C0, 0x00000002, 0x00000001, D_8028C450, D_8028C6F8, 0x00000003, 0x00000000 -dlabel D_8029275C +dlabel HudScript_TimingWait .word 0x00000008, 0x00000013, 0x00000010, 0x00000010, 0x00000004, 0x00000002, 0x0000003C, D_8028CE00, D_8028CE80, 0x00000003, 0x00000000 -dlabel D_80292788 +dlabel HudScript_TimingReady .word 0x00000008, 0x00000013, 0x00000010, 0x00000010, 0x00000004, 0x00000002, 0x0000003C, D_8028CD60, D_8028CDE0, 0x00000003, 0x00000000 -dlabel D_802927B4 +dlabel HudScript_TimingBlink .word 0x00000008, 0x00000013, 0x00000010, 0x00000010, 0x00000004, 0x00000002, 0x0000000A, D_8028CD60, D_8028CDE0, 0x00000002, 0x00000006, D_8028CE00, D_8028CE80, 0x00000003, 0x00000000 -dlabel D_802927F0 +dlabel HudScript_TimingCharge4a .word 0x00000008, 0x00000013, 0x00000008, 0x00000008, 0x00000004, 0x00000002, 0x0000003C, D_8028CF60, D_8028CF80, 0x00000003, 0x00000000 -dlabel D_8029281C +dlabel HudScript_TimingCharge1 .word 0x00000008, 0x00000013, 0x00000008, 0x00000008, 0x00000004, 0x00000002, 0x0000003C, D_8028CEA0, D_8028CEC0, 0x00000003, 0x00000000 -dlabel D_80292848 +dlabel HudScript_TimingCharge4b .word 0x00000008, 0x00000013, 0x00000008, 0x00000008, 0x00000004, 0x00000002, 0x0000003C, D_8028CF60, D_8028CF80, 0x00000003, 0x00000000 -dlabel D_80292874 +dlabel HudScript_TimingCharge2 .word 0x00000008, 0x00000013, 0x00000008, 0x00000008, 0x00000004, 0x00000002, 0x0000003C, D_8028CEE0, D_8028CF00, 0x00000003, 0x00000000 -dlabel D_802928A0 +dlabel HudScript_TimingCharge4c .word 0x00000008, 0x00000013, 0x00000008, 0x00000008, 0x00000004, 0x00000002, 0x0000003C, D_8028CF60, D_8028CF80, 0x00000003, 0x00000000 -dlabel D_802928CC +dlabel HudScript_TimingCharge3 .word 0x00000008, 0x00000013, 0x00000008, 0x00000008, 0x00000004, 0x00000002, 0x0000003C, D_8028CF20, D_8028CF40, 0x00000003, 0x00000000 -dlabel D_802928F8 +dlabel HudScript_RunningAway .word 0x00000008, 0x00000004, 0x00000013, 0x00000010, 0x00000018, 0x00000002, 0x00000001, D_8028D860, D_8028D920, 0x00000002, 0x00000001, D_8028D940, D_8028DA00, 0x00000002, 0x00000001, D_8028DA20, D_8028DAE0, 0x00000002, 0x00000001, D_8028D860, D_8028D920, 0x00000002, 0x00000001, D_8028DA20, D_8028DAE0, 0x00000002, 0x00000001, D_8028D940, D_8028DA00, 0x00000003, 0x00000000 -dlabel D_80292974 +dlabel HudScript_100pct .word 0x00000008, 0x00000013, 0x00000040, 0x00000030, 0x00000004, 0x0000000C, 0x00000000, 0xFFFFFFF0, 0x0000000E, 0x00010000, 0x00000002, 0x00000001, D_8028DB00, D_8028E100, 0x0000000E, 0x00013333, 0x00000002, 0x00000001, D_8028DB00, D_8028E100, 0x0000000E, 0x00014CCC, 0x00000002, 0x00000001, D_8028DB00, D_8028E100, 0x0000000E, 0x0001451E, 0x00000002, 0x00000001, D_8028DB00, D_8028E100, 0x0000000E, 0x00012666, 0x00000002, 0x00000001, D_8028DB00, D_8028E100, 0x0000000E, 0x00010CCC, 0x00000002, 0x00000001, D_8028DB00, D_8028E100, 0x00000003, 0x00000000 -dlabel D_80292A2C +dlabel HudScript_RightOn .word 0x00000008, 0x00000013, 0x00000038, 0x00000018, 0x00000004, 0x0000000C, 0x00000000, 0xFFFFFFF0, 0x0000000E, 0x00010000, 0x00000002, 0x00000001, D_8028E120, D_8028E3C0, 0x0000000E, 0x00011999, 0x00000002, 0x00000001, D_8028E120, D_8028E3C0, 0x0000000E, 0x00013333, 0x00000002, 0x00000001, D_8028E120, D_8028E3C0, 0x0000000E, 0x00014CCC, 0x00000002, 0x00000002, D_8028E120, D_8028E3C0, 0x0000000E, 0x0001451E, 0x00000002, 0x00000002, D_8028E120, D_8028E3C0, 0x0000000E, 0x00012666, 0x00000002, 0x00000002, D_8028E120, D_8028E3C0, 0x0000000E, 0x00010CCC, 0x00000002, 0x00000002, D_8028E120, D_8028E3C0, 0x00000003, 0x00000000 -dlabel D_80292AFC +dlabel HudScript_TimingBar3Chances .word 0x00000008, 0x00000013, 0x00000060, 0x00000018, 0x00000004, 0x00000002, 0x0000003C, D_8028CFA0, D_8028D420, 0x00000003, 0x00000000, 0x00000008, 0x00000013, 0x00000020, 0x00000018, 0x00000004, 0x00000002, 0x0000003C, D_8028D440, D_8028D5C0, 0x00000003, 0x00000000 -dlabel D_80292B54 +dlabel HudScript_TimingOK .word 0x00000008, 0x00000013, 0x00000018, 0x00000018, 0x00000004, 0x00000002, 0x0000003C, D_8028D5E0, D_8028D700, 0x00000003, 0x00000000 -dlabel D_80292B80 +dlabel HudScript_TimingMiss .word 0x00000008, 0x00000013, 0x00000018, 0x00000018, 0x00000004, 0x00000002, 0x0000003C, D_8028D720, D_8028D840, 0x00000003, 0x00000000 -dlabel D_80292BAC +dlabel HudScript_FillGaugeResult .word 0x00000008, 0x00000013, 0x00000020, 0x00000018, 0x00000004, 0x00000002, 0x0000003C, D_8028E3E0, D_8028E560, 0x00000003, 0x00000000 -dlabel D_80292BD8 +dlabel HudScript_ProjectorReel .word 0x00000012, 0x00000013, 0x00000040, 0x00000040, 0x00000004, 0x00000001, 0x0000003C, D_80290C78, 0x00000003, 0x00000000 -dlabel D_80292C00 +dlabel HudScript_ProjectorSpot .word 0x00000012, 0x00000013, 0x00000020, 0x00000020, 0x00000004, 0x00000001, 0x0000003C, D_8028F868, 0x00000003, 0x00000000 -dlabel D_80292C28 +dlabel HudScript_ProjectorBeam .word 0x00000012, 0x00000013, 0x00000040, 0x00000040, 0x00000004, 0x00000001, 0x0000003C, D_8028FC70, 0x00000003, 0x00000000 -dlabel D_80292C50 +dlabel HudScript_SwapZ .word 0x00000008, 0x00000013, 0x00000010, 0x00000010, 0x00000004, 0x00000002, 0x0000003C, D_8028A180, D_8028A200, 0x00000003, 0x00000000 -dlabel D_80292C7C +dlabel HudScript_SwapArrowLeft .word 0x00000008, 0x00000013, 0x00000008, 0x00000010, 0x00000004, 0x00000002, 0x0000000C, D_8028A220, D_8028A260, 0x00000002, 0x00000008, D_8028A220, D_8028A260, 0x00000003, 0x00000000 -dlabel D_80292CB8 +dlabel HudScript_SwapArrowRight .word 0x00000008, 0x00000013, 0x00000008, 0x00000010, 0x00000004, 0x00000002, 0x0000000A, D_8028A280, D_8028A2C0, 0x00000002, 0x0000000A, D_8028A280, D_8028A2C0, 0x00000003, 0x00000000 dlabel D_80292CF4 .word 0x00000012, 0x00000013, 0x00000030, 0x00000010, 0x00000004, 0x00000001, 0x0000003C, D_80291C80, 0x00000003, 0x00000000 -dlabel D_80292D1C +dlabel HudScript_AimMarkerA .word 0x00000008, 0x00000005, 0x00000001, 0x00000004, 0x00000002, 0x00000003, D_8028E580, D_8028E600, 0x00000002, 0x00000003, D_8028E620, D_8028E6A0, 0x00000002, 0x00000003, D_8028E6C0, D_8028E740, 0x00000002, 0x00000003, D_8028E760, D_8028E7E0, 0x00000002, 0x00000003, D_8028E800, D_8028E880, 0x00000002, 0x00000003, D_8028E8A0, D_8028E920, 0x00000002, 0x00000003, D_8028E940, D_8028E9C0, 0x00000002, 0x00000003, D_8028E9E0, D_8028EA60, 0x00000003, 0x00000000 -dlabel D_80292DB4 +dlabel HudScript_AimMarkerB .word 0x00000008, 0x00000005, 0x00000001, 0x00000004, 0x00000002, 0x00000003, D_8028E620, D_8028E6A0, 0x00000002, 0x00000003, D_8028E6C0, D_8028E740, 0x00000002, 0x00000003, D_8028E760, D_8028E7E0, 0x00000002, 0x00000003, D_8028E800, D_8028E880, 0x00000002, 0x00000003, D_8028E8A0, D_8028E920, 0x00000002, 0x00000003, D_8028E940, D_8028E9C0, 0x00000002, 0x00000003, D_8028E9E0, D_8028EA60, 0x00000002, 0x00000003, D_8028E580, D_8028E600, 0x00000003, 0x00000000 -dlabel D_80292E4C +dlabel HudScript_AimMarkerC .word 0x00000008, 0x00000005, 0x00000001, 0x00000004, 0x00000002, 0x00000003, D_8028E6C0, D_8028E740, 0x00000002, 0x00000003, D_8028E760, D_8028E7E0, 0x00000002, 0x00000003, D_8028E800, D_8028E880, 0x00000002, 0x00000003, D_8028E8A0, D_8028E920, 0x00000002, 0x00000003, D_8028E940, D_8028E9C0, 0x00000002, 0x00000003, D_8028E9E0, D_8028EA60, 0x00000002, 0x00000003, D_8028E580, D_8028E600, 0x00000002, 0x00000003, D_8028E620, D_8028E6A0, 0x00000003, 0x00000000 -dlabel D_80292EE4 +dlabel HudScript_AimMarkerD .word 0x00000008, 0x00000005, 0x00000001, 0x00000004, 0x00000002, 0x00000003, D_8028E760, D_8028E7E0, 0x00000002, 0x00000003, D_8028E800, D_8028E880, 0x00000002, 0x00000003, D_8028E8A0, D_8028E920, 0x00000002, 0x00000003, D_8028E940, D_8028E9C0, 0x00000002, 0x00000003, D_8028E9E0, D_8028EA60, 0x00000002, 0x00000003, D_8028E580, D_8028E600, 0x00000002, 0x00000003, D_8028E620, D_8028E6A0, 0x00000002, 0x00000003, D_8028E6C0, D_8028E740, 0x00000003, 0x00000000 -dlabel D_80292F7C +dlabel HudScript_AimMarkerE .word 0x00000008, 0x00000005, 0x00000001, 0x00000004, 0x00000002, 0x00000003, D_8028E800, D_8028E880, 0x00000002, 0x00000003, D_8028E8A0, D_8028E920, 0x00000002, 0x00000003, D_8028E940, D_8028E9C0, 0x00000002, 0x00000003, D_8028E9E0, D_8028EA60, 0x00000002, 0x00000003, D_8028E580, D_8028E600, 0x00000002, 0x00000003, D_8028E620, D_8028E6A0, 0x00000002, 0x00000003, D_8028E6C0, D_8028E740, 0x00000002, 0x00000003, D_8028E760, D_8028E7E0, 0x00000003, 0x00000000 -dlabel D_80293014 +dlabel HudScript_AimMarkerF .word 0x00000008, 0x00000005, 0x00000001, 0x00000004, 0x00000002, 0x00000003, D_8028E8A0, D_8028E920, 0x00000002, 0x00000003, D_8028E940, D_8028E9C0, 0x00000002, 0x00000003, D_8028E9E0, D_8028EA60, 0x00000002, 0x00000003, D_8028E580, D_8028E600, 0x00000002, 0x00000003, D_8028E620, D_8028E6A0, 0x00000002, 0x00000003, D_8028E6C0, D_8028E740, 0x00000002, 0x00000003, D_8028E760, D_8028E7E0, 0x00000002, 0x00000003, D_8028E800, D_8028E880, 0x00000003, 0x00000000, 0x00000008, 0x00000005, 0x00000001, 0x00000004, 0x00000002, 0x00000003, D_8028E940, D_8028E9C0, 0x00000002, 0x00000003, D_8028E9E0, D_8028EA60, 0x00000002, 0x00000003, D_8028E580, D_8028E600, 0x00000002, 0x00000003, D_8028E620, D_8028E6A0, 0x00000002, 0x00000003, D_8028E6C0, D_8028E740, 0x00000002, 0x00000003, D_8028E760, D_8028E7E0, 0x00000002, 0x00000003, D_8028E800, D_8028E880, 0x00000002, 0x00000003, D_8028E8A0, D_8028E920, 0x00000003, 0x00000000, 0x00000008, 0x00000005, 0x00000001, 0x00000004, 0x00000002, 0x00000003, D_8028E9E0, D_8028EA60, 0x00000002, 0x00000003, D_8028E580, D_8028E600, 0x00000002, 0x00000003, D_8028E620, D_8028E6A0, 0x00000002, 0x00000003, D_8028E6C0, D_8028E740, 0x00000002, 0x00000003, D_8028E760, D_8028E7E0, 0x00000002, 0x00000003, D_8028E800, D_8028E880, 0x00000002, 0x00000003, D_8028E8A0, D_8028E920, 0x00000002, 0x00000003, D_8028E940, D_8028E9C0, 0x00000003, 0x00000000 -dlabel D_802931DC +dlabel HudScript_AimShimmerA .word 0x00000008, 0x00000005, 0x00000001, 0x00000004, 0x00000002, 0x00000003, D_8028EA80, D_8028EB00, 0x00000002, 0x00000003, D_8028EB20, D_8028EBA0, 0x00000002, 0x00000003, D_8028EBC0, D_8028EC40, 0x00000002, 0x00000003, D_8028EC60, D_8028ECE0, 0x00000002, 0x00000003, D_8028ED00, D_8028ED80, 0x00000002, 0x00000003, D_8028EDA0, D_8028EE20, 0x00000002, 0x00000003, D_8028EE40, D_8028EEC0, 0x00000002, 0x00000003, D_8028EEE0, D_8028EF60, 0x00000003, 0x00000000 -dlabel D_80293274 +dlabel HudScript_AimShimmerB .word 0x00000008, 0x00000005, 0x00000001, 0x00000004, 0x00000002, 0x00000003, D_8028EB20, D_8028EBA0, 0x00000002, 0x00000003, D_8028EBC0, D_8028EC40, 0x00000002, 0x00000003, D_8028EC60, D_8028ECE0, 0x00000002, 0x00000003, D_8028ED00, D_8028ED80, 0x00000002, 0x00000003, D_8028EDA0, D_8028EE20, 0x00000002, 0x00000003, D_8028EE40, D_8028EEC0, 0x00000002, 0x00000003, D_8028EEE0, D_8028EF60, 0x00000002, 0x00000003, D_8028EA80, D_8028EB00, 0x00000003, 0x00000000 -dlabel D_8029330C +dlabel HudScript_AimShimmerC .word 0x00000008, 0x00000005, 0x00000001, 0x00000004, 0x00000002, 0x00000003, D_8028EBC0, D_8028EC40, 0x00000002, 0x00000003, D_8028EC60, D_8028ECE0, 0x00000002, 0x00000003, D_8028ED00, D_8028ED80, 0x00000002, 0x00000003, D_8028EDA0, D_8028EE20, 0x00000002, 0x00000003, D_8028EE40, D_8028EEC0, 0x00000002, 0x00000003, D_8028EEE0, D_8028EF60, 0x00000002, 0x00000003, D_8028EA80, D_8028EB00, 0x00000002, 0x00000003, D_8028EB20, D_8028EBA0, 0x00000003, 0x00000000 -dlabel D_802933A4 +dlabel HudScript_AimShimmerD .word 0x00000008, 0x00000005, 0x00000001, 0x00000004, 0x00000002, 0x00000003, D_8028EC60, D_8028ECE0, 0x00000002, 0x00000003, D_8028ED00, D_8028ED80, 0x00000002, 0x00000003, D_8028EDA0, D_8028EE20, 0x00000002, 0x00000003, D_8028EE40, D_8028EEC0, 0x00000002, 0x00000003, D_8028EEE0, D_8028EF60, 0x00000002, 0x00000003, D_8028EA80, D_8028EB00, 0x00000002, 0x00000003, D_8028EB20, D_8028EBA0, 0x00000002, 0x00000003, D_8028EBC0, D_8028EC40, 0x00000003, 0x00000000 -dlabel D_8029343C +dlabel HudScript_AimShimmerE .word 0x00000008, 0x00000005, 0x00000001, 0x00000004, 0x00000002, 0x00000003, D_8028ED00, D_8028ED80, 0x00000002, 0x00000003, D_8028EDA0, D_8028EE20, 0x00000002, 0x00000003, D_8028EE40, D_8028EEC0, 0x00000002, 0x00000003, D_8028EEE0, D_8028EF60, 0x00000002, 0x00000003, D_8028EA80, D_8028EB00, 0x00000002, 0x00000003, D_8028EB20, D_8028EBA0, 0x00000002, 0x00000003, D_8028EBC0, D_8028EC40, 0x00000002, 0x00000003, D_8028EC60, D_8028ECE0, 0x00000003, 0x00000000 -dlabel D_802934D4 +dlabel HudScript_AimShimmerF .word 0x00000008, 0x00000005, 0x00000001, 0x00000004, 0x00000002, 0x00000003, D_8028EDA0, D_8028EE20, 0x00000002, 0x00000003, D_8028EE40, D_8028EEC0, 0x00000002, 0x00000003, D_8028EEE0, D_8028EF60, 0x00000002, 0x00000003, D_8028EA80, D_8028EB00, 0x00000002, 0x00000003, D_8028EB20, D_8028EBA0, 0x00000002, 0x00000003, D_8028EBC0, D_8028EC40, 0x00000002, 0x00000003, D_8028EC60, D_8028ECE0, 0x00000002, 0x00000003, D_8028ED00, D_8028ED80, 0x00000003, 0x00000000, 0x00000008, 0x00000005, 0x00000001, 0x00000004, 0x00000002, 0x00000003, D_8028EE40, D_8028EEC0, 0x00000002, 0x00000003, D_8028EEE0, D_8028EF60, 0x00000002, 0x00000003, D_8028EA80, D_8028EB00, 0x00000002, 0x00000003, D_8028EB20, D_8028EBA0, 0x00000002, 0x00000003, D_8028EBC0, D_8028EC40, 0x00000002, 0x00000003, D_8028EC60, D_8028ECE0, 0x00000002, 0x00000003, D_8028ED00, D_8028ED80, 0x00000002, 0x00000003, D_8028EDA0, D_8028EE20, 0x00000003, 0x00000000, 0x00000008, 0x00000005, 0x00000001, 0x00000004, 0x00000002, 0x00000003, D_8028EEE0, D_8028EF60, 0x00000002, 0x00000003, D_8028EA80, D_8028EB00, 0x00000002, 0x00000003, D_8028EB20, D_8028EBA0, 0x00000002, 0x00000003, D_8028EBC0, D_8028EC40, 0x00000002, 0x00000003, D_8028EC60, D_8028ECE0, 0x00000002, 0x00000003, D_8028ED00, D_8028ED80, 0x00000002, 0x00000003, D_8028EDA0, D_8028EE20, 0x00000002, 0x00000003, D_8028EE40, D_8028EEC0, 0x00000003, 0x00000000 -dlabel D_8029369C +dlabel HudScript_AimReticle .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x00000002, 0x00000008, D_8028EF80, D_8028F180, 0x00000002, 0x00000005, D_8028F1A0, D_8028F3A0, 0x00000003, 0x00000000 -dlabel D_802936D4 +dlabel HudScript_AimTarget .word 0x00000008, 0x00000005, 0x00000002, 0x00000004, 0x00000002, 0x00000002, D_8028F3C0, D_8028F4E0, 0x00000002, 0x00000002, D_8028F500, D_8028F620, 0x00000003, 0x00000000, 0x00000008, 0x00000005, 0x00000001, 0x00000004, 0x00000019, 0x00200000, 0x00000002, 0x00000003, D_8028E580, D_8028E600, 0x00000018, 0x00200000, 0x00000002, 0x00000003, D_8028E580, D_8028E600, 0x00000002, 0x00000003, D_8028E580, D_8028E600, 0x00000003, 0x00000000, 0x00000008, 0x00000005, 0x00000001, 0x00000004, 0x00000018, 0x00200000, 0x00000002, 0x00000003, D_8028E580, D_8028E600, 0x00000019, 0x00200000, 0x00000002, 0x00000003, D_8028E580, D_8028E600, 0x00000018, 0x00200000, 0x00000002, 0x00000003, D_8028E580, D_8028E600, 0x00000003, 0x00000000, 0x00000008, 0x00000005, 0x00000001, 0x00000004, 0x00000018, 0x00200000, 0x00000002, 0x00000003, D_8028E580, D_8028E600, 0x00000002, 0x00000003, D_8028E580, D_8028E600, 0x00000019, 0x00200000, 0x00000002, 0x00000003, D_8028E580, D_8028E600, 0x00000003, 0x00000000, 0x00000000 dlabel D_80293820 diff --git a/ver/us/asm/data/5B320.data.s b/ver/us/asm/data/5B320.data.s index d698ba5074..e58d5913e1 100644 --- a/ver/us/asm/data/5B320.data.s +++ b/ver/us/asm/data/5B320.data.s @@ -2,2608 +2,2767 @@ .section .data -dlabel D_8007FF20 -.word 0x00000008, 0x00000005, 0x00000002, 0x00000004, 0x0000000C, 0x00000000, 0xFFFFFFFF, 0x0000000D, 0x00000001, 0x0002C7C0, 0x0002C8E0, 0x00000000, 0x00000000, 0x0000000C, 0x00000000, 0xFFFFFFFF, 0x0000000D, 0x00000001, 0x0002C7C0, 0x0002C8E0, 0x00000000, 0x00000000, 0x0000000C, 0x00000000, 0xFFFFFFFF, 0x0000000D, 0x00000001, 0x0002C7C0, 0x0002C8E0, 0x00000000, 0x00000000, 0x0000000C, 0x00000000, 0xFFFFFFFF, 0x0000000D, 0x00000001, 0x0002C7C0, 0x0002C8E0, 0x00000000, 0x00000000, 0x0000000C, 0x00000002, 0xFFFFFFFF, 0x0000000D, 0x00000001, 0x0002C900, 0x0002CA20, 0x00000000, 0x00000000, 0x0000000C, 0x00000002, 0xFFFFFFFF, 0x0000000D, 0x00000001, 0x0002CA40, 0x0002CB60, 0x00000000, 0x00000000, 0x0000000C, 0x00000002, 0xFFFFFFFF, 0x0000000D, 0x00000004, 0x0002CB80, 0x0002CCA0, 0x00000000, 0x00000000, 0x0000000C, 0x00000002, 0x00000004, 0x0000000D, 0x00000001, 0x0002C900, 0x0002CA20, 0x00000000, 0x00000000, 0x0000000C, 0x00000000, 0x00000003, 0x0000000D, 0x00000001, 0x0002C7C0, 0x0002C8E0, 0x00000000, 0x00000000, 0x0000000C, 0x00000000, 0xFFFFFFFF, 0x0000000D, 0x0000000E, 0x0002CCC0, 0x0002CDE0, 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x00000008, 0x00000005, 0x00000002, 0x0000000C, 0x00000000, 0xFFFFFFFF, 0x0000000D, 0x00000001, 0x0002C7C0, 0x0002C8E0, 0x00000000, 0x00000000, 0x0000000C, 0x00000002, 0xFFFFFFFF, 0x0000000D, 0x00000001, 0x0002C900, 0x0002CA20, 0x00000000, 0x00000000, 0x0000000C, 0x00000002, 0xFFFFFFFF, 0x0000000D, 0x00000001, 0x0002CA40, 0x0002CB60, 0x00000000, 0x00000000, 0x0000000C, 0x00000002, 0xFFFFFFFF, 0x0000000D, 0x00000004, 0x0002CB80, 0x0002CCA0, 0x00000000, 0x00000000, 0x0000000C, 0x00000002, 0x00000004, 0x0000000D, 0x00000001, 0x0002C900, 0x0002CA20, 0x00000000, 0x00000000, 0x0000000C, 0x00000000, 0x00000003, 0x0000000D, 0x00000001, 0x0002C7C0, 0x0002C8E0, 0x00000000, 0x00000000, 0x0000000C, 0x00000000, 0xFFFFFFFF, 0x0000000D, 0x00000002, 0x0002CCC0, 0x0002CDE0, 0x00000000, 0x00000000, 0x0000000C, 0x00000000, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0002C7C0, 0x0002C8E0, 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x00000008, 0x00000005, 0x00000002, 0x00000004, 0x0000000D, 0x0000003C, 0x0002C7C0, 0x0002C8E0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 +dlabel HudScript_HandPointDownLoop +.word 0x00000008, 0x00000005, 0x00000002, 0x00000004, 0x0000000C, 0x00000000, 0xFFFFFFFF, 0x0000000D, 0x00000001, 0x0002C7C0, 0x0002C8E0, 0x00000000, 0x00000000, 0x0000000C, 0x00000000, 0xFFFFFFFF, 0x0000000D, 0x00000001, 0x0002C7C0, 0x0002C8E0, 0x00000000, 0x00000000, 0x0000000C, 0x00000000, 0xFFFFFFFF, 0x0000000D, 0x00000001, 0x0002C7C0, 0x0002C8E0, 0x00000000, 0x00000000, 0x0000000C, 0x00000000, 0xFFFFFFFF, 0x0000000D, 0x00000001, 0x0002C7C0, 0x0002C8E0, 0x00000000, 0x00000000, 0x0000000C, 0x00000002, 0xFFFFFFFF, 0x0000000D, 0x00000001, 0x0002C900, 0x0002CA20, 0x00000000, 0x00000000, 0x0000000C, 0x00000002, 0xFFFFFFFF, 0x0000000D, 0x00000001, 0x0002CA40, 0x0002CB60, 0x00000000, 0x00000000, 0x0000000C, 0x00000002, 0xFFFFFFFF, 0x0000000D, 0x00000004, 0x0002CB80, 0x0002CCA0, 0x00000000, 0x00000000, 0x0000000C, 0x00000002, 0x00000004, 0x0000000D, 0x00000001, 0x0002C900, 0x0002CA20, 0x00000000, 0x00000000, 0x0000000C, 0x00000000, 0x00000003, 0x0000000D, 0x00000001, 0x0002C7C0, 0x0002C8E0, 0x00000000, 0x00000000, 0x0000000C, 0x00000000, 0xFFFFFFFF, 0x0000000D, 0x0000000E, 0x0002CCC0, 0x0002CDE0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80080208 -.word 0x00000008, 0x00000005, 0x00000002, 0x00000004, 0x0000000C, 0x00000000, 0x00000000, 0x0000000D, 0x00000001, 0x0002CE00, 0x0002CF20, 0x00000000, 0x00000000, 0x0000000C, 0x00000000, 0x00000000, 0x0000000D, 0x00000001, 0x0002CE00, 0x0002CF20, 0x00000000, 0x00000000, 0x0000000C, 0x00000000, 0x00000000, 0x0000000D, 0x00000001, 0x0002CE00, 0x0002CF20, 0x00000000, 0x00000000, 0x0000000C, 0x00000000, 0x00000000, 0x0000000D, 0x00000001, 0x0002CE00, 0x0002CF20, 0x00000000, 0x00000000, 0x0000000C, 0x00000000, 0xFFFFFFFF, 0x0000000D, 0x00000001, 0x0002CF40, 0x0002D060, 0x00000000, 0x00000000, 0x0000000C, 0x00000000, 0xFFFFFFFF, 0x0000000D, 0x00000001, 0x0002D080, 0x0002D1A0, 0x00000000, 0x00000000, 0x0000000C, 0x00000001, 0xFFFFFFFD, 0x0000000D, 0x00000004, 0x0002D1C0, 0x0002D2E0, 0x00000000, 0x00000000, 0x0000000C, 0x00000000, 0x00000004, 0x0000000D, 0x00000001, 0x0002CF40, 0x0002D060, 0x00000000, 0x00000000, 0x0000000C, 0x00000000, 0x00000004, 0x0000000D, 0x00000001, 0x0002CE00, 0x0002CF20, 0x00000000, 0x00000000, 0x0000000C, 0x00000000, 0x00000001, 0x0000000D, 0x0000000E, 0x0002D300, 0x0002D420, 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x00000008, 0x00000005, 0x00000002, 0x0000000C, 0x00000000, 0x00000000, 0x0000000D, 0x00000001, 0x0002CE00, 0x0002CF20, 0x00000000, 0x00000000, 0x0000000C, 0x00000000, 0xFFFFFFFF, 0x0000000D, 0x00000001, 0x0002CF40, 0x0002D060, 0x00000000, 0x00000000, 0x0000000C, 0x00000000, 0xFFFFFFFF, 0x0000000D, 0x00000001, 0x0002D080, 0x0002D1A0, 0x00000000, 0x00000000, 0x0000000C, 0x00000001, 0xFFFFFFFD, 0x0000000D, 0x00000004, 0x0002D1C0, 0x0002D2E0, 0x00000000, 0x00000000, 0x0000000C, 0x00000000, 0x00000004, 0x0000000D, 0x00000001, 0x0002CF40, 0x0002D060, 0x00000000, 0x00000000, 0x0000000C, 0x00000000, 0x00000004, 0x0000000D, 0x00000001, 0x0002CE00, 0x0002CF20, 0x00000000, 0x00000000, 0x0000000C, 0x00000000, 0x00000001, 0x0000000D, 0x00000002, 0x0002D300, 0x0002D420, 0x00000000, 0x00000000, 0x0000000C, 0x00000000, 0x00000004, 0x00000004, 0x0000000D, 0x0000003C, 0x0002CE00, 0x0002CF20, 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x00000008, 0x00000005, 0x00000002, 0x00000004, 0x0000000D, 0x0000003C, 0x0002CE00, 0x0002CF20, 0x00000000, 0x00000000, 0x00000003, 0x00000000 +dlabel HudScript_HandPointDown +.word 0x00000008, 0x00000005, 0x00000002, 0x0000000C, 0x00000000, 0xFFFFFFFF, 0x0000000D, 0x00000001, 0x0002C7C0, 0x0002C8E0, 0x00000000, 0x00000000, 0x0000000C, 0x00000002, 0xFFFFFFFF, 0x0000000D, 0x00000001, 0x0002C900, 0x0002CA20, 0x00000000, 0x00000000, 0x0000000C, 0x00000002, 0xFFFFFFFF, 0x0000000D, 0x00000001, 0x0002CA40, 0x0002CB60, 0x00000000, 0x00000000, 0x0000000C, 0x00000002, 0xFFFFFFFF, 0x0000000D, 0x00000004, 0x0002CB80, 0x0002CCA0, 0x00000000, 0x00000000, 0x0000000C, 0x00000002, 0x00000004, 0x0000000D, 0x00000001, 0x0002C900, 0x0002CA20, 0x00000000, 0x00000000, 0x0000000C, 0x00000000, 0x00000003, 0x0000000D, 0x00000001, 0x0002C7C0, 0x0002C8E0, 0x00000000, 0x00000000, 0x0000000C, 0x00000000, 0xFFFFFFFF, 0x0000000D, 0x00000002, 0x0002CCC0, 0x0002CDE0, 0x00000000, 0x00000000, 0x0000000C, 0x00000000, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0002C7C0, 0x0002C8E0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_800804F0 +dlabel HudScript_HandPointDownHeld +.word 0x00000008, 0x00000005, 0x00000002, 0x00000004, 0x0000000D, 0x0000003C, 0x0002C7C0, 0x0002C8E0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 + +dlabel HudScript_HandPointLeftLoop +.word 0x00000008, 0x00000005, 0x00000002, 0x00000004, 0x0000000C, 0x00000000, 0x00000000, 0x0000000D, 0x00000001, 0x0002CE00, 0x0002CF20, 0x00000000, 0x00000000, 0x0000000C, 0x00000000, 0x00000000, 0x0000000D, 0x00000001, 0x0002CE00, 0x0002CF20, 0x00000000, 0x00000000, 0x0000000C, 0x00000000, 0x00000000, 0x0000000D, 0x00000001, 0x0002CE00, 0x0002CF20, 0x00000000, 0x00000000, 0x0000000C, 0x00000000, 0x00000000, 0x0000000D, 0x00000001, 0x0002CE00, 0x0002CF20, 0x00000000, 0x00000000, 0x0000000C, 0x00000000, 0xFFFFFFFF, 0x0000000D, 0x00000001, 0x0002CF40, 0x0002D060, 0x00000000, 0x00000000, 0x0000000C, 0x00000000, 0xFFFFFFFF, 0x0000000D, 0x00000001, 0x0002D080, 0x0002D1A0, 0x00000000, 0x00000000, 0x0000000C, 0x00000001, 0xFFFFFFFD, 0x0000000D, 0x00000004, 0x0002D1C0, 0x0002D2E0, 0x00000000, 0x00000000, 0x0000000C, 0x00000000, 0x00000004, 0x0000000D, 0x00000001, 0x0002CF40, 0x0002D060, 0x00000000, 0x00000000, 0x0000000C, 0x00000000, 0x00000004, 0x0000000D, 0x00000001, 0x0002CE00, 0x0002CF20, 0x00000000, 0x00000000, 0x0000000C, 0x00000000, 0x00000001, 0x0000000D, 0x0000000E, 0x0002D300, 0x0002D420, 0x00000000, 0x00000000, 0x00000003, 0x00000000 + +dlabel HudScript_HandPointLeft +.word 0x00000008, 0x00000005, 0x00000002, 0x0000000C, 0x00000000, 0x00000000, 0x0000000D, 0x00000001, 0x0002CE00, 0x0002CF20, 0x00000000, 0x00000000, 0x0000000C, 0x00000000, 0xFFFFFFFF, 0x0000000D, 0x00000001, 0x0002CF40, 0x0002D060, 0x00000000, 0x00000000, 0x0000000C, 0x00000000, 0xFFFFFFFF, 0x0000000D, 0x00000001, 0x0002D080, 0x0002D1A0, 0x00000000, 0x00000000, 0x0000000C, 0x00000001, 0xFFFFFFFD, 0x0000000D, 0x00000004, 0x0002D1C0, 0x0002D2E0, 0x00000000, 0x00000000, 0x0000000C, 0x00000000, 0x00000004, 0x0000000D, 0x00000001, 0x0002CF40, 0x0002D060, 0x00000000, 0x00000000, 0x0000000C, 0x00000000, 0x00000004, 0x0000000D, 0x00000001, 0x0002CE00, 0x0002CF20, 0x00000000, 0x00000000, 0x0000000C, 0x00000000, 0x00000001, 0x0000000D, 0x00000002, 0x0002D300, 0x0002D420, 0x00000000, 0x00000000, 0x0000000C, 0x00000000, 0x00000004, 0x00000004, 0x0000000D, 0x0000003C, 0x0002CE00, 0x0002CF20, 0x00000000, 0x00000000, 0x00000003, 0x00000000 + +dlabel HudScript_HandPointLeftHeld +.word 0x00000008, 0x00000005, 0x00000002, 0x00000004, 0x0000000D, 0x0000003C, 0x0002CE00, 0x0002CF20, 0x00000000, 0x00000000, 0x00000003, 0x00000000 + +dlabel HudScript_Item_Present .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00000000, 0x00000200, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80080520 +dlabel HudScript_Item_CakeDone .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00000220, 0x00000420, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80080550 +dlabel HudScript_Item_CakeBaked .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00000440, 0x00000640, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80080580 +dlabel HudScript_Item_CakePan .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00000660, 0x00000860, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_800805B0 +dlabel HudScript_Item_CakeBatter .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00000880, 0x00000A80, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_800805E0 +dlabel HudScript_Item_CakeBowl .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00000AA0, 0x00000CA0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80080610 +dlabel HudScript_Item_CakeMixed .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00000CC0, 0x00000EC0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80080640 +dlabel HudScript_Item_CakeIcing .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00000EE0, 0x000010E0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80080670 +dlabel HudScript_Item_CakeBerries .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00001100, 0x00001300, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_800806A0 +dlabel HudScript_Item_Hammer1 .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0002D940, 0x0002DB40, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_800806D0 +dlabel HudScript_Item_Hammer2 .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0002DB80, 0x0002DD80, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80080700 +dlabel HudScript_Item_Hammer3 .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0002DDC0, 0x0002DFC0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80080730 +dlabel HudScript_Item_Boots1 .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0002E000, 0x0002E200, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80080760 +dlabel HudScript_Item_Boots2 .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0002E240, 0x0002E440, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80080790 +dlabel HudScript_Item_Boots3 .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0002E480, 0x0002E680, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_800807C0 +dlabel HudScript_Item_Items .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0002E6C0, 0x0002E8C0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_800807F0 +dlabel HudScript_Item_HeartPiece .word 0x00000008, 0x00000005, 0x00000002, 0x00000004, 0x0000000D, 0x0000003C, 0x00030CE0, 0x00030E00, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80080820 +dlabel HudScript_Item_Heart .word 0x00000008, 0x00000005, 0x00000002, 0x00000004, 0x0000000D, 0x0000000A, 0x00030A60, 0x00030B80, 0x00000000, 0x00000000, 0x0000000D, 0x00000006, 0x00030BA0, 0x00030CC0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80080868 +dlabel HudScript_Item_Coin .word 0x00000008, 0x00000005, 0x00000002, 0x00000004, 0x00000015, 0x00000000, 0x0000000D, 0x00000003, 0x0002F5C0, 0x0002F6E0, 0x00000000, 0x00000000, 0x0000000D, 0x00000003, 0x0002F700, 0x0002F820, 0x00000000, 0x00000000, 0x0000000D, 0x00000003, 0x0002FAC0, 0x0002FBE0, 0x00000000, 0x00000000, 0x0000000D, 0x00000003, 0x0002FC00, 0x0002FD20, 0x00000000, 0x00000000, 0x0000000D, 0x00000003, 0x0002FD40, 0x0002FE60, 0x00000000, 0x00000000, 0x0000000D, 0x00000003, 0x0002FE80, 0x0002FFA0, 0x00000000, 0x00000000, 0x0000000D, 0x00000003, 0x0002FFC0, 0x000300E0, 0x00000000, 0x00000000, 0x0000000D, 0x00000003, 0x00030100, 0x00030220, 0x00000000, 0x00000000, 0x00000014, 0x00000064, 0x00000046, 0x00000015, 0x00000001, 0x0000000D, 0x00000003, 0x0002F5C0, 0x0002F6E0, 0x00000000, 0x00000000, 0x0000000D, 0x00000002, 0x0002F700, 0x0002F820, 0x00000000, 0x00000000, 0x0000000D, 0x00000001, 0x0002F840, 0x0002F960, 0x00000000, 0x00000000, 0x0000000D, 0x00000001, 0x0002F980, 0x0002FAA0, 0x00000000, 0x00000000, 0x0000000D, 0x00000002, 0x0002FAC0, 0x0002FBE0, 0x00000000, 0x00000000, 0x0000000D, 0x00000003, 0x0002FC00, 0x0002FD20, 0x00000000, 0x00000000, 0x0000000D, 0x00000003, 0x0002FD40, 0x0002FE60, 0x00000000, 0x00000000, 0x0000000D, 0x00000003, 0x0002FE80, 0x0002FFA0, 0x00000000, 0x00000000, 0x0000000D, 0x00000003, 0x0002FFC0, 0x000300E0, 0x00000000, 0x00000000, 0x0000000D, 0x00000003, 0x00030100, 0x00030220, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80080A4C +dlabel HudScript_Item_CoinSparkleA .word 0x0000000C, 0xFFFFFFF8, 0x00000000, 0x0000000D, 0x00000001, 0x00030240, 0x00030260, 0x00000000, 0x00000000, 0x0000000D, 0x00000001, 0x00030280, 0x000302A0, 0x00000000, 0x00000000, 0x0000000D, 0x00000001, 0x000302C0, 0x000302E0, 0x00000000, 0x00000000, 0x0000000D, 0x00000002, 0x000303C0, 0x000303E0, 0x00000000, 0x00000000, 0x0000000D, 0x00000001, 0x000302C0, 0x000302E0, 0x00000000, 0x00000000, 0x0000000D, 0x00000001, 0x00030300, 0x00030320, 0x00000000, 0x00000000, 0x0000000D, 0x00000001, 0x000303C0, 0x000303E0, 0x00000000, 0x00000000, 0x0000000D, 0x00000001, 0x00030340, 0x00030360, 0x00000000, 0x00000000, 0x0000000D, 0x00000001, 0x000303C0, 0x000303E0, 0x00000000, 0x00000000, 0x0000000D, 0x00000001, 0x00030380, 0x000303A0, 0x00000000, 0x00000000, 0x0000000D, 0x00000010, 0x000303C0, 0x000303E0, 0x00000000, 0x00000000, 0x00000000 -dlabel D_80080B64 +dlabel HudScript_Item_CoinSparkleB .word 0x0000000C, 0x00000008, 0x00000008, 0x0000000D, 0x00000001, 0x00030240, 0x00030260, 0x00000000, 0x00000000, 0x0000000D, 0x00000001, 0x00030280, 0x000302A0, 0x00000000, 0x00000000, 0x0000000D, 0x00000001, 0x000302C0, 0x000302E0, 0x00000000, 0x00000000, 0x0000000D, 0x00000002, 0x000303C0, 0x000303E0, 0x00000000, 0x00000000, 0x0000000D, 0x00000001, 0x000302C0, 0x000302E0, 0x00000000, 0x00000000, 0x0000000D, 0x00000001, 0x00030300, 0x00030320, 0x00000000, 0x00000000, 0x0000000D, 0x00000001, 0x000303C0, 0x000303E0, 0x00000000, 0x00000000, 0x0000000D, 0x00000001, 0x00030340, 0x00030360, 0x00000000, 0x00000000, 0x0000000D, 0x00000001, 0x000303C0, 0x000303E0, 0x00000000, 0x00000000, 0x0000000D, 0x00000001, 0x00030380, 0x000303A0, 0x00000000, 0x00000000, 0x0000000D, 0x00000010, 0x000303C0, 0x000303E0, 0x00000000, 0x00000000, 0x00000000 -dlabel D_80080C7C +dlabel HudScript_Item_CoinSparkleC .word 0x0000000C, 0xFFFFFFFC, 0x00000008, 0x0000000D, 0x00000001, 0x00030240, 0x00030260, 0x00000000, 0x00000000, 0x0000000D, 0x00000001, 0x00030280, 0x000302A0, 0x00000000, 0x00000000, 0x0000000D, 0x00000001, 0x000302C0, 0x000302E0, 0x00000000, 0x00000000, 0x0000000D, 0x00000002, 0x000303C0, 0x000303E0, 0x00000000, 0x00000000, 0x0000000D, 0x00000001, 0x000302C0, 0x000302E0, 0x00000000, 0x00000000, 0x0000000D, 0x00000001, 0x00030300, 0x00030320, 0x00000000, 0x00000000, 0x0000000D, 0x00000001, 0x000303C0, 0x000303E0, 0x00000000, 0x00000000, 0x0000000D, 0x00000001, 0x00030340, 0x00030360, 0x00000000, 0x00000000, 0x0000000D, 0x00000001, 0x000303C0, 0x000303E0, 0x00000000, 0x00000000, 0x0000000D, 0x00000001, 0x00030380, 0x000303A0, 0x00000000, 0x00000000, 0x0000000D, 0x00000010, 0x000303C0, 0x000303E0, 0x00000000, 0x00000000, 0x00000000 -dlabel D_80080D94 +dlabel HudScript_Item_CoinSparkleD .word 0x0000000C, 0x00000006, 0xFFFFFFFA, 0x0000000D, 0x00000001, 0x00030240, 0x00030260, 0x00000000, 0x00000000, 0x0000000D, 0x00000001, 0x00030280, 0x000302A0, 0x00000000, 0x00000000, 0x0000000D, 0x00000001, 0x000302C0, 0x000302E0, 0x00000000, 0x00000000, 0x0000000D, 0x00000002, 0x000303C0, 0x000303E0, 0x00000000, 0x00000000, 0x0000000D, 0x00000001, 0x000302C0, 0x000302E0, 0x00000000, 0x00000000, 0x0000000D, 0x00000001, 0x00030300, 0x00030320, 0x00000000, 0x00000000, 0x0000000D, 0x00000001, 0x000303C0, 0x000303E0, 0x00000000, 0x00000000, 0x0000000D, 0x00000001, 0x00030340, 0x00030360, 0x00000000, 0x00000000, 0x0000000D, 0x00000001, 0x000303C0, 0x000303E0, 0x00000000, 0x00000000, 0x0000000D, 0x00000001, 0x00030380, 0x000303A0, 0x00000000, 0x00000000, 0x0000000D, 0x00000010, 0x000303C0, 0x000303E0, 0x00000000, 0x00000000, 0x00000000 -dlabel D_80080EAC +dlabel HudScript_Item_CoinSparkleE .word 0x0000000C, 0x00000001, 0xFFFFFFF8, 0x0000000D, 0x00000001, 0x00030240, 0x00030260, 0x00000000, 0x00000000, 0x0000000D, 0x00000001, 0x00030280, 0x000302A0, 0x00000000, 0x00000000, 0x0000000D, 0x00000001, 0x000302C0, 0x000302E0, 0x00000000, 0x00000000, 0x0000000D, 0x00000002, 0x000303C0, 0x000303E0, 0x00000000, 0x00000000, 0x0000000D, 0x00000001, 0x000302C0, 0x000302E0, 0x00000000, 0x00000000, 0x0000000D, 0x00000001, 0x00030300, 0x00030320, 0x00000000, 0x00000000, 0x0000000D, 0x00000001, 0x000303C0, 0x000303E0, 0x00000000, 0x00000000, 0x0000000D, 0x00000001, 0x00030340, 0x00030360, 0x00000000, 0x00000000, 0x0000000D, 0x00000001, 0x000303C0, 0x000303E0, 0x00000000, 0x00000000, 0x0000000D, 0x00000001, 0x00030380, 0x000303A0, 0x00000000, 0x00000000, 0x0000000D, 0x00000010, 0x000303C0, 0x000303E0, 0x00000000, 0x00000000, 0x00000000 -dlabel D_80080FC4 -.word 0x00000008, 0x00000005, 0x00000000, 0x00000017, 0x00000005, D_80080A4C, D_80080B64, D_80080C7C, D_80080D94, D_80080EAC, 0x00000000 +dlabel HudScript_Item_CoinSparkleRandom +.word 0x00000008, 0x00000005, 0x00000000, 0x00000017, 0x00000005, HudScript_Item_CoinSparkleA, HudScript_Item_CoinSparkleB, HudScript_Item_CoinSparkleC, HudScript_Item_CoinSparkleD, HudScript_Item_CoinSparkleE, 0x00000000 -dlabel D_80080FF0 +dlabel HudScript_Item_StarPoint .word 0x00000008, 0x00000005, 0x00000002, 0x00000004, 0x0000000D, 0x00000002, 0x00030E20, 0x00030F40, 0x00000000, 0x00000000, 0x0000000D, 0x00000002, 0x00030F60, 0x00031080, 0x00000000, 0x00000000, 0x0000000D, 0x00000002, 0x000310A0, 0x000311C0, 0x00000000, 0x00000000, 0x0000000D, 0x00000002, 0x000311E0, 0x00031300, 0x00000000, 0x00000000, 0x0000000D, 0x00000002, 0x00031320, 0x00031440, 0x00000000, 0x00000000, 0x0000000D, 0x00000002, 0x00031460, 0x00031580, 0x00000000, 0x00000000, 0x0000000D, 0x00000002, 0x000315A0, 0x000316C0, 0x00000000, 0x00000000, 0x0000000D, 0x00000002, 0x000316E0, 0x00031800, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_800810C8 +dlabel HudScript_Item_SmallStarPoint .word 0x00000008, 0x00000005, 0x00000000, 0x00000004, 0x0000000D, 0x00000002, 0x00031CA0, 0x00031CC0, 0x00000000, 0x00000000, 0x0000000D, 0x00000002, 0x00031CE0, 0x00031D00, 0x00000000, 0x00000000, 0x0000000D, 0x00000002, 0x00031D20, 0x00031D40, 0x00000000, 0x00000000, 0x0000000D, 0x00000002, 0x00031D60, 0x00031D80, 0x00000000, 0x00000000, 0x0000000D, 0x00000002, 0x00031DA0, 0x00031DC0, 0x00000000, 0x00000000, 0x0000000D, 0x00000002, 0x00031DE0, 0x00031E00, 0x00000000, 0x00000000, 0x0000000D, 0x00000002, 0x00031E20, 0x00031E40, 0x00000000, 0x00000000, 0x0000000D, 0x00000002, 0x00031E60, 0x00031E80, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_800811A0 +dlabel HudScript_Item_HeartPoint .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x00000008, 0x0002E900, 0x0002EB00, 0x00000000, 0x00000000, 0x0000000D, 0x00000005, 0x0002EB20, 0x0002ED20, 0x00000000, 0x00000000, 0x0000000D, 0x00000008, 0x0002ED40, 0x0002EF40, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80081200 +dlabel HudScript_Item_FlowerPoint .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x00000008, 0x0002EF60, 0x0002F160, 0x00000000, 0x00000000, 0x0000000D, 0x00000005, 0x0002F180, 0x0002F380, 0x00000000, 0x00000000, 0x0000000D, 0x00000008, 0x0002F3A0, 0x0002F5A0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80081260 +dlabel HudScript_Item_StarPiece .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000000C, 0x00030400, 0x00030600, 0x00000000, 0x00000000, 0x0000000D, 0x00000004, 0x00030620, 0x00030820, 0x00000000, 0x00000000, 0x0000000D, 0x0000000C, 0x00030840, 0x00030A40, 0x00000000, 0x00000000, 0x0000000D, 0x00000004, 0x00030620, 0x00030820, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_800812D8 +dlabel HudScript_Item_GearBoots1 .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00001320, 0x00001520, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80081308 +dlabel HudScript_Item_GearBoots2 .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00001540, 0x00001740, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80081338 +dlabel HudScript_Item_GearBoots3 .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00001760, 0x00001960, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80081368 +dlabel HudScript_Item_GearHammer1 .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00001980, 0x00001B80, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80081398 +dlabel HudScript_Item_GearHammer2 .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00001BA0, 0x00001DA0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_800813C8 +dlabel HudScript_Item_GearHammer3 .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00001DC0, 0x00001FC0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_800813F8 +dlabel HudScript_Item_LuckyStar .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00001FE0, 0x000021E0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80081428 +dlabel HudScript_Item_Map .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00002200, 0x00002400, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80081458 +dlabel HudScript_Item_KoopaFortressKey .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00009020, 0x00009220, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80081488 +dlabel HudScript_Item_RuinsKey .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00009240, 0x00009440, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_800814B8 +dlabel HudScript_Item_TubbaCastleKey .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00009460, 0x00009660, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_800814E8 +dlabel HudScript_Item_IcePalaceKey .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00009680, 0x00009880, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80081518 +dlabel HudScript_Item_BowserCastleKey .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x000098A0, 0x00009AA0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80081548 +dlabel HudScript_Item_Dolly .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00009AC0, 0x00009CC0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80081578 +dlabel HudScript_Item_KooperShell .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00009CE0, 0x00009EE0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_800815A8 +dlabel HudScript_Item_PulseStone .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00009F00, 0x0000A100, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_800815D8 +dlabel HudScript_Item_Artifact .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0000A120, 0x0000A320, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80081608 +dlabel HudScript_Item_AncientVase .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0000A340, 0x0000A540, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80081638 +dlabel HudScript_Item_RuinsStonePyramid .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0000A560, 0x0000A760, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80081668 +dlabel HudScript_Item_RuinsStoneStar .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0000A780, 0x0000A980, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80081698 +dlabel HudScript_Item_RuinsStoneMoon .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0000A9A0, 0x0000ABA0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_800816C8 +dlabel HudScript_Item_ForestPass .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0000ABC0, 0x0000ADC0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_800816F8 +dlabel HudScript_Item_BooRecordOutline .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0000ADE0, 0x0000AFE0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80081728 +dlabel HudScript_Item_BooRecord .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0000B000, 0x0000B200, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80081758 +dlabel HudScript_Item_BooWeight .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0000B220, 0x0000B420, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80081788 +dlabel HudScript_Item_BooPortrait .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0000B440, 0x0000B640, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_800817B8 +dlabel HudScript_Item_MysticKey .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0000B660, 0x0000B860, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_800817E8 +dlabel HudScript_Item_StoreroomKey .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0000B880, 0x0000BA80, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80081818 +dlabel HudScript_Item_ToyboxTrain .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0000BAA0, 0x0000BCA0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80081848 +dlabel HudScript_Item_FryingPan .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0000BCC0, 0x0000BEC0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80081878 +dlabel HudScript_Item_Dictionary .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0000BEE0, 0x0000C0E0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_800818A8 +dlabel HudScript_Item_MysteryNote .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0000C100, 0x0000C300, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_800818D8 +dlabel HudScript_Item_SuspiciousNote .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0000C320, 0x0000C520, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80081908 +dlabel HudScript_Item_Seed1 .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0000C540, 0x0000C740, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80081938 +dlabel HudScript_Item_Seed2 .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0000C760, 0x0000C960, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80081968 +dlabel HudScript_Item_Seed3 .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0000C980, 0x0000CB80, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80081998 +dlabel HudScript_Item_Seed4 .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0000CBA0, 0x0000CDA0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_800819C8 +dlabel HudScript_Item_CrystalBerry .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0000CDC0, 0x0000CFC0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_800819F8 +dlabel HudScript_Item_WaterStone .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0000CFE0, 0x0000D1E0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80081A28 +dlabel HudScript_Item_MagicBean .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0000D200, 0x0000D400, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80081A58 +dlabel HudScript_Item_FertileSoil .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0000D420, 0x0000D620, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80081A88 +dlabel HudScript_Item_MiracleWater .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0000D640, 0x0000D840, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80081AB8 +dlabel HudScript_Item_UltraStone .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0000D860, 0x0000DA60, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80081AE8 +dlabel HudScript_Item_ToadDoll .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0000DAA0, 0x0000DCA0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80081B18 +dlabel HudScript_Item_Calculator .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0000DCC0, 0x0000DEC0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80081B48 +dlabel HudScript_Item_Screwdriver .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0000DEE0, 0x0000E0E0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80081B78 +dlabel HudScript_Item_CookBook .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0000E100, 0x0000E300, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80081BA8 +dlabel HudScript_Item_JadeRaven .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0000E320, 0x0000E520, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80081BD8 +dlabel HudScript_Item_SnowmanBucket .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0000E540, 0x0000E740, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80081C08 +dlabel HudScript_Item_SnowmanScarf .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0000E760, 0x0000E960, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80081C38 +dlabel HudScript_Item_RedKey .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0000E980, 0x0000EB80, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80081C68 +dlabel HudScript_Item_BlueKey .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0000EBC0, 0x0000EDC0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80081C98 +dlabel HudScript_Item_KootPackage .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0000EDE0, 0x0000EFE0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80081CC8 +dlabel HudScript_Item_KootRedJar .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0000F000, 0x0000F200, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80081CF8 +dlabel HudScript_Item_Melody .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0000F220, 0x0000F420, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80081D28 +dlabel HudScript_Item_Lyrics .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0000F440, 0x0000F640, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80081D58 +dlabel HudScript_Item_Mailbag .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0000F660, 0x0000F860, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80081D88 +dlabel HudScript_Item_StarStone .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0000F880, 0x0000FA80, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80081DB8 +dlabel HudScript_Item_SneakyParasol .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0000FAA0, 0x0000FCA0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80081DE8 +dlabel HudScript_Item_PeachKey .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0000FCE0, 0x0000FEE0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80081E18 +dlabel HudScript_Item_UNK_1DC210 .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0000FF00, 0x00010100, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80081E48 +dlabel HudScript_Item_UNK_1DC430 .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00010120, 0x00010320, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80081E78 +dlabel HudScript_Item_UNK_1DC650 .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00010340, 0x00010540, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80081EA8 +dlabel HudScript_Item_UNK_1DC870 .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00010560, 0x00010760, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80081ED8 +dlabel HudScript_Item_DojoCard1 .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00010780, 0x00010980, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80081F08 +dlabel HudScript_Item_DojoCard2 .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x000109A0, 0x00010BA0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80081F38 +dlabel HudScript_Item_DojoCard3 .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00010BC0, 0x00010DC0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80081F68 +dlabel HudScript_Item_DojoCard4 .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00010E00, 0x00011000, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80081F98 +dlabel HudScript_Item_DojoCard5 .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00011020, 0x00011220, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80081FC8 +dlabel HudScript_Item_CrystalBall .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00011240, 0x00011440, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80081FF8 +dlabel HudScript_Item_GoldCard .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00011460, 0x00011660, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80082028 +dlabel HudScript_Item_SilverCard .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00011680, 0x00011880, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80082058 +dlabel HudScript_Item_KootBook .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x000118A0, 0x00011AA0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80082088 +dlabel HudScript_Item_KootTheTape .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00011AC0, 0x00011CC0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_800820B8 +dlabel HudScript_Item_KootMerluvleeAutograph .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00011CE0, 0x00011EE0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_800820E8 +dlabel HudScript_Item_KootEmptyWallet .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00011F20, 0x00012120, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80082118 +dlabel HudScript_Item_KootLuigiAutograph .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00012140, 0x00012340, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80082148 +dlabel HudScript_Item_KootShell .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00012360, 0x00012560, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80082178 +dlabel HudScript_Item_KootPhoto .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00012580, 0x00012780, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_800821A8 +dlabel HudScript_Item_KootGlasses .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x000127A0, 0x000129A0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_800821D8 +dlabel HudScript_Item_Letter .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x000129C0, 0x00012BC0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80082208 +dlabel HudScript_Item_Letter_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x000129C0, 0x00012BE0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80082238 +dlabel HudScript_Item_ITEM_089 .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00012C00, 0x00012E00, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80082268 +dlabel HudScript_Item_ITEM_089_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00012C00, 0x00012E20, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80082298 +dlabel HudScript_Item_ITEM_08A .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00012E40, 0x00013040, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_800822C8 +dlabel HudScript_Item_ITEM_08A_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00012E40, 0x00013060, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_800822F8 +dlabel HudScript_Item_ITEM_08B .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00013080, 0x00013280, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80082328 +dlabel HudScript_Item_ITEM_08B_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00013080, 0x000132A0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80082358 +dlabel HudScript_Item_ITEM_08C .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x000132C0, 0x000134C0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80082388 +dlabel HudScript_Item_ITEM_08C_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x000132C0, 0x000134E0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_800823B8 +dlabel HudScript_Item_ITEM_08D .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00013500, 0x00013700, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_800823E8 +dlabel HudScript_Item_ITEM_08D_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00013500, 0x00013720, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80082418 +dlabel HudScript_Item_ITEM_08E .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00013740, 0x00013940, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80082448 +dlabel HudScript_Item_ITEM_08E_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00013740, 0x00013960, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80082478 +dlabel HudScript_Item_ITEM_08F .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00013980, 0x00013B80, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_800824A8 +dlabel HudScript_Item_ITEM_08F_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00013980, 0x00013BA0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_800824D8 +dlabel HudScript_Item_PleaseComeBack .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00013BC0, 0x00013DC0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80082508 +dlabel HudScript_Item_PleaseComeBack_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00013BC0, 0x00013DE0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80082538 +dlabel HudScript_Item_ITEM_139 .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00013E00, 0x00014000, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80082568 +dlabel HudScript_Item_ITEM_139_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00013E00, 0x00014020, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80082598 +dlabel HudScript_Item_FrightJar .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00014040, 0x00014240, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_800825C8 +dlabel HudScript_Item_FrightJar_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00014040, 0x00014260, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_800825F8 +dlabel HudScript_Item_Mystery .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00014280, 0x00014480, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80082628 +dlabel HudScript_Item_Mystery_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00014280, 0x000144A0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80082658 +dlabel HudScript_Item_RepelGel .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x000144C0, 0x000146C0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80082688 +dlabel HudScript_Item_RepelGel_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x000144C0, 0x000146E0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_800826B8 +dlabel HudScript_Item_InsecticideHerb .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00014700, 0x00014900, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_800826E8 +dlabel HudScript_Item_InsecticideHerb_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00014700, 0x00014920, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80082718 +dlabel HudScript_Item_ITEM_13E .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00014940, 0x00014B40, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80082748 +dlabel HudScript_Item_ITEM_13E_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00014940, 0x00014B60, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80082778 +dlabel HudScript_Item_ITEM_13F .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00014B80, 0x00014D80, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_800827A8 +dlabel HudScript_Item_ITEM_13F_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00014B80, 0x00014DA0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_800827D8 +dlabel HudScript_Item_SpicySoup .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00002420, 0x00002620, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80082808 +dlabel HudScript_Item_SpicySoup_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00002420, 0x00002640, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80082838 +dlabel HudScript_Item_ApplePie .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00002660, 0x00002860, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80082868 +dlabel HudScript_Item_ApplePie_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00002660, 0x00002880, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80082898 +dlabel HudScript_Item_HoneyUltra .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x000028A0, 0x00002AA0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_800828C8 +dlabel HudScript_Item_HoneyUltra_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x000028A0, 0x00002AC0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_800828F8 +dlabel HudScript_Item_MapleUltra .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00002AE0, 0x00002CE0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80082928 +dlabel HudScript_Item_MapleUltra_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00002AE0, 0x00002D00, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80082958 +dlabel HudScript_Item_JellyUltra .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00002D20, 0x00002F20, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80082988 +dlabel HudScript_Item_JellyUltra_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00002D20, 0x00002F40, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_800829B8 +dlabel HudScript_Item_Koopasta .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00002F60, 0x00003160, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_800829E8 +dlabel HudScript_Item_Koopasta_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00002F60, 0x00003180, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80082A18 +dlabel HudScript_Item_FriedShroom .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x000031A0, 0x000033A0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80082A48 +dlabel HudScript_Item_FriedShroom_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x000031A0, 0x000033C0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80082A78 +dlabel HudScript_Item_ShroomCake .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x000033E0, 0x000035E0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80082AA8 +dlabel HudScript_Item_ShroomCake_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x000033E0, 0x00003600, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80082AD8 +dlabel HudScript_Item_ShroomSteak .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00003620, 0x00003820, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80082B08 +dlabel HudScript_Item_ShroomSteak_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00003620, 0x00003840, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80082B38 +dlabel HudScript_Item_HotShroom .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00003860, 0x00003A60, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80082B68 +dlabel HudScript_Item_HotShroom_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00003860, 0x00003A80, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80082B98 +dlabel HudScript_Item_SweetShroom .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00003AA0, 0x00003CA0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80082BC8 +dlabel HudScript_Item_SweetShroom_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00003AA0, 0x00003CC0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80082BF8 +dlabel HudScript_Item_HealthyJuice .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00003CE0, 0x00003EE0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80082C28 +dlabel HudScript_Item_HealthyJuice_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00003CE0, 0x00003F00, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80082C58 +dlabel HudScript_Item_BlandMeal .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00003F20, 0x00004120, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80082C88 +dlabel HudScript_Item_BlandMeal_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00003F20, 0x00004140, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80082CB8 +dlabel HudScript_Item_YummyMeal .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00004160, 0x00004360, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80082CE8 +dlabel HudScript_Item_YummyMeal_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00004160, 0x00004380, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80082D18 +dlabel HudScript_Item_DeluxeFeast .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x000043A0, 0x000045A0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80082D48 +dlabel HudScript_Item_DeluxeFeast_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x000043A0, 0x000045C0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80082D78 +dlabel HudScript_Item_SpecialShake .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x000045E0, 0x000047E0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80082DA8 +dlabel HudScript_Item_SpecialShake_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x000045E0, 0x00004800, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80082DD8 +dlabel HudScript_Item_BigCookie .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00004820, 0x00004A20, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80082E08 +dlabel HudScript_Item_BigCookie_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00004820, 0x00004A40, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80082E38 +dlabel HudScript_Item_Cake .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00004A60, 0x00004C60, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80082E68 +dlabel HudScript_Item_Cake_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00004A60, 0x00004C80, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80082E98 +dlabel HudScript_Item_Mistake .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00004CA0, 0x00004EA0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80082EC8 +dlabel HudScript_Item_Mistake_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00004CA0, 0x00004EC0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80082EF8 +dlabel HudScript_Item_KoopaTea .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00004EE0, 0x000050E0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80082F28 +dlabel HudScript_Item_KoopaTea_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00004EE0, 0x00005100, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80082F58 +dlabel HudScript_Item_HoneySuper .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00005120, 0x00005320, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80082F88 +dlabel HudScript_Item_HoneySuper_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00005120, 0x00005340, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80082FB8 +dlabel HudScript_Item_MapleSuper .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00005360, 0x00005560, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80082FE8 +dlabel HudScript_Item_MapleSuper_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00005360, 0x00005580, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80083018 +dlabel HudScript_Item_JellySuper .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x000055A0, 0x000057A0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80083048 +dlabel HudScript_Item_JellySuper_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x000055A0, 0x000057C0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80083078 +dlabel HudScript_Item_Spaghetti .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x000057E0, 0x000059E0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_800830A8 +dlabel HudScript_Item_Spaghetti_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x000057E0, 0x00005A00, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_800830D8 +dlabel HudScript_Item_EggMissile .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00005A20, 0x00005C20, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80083108 +dlabel HudScript_Item_EggMissile_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00005A20, 0x00005C40, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80083138 +dlabel HudScript_Item_FriedEgg .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00005C60, 0x00005E60, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80083168 +dlabel HudScript_Item_FriedEgg_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00005C60, 0x00005E80, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80083198 +dlabel HudScript_Item_HoneyShroom .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00005EA0, 0x000060A0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_800831C8 +dlabel HudScript_Item_HoneyShroom_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00005EA0, 0x000060C0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_800831F8 +dlabel HudScript_Item_HoneyCandy .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x000060E0, 0x000062E0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80083228 +dlabel HudScript_Item_HoneyCandy_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x000060E0, 0x00006300, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80083258 +dlabel HudScript_Item_ElectroPop .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00006320, 0x00006520, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80083288 +dlabel HudScript_Item_ElectroPop_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00006320, 0x00006540, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_800832B8 +dlabel HudScript_Item_FirePop .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00006560, 0x00006760, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_800832E8 +dlabel HudScript_Item_FirePop_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00006560, 0x00006780, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80083318 +dlabel HudScript_Item_LimeCandy .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x000067A0, 0x000069A0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80083348 +dlabel HudScript_Item_LimeCandy_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x000067A0, 0x000069C0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80083378 +dlabel HudScript_Item_CocoPop .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x000069E0, 0x00006BE0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_800833A8 +dlabel HudScript_Item_CocoPop_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x000069E0, 0x00006C00, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_800833D8 +dlabel HudScript_Item_LemonCandy .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00006C20, 0x00006E20, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80083408 +dlabel HudScript_Item_LemonCandy_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00006C20, 0x00006E40, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80083438 +dlabel HudScript_Item_JellyPop .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00006E60, 0x00007060, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80083468 +dlabel HudScript_Item_JellyPop_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00006E60, 0x00007080, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80083498 +dlabel HudScript_Item_StrangeCake .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x000070A0, 0x000072A0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_800834C8 +dlabel HudScript_Item_StrangeCake_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x000070A0, 0x000072C0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_800834F8 +dlabel HudScript_Item_KookyCookie .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x000072E0, 0x000074E0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80083528 +dlabel HudScript_Item_KookyCookie_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x000072E0, 0x00007500, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80083558 +dlabel HudScript_Item_FrozenFries .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00007520, 0x00007720, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80083588 +dlabel HudScript_Item_FrozenFries_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00007520, 0x00007740, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_800835B8 +dlabel HudScript_Item_PotatoSalad .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00007760, 0x00007960, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_800835E8 +dlabel HudScript_Item_PotatoSalad_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00007760, 0x00007980, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80083618 +dlabel HudScript_Item_NuttyCake .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x000079A0, 0x00007BA0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80083648 +dlabel HudScript_Item_NuttyCake_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x000079A0, 0x00007BC0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80083678 +dlabel HudScript_Item_MapleShroom .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00007BE0, 0x00007DE0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_800836A8 +dlabel HudScript_Item_MapleShroom_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00007BE0, 0x00007E00, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_800836D8 +dlabel HudScript_Item_BoiledEgg .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00007E20, 0x00008020, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80083708 +dlabel HudScript_Item_BoiledEgg_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00007E20, 0x00008040, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80083738 +dlabel HudScript_Item_YoshiCookie .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00008060, 0x00008260, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80083768 +dlabel HudScript_Item_YoshiCookie_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00008060, 0x00008280, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80083798 +dlabel HudScript_Item_JellyShroom .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x000082A0, 0x000084A0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_800837C8 +dlabel HudScript_Item_JellyShroom_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x000082A0, 0x000084C0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_800837F8 +dlabel HudScript_Item_ITEM_02C .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x000084E0, 0x000086E0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80083828 +dlabel HudScript_Item_ITEM_02C_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x000084E0, 0x00008700, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80083858 +dlabel HudScript_Item_ITEM_02D .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00008720, 0x00008920, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80083888 +dlabel HudScript_Item_ITEM_02D_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00008720, 0x00008940, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_800838B8 +dlabel HudScript_Item_ITEM_02E .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00008960, 0x00008B60, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_800838E8 +dlabel HudScript_Item_ITEM_02E_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00008960, 0x00008B80, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80083918 +dlabel HudScript_Item_ITEM_02F .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00008BA0, 0x00008DA0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80083948 +dlabel HudScript_Item_ITEM_02F_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00008BA0, 0x00008DC0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80083978 +dlabel HudScript_Item_ITEM_030 .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00008DE0, 0x00008FE0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_800839A8 +dlabel HudScript_Item_ITEM_030_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00008DE0, 0x00009000, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_800839D8 +dlabel HudScript_Item_SpinSmash .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00014DC0, 0x00014FC0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80083A08 +dlabel HudScript_Item_SpinSmash_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00014DC0, 0x00014FE0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80083A38 +dlabel HudScript_Item_Multibounce .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00015000, 0x00015200, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80083A68 +dlabel HudScript_Item_Multibounce_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00015000, 0x00015220, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80083A98 +dlabel HudScript_Item_PowerPlus .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00015240, 0x00015440, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80083AC8 +dlabel HudScript_Item_PowerPlus_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00015240, 0x00015460, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80083AF8 +dlabel HudScript_Item_DodgeMaster .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00015480, 0x00015680, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80083B28 +dlabel HudScript_Item_DodgeMaster_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00015480, 0x000156A0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80083B58 +dlabel HudScript_Item_PowerBounce .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x000156C0, 0x000158C0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80083B88 +dlabel HudScript_Item_PowerBounce_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x000156C0, 0x000158E0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80083BB8 +dlabel HudScript_Item_SpikeShield .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00015900, 0x00015B00, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80083BE8 +dlabel HudScript_Item_SpikeShield_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00015900, 0x00015B20, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80083C18 +dlabel HudScript_Item_FirstAttack .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00015B40, 0x00015D40, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80083C48 +dlabel HudScript_Item_FirstAttack_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00015B40, 0x00015D60, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80083C78 +dlabel HudScript_Item_HPPlus .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00015D80, 0x00015F80, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80083CA8 +dlabel HudScript_Item_HPPlus_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00015D80, 0x00015FA0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80083CD8 +dlabel HudScript_Item_QuakeHammer .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00015FC0, 0x000161C0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80083D08 +dlabel HudScript_Item_QuakeHammer_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00015FC0, 0x000161E0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80083D38 +dlabel HudScript_Item_DoubleDip .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00016200, 0x00016400, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80083D68 +dlabel HudScript_Item_DoubleDip_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00016200, 0x00016420, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80083D98 +dlabel HudScript_Item_PowerQuake .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00016440, 0x00016640, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80083DC8 +dlabel HudScript_Item_PowerQuake_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00016440, 0x00016660, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80083DF8 +dlabel HudScript_Item_MegaQuake .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00016680, 0x00016880, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80083E28 +dlabel HudScript_Item_MegaQuake_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00016680, 0x000168A0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80083E58 +dlabel HudScript_Item_SleepStomp .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x000168C0, 0x00016AC0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80083E88 +dlabel HudScript_Item_SleepStomp_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x000168C0, 0x00016AE0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80083EB8 +dlabel HudScript_Item_SmashCharge .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00016B00, 0x00016D00, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80083EE8 +dlabel HudScript_Item_SmashCharge_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00016B00, 0x00016D20, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80083F18 +dlabel HudScript_Item_SSmashChg .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00016D40, 0x00016F40, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80083F48 +dlabel HudScript_Item_SSmashChg_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00016D40, 0x00016F60, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80083F78 +dlabel HudScript_Item_AutoSmash .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00016F80, 0x00017180, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80083FA8 +dlabel HudScript_Item_AutoSmash_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00016F80, 0x000171A0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80083FD8 +dlabel HudScript_Item_FireShield .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x000171C0, 0x000173C0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80084008 +dlabel HudScript_Item_FireShield_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x000171C0, 0x000173E0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80084038 +dlabel HudScript_Item_JumpCharge .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00017400, 0x00017600, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80084068 +dlabel HudScript_Item_JumpCharge_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00017400, 0x00017620, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80084098 +dlabel HudScript_Item_SJumpChg .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00017640, 0x00017840, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_800840C8 +dlabel HudScript_Item_SJumpChg_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00017640, 0x00017860, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_800840F8 +dlabel HudScript_Item_AutoJump .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00017880, 0x00017A80, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80084128 +dlabel HudScript_Item_AutoJump_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00017880, 0x00017AA0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80084158 +dlabel HudScript_Item_DDownPound .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00017AC0, 0x00017CC0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80084188 +dlabel HudScript_Item_DDownPound_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00017AC0, 0x00017CE0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_800841B8 +dlabel HudScript_Item_AutoMultibounce .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00017D00, 0x00017F00, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_800841E8 +dlabel HudScript_Item_AutoMultibounce_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00017D00, 0x00017F20, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80084218 +dlabel HudScript_Item_DizzyStomp .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00017F40, 0x00018140, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80084248 +dlabel HudScript_Item_DizzyStomp_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00017F40, 0x00018160, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80084278 +dlabel HudScript_Item_HammerThrow .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00018180, 0x00018380, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_800842A8 +dlabel HudScript_Item_HammerThrow_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00018180, 0x000183A0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_800842D8 +dlabel HudScript_Item_SmashCharge0 .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x000183C0, 0x000185C0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80084308 +dlabel HudScript_Item_SmashCharge0_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x000183C0, 0x000185E0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80084338 +dlabel HudScript_Item_PrettyLucky .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00018600, 0x00018800, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80084368 +dlabel HudScript_Item_PrettyLucky_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00018600, 0x00018820, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80084398 +dlabel HudScript_Item_FeelingFine .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00018840, 0x00018A40, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_800843C8 +dlabel HudScript_Item_FeelingFine_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00018840, 0x00018A60, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_800843F8 +dlabel HudScript_Item_AttackFXA .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00018A80, 0x00018C80, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80084428 +dlabel HudScript_Item_AttackFXA_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00018A80, 0x00018CA0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80084458 +dlabel HudScript_Item_AllorNothing .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00018CC0, 0x00018EC0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80084488 +dlabel HudScript_Item_AllorNothing_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00018CC0, 0x00018EE0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_800844B8 +dlabel HudScript_Item_HPDrain .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00018F00, 0x00019100, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_800844E8 +dlabel HudScript_Item_HPDrain_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00018F00, 0x00019120, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80084518 +dlabel HudScript_Item_JumpCharge0 .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00019140, 0x00019340, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80084548 +dlabel HudScript_Item_JumpCharge0_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00019140, 0x00019360, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80084578 +dlabel HudScript_Item_SlowGo .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00019380, 0x00019580, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_800845A8 +dlabel HudScript_Item_SlowGo_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00019380, 0x000195A0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_800845D8 +dlabel HudScript_Item_FPPlus .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x000195C0, 0x000197C0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80084608 +dlabel HudScript_Item_FPPlus_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x000195C0, 0x000197E0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80084638 +dlabel HudScript_Item_MegaRush .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00019800, 0x00019A00, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80084668 +dlabel HudScript_Item_MegaRush_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00019800, 0x00019A20, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80084698 +dlabel HudScript_Item_IcePower .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00019A40, 0x00019C40, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_800846C8 +dlabel HudScript_Item_IcePower_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00019A40, 0x00019C60, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_800846F8 +dlabel HudScript_Item_DefendPlus .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00019C80, 0x00019E80, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80084728 +dlabel HudScript_Item_DefendPlus_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00019C80, 0x00019EA0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80084758 +dlabel HudScript_Item_PayOff .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00019EC0, 0x0001A0C0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80084788 +dlabel HudScript_Item_PayOff_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00019EC0, 0x0001A0E0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_800847B8 +dlabel HudScript_Item_MoneyMoney .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0001A100, 0x0001A300, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_800847E8 +dlabel HudScript_Item_MoneyMoney_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0001A100, 0x0001A320, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80084818 +dlabel HudScript_Item_ChillOut .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0001A340, 0x0001A540, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80084848 +dlabel HudScript_Item_ChillOut_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0001A340, 0x0001A560, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80084878 +dlabel HudScript_Item_HappyHeart .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0001A580, 0x0001A780, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_800848A8 +dlabel HudScript_Item_HappyHeart_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0001A580, 0x0001A7A0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_800848D8 +dlabel HudScript_Item_ZapTap .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0001A7C0, 0x0001A9C0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80084908 +dlabel HudScript_Item_ZapTap_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0001A7C0, 0x0001A9E0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80084938 +dlabel HudScript_Item_Berserker .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0001AA00, 0x0001AC00, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80084968 +dlabel HudScript_Item_Berserker_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0001AA00, 0x0001AC20, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80084998 +dlabel HudScript_Item_RightOn .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0001AC40, 0x0001AE40, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_800849C8 +dlabel HudScript_Item_RightOn_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0001AC40, 0x0001AE60, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_800849F8 +dlabel HudScript_Item_RunawayPay .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0001AE80, 0x0001B080, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80084A28 +dlabel HudScript_Item_RunawayPay_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0001AE80, 0x0001B0A0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80084A58 +dlabel HudScript_Item_Refund .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0001B0C0, 0x0001B2C0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80084A88 +dlabel HudScript_Item_Refund_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0001B0C0, 0x0001B2E0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80084AB8 +dlabel HudScript_Item_FlowerSaver .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0001B300, 0x0001B500, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80084AE8 +dlabel HudScript_Item_FlowerSaver_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0001B300, 0x0001B520, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80084B18 +dlabel HudScript_Item_TripleDip .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0001B540, 0x0001B740, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80084B48 +dlabel HudScript_Item_TripleDip_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0001B540, 0x0001B760, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80084B78 +dlabel HudScript_Item_FlowerFanatic .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0001B780, 0x0001B980, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80084BA8 +dlabel HudScript_Item_FlowerFanatic_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0001B780, 0x0001B9A0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80084BD8 +dlabel HudScript_Item_PowerJump .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0001B9C0, 0x0001BBC0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80084C08 +dlabel HudScript_Item_PowerJump_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0001B9C0, 0x0001BBE0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80084C38 +dlabel HudScript_Item_SuperJump .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0001BC00, 0x0001BE00, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80084C68 +dlabel HudScript_Item_SuperJump_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0001BC00, 0x0001BE20, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80084C98 +dlabel HudScript_Item_MegaJump .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0001BE40, 0x0001C040, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80084CC8 +dlabel HudScript_Item_MegaJump_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0001BE40, 0x0001C060, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80084CF8 +dlabel HudScript_Item_PowerSmash1 .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0001C080, 0x0001C280, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80084D28 +dlabel HudScript_Item_PowerSmash1_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0001C080, 0x0001C2A0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80084D58 +dlabel HudScript_Item_SuperSmash .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0001C2C0, 0x0001C4C0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80084D88 +dlabel HudScript_Item_SuperSmash_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0001C2C0, 0x0001C4E0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80084DB8 +dlabel HudScript_Item_MegaSmash .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0001C500, 0x0001C700, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80084DE8 +dlabel HudScript_Item_MegaSmash_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0001C500, 0x0001C720, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80084E18 +dlabel HudScript_Item_LuckyDay .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0001C740, 0x0001C940, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80084E48 +dlabel HudScript_Item_LuckyDay_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0001C740, 0x0001C960, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80084E78 +dlabel HudScript_Item_MegaHPDrain .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0001C980, 0x0001CB80, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80084EA8 +dlabel HudScript_Item_MegaHPDrain_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0001C980, 0x0001CBA0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80084ED8 +dlabel HudScript_Item_BumpAttack .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0001CBC0, 0x0001CDC0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80084F08 +dlabel HudScript_Item_BumpAttack_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0001CBC0, 0x0001CDE0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80084F38 +dlabel HudScript_Item_PUpDDown .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0001CE00, 0x0001D000, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80084F68 +dlabel HudScript_Item_PUpDDown_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0001CE00, 0x0001D020, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80084F98 +dlabel HudScript_Item_PDownDUp .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0001D040, 0x0001D240, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80084FC8 +dlabel HudScript_Item_PDownDUp_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0001D040, 0x0001D260, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80084FF8 +dlabel HudScript_Item_HeartFinder .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0001D280, 0x0001D480, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80085028 +dlabel HudScript_Item_HeartFinder_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0001D280, 0x0001D4A0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80085058 +dlabel HudScript_Item_FlowerFinder .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0001D4C0, 0x0001D6C0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80085088 +dlabel HudScript_Item_FlowerFinder_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0001D4C0, 0x0001D6E0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_800850B8 +dlabel HudScript_Item_DizzyAttack .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0001D700, 0x0001D900, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_800850E8 +dlabel HudScript_Item_DizzyAttack_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0001D700, 0x0001D920, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80085118 +dlabel HudScript_Item_SpeedySpin .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0001D940, 0x0001DB40, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80085148 +dlabel HudScript_Item_SpeedySpin_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0001D940, 0x0001DB60, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80085178 +dlabel HudScript_Item_SpinAttack .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0001DB80, 0x0001DD80, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_800851A8 +dlabel HudScript_Item_SpinAttack_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0001DB80, 0x0001DDA0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_800851D8 +dlabel HudScript_Item_ISpy .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0001DDC0, 0x0001DFC0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80085208 +dlabel HudScript_Item_ISpy_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0001DDC0, 0x0001DFE0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80085238 +dlabel HudScript_Item_PowerRush .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0001E000, 0x0001E200, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80085268 +dlabel HudScript_Item_PowerRush_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0001E000, 0x0001E220, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80085298 +dlabel HudScript_Item_LastStand .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0001E240, 0x0001E440, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_800852C8 +dlabel HudScript_Item_LastStand_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0001E240, 0x0001E460, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_800852F8 +dlabel HudScript_Item_CloseCall .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0001E480, 0x0001E680, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80085328 +dlabel HudScript_Item_CloseCall_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0001E480, 0x0001E6A0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80085358 +dlabel HudScript_Item_CrazyHeart .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0001E6C0, 0x0001E8C0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80085388 +dlabel HudScript_Item_CrazyHeart_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0001E6C0, 0x0001E8E0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_800853B8 +dlabel HudScript_Item_ITEM_0D5 .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0001E900, 0x0001EB00, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_800853E8 +dlabel HudScript_Item_ITEM_0D5_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0001E900, 0x0001EB20, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80085418 +dlabel HudScript_Item_ITEM_0D6 .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0001EB40, 0x0001ED40, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80085448 +dlabel HudScript_Item_ITEM_0D6_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0001EB40, 0x0001ED60, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80085478 +dlabel HudScript_Item_ITEM_0D7 .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0001ED80, 0x0001EF80, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_800854A8 +dlabel HudScript_Item_ITEM_0D7_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0001ED80, 0x0001EFA0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_800854D8 +dlabel HudScript_Item_ShrinkSmash .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0001EFC0, 0x0001F1C0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80085508 +dlabel HudScript_Item_ShrinkSmash_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0001EFC0, 0x0001F1E0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80085538 +dlabel HudScript_Item_ShrinkStomp .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0001F200, 0x0001F400, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80085568 +dlabel HudScript_Item_ShrinkStomp_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0001F200, 0x0001F420, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80085598 +dlabel HudScript_Item_DDownJump .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0001F440, 0x0001F640, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_800855C8 +dlabel HudScript_Item_DDownJump_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0001F440, 0x0001F660, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_800855F8 +dlabel HudScript_Item_DamageDodge .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0001F680, 0x0001F880, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80085628 +dlabel HudScript_Item_DamageDodge_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0001F680, 0x0001F8A0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80085658 +dlabel HudScript_Item_EarthquakeJump .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0001F8C0, 0x0001FAC0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80085688 +dlabel HudScript_Item_EarthquakeJump_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0001F8C0, 0x0001FAE0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_800856B8 +dlabel HudScript_Item_HappyFlower .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0001FB00, 0x0001FD00, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_800856E8 +dlabel HudScript_Item_HappyFlower_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0001FB00, 0x0001FD20, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80085718 +dlabel HudScript_Item_ITEM_0DE .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0001FD40, 0x0001FF40, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80085748 +dlabel HudScript_Item_ITEM_0DE_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0001FD40, 0x0001FF60, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80085778 +dlabel HudScript_Item_ITEM_0DF .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0001FF80, 0x00020180, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_800857A8 +dlabel HudScript_Item_ITEM_0DF_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0001FF80, 0x000201A0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_800857D8 +dlabel HudScript_Item_DeepFocus3 .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x000201C0, 0x000203C0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80085808 +dlabel HudScript_Item_DeepFocus3_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x000201C0, 0x000203E0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80085838 +dlabel HudScript_Item_SuperFocus .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00020400, 0x00020600, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80085868 +dlabel HudScript_Item_SuperFocus_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00020400, 0x00020620, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80085898 +dlabel HudScript_Item_Kaiden .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00020640, 0x00020840, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_800858C8 +dlabel HudScript_Item_Kaiden_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00020640, 0x00020860, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_800858F8 +dlabel HudScript_Item_QuickChange .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00020880, 0x00020A80, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80085928 +dlabel HudScript_Item_QuickChange_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00020880, 0x00020AA0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80085958 +dlabel HudScript_Item_ITEM_0E4 .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00020AC0, 0x00020CC0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80085988 +dlabel HudScript_Item_ITEM_0E4_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00020AC0, 0x00020CE0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_800859B8 +dlabel HudScript_Item_ITEM_0E5 .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00020D00, 0x00020F00, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_800859E8 +dlabel HudScript_Item_ITEM_0E5_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00020D00, 0x00020F20, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80085A18 +dlabel HudScript_Item_ITEM_0E6 .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00020F40, 0x00021140, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80085A48 +dlabel HudScript_Item_ITEM_0E6_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00020F40, 0x00021160, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80085A78 +dlabel HudScript_Item_ITEM_0E7 .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00021180, 0x00021380, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80085AA8 +dlabel HudScript_Item_ITEM_0E7_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00021180, 0x000213A0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80085AD8 +dlabel HudScript_Item_Peekaboo .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x000213C0, 0x000215C0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80085B08 +dlabel HudScript_Item_Peekaboo_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x000213C0, 0x000215E0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80085B38 +dlabel HudScript_Item_GroupFocus .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00021600, 0x00021800, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80085B68 +dlabel HudScript_Item_GroupFocus_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00021600, 0x00021820, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80085B98 +dlabel HudScript_Item_AttackFXD .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00021840, 0x00021A40, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80085BC8 +dlabel HudScript_Item_AttackFXD_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00021840, 0x00021A60, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80085BF8 +dlabel HudScript_Item_AttackFXB .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00021A80, 0x00021C80, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80085C28 +dlabel HudScript_Item_AttackFXB_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00021A80, 0x00021CA0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80085C58 +dlabel HudScript_Item_AttackFXE .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00021CC0, 0x00021EC0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80085C88 +dlabel HudScript_Item_AttackFXE_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00021CC0, 0x00021EE0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80085CB8 +dlabel HudScript_Item_AttackFXC .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00021F00, 0x00022100, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80085CE8 +dlabel HudScript_Item_AttackFXC_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00021F00, 0x00022120, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80085D18 +dlabel HudScript_Item_AttackFXF .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00022140, 0x00022340, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80085D48 +dlabel HudScript_Item_AttackFXF_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00022140, 0x00022360, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80085D78 +dlabel HudScript_Item_ITEM_0EF .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00022380, 0x00022580, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80085DA8 +dlabel HudScript_Item_ITEM_0EF_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00022380, 0x000225A0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80085DD8 +dlabel HudScript_Item_HealthyHealthy .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x000225C0, 0x000227C0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80085E08 +dlabel HudScript_Item_HealthyHealthy_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x000225C0, 0x000227E0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80085E38 +dlabel HudScript_Item_ITEM_0F1 .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00022800, 0x00022A00, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80085E68 +dlabel HudScript_Item_ITEM_0F1_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00022800, 0x00022A20, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80085E98 +dlabel HudScript_Item_ITEM_0F2 .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00022A40, 0x00022C40, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80085EC8 +dlabel HudScript_Item_ITEM_0F2_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00022A40, 0x00022C60, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80085EF8 +dlabel HudScript_Item_ITEM_0F3 .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00022C80, 0x00022E80, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80085F28 +dlabel HudScript_Item_ITEM_0F3_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00022C80, 0x00022EA0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80085F58 +dlabel HudScript_Item_ITEM_0F4 .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00022EC0, 0x000230C0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80085F88 +dlabel HudScript_Item_ITEM_0F4_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00022EC0, 0x000230E0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80085FB8 +dlabel HudScript_Item_ITEM_0F5 .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00023100, 0x00023300, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80085FE8 +dlabel HudScript_Item_ITEM_0F5_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00023100, 0x00023320, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80086018 +dlabel HudScript_Item_ITEM_0F6 .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00023340, 0x00023540, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80086048 +dlabel HudScript_Item_ITEM_0F6_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00023340, 0x00023560, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80086078 +dlabel HudScript_Item_ITEM_0F7 .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00023580, 0x00023780, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_800860A8 +dlabel HudScript_Item_ITEM_0F7_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00023580, 0x000237A0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_800860D8 +dlabel HudScript_Item_FireFlower .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0002A3C0, 0x0002A5C0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80086108 +dlabel HudScript_Item_FireFlower_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0002A3C0, 0x0002A5E0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80086138 +dlabel HudScript_Item_SnowmanDoll .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0002A600, 0x0002A800, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80086168 +dlabel HudScript_Item_SnowmanDoll_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0002A600, 0x0002A820, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80086198 +dlabel HudScript_Item_ThunderRage .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0002A840, 0x0002AA40, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_800861C8 +dlabel HudScript_Item_ThunderRage_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0002A840, 0x0002AA60, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_800861F8 +dlabel HudScript_Item_ThunderBolt .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0002AA80, 0x0002AC80, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80086228 +dlabel HudScript_Item_ThunderBolt_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0002AA80, 0x0002ACA0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80086258 +dlabel HudScript_Item_ShootingStar .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0002ACC0, 0x0002AEC0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80086288 +dlabel HudScript_Item_ShootingStar_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0002ACC0, 0x0002AEE0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_800862B8 +dlabel HudScript_Item_DustyHammer .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0002AF00, 0x0002B100, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_800862E8 +dlabel HudScript_Item_DustyHammer_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0002AF00, 0x0002B120, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80086318 +dlabel HudScript_Item_Pebble .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0002B140, 0x0002B340, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80086348 +dlabel HudScript_Item_Pebble_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0002B140, 0x0002B360, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80086378 +dlabel HudScript_Item_ITEM_127 .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0002B380, 0x0002B580, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_800863A8 +dlabel HudScript_Item_ITEM_127_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0002B380, 0x0002B5A0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_800863D8 +dlabel HudScript_Item_StoneCap .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0002B5C0, 0x0002B7C0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80086408 +dlabel HudScript_Item_StoneCap_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0002B5C0, 0x0002B7E0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80086438 +dlabel HudScript_Item_VoltShroom .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0002B800, 0x0002BA00, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80086468 +dlabel HudScript_Item_VoltShroom_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0002B800, 0x0002BA20, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80086498 +dlabel HudScript_Item_PowerStar .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0002BA40, 0x0002BC40, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_800864C8 +dlabel HudScript_Item_PowerStar_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0002BA40, 0x0002BC60, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_800864F8 +dlabel HudScript_Item_Parasol .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0002BC80, 0x0002BE80, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80086528 +dlabel HudScript_Item_Parasol_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0002BC80, 0x0002BEA0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80086558 +dlabel HudScript_Item_MagicMirror .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0002BEC0, 0x0002C0C0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80086588 +dlabel HudScript_Item_MagicMirror_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0002BEC0, 0x0002C0E0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_800865B8 +dlabel HudScript_Item_ITEM_12D .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0002C100, 0x0002C300, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_800865E8 +dlabel HudScript_Item_ITEM_12D_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0002C100, 0x0002C320, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80086618 +dlabel HudScript_Item_ITEM_12E .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0002C340, 0x0002C540, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80086648 +dlabel HudScript_Item_ITEM_12E_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0002C340, 0x0002C560, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80086678 +dlabel HudScript_Item_ITEM_12F .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0002C580, 0x0002C780, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_800866A8 +dlabel HudScript_Item_ITEM_12F_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0002C580, 0x0002C7A0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_800866D8 +dlabel HudScript_Item_Mushroom .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x000237C0, 0x000239C0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80086708 +dlabel HudScript_Item_Mushroom_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x000237C0, 0x000239E0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80086738 +dlabel HudScript_Item_SuperShroom .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00023A00, 0x00023C00, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80086768 +dlabel HudScript_Item_SuperShroom_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00023A00, 0x00023C20, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80086798 +dlabel HudScript_Item_UltraShroom .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00023C40, 0x00023E40, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_800867C8 +dlabel HudScript_Item_UltraShroom_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00023C40, 0x00023E60, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_800867F8 +dlabel HudScript_Item_LifeShroom .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00023E80, 0x00024080, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80086828 +dlabel HudScript_Item_LifeShroom_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00023E80, 0x000240A0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80086858 +dlabel HudScript_Item_DriedShroom .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x000240C0, 0x000242C0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80086888 +dlabel HudScript_Item_DriedShroom_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x000240C0, 0x000242E0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_800868B8 +dlabel HudScript_Item_TastyTonic .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00024300, 0x00024500, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_800868E8 +dlabel HudScript_Item_TastyTonic_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00024300, 0x00024520, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80086918 +dlabel HudScript_Item_SuperSoda .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00024540, 0x00024740, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80086948 +dlabel HudScript_Item_SuperSoda_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00024540, 0x00024760, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80086978 +dlabel HudScript_Item_BlueBerry .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00024780, 0x00024980, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_800869A8 +dlabel HudScript_Item_BlueBerry_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00024780, 0x000249A0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_800869D8 +dlabel HudScript_Item_RedBerry .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x000249C0, 0x00024BC0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80086A08 +dlabel HudScript_Item_RedBerry_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x000249C0, 0x00024BE0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80086A38 +dlabel HudScript_Item_YellowBerry .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00024C00, 0x00024E00, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80086A68 +dlabel HudScript_Item_YellowBerry_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00024C00, 0x00024E20, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80086A98 +dlabel HudScript_Item_BubbleBerry .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00024E40, 0x00025040, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80086AC8 +dlabel HudScript_Item_BubbleBerry_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00024E40, 0x00025060, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80086AF8 +dlabel HudScript_Item_Goomnut .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00025080, 0x00025280, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80086B28 +dlabel HudScript_Item_Goomnut_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00025080, 0x000252A0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80086B58 +dlabel HudScript_Item_KoopaLeaf .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x000252C0, 0x000254C0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80086B88 +dlabel HudScript_Item_KoopaLeaf_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x000252C0, 0x000254E0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80086BB8 +dlabel HudScript_Item_DriedPasta .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00025500, 0x00025700, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80086BE8 +dlabel HudScript_Item_DriedPasta_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00025500, 0x00025720, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80086C18 +dlabel HudScript_Item_Lime .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00025740, 0x00025940, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80086C48 +dlabel HudScript_Item_Lime_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00025740, 0x00025960, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80086C78 +dlabel HudScript_Item_Lemon .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00025980, 0x00025B80, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80086CA8 +dlabel HudScript_Item_Lemon_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00025980, 0x00025BA0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80086CD8 +dlabel HudScript_Item_DriedFruit .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00025BC0, 0x00025DC0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80086D08 +dlabel HudScript_Item_DriedFruit_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00025BC0, 0x00025DE0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80086D38 +dlabel HudScript_Item_StrangeLeaf .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00025E00, 0x00026000, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80086D68 +dlabel HudScript_Item_StrangeLeaf_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00025E00, 0x00026020, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80086D98 +dlabel HudScript_Item_CakeMix .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00026040, 0x00026240, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80086DC8 +dlabel HudScript_Item_CakeMix_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00026040, 0x00026260, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80086DF8 +dlabel HudScript_Item_Egg .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00026280, 0x00026480, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80086E28 +dlabel HudScript_Item_Egg_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00026280, 0x000264A0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80086E58 +dlabel HudScript_Item_Coconut .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x000264C0, 0x000266C0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80086E88 +dlabel HudScript_Item_Coconut_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x000264C0, 0x000266E0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80086EB8 +dlabel HudScript_Item_Melon .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00026700, 0x00026900, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80086EE8 +dlabel HudScript_Item_Melon_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00026700, 0x00026920, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80086F18 +dlabel HudScript_Item_StinkyHerb .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00026940, 0x00026B40, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80086F48 +dlabel HudScript_Item_StinkyHerb_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00026940, 0x00026B60, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80086F78 +dlabel HudScript_Item_IcedPotato .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00026B80, 0x00026D80, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80086FA8 +dlabel HudScript_Item_IcedPotato_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00026B80, 0x00026DA0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80086FD8 +dlabel HudScript_Item_HoneySyrup .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00026DC0, 0x00026FC0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80087008 +dlabel HudScript_Item_HoneySyrup_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00026DC0, 0x00026FE0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80087038 +dlabel HudScript_Item_MapleSyrup .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00027000, 0x00027200, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80087068 +dlabel HudScript_Item_MapleSyrup_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00027000, 0x00027220, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80087098 +dlabel HudScript_Item_JamminJelly .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00027240, 0x00027440, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_800870C8 +dlabel HudScript_Item_JamminJelly_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00027240, 0x00027460, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_800870F8 +dlabel HudScript_Item_WhackasBump .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00027480, 0x00027680, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80087128 +dlabel HudScript_Item_WhackasBump_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00027480, 0x000276A0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80087158 +dlabel HudScript_Item_Apple .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x000276C0, 0x000278C0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80087188 +dlabel HudScript_Item_Apple_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x000276C0, 0x000278E0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_800871B8 +dlabel HudScript_Item_BakingSalt .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00027900, 0x00027B00, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_800871E8 +dlabel HudScript_Item_BakingSalt_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00027900, 0x00027B20, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80087218 +dlabel HudScript_Item_BakingSugar .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00027B40, 0x00027D40, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80087248 +dlabel HudScript_Item_BakingSugar_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00027B40, 0x00027D60, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80087278 +dlabel HudScript_Item_BakingEgg .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00027D80, 0x00027F80, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_800872A8 +dlabel HudScript_Item_BakingEgg_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00027D80, 0x00027FA0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_800872D8 +dlabel HudScript_Item_BakingCream .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00027FC0, 0x000281C0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80087308 +dlabel HudScript_Item_BakingCream_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00027FC0, 0x000281E0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80087338 +dlabel HudScript_Item_BakingStrawberry .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00028200, 0x00028400, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80087368 +dlabel HudScript_Item_BakingStrawberry_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00028200, 0x00028420, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80087398 +dlabel HudScript_Item_BakingButter .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00028440, 0x00028640, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_800873C8 +dlabel HudScript_Item_BakingButter_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00028440, 0x00028660, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_800873F8 +dlabel HudScript_Item_BakingCleanser .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00028680, 0x00028880, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80087428 +dlabel HudScript_Item_BakingCleanser_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00028680, 0x000288A0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80087458 +dlabel HudScript_Item_BakingWater .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x000288C0, 0x00028AC0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80087488 +dlabel HudScript_Item_BakingWater_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x000288C0, 0x00028AE0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_800874B8 +dlabel HudScript_Item_BakingFlour .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00028B00, 0x00028D00, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_800874E8 +dlabel HudScript_Item_BakingFlour_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00028B00, 0x00028D20, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80087518 +dlabel HudScript_Item_BakingMilk .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00028D40, 0x00028F40, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80087548 +dlabel HudScript_Item_BakingMilk_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00028D40, 0x00028F60, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80087578 +dlabel HudScript_Item_ITEM_11F .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00028F80, 0x00029180, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_800875A8 +dlabel HudScript_Item_ITEM_11F_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00028F80, 0x000291A0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_800875D8 +dlabel HudScript_Item_SleepySheep .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x000291C0, 0x000293C0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80087608 +dlabel HudScript_Item_SleepySheep_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x000291C0, 0x000293E0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80087638 +dlabel HudScript_Item_XBandage .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00029400, 0x00029600, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80087668 +dlabel HudScript_Item_XBandage_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00029400, 0x00029620, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80087698 +dlabel HudScript_Item_POWBlock .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00029640, 0x00029840, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_800876C8 +dlabel HudScript_Item_POWBlock_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00029640, 0x00029860, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_800876F8 +dlabel HudScript_Item_HustleDrink .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00029880, 0x00029A80, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80087728 +dlabel HudScript_Item_HustleDrink_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00029880, 0x00029AA0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80087758 +dlabel HudScript_Item_StopWatch .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00029AC0, 0x00029CC0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80087788 +dlabel HudScript_Item_StopWatch_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00029AC0, 0x00029CE0, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_800877B8 +dlabel HudScript_Item_DizzyDial .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00029D00, 0x00029F00, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_800877E8 +dlabel HudScript_Item_DizzyDial_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00029D00, 0x00029F20, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80087818 +dlabel HudScript_Item_ITEM_136 .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00029F40, 0x0002A140, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80087848 +dlabel HudScript_Item_ITEM_136_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x00029F40, 0x0002A160, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_80087878 +dlabel HudScript_Item_ITEM_137 .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0002A180, 0x0002A380, 0x00000000, 0x00000000, 0x00000003, 0x00000000 -dlabel D_800878A8 +dlabel HudScript_Item_ITEM_137_disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x0000000D, 0x0000003C, 0x0002A180, 0x0002A3A0, 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x00000000, 0x00000000 dlabel gItemTable .word 0x00000000, 0x01400000, 0x00000008, 0x00000000, 0x00000000, 0x00000000, 0x10000000, 0x00000000, 0x002600A0, 0x00380000, 0x00000008, 0xFFFF0000, 0x00000000, 0x00000000, 0x10200000, 0x00000000, 0x002600A1, 0x00390000, 0x00000002, 0xFFFF0000, 0x00000000, 0x00000000, 0x10200000, 0x00000000, 0x002600A2, 0x003A0000, 0x00000001, 0xFFFF0000, 0x00000000, 0x00000000, 0x10200000, 0x00000000, 0x002600A3, 0x003B0000, 0x00000008, 0xFFFF0000, 0x00000000, 0x00000000, 0x10200000, 0x00000000, 0x002600A4, 0x003C0000, 0x00000001, 0xFFFF0000, 0x00000000, 0x00000000, 0x10200000, 0x00000000, 0x002600A5, 0x003D0000, 0x00000002, 0xFFFF0000, 0x00000000, 0x00000000, 0x10200000, 0x00000000, 0x002600A6, 0x003E0000, 0x00000002, 0xFFFF0000, 0x002500A6, 0x002300A6, 0x10080000, 0x00000000, 0x00000000, 0x01400000, 0x00000002, 0xFFFF0000, 0x00000000, 0x00000000, 0x10200000, 0x00000000, 0x00000000, 0x01400000, 0x00000002, 0xFFFF0000, 0x00000000, 0x00000000, 0x10200000, 0x00000000, 0x002600E2, 0x00780000, 0x00000002, 0xFFFF0000, 0x002500E2, 0x002300E2, 0x10080000, 0x00000000, 0x002600E3, 0x00790000, 0x00000002, 0xFFFF0000, 0x002500E3, 0x002300E3, 0x10080000, 0x00000000, 0x002600E4, 0x007A0000, 0x00000002, 0xFFFF0000, 0x002500E4, 0x002300E4, 0x10080000, 0x00000000, 0x002600E5, 0x007B0000, 0x00000002, 0xFFFF0000, 0x002500E5, 0x002300E5, 0x10080000, 0x00000000, 0x002600E6, 0x007C0000, 0x00000002, 0xFFFF0000, 0x002500E6, 0x002300E6, 0x10080000, 0x00000000, 0x002600E7, 0x00620000, 0x00000002, 0xFFFF0000, 0x002500E7, 0x002300E7, 0x10080000, 0x00000000, 0x002600A7, 0x00400000, 0x00000008, 0xFFFF0000, 0x002500A7, 0x002300A7, 0x10090000, 0x00000000, 0x002600A8, 0x00410000, 0x00000008, 0xFFFF0000, 0x002500A8, 0x002300A8, 0x10090000, 0x00000000, 0x002600B0, 0x00470000, 0x00000008, 0xFFFF0000, 0x002500B0, 0x002300B0, 0x10090000, 0x00000000, 0x002600A9, 0x00420000, 0x00000008, 0xFFFF0000, 0x002500A9, 0x002300A9, 0x10090000, 0x00000000, 0x002600AA, 0x00430000, 0x00000008, 0xFFFF0000, 0x002500AA, 0x002300AA, 0x10090000, 0x00000000, 0x002600B3, 0x004C0000, 0x00000008, 0xFFFF0000, 0x002500B3, 0x002300B3, 0x10090000, 0x00000000, 0x002600B4, 0x004A0000, 0x00000008, 0xFFFF0000, 0x002500B4, 0x002300B4, 0x10090000, 0x00000000, 0x002600B5, 0x004B0000, 0x00000008, 0xFFFF0000, 0x002500B5, 0x002300B5, 0x10090000, 0x00000000, 0x002600B2, 0x00490000, 0x00000008, 0xFFFF0000, 0x002500B2, 0x002300B2, 0x10090000, 0x00000000, 0x002600AF, 0x00460000, 0x00000008, 0xFFFF0000, 0x002500AF, 0x002300AF, 0x10090000, 0x00000000, 0x002600AB, 0x00440000, 0x00000008, 0xFFFF0000, 0x002500AB, 0x002300AB, 0x10090000, 0x00000000, 0x00000000, 0x004D0000, 0x00000008, 0xFFFF0000, 0x00000000, 0x00000000, 0x10090000, 0x00000000, 0x002600B7, 0x00500000, 0x00000008, 0xFFFF0000, 0x002500B7, 0x002300B7, 0x10090000, 0x00000000, 0x002600B8, 0x00510000, 0x00000008, 0xFFFF0000, 0x002500B8, 0x002300B8, 0x10090000, 0x00000000, 0x002600C4, 0x005D0000, 0x00000008, 0xFFFF0000, 0x002500C4, 0x002300C4, 0x10090000, 0x00000000, 0x002600B9, 0x00520000, 0x00000008, 0xFFFF0000, 0x002500B9, 0x002300B9, 0x10090000, 0x00000000, 0x002600BA, 0x00530000, 0x00000008, 0xFFFF0000, 0x002500BA, 0x002300BA, 0x10090000, 0x00000000, 0x002600BB, 0x00540000, 0x00000008, 0xFFFF0000, 0x002500BB, 0x002300BB, 0x10090000, 0x00000000, 0x002600B6, 0x004F0000, 0x00000008, 0xFFFF0000, 0x002500B6, 0x002300B6, 0x10090000, 0x00000000, 0x002600BC, 0x00550000, 0x00000008, 0xFFFF0000, 0x002500BC, 0x002300BC, 0x10090000, 0x00000000, 0x002600BD, 0x00560000, 0x00000008, 0xFFFF0000, 0x002500BD, 0x002300BD, 0x10090000, 0x00000000, 0x002600BE, 0x00570000, 0x00000008, 0xFFFF0000, 0x002500BE, 0x002300BE, 0x10090000, 0x00000000, 0x00000000, 0x00580000, 0x00000008, 0xFFFF0000, 0x00000000, 0x00000000, 0x10090000, 0x00000000, 0x002600C9, 0x007D0000, 0x00000008, 0xFFFF0000, 0x002500C9, 0x002300C9, 0x10090000, 0x00000000, 0x00000000, 0x00650000, 0x00000008, 0xFFFF0000, 0x00000000, 0x00000000, 0x10090000, 0x00000000, 0x002600CB, 0x00660000, 0x00000008, 0xFFFF0000, 0x002500CB, 0x002300CB, 0x10090000, 0x00000000, 0x002600CC, 0x00670000, 0x00000008, 0xFFFF0000, 0x002500CC, 0x002300CC, 0x10090000, 0x00000000, 0x002600C0, 0x00590000, 0x00000008, 0xFFFF0000, 0x002500C0, 0x002300C0, 0x10090000, 0x00000000, 0x002600C1, 0x005A0000, 0x00000008, 0xFFFF0000, 0x002500C1, 0x002300C1, 0x10090000, 0x00000000, 0x002600C2, 0x005B0000, 0x00000008, 0xFFFF0000, 0x002500C2, 0x002300C2, 0x10090000, 0x00000000, 0x002600C3, 0x005C0000, 0x00000008, 0xFFFF0000, 0x002500C3, 0x002300C3, 0x10090000, 0x00000000, 0x00000000, 0x00630000, 0x00000008, 0xFFFF0000, 0x00000000, 0x00000000, 0x10090000, 0x00000000, 0x002600CA, 0x00640000, 0x00000008, 0xFFFF0000, 0x002500CA, 0x002300CA, 0x10090000, 0x00000000, 0x002600CF, 0x00680000, 0x00000008, 0xFFFF0000, 0x002500CF, 0x002300CF, 0x10090000, 0x00000000, 0x002600D0, 0x00690000, 0x00000008, 0xFFFF0000, 0x002500D0, 0x002300D0, 0x10090000, 0x00000000, 0x002600D2, 0x006A0000, 0x00000008, 0xFFFF0000, 0x002500D2, 0x002300D2, 0x10090000, 0x00000000, 0x002600D3, 0x006B0000, 0x00000008, 0xFFFF0000, 0x002500D3, 0x002300D3, 0x10090000, 0x00000000, 0x00000000, 0x00880000, 0x00000008, 0xFFFF0000, 0x00000000, 0x00000000, 0x10090000, 0x00000000, 0x002600EB, 0x00880000, 0x00000008, 0xFFFF0000, 0x002500EB, 0x002300EB, 0x10090000, 0x00000000, 0x002600EC, 0x00880000, 0x00000008, 0xFFFF0000, 0x002500EC, 0x002300EC, 0x10090000, 0x00000000, 0x002600ED, 0x00880000, 0x00000008, 0xFFFF0000, 0x002500ED, 0x002300ED, 0x10090000, 0x00000000, 0x002600EE, 0x00880000, 0x00000008, 0xFFFF0000, 0x002500EE, 0x002300EE, 0x10090000, 0x00000000, 0x002600EF, 0x00880000, 0x00000008, 0xFFFF0000, 0x002500EF, 0x002300EF, 0x10090000, 0x00000000, 0x002600F0, 0x00880000, 0x00000008, 0xFFFF0000, 0x002500F0, 0x002300F0, 0x10090000, 0x00000000, 0x002600F1, 0x00880000, 0x00000008, 0xFFFF0000, 0x002500F1, 0x002300F1, 0x10090000, 0x00000000, 0x002600F2, 0x00880000, 0x00000008, 0xFFFF0000, 0x002500F2, 0x002300F2, 0x10090000, 0x00000000, 0x002600F3, 0x00880000, 0x00000008, 0xFFFF0000, 0x002500F3, 0x002300F3, 0x10090000, 0x00000000, 0x00000000, 0x00880000, 0x00000008, 0xFFFF0000, 0x00000000, 0x00000000, 0x10090000, 0x00000000, 0x002600F4, 0x00880000, 0x00000008, 0xFFFF0000, 0x002500F4, 0x002300F4, 0x10090000, 0x00000000, 0x002600F5, 0x00880000, 0x00000008, 0xFFFF0000, 0x002500F5, 0x002300F5, 0x10090000, 0x00000000, 0x00000000, 0x00880000, 0x00000008, 0xFFFF0000, 0x00000000, 0x00000000, 0x10090000, 0x00000000, 0x00000000, 0x00880000, 0x00000008, 0xFFFF0000, 0x00000000, 0x00000000, 0x10090000, 0x00000000, 0x00000000, 0x00880000, 0x00000008, 0xFFFF0000, 0x00000000, 0x00000000, 0x10090000, 0x00000000, 0x002600F6, 0x00880000, 0x00000008, 0xFFFF0000, 0x002500F6, 0x002300F6, 0x10090000, 0x00000000, 0x002600F7, 0x00880000, 0x00000008, 0xFFFF0000, 0x002500F7, 0x002300F7, 0x10090000, 0x00000000, 0x002600F8, 0x00880000, 0x00000008, 0xFFFF0000, 0x002500F8, 0x002300F8, 0x10090000, 0x00000000, 0x002600F9, 0x00880000, 0x00000008, 0xFFFF0000, 0x002500F9, 0x002300F9, 0x10090000, 0x00000000, 0x002600FA, 0x00880000, 0x00000008, 0xFFFF0000, 0x002500FA, 0x002300FA, 0x10090000, 0x00000000, 0x002600FB, 0x00880000, 0x00000008, 0xFFFF0000, 0x002500FB, 0x002300FB, 0x10090000, 0x00000000, 0x002600FC, 0x00880000, 0x00000008, 0xFFFF0000, 0x002500FC, 0x002300FC, 0x10090000, 0x00000000, 0x002600FD, 0x00880000, 0x00000008, 0xFFFF0000, 0x002500FD, 0x002300FD, 0x10090000, 0x00000000, 0x00000000, 0x00880000, 0x00000008, 0xFFFF0000, 0x00000000, 0x00000000, 0x10090000, 0x00000000, 0x002600FE, 0x00880000, 0x00000008, 0xFFFF0000, 0x002500FE, 0x002300FE, 0x10090000, 0x00000000, 0x002600FF, 0x00880000, 0x00000008, 0xFFFF0000, 0x002500FF, 0x002300FF, 0x10090000, 0x00000000, 0x00260100, 0x00880000, 0x00000008, 0xFFFF0000, 0x00250100, 0x00230100, 0x10090000, 0x00000000, 0x00260101, 0x00880000, 0x00000008, 0xFFFF0000, 0x00250101, 0x00230101, 0x10090000, 0x00000000, 0x00260102, 0x00880000, 0x00000008, 0xFFFF0000, 0x00250102, 0x00230102, 0x10090000, 0x00000000, 0x002600B1, 0x00480000, 0x00000008, 0xFFFF0000, 0x002500B1, 0x002300B1, 0x10090000, 0x00000000, 0x002600EA, 0x00880000, 0x00000008, 0xFFFF0000, 0x002500EA, 0x002300EA, 0x10090000, 0x00000000, 0x00000000, 0x00880000, 0x00000008, 0xFFFF0000, 0x00000000, 0x00000000, 0x10090000, 0x00000000, 0x002600AE, 0x00450000, 0x00000008, 0xFFFF0000, 0x002500AE, 0x002300AE, 0x10090000, 0x00000000, 0x002600C5, 0x005E0000, 0x00000008, 0xFFFF0000, 0x002500C5, 0x002300C5, 0x10090000, 0x00000000, 0x002600C6, 0x005F0000, 0x00000008, 0xFFFF0000, 0x002500C6, 0x002300C6, 0x10090000, 0x00000000, 0x002600C7, 0x00600000, 0x00000008, 0xFFFF0000, 0x002500C7, 0x002300C7, 0x10090000, 0x00000000, 0x002600C8, 0x00610000, 0x00000008, 0xFFFF0000, 0x002500C8, 0x002300C8, 0x10090000, 0x00000000, 0x002600CD, 0x00490000, 0x00000008, 0xFFFF0000, 0x002500CD, 0x002300CD, 0x10090000, 0x00000000, 0x00260104, 0x00810000, 0x00000008, 0xFFFF0000, 0x00250104, 0x00230104, 0x10090000, 0x00000000, 0x002600D8, 0x01160000, 0x00000008, 0xFFFF0000, 0x002500D8, 0x002300D8, 0x10090000, 0x00000000, 0x002600D9, 0x01150000, 0x00000008, 0xFFFF0000, 0x002500D9, 0x002300D9, 0x10090000, 0x00000000, 0x002600DA, 0x01170000, 0x00000008, 0xFFFF0000, 0x002500DA, 0x002300DA, 0x10090000, 0x00000000, 0x002600DB, 0x01180000, 0x00000008, 0xFFFF0000, 0x002500DB, 0x002300DB, 0x10090000, 0x00000000, 0x002600DC, 0x01190000, 0x00000008, 0xFFFF0000, 0x002500DC, 0x002300DC, 0x10090000, 0x00000000, 0x002600DD, 0x011A0000, 0x00000008, 0xFFFF0000, 0x002500DD, 0x002300DD, 0x10090000, 0x00000000, 0x002600DE, 0x011B0000, 0x00000008, 0xFFFF0000, 0x002500DE, 0x002300DE, 0x10090000, 0x00000000, 0x002600DF, 0x011C0000, 0x00000008, 0xFFFF0000, 0x002500DF, 0x002300DF, 0x10090000, 0x00000000, 0x002600E0, 0x011D0000, 0x00000008, 0xFFFF0000, 0x002500E0, 0x002300E0, 0x10090000, 0x00000000, 0x002600E1, 0x011E0000, 0x00000008, 0xFFFF0000, 0x002500E1, 0x002300E1, 0x10090000, 0x00000000, 0x002600D6, 0x006F0000, 0x00000008, 0xFFFF0000, 0x002500D6, 0x002300D6, 0x10090000, 0x00000000, 0x002600D7, 0x006E0000, 0x00000008, 0xFFFF0000, 0x002500D7, 0x002300D7, 0x10090000, 0x00000000, 0x002600BF, 0x00700000, 0x00000008, 0xFFFF0000, 0x002500BF, 0x002300BF, 0x10090000, 0x00000000, 0x002600AC, 0x00730000, 0x00000008, 0xFFFF0000, 0x002500AC, 0x002300AC, 0x10090000, 0x00000000, 0x002600AD, 0x00530000, 0x00000008, 0xFFFF0000, 0x002500AD, 0x002300AD, 0x10090000, 0x00000000, 0x002600D1, 0x00710000, 0x00000008, 0xFFFF0000, 0x002500D1, 0x002300D1, 0x10090000, 0x00000000, 0x002600D4, 0x00720000, 0x00000008, 0xFFFF0000, 0x002500D4, 0x002300D4, 0x10090000, 0x00000000, 0x00260103, 0x00800000, 0x00000008, 0xFFFF0000, 0x00250103, 0x00230103, 0x10090000, 0x00000000, 0x00260105, 0x00820000, 0x00000008, 0xFFFF0000, 0x00250105, 0x00230105, 0x10090000, 0x00000000, 0x00260106, 0x00830000, 0x00000008, 0xFFFF0000, 0x00250106, 0x00230106, 0x10090000, 0x00000000, 0x00260107, 0x00840000, 0x00000008, 0xFFFF0000, 0x00250107, 0x00230107, 0x10090000, 0x00000000, 0x00000000, 0x00850000, 0x00000008, 0xFFFF0000, 0x00000000, 0x00000000, 0x10090000, 0x00000000, 0x00260108, 0x00860000, 0x00000008, 0xFFFF0000, 0x00250108, 0x00230108, 0x10090000, 0x00000000, 0x00260109, 0x00870000, 0x00000008, 0xFFFF0000, 0x00250109, 0x00230109, 0x10090000, 0x00000000, 0x00000000, 0x00860000, 0x00000008, 0xFFFF0000, 0x00000000, 0x00000000, 0x10090000, 0x00000000, 0x0026010A, 0x006C0000, 0x00000008, 0xFFFF0000, 0x0025010A, 0x0023010A, 0x10090000, 0x00000000, 0x0026010B, 0x006D0000, 0x00000008, 0xFFFF0000, 0x0025010B, 0x0023010B, 0x10090000, 0x00000000, 0x002600AC, 0x00730000, 0x00000008, 0xFFFF0000, 0x002500AC, 0x002300AC, 0x10090000, 0x00000000, 0x002600CE, 0x00530000, 0x00000008, 0xFFFF0000, 0x002500CE, 0x002300CE, 0x10090000, 0x00000000, 0x002600D5, 0x00530000, 0x00000008, 0xFFFF0000, 0x002500D5, 0x002300D5, 0x10090000, 0x00000000, 0x002600E8, 0x007F0000, 0x00000008, 0xFFFF0000, 0x002500E8, 0x002300E8, 0x10090000, 0x00000000, 0x002600E9, 0x007E0000, 0x00000008, 0xFFFF0000, 0x002500E9, 0x002300E9, 0x10090000, 0x00000000, 0x002600D5, 0x00730000, 0x00000008, 0xFFFF0000, 0x002500D5, 0x002300D5, 0x10090000, 0x00000000, 0x002600D5, 0x00730000, 0x00000008, 0xFFFF0000, 0x002500D5, 0x002300D5, 0x10090000, 0x00000000, 0x002600D5, 0x00730000, 0x00000008, 0xFFFF0000, 0x002500D5, 0x002300D5, 0x10090000, 0x00000000, 0x00260000, 0x01200000, 0x00008002, 0x00040000, 0x00250000, 0x00230000, 0x10060003, 0x00000000, 0x00260001, 0x01210000, 0x00008002, 0x00060000, 0x00250001, 0x00230001, 0x10060004, 0x00000000, 0x00260002, 0x01220000, 0x00008002, 0x00080000, 0x00250002, 0x00230002, 0x10060005, 0x00000000, 0x00260004, 0x01240000, 0x00008002, 0x000F0000, 0x00250004, 0x00230004, 0x10060006, 0x00000000, 0x00260003, 0x01230000, 0x00008003, 0x00040000, 0x00250003, 0x00230003, 0x10060005, 0x00000000, 0x00260006, 0x01260000, 0x00008003, 0x00010000, 0x00250006, 0x00230006, 0x10060001, 0x00000000, 0x00260005, 0x01250000, 0x00008003, 0x00010000, 0x00250005, 0x00230005, 0x10060001, 0x00000000, 0x00000000, 0x013D0000, 0x00008003, 0x00010000, 0x00000000, 0x00000000, 0x10060000, 0x00000000, 0x00260007, 0x01280000, 0x00000008, 0x000F0000, 0x00250007, 0x00230007, 0x10060003, 0x00000000, 0x0026000E, 0x00FD0000, 0x00000009, 0x00010000, 0x0025000E, 0x0023000E, 0x11870000, 0x00000000, 0x00260009, 0x00F80000, 0x00000009, 0x00020000, 0x00250009, 0x00230009, 0x10870005, 0x00000000, 0x00260008, 0x01290000, 0x00000008, 0x00070000, 0x00250008, 0x00230008, 0x10860004, 0x00000000, 0x0026000A, 0x00F90000, 0x00000009, 0x00070000, 0x0025000A, 0x0023000A, 0x1087000A, 0x00000000, 0x0026000D, 0x00FC0000, 0x00000009, 0x00010000, 0x0025000D, 0x0023000D, 0x10870001, 0x00000000, 0x0026000B, 0x00FA0000, 0x00000009, 0x00320000, 0x0025000B, 0x0023000B, 0x10870032, 0x00000000, 0x00260026, 0x01300000, 0x00008002, 0x00040000, 0x00250026, 0x00230026, 0x10060003, 0x00000000, 0x00260027, 0x01320000, 0x00008002, 0x00030000, 0x00250027, 0x00230027, 0x10060002, 0x00000000, 0x00000000, 0x01330000, 0x00000008, 0x000A0000, 0x00000000, 0x00000000, 0x11860002, 0x00000000, 0x00260028, 0x01340000, 0x00008002, 0x000A0000, 0x00250028, 0x00230028, 0x10060004, 0x00000000, 0x00260019, 0x01130000, 0x00000009, 0x001E0000, 0x00250019, 0x00230019, 0x10870019, 0x19000000, 0x0026001A, 0x01140000, 0x00000009, 0x00020000, 0x0025001A, 0x0023001A, 0x10870005, 0x00000000, 0x0026000C, 0x00FB0000, 0x00000009, 0x00140000, 0x0025000C, 0x0023000C, 0x1087000A, 0x00000000, 0x0026002B, 0x013B0000, 0x00000008, 0x00010000, 0x0025002B, 0x0023002B, 0x10060000, 0x00000000, 0x0026002C, 0x013C0000, 0x00000008, 0x000F0000, 0x0025002C, 0x0023002C, 0x10060002, 0x00000000, 0x0026002A, 0x013A0000, 0x00008002, 0x00030000, 0x0025002A, 0x0023002A, 0x10060000, 0x00000000, 0x00000000, 0x01380000, 0x00000008, 0x00050000, 0x00000000, 0x00000000, 0x10060000, 0x00000000, 0x00260029, 0x01350000, 0x00008002, 0x00060000, 0x00250029, 0x00230029, 0x10060003, 0x00000000, 0x0026000F, 0x00FE0000, 0x00000009, 0x00030000, 0x0025000F, 0x0023000F, 0x11870000, 0x05000000, 0x00260015, 0x01070000, 0x00000009, 0x00010000, 0x00250015, 0x00230015, 0x10870001, 0x02000000, 0x00260014, 0x01060000, 0x00000009, 0x00010000, 0x00250014, 0x00230014, 0x10870000, 0x03000000, 0x00260010, 0x00FF0000, 0x00000009, 0x00020000, 0x00250010, 0x00230010, 0x10870000, 0x05000000, 0x00260011, 0x01000000, 0x00000009, 0x00020000, 0x00250011, 0x00230011, 0x10870005, 0x00000000, 0x00260012, 0x01010000, 0x00000009, 0x00020000, 0x00250012, 0x00230012, 0x10870003, 0x03000000, 0x00260013, 0x01020000, 0x00000009, 0x00030000, 0x00250013, 0x00230013, 0x10870005, 0x00000000, 0x00260018, 0x01120000, 0x00000009, 0x00320000, 0x00250018, 0x00230018, 0x10870000, 0x32000000, 0x00260017, 0x01110000, 0x00000009, 0x000A0000, 0x00250017, 0x00230017, 0x11870000, 0x0A000000, 0x00260016, 0x01100000, 0x00000009, 0x00030000, 0x00250016, 0x00230016, 0x11870000, 0x05000000, 0x0026001B, 0x01030000, 0x00000009, 0x00020000, 0x0025001B, 0x0023001B, 0x10870000, 0x03000000, 0x0026001C, 0x01040000, 0x00000009, 0x00010000, 0x0025001C, 0x0023001C, 0x10870000, 0x03000000, 0x0026001D, 0x01050000, 0x00000009, 0x00040000, 0x0025001D, 0x0023001D, 0x10870003, 0x02000000, 0x0026001E, 0x01080000, 0x00000009, 0x00050000, 0x0025001E, 0x0023001E, 0x1087000F, 0x00000000, 0x0026001F, 0x01090000, 0x00000009, 0x00020000, 0x0025001F, 0x0023001F, 0x10870000, 0x05000000, 0x00260020, 0x010A0000, 0x00000009, 0x00030000, 0x00250020, 0x00230020, 0x10870000, 0x01000000, 0x00260021, 0x010B0000, 0x00000009, 0x00020000, 0x00250021, 0x00230021, 0x10870005, 0x00000000, 0x00260022, 0x010C0000, 0x00008003, 0x00010000, 0x00250022, 0x00230022, 0x10060003, 0x00000000, 0x00260023, 0x010D0000, 0x00000009, 0x00070000, 0x00250023, 0x00230023, 0x1087000F, 0x00000000, 0x00260024, 0x010E0000, 0x00000009, 0x00010000, 0x00250024, 0x00230024, 0x10870000, 0x05000000, 0x00260025, 0x010F0000, 0x00000009, 0x00030000, 0x00250025, 0x00230025, 0x10870005, 0x00000000, 0x0026002D, 0x00010000, 0x00000009, 0x000A0000, 0x0025002D, 0x0023002D, 0x11870004, 0x04000000, 0x0026002E, 0x00020000, 0x00000009, 0x000A0000, 0x0025002E, 0x0023002E, 0x10870005, 0x0F000000, 0x00260035, 0x00030000, 0x00000009, 0x004B0000, 0x00250035, 0x00230035, 0x10870032, 0x05000000, 0x00260036, 0x00040000, 0x00000009, 0x00640000, 0x00250036, 0x00230036, 0x10870032, 0x0A000000, 0x00260037, 0x00050000, 0x00000009, 0x00960000, 0x00250037, 0x00230037, 0x10870032, 0x32000000, 0x00260038, 0x00060000, 0x00000009, 0x000A0000, 0x00250038, 0x00230038, 0x10870007, 0x07000000, 0x00260039, 0x00070000, 0x00000009, 0x00050000, 0x00250039, 0x00230039, 0x10870006, 0x02000000, 0x0026003C, 0x00080000, 0x00000009, 0x00140000, 0x0025003C, 0x0023003C, 0x1087000A, 0x0A000000, 0x0026003B, 0x00090000, 0x00000009, 0x002D0000, 0x0025003B, 0x0023003B, 0x1087001E, 0x0A000000, 0x0026003A, 0x000A0000, 0x00000009, 0x000F0000, 0x0025003A, 0x0023003A, 0x1087000F, 0x05000000, 0x0026003D, 0x000B0000, 0x00000009, 0x00320000, 0x0025003D, 0x0023003D, 0x1087001E, 0x14000000, 0x0026003F, 0x000E0000, 0x00000009, 0x000F0000, 0x0025003F, 0x0023003F, 0x10870014, 0x14000000, 0x00260042, 0x000C0000, 0x00000009, 0x00190000, 0x00250042, 0x00230042, 0x11870000, 0x28000000, 0x0026003E, 0x000D0000, 0x00000009, 0x000A0000, 0x0025003E, 0x0023003E, 0x1087000A, 0x0A000000, 0x00260040, 0x000F0000, 0x00000009, 0x003C0000, 0x00250040, 0x00230040, 0x10870028, 0x28000000, 0x00260041, 0x00100000, 0x00000009, 0x000A0000, 0x00250041, 0x00230041, 0x11870000, 0x14000000, 0x00260043, 0x00110000, 0x00000009, 0x000A0000, 0x00250043, 0x00230043, 0x10870000, 0x14000000, 0x00260044, 0x00120000, 0x00000009, 0x000A0000, 0x00250044, 0x00230044, 0x10870000, 0x0F000000, 0x00260045, 0x00130000, 0x00000009, 0x00010000, 0x00250045, 0x00230045, 0x10870001, 0x01000000, 0x00260046, 0x00140000, 0x00000009, 0x00030000, 0x00250046, 0x00230046, 0x11870000, 0x07000000, 0x00260032, 0x00150000, 0x00000009, 0x00140000, 0x00250032, 0x00230032, 0x1087000A, 0x05000000, 0x00260033, 0x00160000, 0x00000009, 0x00230000, 0x00250033, 0x00230033, 0x1087000A, 0x0A000000, 0x00260034, 0x00170000, 0x00000009, 0x00640000, 0x00250034, 0x00230034, 0x1087000A, 0x32000000, 0x00260047, 0x00180000, 0x00000009, 0x00070000, 0x00250047, 0x00230047, 0x10870006, 0x04000000, 0x00260048, 0x00190000, 0x00008003, 0x000A0000, 0x00250048, 0x00230048, 0x10060006, 0x00000000, 0x00260049, 0x001A0000, 0x00000009, 0x00070000, 0x00250049, 0x00230049, 0x1087000A, 0x00000000, 0x0026002F, 0x001B0000, 0x00000009, 0x000A0000, 0x0025002F, 0x0023002F, 0x10870005, 0x05000000, 0x0026004A, 0x001C0000, 0x00000009, 0x000F0000, 0x0025004A, 0x0023004A, 0x10870000, 0x14000000, 0x0026004B, 0x001D0000, 0x00000009, 0x00190000, 0x0025004B, 0x0023004B, 0x10870000, 0x0F000000, 0x0026004C, 0x001E0000, 0x00000009, 0x00140000, 0x0025004C, 0x0023004C, 0x108700FF, 0x14000000, 0x0026004D, 0x001F0000, 0x00000009, 0x000F0000, 0x0025004D, 0x0023004D, 0x10870000, 0x14000000, 0x0026004E, 0x00200000, 0x00000009, 0x000C0000, 0x0025004E, 0x0023004E, 0x10870003, 0x0F000000, 0x0026004F, 0x00210000, 0x00000009, 0x000F0000, 0x0025004F, 0x0023004F, 0x10870005, 0x0F000000, 0x00260050, 0x00220000, 0x00000009, 0x00640000, 0x00250050, 0x00230050, 0x10870000, 0x40000000, 0x00260051, 0x00230000, 0x00000009, 0x000A0000, 0x00250051, 0x00230051, 0x10860000, 0x00000000, 0x00260052, 0x00240000, 0x00000009, 0x000C0000, 0x00250052, 0x00230052, 0x10870000, 0x0F000000, 0x00260053, 0x00250000, 0x00000009, 0x000F0000, 0x00250053, 0x00230053, 0x1087000F, 0x00000000, 0x00260054, 0x00260000, 0x00000009, 0x00060000, 0x00250054, 0x00230054, 0x1087000A, 0x00000000, 0x00260055, 0x00270000, 0x00000009, 0x00060000, 0x00250055, 0x00230055, 0x10870000, 0x0A000000, 0x00260030, 0x00280000, 0x00000009, 0x00190000, 0x00250030, 0x00230030, 0x10870005, 0x0A000000, 0x00260056, 0x00290000, 0x00000009, 0x000A0000, 0x00250056, 0x00230056, 0x10870008, 0x08000000, 0x00260057, 0x002A0000, 0x00000009, 0x00140000, 0x00250057, 0x00230057, 0x1087000F, 0x0F000000, 0x00260031, 0x002B0000, 0x00000009, 0x004B0000, 0x00250031, 0x00230031, 0x10870005, 0x32000000, 0x00260031, 0x002B0000, 0x00000009, 0x004B0000, 0x00250031, 0x00230031, 0x10870005, 0x32000000, 0x00260031, 0x002B0000, 0x00000009, 0x004B0000, 0x00250031, 0x00230031, 0x10870005, 0x32000000, 0x00260031, 0x002B0000, 0x00000009, 0x004B0000, 0x00250031, 0x00230031, 0x10870005, 0x32000000, 0x00260031, 0x002B0000, 0x00000009, 0x004B0000, 0x00250031, 0x00230031, 0x10870005, 0x32000000, 0x00260031, 0x002B0000, 0x00000009, 0x004B0000, 0x00250031, 0x00230031, 0x10870005, 0x32000000, 0x00260068, 0x00900017, 0x00000000, 0x004B0000, 0x00250068, 0x00230068, 0x10400800, 0x00000000, 0x0026005E, 0x00910004, 0x00000000, 0x004B0000, 0x0025005E, 0x0023005E, 0x10401F00, 0x00000000, 0x00260073, 0x00920043, 0x00000000, 0x00FA0000, 0x00250073, 0x00230073, 0x10403B00, 0x00000000, 0x00260080, 0x00930028, 0x00000000, 0x00640000, 0x00250080, 0x00230080, 0x10404C00, 0x00000000, 0x00260061, 0x0094000D, 0x00000000, 0x00640000, 0x00250061, 0x00230061, 0x10402000, 0x00000000, 0x0026007F, 0x0095005C, 0x00000000, 0x00640000, 0x0025007F, 0x0023007F, 0x10404000, 0x00000000, 0x00260087, 0x0096006D, 0x00000000, 0x00640000, 0x00250087, 0x00230087, 0x10404D00, 0x00000000, 0x00260071, 0x00970035, 0x00000000, 0x00960000, 0x00250071, 0x00230071, 0x10405200, 0x00000000, 0x0026006A, 0x00980018, 0x00000000, 0x00640000, 0x0025006A, 0x0023006A, 0x10400900, 0x00000000, 0x0026006D, 0x00990021, 0x00000000, 0x00640000, 0x0025006D, 0x0023006D, 0x10403500, 0x00000000, 0x00000000, 0x01400000, 0x00000000, 0x00640000, 0x00000000, 0x00000000, 0x10405300, 0x00000000, 0x0026005C, 0x009C0009, 0x00000000, 0x004B0000, 0x0025005C, 0x0023005C, 0x10402100, 0x00000000, 0x00260097, 0x00A0005B, 0x00000000, 0x004B0000, 0x00250097, 0x00230097, 0x10404100, 0x00000000, 0x00260070, 0x00E30024, 0x00000000, 0x00C80000, 0x00250070, 0x00230070, 0x10403800, 0x00000000, 0x00260069, 0x00A4001D, 0x00000000, 0x004B0000, 0x00250069, 0x00230069, 0x10400A00, 0x00000000, 0x0026005D, 0x00A6000A, 0x00000000, 0x004B0000, 0x0025005D, 0x0023005D, 0x10402200, 0x00000000, 0x00000000, 0x00A80014, 0x00000000, 0x001E0000, 0x00000000, 0x00000000, 0x10400B00, 0x00000000, 0x00260081, 0x00A90055, 0x00000000, 0x00640000, 0x00250081, 0x00230081, 0x10404200, 0x00000000, 0x0026008C, 0x00AA005E, 0x00000000, 0x00640000, 0x0025008C, 0x0023008C, 0x10404300, 0x00000000, 0x0026008D, 0x00AB0070, 0x00000000, 0x001E0000, 0x0025008D, 0x0023008D, 0x10405400, 0x00000000, 0x00260093, 0x00AC0050, 0x00000000, 0x00640000, 0x00250093, 0x00230093, 0x10403C00, 0x00000000, 0x00260078, 0x00AD004F, 0x00000000, 0x00320000, 0x00250078, 0x00230078, 0x10405A00, 0x00000000, 0x00000000, 0x00AE0004, 0x00000000, 0x001E0000, 0x00000000, 0x00000000, 0x10402300, 0x00000000, 0x00260094, 0x00AF006F, 0x00000000, 0x000A0000, 0x00250094, 0x00230094, 0x10404E00, 0x00000000, 0x00260072, 0x00B0003A, 0x00000000, 0x00960000, 0x00250072, 0x00230072, 0x10405B00, 0x00000000, 0x00260086, 0x00B10051, 0x00000000, 0x00320000, 0x00250086, 0x00230086, 0x10405F00, 0x00000000, 0x00260095, 0x00B2005A, 0x00000000, 0x004B0000, 0x00250095, 0x00230095, 0x10403D00, 0x00000000, 0x00260074, 0x00B30046, 0x00000000, 0x00FA0000, 0x00250074, 0x00230074, 0x10404500, 0x00000000, 0x00260096, 0x00B40065, 0x00000000, 0x00320000, 0x00250096, 0x00230096, 0x10406300, 0x00000000, 0x0026009A, 0x00B50065, 0x00000000, 0x00C80000, 0x0025009A, 0x0023009A, 0x10405C00, 0x00000000, 0x00260098, 0x00B60069, 0x00000000, 0x00320000, 0x00250098, 0x00230098, 0x10405D00, 0x00000000, 0x00260079, 0x00B7002A, 0x00000000, 0x00640000, 0x00250079, 0x00230079, 0x10405E00, 0x00000000, 0x00260099, 0x00B8005F, 0x00000000, 0x00640000, 0x00250099, 0x00230099, 0x10404400, 0x00000000, 0x00000000, 0x00B90058, 0x00000000, 0x012C0000, 0x00000000, 0x00000000, 0x10406000, 0x00000000, 0x0026009B, 0x00BA0029, 0x00000000, 0x012C0000, 0x0025009B, 0x0023009B, 0x10404F00, 0x00000000, 0x0026009C, 0x00BB0063, 0x00000000, 0x00320000, 0x0025009C, 0x0023009C, 0x10406100, 0x00000000, 0x0026009D, 0x00BC0064, 0x00000000, 0x00320000, 0x0025009D, 0x0023009D, 0x10406E00, 0x00000000, 0x0026007B, 0x00BD003F, 0x00000000, 0x00FA0000, 0x0025007B, 0x0023007B, 0x10406200, 0x00000000, 0x0026006E, 0x00BE0022, 0x00000000, 0x00C80000, 0x0025006E, 0x0023006E, 0x10403600, 0x00000000, 0x00260066, 0x00A7001C, 0x00000000, 0x004B0000, 0x00250066, 0x00230066, 0x10400D00, 0x00000000, 0x0026006C, 0x009B001A, 0x00000000, 0x00C80000, 0x0025006C, 0x0023006C, 0x10400E00, 0x00000000, 0x00260064, 0x009D0015, 0x00000000, 0x00320000, 0x00250064, 0x00230064, 0x10400F00, 0x00000000, 0x0026005A, 0x00A10005, 0x00000000, 0x00320000, 0x0025005A, 0x0023005A, 0x10402500, 0x00000000, 0x00260065, 0x009E0016, 0x00000000, 0x00640000, 0x00250065, 0x00230065, 0x10401100, 0x00000000, 0x0026005B, 0x00A20006, 0x00000000, 0x00640000, 0x0025005B, 0x0023005B, 0x10402700, 0x00000000, 0x00260084, 0x00D10053, 0x00000000, 0x00320000, 0x00250084, 0x00230084, 0x10406400, 0x00000000, 0x00000000, 0x00A3000F, 0x00000000, 0x00320000, 0x00000000, 0x00000000, 0x10402900, 0x00000000, 0x00000000, 0x009F001F, 0x00000000, 0x00320000, 0x00000000, 0x00000000, 0x10401300, 0x00000000, 0x00000000, 0x00D4002D, 0x00000000, 0x012C0000, 0x00000000, 0x00000000, 0x10406500, 0x00000000, 0x00260085, 0x00D20052, 0x00000000, 0x00320000, 0x00250085, 0x00230085, 0x10404600, 0x00000000, 0x00260083, 0x00D30054, 0x00000000, 0x00320000, 0x00250083, 0x00230083, 0x10404700, 0x00000000, 0x00260076, 0x00C9004E, 0x00000000, 0x00640000, 0x00250076, 0x00230076, 0x10403E00, 0x00000000, 0x00260082, 0x00C60056, 0x00000000, 0x012C0000, 0x00250082, 0x00230082, 0x10404800, 0x00000000, 0x00000000, 0x00C70057, 0x00000000, 0x00640000, 0x00000000, 0x00000000, 0x10406600, 0x00000000, 0x00260077, 0x00CA004D, 0x00000000, 0x00640000, 0x00250077, 0x00230077, 0x10404900, 0x00000000, 0x0026006B, 0x009A0019, 0x00000000, 0x00960000, 0x0025006B, 0x0023006B, 0x10401400, 0x00000000, 0x00000000, 0x00A5000E, 0x00000000, 0x004B0000, 0x00000000, 0x00000000, 0x10402A00, 0x00000000, 0x00000000, 0x00BF0042, 0x00000000, 0x012C0000, 0x00000000, 0x00000000, 0x10406700, 0x00000000, 0x0026007C, 0x00CB0061, 0x00000000, 0x004B0000, 0x0025007C, 0x0023007C, 0x10406800, 0x00000000, 0x0026007D, 0x00CC0062, 0x00000000, 0x004B0000, 0x0025007D, 0x0023007D, 0x10406900, 0x00000000, 0x00260089, 0x00CF006C, 0x00000000, 0x00960000, 0x00250089, 0x00230089, 0x10406A00, 0x00000000, 0x0026008A, 0x00CD006B, 0x00000000, 0x00640000, 0x0025008A, 0x0023008A, 0x10406B00, 0x00000000, 0x0026009E, 0x00D00068, 0x00000000, 0x00C80000, 0x0025009E, 0x0023009E, 0x10406C00, 0x00000000, 0x0026008B, 0x00CE006A, 0x00000000, 0x00320000, 0x0025008B, 0x0023008B, 0x10406D00, 0x00000000, 0x00260088, 0x00C8006E, 0x00000000, 0x00C80000, 0x00250088, 0x00230088, 0x10405000, 0x00000000, 0x00260058, 0x00C00001, 0x00000000, 0x00320000, 0x00250058, 0x00230058, 0x10402B00, 0x00000000, 0x00000000, 0x00C10002, 0x00000000, 0x00640000, 0x00000000, 0x00000000, 0x10402C00, 0x00000000, 0x00260059, 0x00C20003, 0x00000000, 0x00C80000, 0x00250059, 0x00230059, 0x10402D00, 0x00000000, 0x00260062, 0x00C30011, 0x00000000, 0x00320000, 0x00250062, 0x00230062, 0x10401500, 0x00000000, 0x00000000, 0x00C40012, 0x00000000, 0x00640000, 0x00000000, 0x00000000, 0x10401600, 0x00000000, 0x00260063, 0x00C50013, 0x00000000, 0x00C80000, 0x00250063, 0x00230063, 0x10401700, 0x00000000, 0x00260062, 0x01400011, 0x00000000, 0x00320000, 0x00250062, 0x00230062, 0x10401700, 0x00000000, 0x00260062, 0x01400011, 0x00000000, 0x00320000, 0x00250062, 0x00230062, 0x10401700, 0x00000000, 0x0026007E, 0x00E00031, 0x00000000, 0x00320000, 0x0025007E, 0x0023007E, 0x10407100, 0x00000000, 0x00000000, 0x00E10034, 0x00000000, 0x00640000, 0x00000000, 0x00000000, 0x10407200, 0x00000000, 0x00260067, 0x00D8001B, 0x00000000, 0x004B0000, 0x00250067, 0x00230067, 0x10401800, 0x00000000, 0x00000000, 0x0140001E, 0x00000000, 0x00640000, 0x00000000, 0x00000000, 0x10401900, 0x00000000, 0x00000000, 0x00E20027, 0x00000000, 0x012C0000, 0x00000000, 0x00000000, 0x10407300, 0x00000000, 0x00260060, 0x00DA000C, 0x00000000, 0x00640000, 0x00250060, 0x00230060, 0x10402E00, 0x00000000, 0x0026005F, 0x00D90008, 0x00000000, 0x004B0000, 0x0025005F, 0x0023005F, 0x10402F00, 0x00000000, 0x00260075, 0x00DB0049, 0x00000000, 0x00960000, 0x00250075, 0x00230075, 0x10403300, 0x00000000, 0x00000000, 0x00DC000B, 0x00000000, 0x00640000, 0x00000000, 0x00000000, 0x10403000, 0x00000000, 0x0026007E, 0x00E00031, 0x00000000, 0x00320000, 0x0025007E, 0x0023007E, 0x10407100, 0x00000000, 0x0026007E, 0x00E00031, 0x00000000, 0x00320000, 0x0025007E, 0x0023007E, 0x10407100, 0x00000000, 0x00260071, 0x00970035, 0x00000000, 0x00960000, 0x00250071, 0x00230071, 0x10405200, 0x00000000, 0x00260072, 0x00B0003A, 0x00000000, 0x00960000, 0x00250072, 0x00230072, 0x10405B00, 0x00000000, 0x00260079, 0x00B7002A, 0x00000000, 0x00640000, 0x00250079, 0x00230079, 0x10405E00, 0x00000000, 0x00260079, 0x00B7002A, 0x00000000, 0x00640000, 0x00250079, 0x00230079, 0x10405E00, 0x00000000, 0x0026007B, 0x00BD003F, 0x00000000, 0x00FA0000, 0x0025007B, 0x0023007B, 0x10406200, 0x00000000, 0x0026007B, 0x00BD003F, 0x00000000, 0x00FA0000, 0x0025007B, 0x0023007B, 0x10406200, 0x00000000, 0x00260075, 0x00DB0049, 0x00000000, 0x00960000, 0x00250075, 0x00230075, 0x10403300, 0x00000000, 0x00260075, 0x00DB0049, 0x00000000, 0x00960000, 0x00250075, 0x00230075, 0x10403300, 0x00000000, 0x00260073, 0x00920043, 0x00000000, 0x00FA0000, 0x00250073, 0x00230073, 0x10403B00, 0x00000000, 0x00260073, 0x00920043, 0x00000000, 0x00FA0000, 0x00250073, 0x00230073, 0x10403B00, 0x00000000, 0x00260074, 0x00B30046, 0x00000000, 0x00FA0000, 0x00250074, 0x00230074, 0x10404500, 0x00000000, 0x00260074, 0x00B30046, 0x00000000, 0x00FA0000, 0x00250074, 0x00230074, 0x10404500, 0x00000000, 0x0026007A, 0x00DD002E, 0x00000000, 0x00640000, 0x0025007A, 0x0023007A, 0x10407400, 0x00000000, 0x0026007A, 0x00DD002E, 0x00000000, 0x00640000, 0x0025007A, 0x0023007A, 0x10407400, 0x00000000, 0x0026007A, 0x00DD002E, 0x00000000, 0x00640000, 0x0025007A, 0x0023007A, 0x10407400, 0x00000000, 0x0026006F, 0x00E90023, 0x00000000, 0x00640000, 0x0025006F, 0x0023006F, 0x10407500, 0x00000000, 0x0026009F, 0x00E80025, 0x00000000, 0x00640000, 0x0025009F, 0x0023009F, 0x10407600, 0x00000000, 0x0026008E, 0x00EA0073, 0x00000000, 0x001E0000, 0x0025008E, 0x0023008E, 0x10405500, 0x00000000, 0x0026008F, 0x00EB0071, 0x00000000, 0x001E0000, 0x0025008F, 0x0023008F, 0x10405600, 0x00000000, 0x00260090, 0x00EC0074, 0x00000000, 0x001E0000, 0x00250090, 0x00230090, 0x10405700, 0x00000000, 0x00260091, 0x00ED0072, 0x00000000, 0x001E0000, 0x00250091, 0x00230091, 0x10405800, 0x00000000, 0x00260092, 0x00EE0075, 0x00000000, 0x001E0000, 0x00250092, 0x00230092, 0x10405900, 0x00000000, 0x00260071, 0x00970035, 0x00000000, 0x00960000, 0x00250071, 0x00230071, 0x10405200, 0x00000000, 0x00260071, 0x00970035, 0x00000000, 0x00960000, 0x00250071, 0x00230071, 0x10405200, 0x00000000, 0x00260071, 0x00970035, 0x00000000, 0x00960000, 0x00250071, 0x00230071, 0x10405200, 0x00000000, 0x00260072, 0x00B0003A, 0x00000000, 0x00960000, 0x00250072, 0x00230072, 0x10405B00, 0x00000000, 0x00260072, 0x00B0003A, 0x00000000, 0x00960000, 0x00250072, 0x00230072, 0x10405B00, 0x00000000, 0x00260072, 0x00B0003A, 0x00000000, 0x00960000, 0x00250072, 0x00230072, 0x10405B00, 0x00000000, 0x00000000, 0x00F0005D, 0x00000000, 0x00640000, 0x00000000, 0x00000000, 0x10404A00, 0x00000000, 0x00260092, 0x00EE0075, 0x00000000, 0x001E0000, 0x00250092, 0x00230092, 0x10405900, 0x00000000, 0x00260092, 0x00EE0075, 0x00000000, 0x001E0000, 0x00250092, 0x00230092, 0x10405900, 0x00000000, 0x00260092, 0x00EE0075, 0x00000000, 0x001E0000, 0x00250092, 0x00230092, 0x10405900, 0x00000000, 0x00260092, 0x00EE0075, 0x00000000, 0x001E0000, 0x00250092, 0x00230092, 0x10405900, 0x00000000, 0x00000000, 0x01490000, 0x00000008, 0x00010000, 0x00000000, 0x00000000, 0x10400000, 0x00000000, 0x00000000, 0x00310000, 0x00000008, 0xFFFF0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00320000, 0x00000008, 0x00010000, 0x00000000, 0x00000000, 0x02000000, 0x00000000, 0x00000000, 0x00330000, 0x00000008, 0xFFFF0000, 0x00000000, 0x00000000, 0x02000000, 0x00000000, 0x00000000, 0x00340000, 0x00000008, 0xFFFF0000, 0x00000000, 0x00000000, 0x02000000, 0x00000000, 0x00000000, 0x00350000, 0x00000008, 0xFFFF0000, 0x00000000, 0x00000000, 0x12000000, 0x00000000, 0x00000000, 0x00360000, 0x00000008, 0x00010000, 0x00000000, 0x00000000, 0x12000000, 0x00000000, 0x0026010C, 0x00370000, 0x00000008, 0x00010000, 0x00000000, 0x00000000, 0x12000000, 0x00000000, 0x00000000, 0x01400000, 0x00000008, 0x00000000, 0x00000000, 0x00000000, 0x10000000, 0x00000000, 0x00000000, 0x01410000, 0x00000008, 0x00000000, 0x00000000, 0x00000000, 0x10000000, 0x00000000, 0x00000000, 0x01420000, 0x00000008, 0x00000000, 0x00000000, 0x00000000, 0x10000000, 0x00000000, 0x00000000, 0x01430000, 0x00000008, 0x00000000, 0x00000000, 0x00000000, 0x10000000, 0x00000000, 0x00000000, 0x01440000, 0x00000008, 0x00000000, 0x00000000, 0x00000000, 0x10000000, 0x00000000, 0x00000000, 0x01450000, 0x00000008, 0x00000000, 0x00000000, 0x00000000, 0x10000000, 0x00000000, 0x00000000, 0x01460000, 0x00000008, 0x00000000, 0x00000000, 0x00000000, 0x10000000, 0x00000000, 0x00000000, 0x01470000, 0x00000008, 0x00000000, 0x00000000, 0x00000000, 0x10000000, 0x00000000, 0x00000000, 0x01480000, 0x00000008, 0x00000000, 0x00000000, 0x00000000, 0x10000000, 0x00000000, 0x00000000, 0x014A0000, 0x00000008, 0x00000000, 0x00000000, 0x00000000, 0x10000000, 0x00000000, 0x00000000, 0x014B0000, 0x00000008, 0x00000000, 0x00000000, 0x00000000, 0x10000000, 0x00000000, 0x00000000, 0x014C0000, 0x00000008, 0x00000000, 0x00000000, 0x00000000, 0x10000000, 0x00000000, 0x00000000, 0x014D0000, 0x00000008, 0x00000000, 0x00000000, 0x00000000, 0x10000000, 0x00000000, 0x00000000, 0x014E0000, 0x00000008, 0x00000000, 0x00000000, 0x00000000, 0x10000000, 0x00000000, 0x00000000, 0x014F0000, 0x00000008, 0x00000000, 0x00000000, 0x00000000, 0x10000000, 0x00000000, 0x00000000, 0x01500000, 0x00000008, 0x00000000, 0x00000000, 0x00000000, 0x10000000, 0x00000000 -dlabel D_8008A680 -.word 0x00000000, 0x00000000, D_800827D8, D_80082808, D_80082838, D_80082868, D_80082898, D_800828C8, D_800828F8, D_80082928, D_80082958, D_80082988, D_800829B8, D_800829E8, D_80082A18, D_80082A48, D_80082A78, D_80082AA8, D_80082AD8, D_80082B08, D_80082B38, D_80082B68, D_80082B98, D_80082BC8, D_80082BF8, D_80082C28, D_80082C58, D_80082C88, D_80082CB8, D_80082CE8, D_80082D18, D_80082D48, D_80082D78, D_80082DA8, D_80082DD8, D_80082E08, D_80082E38, D_80082E68, D_80082E98, D_80082EC8, D_80082EF8, D_80082F28, D_80082F58, D_80082F88, D_80082FB8, D_80082FE8, D_80083018, D_80083048, D_80083078, D_800830A8, D_800830D8, D_80083108, D_80083138, D_80083168, D_80083198, D_800831C8, D_800831F8, D_80083228, D_80083258, D_80083288, D_800832B8, D_800832E8, D_80083318, D_80083348, D_80083378, D_800833A8, D_800833D8, D_80083408, D_80083438, D_80083468, D_80083498, D_800834C8, D_800834F8, D_80083528, D_80083558, D_80083588, D_800835B8, D_800835E8, D_80083618, D_80083648, D_80083678, D_800836A8, D_800836D8, D_80083708, D_80083738, D_80083768, D_80083798, D_800837C8, D_800837F8, D_80083828, D_80083858, D_80083888, D_800838B8, D_800838E8, D_80083918, D_80083948, D_80083978, D_800839A8, D_80080820, D_80080820, D_80080868, D_80080868, D_800807F0, D_800807F0, D_80080FF0, D_80080FF0, D_800811A0, D_800811A0, D_80081200, D_80081200, D_80081260, D_80081260, D_800812D8, D_800812D8, D_80081308, D_80081308, D_80081338, D_80081338, D_80081368, D_80081368, D_80081398, D_80081398, D_800813C8, D_800813C8, D_800813F8, D_800813F8, D_80081428, D_80081428, D_80081458, D_80081458, D_80081488, D_80081488, D_800814B8, D_800814B8, D_800814E8, D_800814E8, D_80081518, D_80081518, D_80081548, D_80081548, D_80081578, D_80081578, D_800815A8, D_800815A8, D_800815D8, D_800815D8, D_80081608, D_80081608, D_80081638, D_80081638, D_80081668, D_80081668, D_80081698, D_80081698, D_800816C8, D_800816C8, D_800816F8, D_800816F8, D_80081728, D_80081728, D_80081758, D_80081758, D_80081788, D_80081788, D_800817B8, D_800817B8, D_800817E8, D_800817E8, D_80081818, D_80081818, D_80081848, D_80081848, D_80081878, D_80081878, D_800818A8, D_800818A8, D_800818D8, D_800818D8, D_80081908, D_80081908, D_80081938, D_80081938, D_80081968, D_80081968, D_80081998, D_80081998, D_800819C8, D_800819C8, D_800819F8, D_800819F8, D_80081A28, D_80081A28, D_80081A58, D_80081A58, D_80081A88, D_80081A88, D_80081AB8, D_80081AB8, D_80081AE8, D_80081AE8, D_80081B18, D_80081B18, D_80081B48, D_80081B48, D_80081B78, D_80081B78, D_80081BA8, D_80081BA8, D_80081BD8, D_80081BD8, D_80081C08, D_80081C08, D_80081C38, D_80081C38, D_80081C68, D_80081C68, D_80081C98, D_80081C98, D_80081CC8, D_80081CC8, D_80081CF8, D_80081CF8, D_80081D28, D_80081D28, D_80081D58, D_80081D58, D_80081D88, D_80081D88, D_80081DB8, D_80081DB8, D_80081DE8, D_80081DE8, D_80081E18, D_80081E18, D_80081E48, D_80081E48, D_80081E78, D_80081E78, D_80081EA8, D_80081EA8, D_80081ED8, D_80081ED8, D_80081F08, D_80081F08, D_80081F38, D_80081F38, D_80081F68, D_80081F68, D_80081F98, D_80081F98, D_80081FC8, D_80081FC8, D_80081FF8, D_80081FF8, D_80082028, D_80082028, D_80082058, D_80082058, D_80082088, D_80082088, D_800820B8, D_800820B8, D_800820E8, D_800820E8, D_80082118, D_80082118, D_80082148, D_80082148, D_80082178, D_80082178, D_800821A8, D_800821A8, D_800821D8, D_80082208, D_80082238, D_80082268, D_80082298, D_800822C8, D_800822F8, D_80082328, D_80082358, D_80082388, D_800823B8, D_800823E8, D_80082418, D_80082448, D_80082478, D_800824A8, D_800839D8, D_80083A08, D_80083A38, D_80083A68, D_80083A98, D_80083AC8, D_80083AF8, D_80083B28, D_80083B58, D_80083B88, D_80083BB8, D_80083BE8, D_80083C18, D_80083C48, D_80083C78, D_80083CA8, D_80083CD8, D_80083D08, D_80083D38, D_80083D68, D_80083D98, D_80083DC8, D_80083DF8, D_80083E28, D_80083E58, D_80083E88, D_80083EB8, D_80083EE8, D_80083F18, D_80083F48, D_80083F78, D_80083FA8, D_80083FD8, D_80084008, D_80084038, D_80084068, D_80084098, D_800840C8, D_800840F8, D_80084128, D_80084158, D_80084188, D_800841B8, D_800841E8, D_80084218, D_80084248, D_80084278, D_800842A8, D_800842D8, D_80084308, D_80084338, D_80084368, D_80084398, D_800843C8, D_800843F8, D_80084428, D_80084458, D_80084488, D_800844B8, D_800844E8, D_80084518, D_80084548, D_80084578, D_800845A8, D_800845D8, D_80084608, D_80084638, D_80084668, D_80084698, D_800846C8, D_800846F8, D_80084728, D_80084758, D_80084788, D_800847B8, D_800847E8, D_80084818, D_80084848, D_80084878, D_800848A8, D_800848D8, D_80084908, D_80084938, D_80084968, D_80084998, D_800849C8, D_800849F8, D_80084A28, D_80084A58, D_80084A88, D_80084AB8, D_80084AE8, D_80084B18, D_80084B48, D_80084B78, D_80084BA8, D_80084BD8, D_80084C08, D_80084C38, D_80084C68, D_80084C98, D_80084CC8, D_80084CF8, D_80084D28, D_80084D58, D_80084D88, D_80084DB8, D_80084DE8, D_80084E18, D_80084E48, D_80084E78, D_80084EA8, D_80084ED8, D_80084F08, D_80084F38, D_80084F68, D_80084F98, D_80084FC8, D_80084FF8, D_80085028, D_80085058, D_80085088, D_800850B8, D_800850E8, D_80085118, D_80085148, D_80085178, D_800851A8, D_800851D8, D_80085208, D_80085238, D_80085268, D_80085298, D_800852C8, D_800852F8, D_80085328, D_80085358, D_80085388, D_800853B8, D_800853E8, D_80085418, D_80085448, D_80085478, D_800854A8, D_800854D8, D_80085508, D_80085538, D_80085568, D_80085598, D_800855C8, D_800855F8, D_80085628, D_80085658, D_80085688, D_800856B8, D_800856E8, D_80085718, D_80085748, D_80085778, D_800857A8, D_800857D8, D_80085808, D_80085838, D_80085868, D_80085898, D_800858C8, D_800858F8, D_80085928, D_80085958, D_80085988, D_800859B8, D_800859E8, D_80085A18, D_80085A48, D_80085A78, D_80085AA8, D_80085AD8, D_80085B08, D_80085B38, D_80085B68, D_80085B98, D_80085BC8, D_80085BF8, D_80085C28, D_80085C58, D_80085C88, D_80085CB8, D_80085CE8, D_80085D18, D_80085D48, D_80085D78, D_80085DA8, D_80085DD8, D_80085E08, D_80085E38, D_80085E68, D_80085E98, D_80085EC8, D_80085EF8, D_80085F28, D_80085F58, D_80085F88, D_80085FB8, D_80085FE8, D_80086018, D_80086048, D_80086078, D_800860A8, D_800866D8, D_80086708, D_80086738, D_80086768, D_80086798, D_800867C8, D_800867F8, D_80086828, D_80086858, D_80086888, D_800868B8, D_800868E8, D_80086918, D_80086948, D_80086978, D_800869A8, D_800869D8, D_80086A08, D_80086A38, D_80086A68, D_80086A98, D_80086AC8, D_80086AF8, D_80086B28, D_80086B58, D_80086B88, D_80086BB8, D_80086BE8, D_80086C18, D_80086C48, D_80086C78, D_80086CA8, D_80086CD8, D_80086D08, D_80086D38, D_80086D68, D_80086D98, D_80086DC8, D_80086DF8, D_80086E28, D_80086E58, D_80086E88, D_80086EB8, D_80086EE8, D_80086F18, D_80086F48, D_80086F78, D_80086FA8, D_80086FD8, D_80087008, D_80087038, D_80087068, D_80087098, D_800870C8, D_800870F8, D_80087128, D_80087158, D_80087188, D_800871B8, D_800871E8, D_80087218, D_80087248, D_80087278, D_800872A8, D_800872D8, D_80087308, D_80087338, D_80087368, D_80087398, D_800873C8, D_800873F8, D_80087428, D_80087458, D_80087488, D_800874B8, D_800874E8, D_80087518, D_80087548, D_80087578, D_800875A8, D_800860D8, D_80086108, D_80086138, D_80086168, D_80086198, D_800861C8, D_800861F8, D_80086228, D_80086258, D_80086288, D_800862B8, D_800862E8, D_80086318, D_80086348, D_80086378, D_800863A8, D_800863D8, D_80086408, D_80086438, D_80086468, D_80086498, D_800864C8, D_800864F8, D_80086528, D_80086558, D_80086588, D_800865B8, D_800865E8, D_80086618, D_80086648, D_80086678, D_800866A8, D_800875D8, D_80087608, D_80087638, D_80087668, D_80087698, D_800876C8, D_800876F8, D_80087728, D_80087758, D_80087788, D_800877B8, D_800877E8, D_80087818, D_80087848, D_80087878, D_800878A8, D_800824D8, D_80082508, D_80082538, D_80082568, D_80082598, D_800825C8, D_800825F8, D_80082628, D_80082658, D_80082688, D_800826B8, D_800826E8, D_80082718, D_80082748, D_80082778, D_800827A8, D_800804F0, D_800804F0, D_80080520, D_80080520, D_80080550, D_80080550, D_80080580, D_80080580, D_800805B0, D_800805B0, D_800805E0, D_800805E0, D_80080610, D_80080610, D_80080640, D_80080640, D_80080670, D_80080670, 0x80109338, 0x801093D8, D_800806A0, D_800806A0, D_800806D0, D_800806D0, D_80080700, D_80080700, D_80080730, D_80080730, D_80080760, D_80080760, D_80080790, D_80080790, D_800807C0, D_800807C0 +dlabel gItemHudScripts +.word 0x00000000, 0x00000000, HudScript_Item_SpicySoup, HudScript_Item_SpicySoup_disabled, HudScript_Item_ApplePie, HudScript_Item_ApplePie_disabled, HudScript_Item_HoneyUltra, HudScript_Item_HoneyUltra_disabled, HudScript_Item_MapleUltra, HudScript_Item_MapleUltra_disabled, HudScript_Item_JellyUltra, HudScript_Item_JellyUltra_disabled, HudScript_Item_Koopasta, HudScript_Item_Koopasta_disabled, HudScript_Item_FriedShroom, HudScript_Item_FriedShroom_disabled, HudScript_Item_ShroomCake, HudScript_Item_ShroomCake_disabled, HudScript_Item_ShroomSteak, HudScript_Item_ShroomSteak_disabled, HudScript_Item_HotShroom, HudScript_Item_HotShroom_disabled, HudScript_Item_SweetShroom, HudScript_Item_SweetShroom_disabled, HudScript_Item_HealthyJuice, HudScript_Item_HealthyJuice_disabled, HudScript_Item_BlandMeal, HudScript_Item_BlandMeal_disabled, HudScript_Item_YummyMeal, HudScript_Item_YummyMeal_disabled, HudScript_Item_DeluxeFeast, HudScript_Item_DeluxeFeast_disabled, HudScript_Item_SpecialShake, HudScript_Item_SpecialShake_disabled, HudScript_Item_BigCookie, HudScript_Item_BigCookie_disabled, HudScript_Item_Cake, HudScript_Item_Cake_disabled, HudScript_Item_Mistake, HudScript_Item_Mistake_disabled, HudScript_Item_KoopaTea, HudScript_Item_KoopaTea_disabled, HudScript_Item_HoneySuper, HudScript_Item_HoneySuper_disabled, HudScript_Item_MapleSuper, HudScript_Item_MapleSuper_disabled, HudScript_Item_JellySuper, HudScript_Item_JellySuper_disabled, HudScript_Item_Spaghetti, HudScript_Item_Spaghetti_disabled, HudScript_Item_EggMissile, HudScript_Item_EggMissile_disabled, HudScript_Item_FriedEgg, HudScript_Item_FriedEgg_disabled, HudScript_Item_HoneyShroom, HudScript_Item_HoneyShroom_disabled, HudScript_Item_HoneyCandy, HudScript_Item_HoneyCandy_disabled, HudScript_Item_ElectroPop, HudScript_Item_ElectroPop_disabled, HudScript_Item_FirePop, HudScript_Item_FirePop_disabled, HudScript_Item_LimeCandy, HudScript_Item_LimeCandy_disabled, HudScript_Item_CocoPop, HudScript_Item_CocoPop_disabled, HudScript_Item_LemonCandy, HudScript_Item_LemonCandy_disabled, HudScript_Item_JellyPop, HudScript_Item_JellyPop_disabled, HudScript_Item_StrangeCake, HudScript_Item_StrangeCake_disabled, HudScript_Item_KookyCookie, HudScript_Item_KookyCookie_disabled, HudScript_Item_FrozenFries, HudScript_Item_FrozenFries_disabled, HudScript_Item_PotatoSalad, HudScript_Item_PotatoSalad_disabled, HudScript_Item_NuttyCake, HudScript_Item_NuttyCake_disabled, HudScript_Item_MapleShroom, HudScript_Item_MapleShroom_disabled, HudScript_Item_BoiledEgg, HudScript_Item_BoiledEgg_disabled, HudScript_Item_YoshiCookie, HudScript_Item_YoshiCookie_disabled, HudScript_Item_JellyShroom, HudScript_Item_JellyShroom_disabled, HudScript_Item_ITEM_02C, HudScript_Item_ITEM_02C_disabled, HudScript_Item_ITEM_02D, HudScript_Item_ITEM_02D_disabled, HudScript_Item_ITEM_02E, HudScript_Item_ITEM_02E_disabled, HudScript_Item_ITEM_02F, HudScript_Item_ITEM_02F_disabled, HudScript_Item_ITEM_030, HudScript_Item_ITEM_030_disabled, HudScript_Item_Heart, HudScript_Item_Heart, HudScript_Item_Coin, HudScript_Item_Coin, HudScript_Item_HeartPiece, HudScript_Item_HeartPiece, HudScript_Item_StarPoint, HudScript_Item_StarPoint, HudScript_Item_HeartPoint, HudScript_Item_HeartPoint, HudScript_Item_FlowerPoint, HudScript_Item_FlowerPoint, HudScript_Item_StarPiece, HudScript_Item_StarPiece, HudScript_Item_GearBoots1, HudScript_Item_GearBoots1, HudScript_Item_GearBoots2, HudScript_Item_GearBoots2, HudScript_Item_GearBoots3, HudScript_Item_GearBoots3, HudScript_Item_GearHammer1, HudScript_Item_GearHammer1, HudScript_Item_GearHammer2, HudScript_Item_GearHammer2, HudScript_Item_GearHammer3, HudScript_Item_GearHammer3, HudScript_Item_LuckyStar, HudScript_Item_LuckyStar, HudScript_Item_Map, HudScript_Item_Map, HudScript_Item_KoopaFortressKey, HudScript_Item_KoopaFortressKey, HudScript_Item_RuinsKey, HudScript_Item_RuinsKey, HudScript_Item_TubbaCastleKey, HudScript_Item_TubbaCastleKey, HudScript_Item_IcePalaceKey, HudScript_Item_IcePalaceKey, HudScript_Item_BowserCastleKey, HudScript_Item_BowserCastleKey, HudScript_Item_Dolly, HudScript_Item_Dolly, HudScript_Item_KooperShell, HudScript_Item_KooperShell, HudScript_Item_PulseStone, HudScript_Item_PulseStone, HudScript_Item_Artifact, HudScript_Item_Artifact, HudScript_Item_AncientVase, HudScript_Item_AncientVase, HudScript_Item_RuinsStonePyramid, HudScript_Item_RuinsStonePyramid, HudScript_Item_RuinsStoneStar, HudScript_Item_RuinsStoneStar, HudScript_Item_RuinsStoneMoon, HudScript_Item_RuinsStoneMoon, HudScript_Item_ForestPass, HudScript_Item_ForestPass, HudScript_Item_BooRecordOutline, HudScript_Item_BooRecordOutline, HudScript_Item_BooRecord, HudScript_Item_BooRecord, HudScript_Item_BooWeight, HudScript_Item_BooWeight, HudScript_Item_BooPortrait, HudScript_Item_BooPortrait, HudScript_Item_MysticKey, HudScript_Item_MysticKey, HudScript_Item_StoreroomKey, HudScript_Item_StoreroomKey, HudScript_Item_ToyboxTrain, HudScript_Item_ToyboxTrain, HudScript_Item_FryingPan, HudScript_Item_FryingPan, HudScript_Item_Dictionary, HudScript_Item_Dictionary, HudScript_Item_MysteryNote, HudScript_Item_MysteryNote, HudScript_Item_SuspiciousNote, HudScript_Item_SuspiciousNote, HudScript_Item_Seed1, HudScript_Item_Seed1, HudScript_Item_Seed2, HudScript_Item_Seed2, HudScript_Item_Seed3, HudScript_Item_Seed3, HudScript_Item_Seed4, HudScript_Item_Seed4, HudScript_Item_CrystalBerry, HudScript_Item_CrystalBerry, HudScript_Item_WaterStone, HudScript_Item_WaterStone, HudScript_Item_MagicBean, HudScript_Item_MagicBean, HudScript_Item_FertileSoil, HudScript_Item_FertileSoil, HudScript_Item_MiracleWater, HudScript_Item_MiracleWater, HudScript_Item_UltraStone, HudScript_Item_UltraStone, HudScript_Item_ToadDoll, HudScript_Item_ToadDoll, HudScript_Item_Calculator, HudScript_Item_Calculator, HudScript_Item_Screwdriver, HudScript_Item_Screwdriver, HudScript_Item_CookBook, HudScript_Item_CookBook, HudScript_Item_JadeRaven, HudScript_Item_JadeRaven, HudScript_Item_SnowmanBucket, HudScript_Item_SnowmanBucket, HudScript_Item_SnowmanScarf, HudScript_Item_SnowmanScarf, HudScript_Item_RedKey, HudScript_Item_RedKey, HudScript_Item_BlueKey, HudScript_Item_BlueKey, HudScript_Item_KootPackage, HudScript_Item_KootPackage, HudScript_Item_KootRedJar, HudScript_Item_KootRedJar, HudScript_Item_Melody, HudScript_Item_Melody, HudScript_Item_Lyrics, HudScript_Item_Lyrics, HudScript_Item_Mailbag, HudScript_Item_Mailbag, HudScript_Item_StarStone, HudScript_Item_StarStone, HudScript_Item_SneakyParasol, HudScript_Item_SneakyParasol, HudScript_Item_PeachKey, HudScript_Item_PeachKey, HudScript_Item_UNK_1DC210, HudScript_Item_UNK_1DC210, HudScript_Item_UNK_1DC430, HudScript_Item_UNK_1DC430, HudScript_Item_UNK_1DC650, HudScript_Item_UNK_1DC650, HudScript_Item_UNK_1DC870, HudScript_Item_UNK_1DC870, HudScript_Item_DojoCard1, HudScript_Item_DojoCard1, HudScript_Item_DojoCard2, HudScript_Item_DojoCard2, HudScript_Item_DojoCard3, HudScript_Item_DojoCard3, HudScript_Item_DojoCard4, HudScript_Item_DojoCard4, HudScript_Item_DojoCard5, HudScript_Item_DojoCard5, HudScript_Item_CrystalBall, HudScript_Item_CrystalBall, HudScript_Item_GoldCard, HudScript_Item_GoldCard, HudScript_Item_SilverCard, HudScript_Item_SilverCard, HudScript_Item_KootBook, HudScript_Item_KootBook, HudScript_Item_KootTheTape, HudScript_Item_KootTheTape, HudScript_Item_KootMerluvleeAutograph, HudScript_Item_KootMerluvleeAutograph, HudScript_Item_KootEmptyWallet, HudScript_Item_KootEmptyWallet, HudScript_Item_KootLuigiAutograph, HudScript_Item_KootLuigiAutograph, HudScript_Item_KootShell, HudScript_Item_KootShell, HudScript_Item_KootPhoto, HudScript_Item_KootPhoto, HudScript_Item_KootGlasses, HudScript_Item_KootGlasses, HudScript_Item_Letter, HudScript_Item_Letter_disabled, HudScript_Item_ITEM_089, HudScript_Item_ITEM_089_disabled, HudScript_Item_ITEM_08A, HudScript_Item_ITEM_08A_disabled, HudScript_Item_ITEM_08B, HudScript_Item_ITEM_08B_disabled, HudScript_Item_ITEM_08C, HudScript_Item_ITEM_08C_disabled, HudScript_Item_ITEM_08D, HudScript_Item_ITEM_08D_disabled, HudScript_Item_ITEM_08E, HudScript_Item_ITEM_08E_disabled, HudScript_Item_ITEM_08F, HudScript_Item_ITEM_08F_disabled, HudScript_Item_SpinSmash, HudScript_Item_SpinSmash_disabled, HudScript_Item_Multibounce, HudScript_Item_Multibounce_disabled, HudScript_Item_PowerPlus, HudScript_Item_PowerPlus_disabled, HudScript_Item_DodgeMaster, HudScript_Item_DodgeMaster_disabled, HudScript_Item_PowerBounce, HudScript_Item_PowerBounce_disabled, HudScript_Item_SpikeShield, HudScript_Item_SpikeShield_disabled, HudScript_Item_FirstAttack, HudScript_Item_FirstAttack_disabled, HudScript_Item_HPPlus, HudScript_Item_HPPlus_disabled, HudScript_Item_QuakeHammer, HudScript_Item_QuakeHammer_disabled, HudScript_Item_DoubleDip, HudScript_Item_DoubleDip_disabled, HudScript_Item_PowerQuake, HudScript_Item_PowerQuake_disabled, HudScript_Item_MegaQuake, HudScript_Item_MegaQuake_disabled, HudScript_Item_SleepStomp, HudScript_Item_SleepStomp_disabled, HudScript_Item_SmashCharge, HudScript_Item_SmashCharge_disabled, HudScript_Item_SSmashChg, HudScript_Item_SSmashChg_disabled, HudScript_Item_AutoSmash, HudScript_Item_AutoSmash_disabled, HudScript_Item_FireShield, HudScript_Item_FireShield_disabled, HudScript_Item_JumpCharge, HudScript_Item_JumpCharge_disabled, HudScript_Item_SJumpChg, HudScript_Item_SJumpChg_disabled, HudScript_Item_AutoJump, HudScript_Item_AutoJump_disabled, HudScript_Item_DDownPound, HudScript_Item_DDownPound_disabled, HudScript_Item_AutoMultibounce, HudScript_Item_AutoMultibounce_disabled, HudScript_Item_DizzyStomp, HudScript_Item_DizzyStomp_disabled, HudScript_Item_HammerThrow, HudScript_Item_HammerThrow_disabled, HudScript_Item_SmashCharge0, HudScript_Item_SmashCharge0_disabled, HudScript_Item_PrettyLucky, HudScript_Item_PrettyLucky_disabled, HudScript_Item_FeelingFine, HudScript_Item_FeelingFine_disabled, HudScript_Item_AttackFXA, HudScript_Item_AttackFXA_disabled, HudScript_Item_AllorNothing, HudScript_Item_AllorNothing_disabled, HudScript_Item_HPDrain, HudScript_Item_HPDrain_disabled, HudScript_Item_JumpCharge0, HudScript_Item_JumpCharge0_disabled, HudScript_Item_SlowGo, HudScript_Item_SlowGo_disabled, HudScript_Item_FPPlus, HudScript_Item_FPPlus_disabled, HudScript_Item_MegaRush, HudScript_Item_MegaRush_disabled, HudScript_Item_IcePower, HudScript_Item_IcePower_disabled, HudScript_Item_DefendPlus, HudScript_Item_DefendPlus_disabled, HudScript_Item_PayOff, HudScript_Item_PayOff_disabled, HudScript_Item_MoneyMoney, HudScript_Item_MoneyMoney_disabled, HudScript_Item_ChillOut, HudScript_Item_ChillOut_disabled, HudScript_Item_HappyHeart, HudScript_Item_HappyHeart_disabled, HudScript_Item_ZapTap, HudScript_Item_ZapTap_disabled, HudScript_Item_Berserker, HudScript_Item_Berserker_disabled, HudScript_Item_RightOn, HudScript_Item_RightOn_disabled, HudScript_Item_RunawayPay, HudScript_Item_RunawayPay_disabled, HudScript_Item_Refund, HudScript_Item_Refund_disabled, HudScript_Item_FlowerSaver, HudScript_Item_FlowerSaver_disabled, HudScript_Item_TripleDip, HudScript_Item_TripleDip_disabled, HudScript_Item_FlowerFanatic, HudScript_Item_FlowerFanatic_disabled, HudScript_Item_PowerJump, HudScript_Item_PowerJump_disabled, HudScript_Item_SuperJump, HudScript_Item_SuperJump_disabled, HudScript_Item_MegaJump, HudScript_Item_MegaJump_disabled, HudScript_Item_PowerSmash1, HudScript_Item_PowerSmash1_disabled, HudScript_Item_SuperSmash, HudScript_Item_SuperSmash_disabled, HudScript_Item_MegaSmash, HudScript_Item_MegaSmash_disabled, HudScript_Item_LuckyDay, HudScript_Item_LuckyDay_disabled, HudScript_Item_MegaHPDrain, HudScript_Item_MegaHPDrain_disabled, HudScript_Item_BumpAttack, HudScript_Item_BumpAttack_disabled, HudScript_Item_PUpDDown, HudScript_Item_PUpDDown_disabled, HudScript_Item_PDownDUp, HudScript_Item_PDownDUp_disabled, HudScript_Item_HeartFinder, HudScript_Item_HeartFinder_disabled, HudScript_Item_FlowerFinder, HudScript_Item_FlowerFinder_disabled, HudScript_Item_DizzyAttack, HudScript_Item_DizzyAttack_disabled, HudScript_Item_SpeedySpin, HudScript_Item_SpeedySpin_disabled, HudScript_Item_SpinAttack, HudScript_Item_SpinAttack_disabled, HudScript_Item_ISpy, HudScript_Item_ISpy_disabled, HudScript_Item_PowerRush, HudScript_Item_PowerRush_disabled, HudScript_Item_LastStand, HudScript_Item_LastStand_disabled, HudScript_Item_CloseCall, HudScript_Item_CloseCall_disabled, HudScript_Item_CrazyHeart, HudScript_Item_CrazyHeart_disabled, HudScript_Item_ITEM_0D5, HudScript_Item_ITEM_0D5_disabled, HudScript_Item_ITEM_0D6, HudScript_Item_ITEM_0D6_disabled, HudScript_Item_ITEM_0D7, HudScript_Item_ITEM_0D7_disabled, HudScript_Item_ShrinkSmash, HudScript_Item_ShrinkSmash_disabled, HudScript_Item_ShrinkStomp, HudScript_Item_ShrinkStomp_disabled, HudScript_Item_DDownJump, HudScript_Item_DDownJump_disabled, HudScript_Item_DamageDodge, HudScript_Item_DamageDodge_disabled, HudScript_Item_EarthquakeJump, HudScript_Item_EarthquakeJump_disabled, HudScript_Item_HappyFlower, HudScript_Item_HappyFlower_disabled, HudScript_Item_ITEM_0DE, HudScript_Item_ITEM_0DE_disabled, HudScript_Item_ITEM_0DF, HudScript_Item_ITEM_0DF_disabled, HudScript_Item_DeepFocus3, HudScript_Item_DeepFocus3_disabled, HudScript_Item_SuperFocus, HudScript_Item_SuperFocus_disabled, HudScript_Item_Kaiden, HudScript_Item_Kaiden_disabled, HudScript_Item_QuickChange, HudScript_Item_QuickChange_disabled, HudScript_Item_ITEM_0E4, HudScript_Item_ITEM_0E4_disabled, HudScript_Item_ITEM_0E5, HudScript_Item_ITEM_0E5_disabled, HudScript_Item_ITEM_0E6, HudScript_Item_ITEM_0E6_disabled, HudScript_Item_ITEM_0E7, HudScript_Item_ITEM_0E7_disabled, HudScript_Item_Peekaboo, HudScript_Item_Peekaboo_disabled, HudScript_Item_GroupFocus, HudScript_Item_GroupFocus_disabled, HudScript_Item_AttackFXD, HudScript_Item_AttackFXD_disabled, HudScript_Item_AttackFXB, HudScript_Item_AttackFXB_disabled, HudScript_Item_AttackFXE, HudScript_Item_AttackFXE_disabled, HudScript_Item_AttackFXC, HudScript_Item_AttackFXC_disabled, HudScript_Item_AttackFXF, HudScript_Item_AttackFXF_disabled, HudScript_Item_ITEM_0EF, HudScript_Item_ITEM_0EF_disabled, HudScript_Item_HealthyHealthy, HudScript_Item_HealthyHealthy_disabled, HudScript_Item_ITEM_0F1, HudScript_Item_ITEM_0F1_disabled, HudScript_Item_ITEM_0F2, HudScript_Item_ITEM_0F2_disabled, HudScript_Item_ITEM_0F3, HudScript_Item_ITEM_0F3_disabled, HudScript_Item_ITEM_0F4, HudScript_Item_ITEM_0F4_disabled, HudScript_Item_ITEM_0F5, HudScript_Item_ITEM_0F5_disabled, HudScript_Item_ITEM_0F6, HudScript_Item_ITEM_0F6_disabled, HudScript_Item_ITEM_0F7, HudScript_Item_ITEM_0F7_disabled, HudScript_Item_Mushroom, HudScript_Item_Mushroom_disabled, HudScript_Item_SuperShroom, HudScript_Item_SuperShroom_disabled, HudScript_Item_UltraShroom, HudScript_Item_UltraShroom_disabled, HudScript_Item_LifeShroom, HudScript_Item_LifeShroom_disabled, HudScript_Item_DriedShroom, HudScript_Item_DriedShroom_disabled, HudScript_Item_TastyTonic, HudScript_Item_TastyTonic_disabled, HudScript_Item_SuperSoda, HudScript_Item_SuperSoda_disabled, HudScript_Item_BlueBerry, HudScript_Item_BlueBerry_disabled, HudScript_Item_RedBerry, HudScript_Item_RedBerry_disabled, HudScript_Item_YellowBerry, HudScript_Item_YellowBerry_disabled, HudScript_Item_BubbleBerry, HudScript_Item_BubbleBerry_disabled, HudScript_Item_Goomnut, HudScript_Item_Goomnut_disabled, HudScript_Item_KoopaLeaf, HudScript_Item_KoopaLeaf_disabled, HudScript_Item_DriedPasta, HudScript_Item_DriedPasta_disabled, HudScript_Item_Lime, HudScript_Item_Lime_disabled, HudScript_Item_Lemon, HudScript_Item_Lemon_disabled, HudScript_Item_DriedFruit, HudScript_Item_DriedFruit_disabled, HudScript_Item_StrangeLeaf, HudScript_Item_StrangeLeaf_disabled, HudScript_Item_CakeMix, HudScript_Item_CakeMix_disabled, HudScript_Item_Egg, HudScript_Item_Egg_disabled, HudScript_Item_Coconut, HudScript_Item_Coconut_disabled, HudScript_Item_Melon, HudScript_Item_Melon_disabled, HudScript_Item_StinkyHerb, HudScript_Item_StinkyHerb_disabled, HudScript_Item_IcedPotato, HudScript_Item_IcedPotato_disabled, HudScript_Item_HoneySyrup, HudScript_Item_HoneySyrup_disabled, HudScript_Item_MapleSyrup, HudScript_Item_MapleSyrup_disabled, HudScript_Item_JamminJelly, HudScript_Item_JamminJelly_disabled, HudScript_Item_WhackasBump, HudScript_Item_WhackasBump_disabled, HudScript_Item_Apple, HudScript_Item_Apple_disabled, HudScript_Item_BakingSalt, HudScript_Item_BakingSalt_disabled, HudScript_Item_BakingSugar, HudScript_Item_BakingSugar_disabled, HudScript_Item_BakingEgg, HudScript_Item_BakingEgg_disabled, HudScript_Item_BakingCream, HudScript_Item_BakingCream_disabled, HudScript_Item_BakingStrawberry, HudScript_Item_BakingStrawberry_disabled, HudScript_Item_BakingButter, HudScript_Item_BakingButter_disabled, HudScript_Item_BakingCleanser, HudScript_Item_BakingCleanser_disabled, HudScript_Item_BakingWater, HudScript_Item_BakingWater_disabled, HudScript_Item_BakingFlour, HudScript_Item_BakingFlour_disabled, HudScript_Item_BakingMilk, HudScript_Item_BakingMilk_disabled, HudScript_Item_ITEM_11F, HudScript_Item_ITEM_11F_disabled, HudScript_Item_FireFlower, HudScript_Item_FireFlower_disabled, HudScript_Item_SnowmanDoll, HudScript_Item_SnowmanDoll_disabled, HudScript_Item_ThunderRage, HudScript_Item_ThunderRage_disabled, HudScript_Item_ThunderBolt, HudScript_Item_ThunderBolt_disabled, HudScript_Item_ShootingStar, HudScript_Item_ShootingStar_disabled, HudScript_Item_DustyHammer, HudScript_Item_DustyHammer_disabled, HudScript_Item_Pebble, HudScript_Item_Pebble_disabled, HudScript_Item_ITEM_127, HudScript_Item_ITEM_127_disabled, HudScript_Item_StoneCap, HudScript_Item_StoneCap_disabled, HudScript_Item_VoltShroom, HudScript_Item_VoltShroom_disabled, HudScript_Item_PowerStar, HudScript_Item_PowerStar_disabled, HudScript_Item_Parasol, HudScript_Item_Parasol_disabled, HudScript_Item_MagicMirror, HudScript_Item_MagicMirror_disabled, HudScript_Item_ITEM_12D, HudScript_Item_ITEM_12D_disabled, HudScript_Item_ITEM_12E, HudScript_Item_ITEM_12E_disabled, HudScript_Item_ITEM_12F, HudScript_Item_ITEM_12F_disabled, HudScript_Item_SleepySheep, HudScript_Item_SleepySheep_disabled, HudScript_Item_XBandage, HudScript_Item_XBandage_disabled, HudScript_Item_POWBlock, HudScript_Item_POWBlock_disabled, HudScript_Item_HustleDrink, HudScript_Item_HustleDrink_disabled, HudScript_Item_StopWatch, HudScript_Item_StopWatch_disabled, HudScript_Item_DizzyDial, HudScript_Item_DizzyDial_disabled, HudScript_Item_ITEM_136, HudScript_Item_ITEM_136_disabled, HudScript_Item_ITEM_137, HudScript_Item_ITEM_137_disabled, HudScript_Item_PleaseComeBack, HudScript_Item_PleaseComeBack_disabled, HudScript_Item_ITEM_139, HudScript_Item_ITEM_139_disabled, HudScript_Item_FrightJar, HudScript_Item_FrightJar_disabled, HudScript_Item_Mystery, HudScript_Item_Mystery_disabled, HudScript_Item_RepelGel, HudScript_Item_RepelGel_disabled, HudScript_Item_InsecticideHerb, HudScript_Item_InsecticideHerb_disabled, HudScript_Item_ITEM_13E, HudScript_Item_ITEM_13E_disabled, HudScript_Item_ITEM_13F, HudScript_Item_ITEM_13F_disabled, HudScript_Item_Present, HudScript_Item_Present, HudScript_Item_CakeDone, HudScript_Item_CakeDone, HudScript_Item_CakeBaked, HudScript_Item_CakeBaked, HudScript_Item_CakePan, HudScript_Item_CakePan, HudScript_Item_CakeBatter, HudScript_Item_CakeBatter, HudScript_Item_CakeBowl, HudScript_Item_CakeBowl, HudScript_Item_CakeMixed, HudScript_Item_CakeMixed, HudScript_Item_CakeIcing, HudScript_Item_CakeIcing, HudScript_Item_CakeBerries, HudScript_Item_CakeBerries, 0x80109338, 0x801093D8, HudScript_Item_Hammer1, HudScript_Item_Hammer1, HudScript_Item_Hammer2, HudScript_Item_Hammer2, HudScript_Item_Hammer3, HudScript_Item_Hammer3, HudScript_Item_Boots1, HudScript_Item_Boots1, HudScript_Item_Boots2, HudScript_Item_Boots2, HudScript_Item_Boots3, HudScript_Item_Boots3, HudScript_Item_Items, HudScript_Item_Items -dlabel D_8008B108 +dlabel ItemScript_Jump .word 0x00000001, 0x000000FF, 0x00000000, 0x00000200, 0x00000000, 0x00000000, 0x00000000 -dlabel D_8008B124 +dlabel ItemScript_CompleteCake .word 0x00000001, 0x000000FF, 0x00000000, 0x00000200, 0x00000000, 0x00000000, 0x00000000 -dlabel D_8008B140 +dlabel ItemScript_CakeDone .word 0x00000001, 0x000000FF, 0x00000220, 0x00000420, 0x00000000, 0x00000000, 0x00000000 -dlabel D_8008B15C +dlabel ItemScript_CakeBaked .word 0x00000001, 0x000000FF, 0x00000440, 0x00000640, 0x00000000, 0x00000000, 0x00000000 -dlabel D_8008B178 +dlabel ItemScript_CakePan .word 0x00000001, 0x000000FF, 0x00000660, 0x00000860, 0x00000000, 0x00000000, 0x00000000 -dlabel D_8008B194 +dlabel ItemScript_CakeBatter .word 0x00000001, 0x000000FF, 0x00000880, 0x00000A80, 0x00000000, 0x00000000, 0x00000000 -dlabel D_8008B1B0 +dlabel ItemScript_CakeBowl .word 0x00000001, 0x000000FF, 0x00000AA0, 0x00000CA0, 0x00000000, 0x00000000, 0x00000000 -dlabel D_8008B1CC +dlabel ItemScript_CakeMixed .word 0x00000001, 0x000000FF, 0x00000CC0, 0x00000EC0, 0x00000000, 0x00000000, 0x00000000 -dlabel D_8008B1E8 +dlabel ItemScript_CakeIcing .word 0x00000001, 0x000000FF, 0x00000EE0, 0x000010E0, 0x00000000, 0x00000000, 0x00000000 -dlabel D_8008B204 +dlabel ItemScript_CakeBerries .word 0x00000001, 0x000000FF, 0x00001100, 0x00001300, 0x00000000, 0x00000000, 0x00000000 -dlabel D_8008B220 +dlabel ItemScript_Hammer1 .word 0x00000001, 0x000000FF, 0x0002D940, 0x0002DB40, 0x00000000, 0x00000000, 0x00000000 -dlabel D_8008B23C +dlabel ItemScript_Hammer2 .word 0x00000001, 0x000000FF, 0x0002DB80, 0x0002DD80, 0x00000000, 0x00000000, 0x00000000 -dlabel D_8008B258 +dlabel ItemScript_Hammer3 .word 0x00000001, 0x000000FF, 0x0002DDC0, 0x0002DFC0, 0x00000000, 0x00000000, 0x00000000 -dlabel D_8008B274 +dlabel ItemScript_Boots1 .word 0x00000001, 0x000000FF, 0x0002E000, 0x0002E200, 0x00000000, 0x00000000, 0x00000000 -dlabel D_8008B290 +dlabel ItemScript_Boots2 .word 0x00000001, 0x000000FF, 0x0002E240, 0x0002E440, 0x00000000, 0x00000000, 0x00000000 -dlabel D_8008B2AC +dlabel ItemScript_Boots3 .word 0x00000001, 0x000000FF, 0x0002E480, 0x0002E680, 0x00000000, 0x00000000, 0x00000000 -dlabel D_8008B2C8 +dlabel ItemScript_Items .word 0x00000001, 0x000000FF, 0x0002E6C0, 0x0002E8C0, 0x00000000, 0x00000000, 0x00000000 -dlabel D_8008B2E4 -.word 0x00000001, 0x0000003C, 0x00013BC0, 0x00013DC0, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x0000003C, 0x00013E00, 0x00014000, 0x00000000, 0x00000000, 0x00000002, 0x00000000 +dlabel ItemScript_PleaseComeBack +.word 0x00000001, 0x0000003C, 0x00013BC0, 0x00013DC0, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008B324 +dlabel ItemScript_ITEM_139 +.word 0x00000001, 0x0000003C, 0x00013E00, 0x00014000, 0x00000000, 0x00000000, 0x00000002, 0x00000000 + +dlabel ItemScript_FrightJar .word 0x00000001, 0x0000003C, 0x00014040, 0x00014240, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008B344 +dlabel ItemScript_Mystery .word 0x00000001, 0x0000003C, 0x00014280, 0x00014480, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008B364 +dlabel ItemScript_RepelGel .word 0x00000001, 0x0000003C, 0x000144C0, 0x000146C0, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008B384 -.word 0x00000001, 0x0000003C, 0x00014700, 0x00014900, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x0000003C, 0x00014940, 0x00014B40, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x0000003C, 0x00014B80, 0x00014D80, 0x00000000, 0x00000000, 0x00000002, 0x00000000 +dlabel ItemScript_InsecticideHerb +.word 0x00000001, 0x0000003C, 0x00014700, 0x00014900, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008B3E4 +dlabel ItemScript_ITEM_13E +.word 0x00000001, 0x0000003C, 0x00014940, 0x00014B40, 0x00000000, 0x00000000, 0x00000002, 0x00000000 + +dlabel ItemScript_ITEM_13F +.word 0x00000001, 0x0000003C, 0x00014B80, 0x00014D80, 0x00000000, 0x00000000, 0x00000002, 0x00000000 + +dlabel ItemScript_GearBoots1 .word 0x00000001, 0x0000003C, 0x00001320, 0x00001520, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008B404 +dlabel ItemScript_GearBoots2 .word 0x00000001, 0x0000003C, 0x00001540, 0x00001740, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008B424 +dlabel ItemScript_GearBoots3 .word 0x00000001, 0x0000003C, 0x00001760, 0x00001960, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008B444 +dlabel ItemScript_GearHammer1 .word 0x00000001, 0x0000003C, 0x00001980, 0x00001B80, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008B464 +dlabel ItemScript_GearHammer2 .word 0x00000001, 0x0000003C, 0x00001BA0, 0x00001DA0, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008B484 +dlabel ItemScript_GearHammer3 .word 0x00000001, 0x0000003C, 0x00001DC0, 0x00001FC0, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008B4A4 -.word 0x00000001, 0x0000003C, 0x00001FE0, 0x000021E0, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x0000003C, 0x00002200, 0x00002400, 0x00000000, 0x00000000, 0x00000002, 0x00000000 +dlabel ItemScript_LuckyStar +.word 0x00000001, 0x0000003C, 0x00001FE0, 0x000021E0, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008B4E4 +dlabel ItemScript_Map +.word 0x00000001, 0x0000003C, 0x00002200, 0x00002400, 0x00000000, 0x00000000, 0x00000002, 0x00000000 + +dlabel ItemScript_KoopaFortressKey .word 0x00000001, 0x0000003C, 0x00009020, 0x00009220, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008B504 +dlabel ItemScript_RuinsKey .word 0x00000001, 0x0000003C, 0x00009240, 0x00009440, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008B524 +dlabel ItemScript_TubbaCastleKey .word 0x00000001, 0x0000003C, 0x00009460, 0x00009660, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008B544 +dlabel ItemScript_IcePalaceKey .word 0x00000001, 0x0000003C, 0x00009680, 0x00009880, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008B564 +dlabel ItemScript_BowserCastleKey .word 0x00000001, 0x0000003C, 0x000098A0, 0x00009AA0, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008B584 +dlabel ItemScript_Dolly .word 0x00000001, 0x0000003C, 0x00009AC0, 0x00009CC0, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008B5A4 +dlabel ItemScript_KooperShell .word 0x00000001, 0x0000003C, 0x00009CE0, 0x00009EE0, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008B5C4 +dlabel ItemScript_PulseStone .word 0x00000001, 0x0000003C, 0x00009F00, 0x0000A100, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008B5E4 +dlabel ItemScript_Artifact .word 0x00000001, 0x0000003C, 0x0000A120, 0x0000A320, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008B604 +dlabel ItemScript_AncientVase .word 0x00000001, 0x0000003C, 0x0000A340, 0x0000A540, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008B624 +dlabel ItemScript_RuinsStonePyramid .word 0x00000001, 0x0000003C, 0x0000A560, 0x0000A760, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008B644 +dlabel ItemScript_RuinsStoneStar .word 0x00000001, 0x0000003C, 0x0000A780, 0x0000A980, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008B664 +dlabel ItemScript_RuinsStoneMoon .word 0x00000001, 0x0000003C, 0x0000A9A0, 0x0000ABA0, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008B684 -.word 0x00000001, 0x0000003C, 0x0000ABC0, 0x0000ADC0, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x0000003C, 0x0000ADE0, 0x0000AFE0, 0x00000000, 0x00000000, 0x00000002, 0x00000000 +dlabel ItemScript_ForestPass +.word 0x00000001, 0x0000003C, 0x0000ABC0, 0x0000ADC0, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008B6C4 +dlabel ItemScript_BooRecordOutline +.word 0x00000001, 0x0000003C, 0x0000ADE0, 0x0000AFE0, 0x00000000, 0x00000000, 0x00000002, 0x00000000 + +dlabel ItemScript_BooRecord .word 0x00000001, 0x0000003C, 0x0000B000, 0x0000B200, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008B6E4 +dlabel ItemScript_BooWeight .word 0x00000001, 0x0000003C, 0x0000B220, 0x0000B420, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008B704 +dlabel ItemScript_BoosPortrait .word 0x00000001, 0x0000003C, 0x0000B440, 0x0000B640, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008B724 +dlabel ItemScript_MysticKey .word 0x00000001, 0x0000003C, 0x0000B660, 0x0000B860, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008B744 +dlabel ItemScript_StoreroomKey .word 0x00000001, 0x0000003C, 0x0000B880, 0x0000BA80, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008B764 +dlabel ItemScript_ToyTrain .word 0x00000001, 0x0000003C, 0x0000BAA0, 0x0000BCA0, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008B784 +dlabel ItemScript_FryingPan .word 0x00000001, 0x0000003C, 0x0000BCC0, 0x0000BEC0, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008B7A4 +dlabel ItemScript_Dictionary .word 0x00000001, 0x0000003C, 0x0000BEE0, 0x0000C0E0, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008B7C4 +dlabel ItemScript_MysteryNote .word 0x00000001, 0x0000003C, 0x0000C100, 0x0000C300, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008B7E4 +dlabel ItemScript_SuspiciousNote .word 0x00000001, 0x0000003C, 0x0000C320, 0x0000C520, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008B804 +dlabel ItemScript_MagicalSeed1 .word 0x00000001, 0x0000003C, 0x0000C540, 0x0000C740, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008B824 +dlabel ItemScript_MagicalSeed2 .word 0x00000001, 0x0000003C, 0x0000C760, 0x0000C960, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008B844 +dlabel ItemScript_MagicalSeed3 .word 0x00000001, 0x0000003C, 0x0000C980, 0x0000CB80, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008B864 +dlabel ItemScript_MagicalSeed4 .word 0x00000001, 0x0000003C, 0x0000CBA0, 0x0000CDA0, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008B884 +dlabel ItemScript_CrystalBerry .word 0x00000001, 0x0000003C, 0x0000CDC0, 0x0000CFC0, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008B8A4 +dlabel ItemScript_WaterStone .word 0x00000001, 0x0000003C, 0x0000CFE0, 0x0000D1E0, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008B8C4 +dlabel ItemScript_MagicalBean .word 0x00000001, 0x0000003C, 0x0000D200, 0x0000D400, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008B8E4 +dlabel ItemScript_FertileSoil .word 0x00000001, 0x0000003C, 0x0000D420, 0x0000D620, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008B904 +dlabel ItemScript_MiracleWater .word 0x00000001, 0x0000003C, 0x0000D640, 0x0000D840, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008B924 +dlabel ItemScript_UltraStone .word 0x00000001, 0x0000003C, 0x0000D860, 0x0000DA60, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008B944 +dlabel ItemScript_ToadDoll .word 0x00000001, 0x0000003C, 0x0000DAA0, 0x0000DCA0, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008B964 +dlabel ItemScript_Calculator .word 0x00000001, 0x0000003C, 0x0000DCC0, 0x0000DEC0, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008B984 +dlabel ItemScript_Screwdriver .word 0x00000001, 0x0000003C, 0x0000DEE0, 0x0000E0E0, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008B9A4 +dlabel ItemScript_Cookbook .word 0x00000001, 0x0000003C, 0x0000E100, 0x0000E300, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008B9C4 +dlabel ItemScript_JadeRaven .word 0x00000001, 0x0000003C, 0x0000E320, 0x0000E520, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008B9E4 +dlabel ItemScript_SnowmanBucket .word 0x00000001, 0x0000003C, 0x0000E540, 0x0000E740, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008BA04 +dlabel ItemScript_SnowmanScarf .word 0x00000001, 0x0000003C, 0x0000E760, 0x0000E960, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008BA24 +dlabel ItemScript_RedKey .word 0x00000001, 0x0000003C, 0x0000E980, 0x0000EB80, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008BA44 +dlabel ItemScript_BlueKey .word 0x00000001, 0x0000003C, 0x0000EBC0, 0x0000EDC0, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008BA64 +dlabel ItemScript_KootPackage .word 0x00000001, 0x0000003C, 0x0000EDE0, 0x0000EFE0, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008BA84 +dlabel ItemScript_KootRedJar .word 0x00000001, 0x0000003C, 0x0000F000, 0x0000F200, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008BAA4 +dlabel ItemScript_Melody .word 0x00000001, 0x0000003C, 0x0000F220, 0x0000F420, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008BAC4 +dlabel ItemScript_Lyrics .word 0x00000001, 0x0000003C, 0x0000F440, 0x0000F640, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008BAE4 +dlabel ItemScript_Mailbag .word 0x00000001, 0x0000003C, 0x0000F660, 0x0000F860, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008BB04 +dlabel ItemScript_StarStone .word 0x00000001, 0x0000003C, 0x0000F880, 0x0000FA80, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008BB24 +dlabel ItemScript_SneakyParasol .word 0x00000001, 0x0000003C, 0x0000FAA0, 0x0000FCA0, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008BB44 -.word 0x00000001, 0x0000003C, 0x0000FCE0, 0x0000FEE0, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x0000003C, 0x0000FF00, 0x00010100, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x0000003C, 0x00010120, 0x00010320, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x0000003C, 0x00010340, 0x00010540, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x0000003C, 0x00010560, 0x00010760, 0x00000000, 0x00000000, 0x00000002, 0x00000000 +dlabel ItemScript_PeachKey +.word 0x00000001, 0x0000003C, 0x0000FCE0, 0x0000FEE0, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008BBE4 +dlabel ItemScript_1DC210 +.word 0x00000001, 0x0000003C, 0x0000FF00, 0x00010100, 0x00000000, 0x00000000, 0x00000002, 0x00000000 + +dlabel ItemScript_1DC430 +.word 0x00000001, 0x0000003C, 0x00010120, 0x00010320, 0x00000000, 0x00000000, 0x00000002, 0x00000000 + +dlabel ItemScript_1DC650 +.word 0x00000001, 0x0000003C, 0x00010340, 0x00010540, 0x00000000, 0x00000000, 0x00000002, 0x00000000 + +dlabel ItemScript_1DC870 +.word 0x00000001, 0x0000003C, 0x00010560, 0x00010760, 0x00000000, 0x00000000, 0x00000002, 0x00000000 + +dlabel ItemScript_DojoCard1 .word 0x00000001, 0x0000003C, 0x00010780, 0x00010980, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008BC04 +dlabel ItemScript_DojoCard2 .word 0x00000001, 0x0000003C, 0x000109A0, 0x00010BA0, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008BC24 +dlabel ItemScript_DojoCard3 .word 0x00000001, 0x0000003C, 0x00010BC0, 0x00010DC0, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008BC44 +dlabel ItemScript_DojoCard4 .word 0x00000001, 0x0000003C, 0x00010E00, 0x00011000, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008BC64 +dlabel ItemScript_DojoCard5 .word 0x00000001, 0x0000003C, 0x00011020, 0x00011220, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008BC84 +dlabel ItemScript_CrystalBall .word 0x00000001, 0x0000003C, 0x00011240, 0x00011440, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008BCA4 +dlabel ItemScript_GoldCard .word 0x00000001, 0x0000003C, 0x00011460, 0x00011660, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008BCC4 +dlabel ItemScript_SilverCard .word 0x00000001, 0x0000003C, 0x00011680, 0x00011880, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008BCE4 +dlabel ItemScript_KootBook .word 0x00000001, 0x0000003C, 0x000118A0, 0x00011AA0, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008BD04 +dlabel ItemScript_KootTheTape .word 0x00000001, 0x0000003C, 0x00011AC0, 0x00011CC0, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008BD24 +dlabel ItemScript_KootAutographMerluvlee .word 0x00000001, 0x0000003C, 0x00011CE0, 0x00011EE0, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008BD44 +dlabel ItemScript_KootEmptyWallet .word 0x00000001, 0x0000003C, 0x00011F20, 0x00012120, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008BD64 +dlabel ItemScript_KootAutographLuigi .word 0x00000001, 0x0000003C, 0x00012140, 0x00012340, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008BD84 +dlabel ItemScript_KootKoopaShell .word 0x00000001, 0x0000003C, 0x00012360, 0x00012560, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008BDA4 +dlabel ItemScript_KootOldPhoto .word 0x00000001, 0x0000003C, 0x00012580, 0x00012780, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008BDC4 +dlabel ItemScript_KootGlasses .word 0x00000001, 0x0000003C, 0x000127A0, 0x000129A0, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008BDE4 -.word 0x00000001, 0x0000003C, 0x000129C0, 0x00012BC0, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x0000003C, 0x00012C00, 0x00012E00, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x0000003C, 0x00012E40, 0x00013040, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x0000003C, 0x00013080, 0x00013280, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x0000003C, 0x000132C0, 0x000134C0, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x0000003C, 0x00013500, 0x00013700, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x0000003C, 0x00013740, 0x00013940, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x0000003C, 0x00013980, 0x00013B80, 0x00000000, 0x00000000, 0x00000002, 0x00000000 +dlabel ItemScript_Letter +.word 0x00000001, 0x0000003C, 0x000129C0, 0x00012BC0, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008BEE4 +dlabel ItemScript_ITEM_089 +.word 0x00000001, 0x0000003C, 0x00012C00, 0x00012E00, 0x00000000, 0x00000000, 0x00000002, 0x00000000 + +dlabel ItemScript_ITEM_08A +.word 0x00000001, 0x0000003C, 0x00012E40, 0x00013040, 0x00000000, 0x00000000, 0x00000002, 0x00000000 + +dlabel ItemScript_ITEM_08B +.word 0x00000001, 0x0000003C, 0x00013080, 0x00013280, 0x00000000, 0x00000000, 0x00000002, 0x00000000 + +dlabel ItemScript_ITEM_08C +.word 0x00000001, 0x0000003C, 0x000132C0, 0x000134C0, 0x00000000, 0x00000000, 0x00000002, 0x00000000 + +dlabel ItemScript_ITEM_08D +.word 0x00000001, 0x0000003C, 0x00013500, 0x00013700, 0x00000000, 0x00000000, 0x00000002, 0x00000000 + +dlabel ItemScript_ITEM_08E +.word 0x00000001, 0x0000003C, 0x00013740, 0x00013940, 0x00000000, 0x00000000, 0x00000002, 0x00000000 + +dlabel ItemScript_ITEM_08F +.word 0x00000001, 0x0000003C, 0x00013980, 0x00013B80, 0x00000000, 0x00000000, 0x00000002, 0x00000000 + +dlabel ItemScript_SpinSmash .word 0x00000001, 0x0000003C, 0x00014DC0, 0x00014FC0, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008BF04 +dlabel ItemScript_Multibounce .word 0x00000001, 0x0000003C, 0x00015000, 0x00015200, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008BF24 +dlabel ItemScript_PowerPlus .word 0x00000001, 0x0000003C, 0x00015240, 0x00015440, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008BF44 +dlabel ItemScript_DodgeMaster .word 0x00000001, 0x0000003C, 0x00015480, 0x00015680, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008BF64 +dlabel ItemScript_PowerBounce .word 0x00000001, 0x0000003C, 0x000156C0, 0x000158C0, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008BF84 +dlabel ItemScript_SpikeShield .word 0x00000001, 0x0000003C, 0x00015900, 0x00015B00, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008BFA4 +dlabel ItemScript_FirstAttack .word 0x00000001, 0x0000003C, 0x00015B40, 0x00015D40, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008BFC4 +dlabel ItemScript_HPPlus .word 0x00000001, 0x0000003C, 0x00015D80, 0x00015F80, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008BFE4 +dlabel ItemScript_QuakeHammer .word 0x00000001, 0x0000003C, 0x00015FC0, 0x000161C0, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008C004 +dlabel ItemScript_DoubleDip .word 0x00000001, 0x0000003C, 0x00016200, 0x00016400, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008C024 +dlabel ItemScript_PowerQuake .word 0x00000001, 0x0000003C, 0x00016440, 0x00016640, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008C044 +dlabel ItemScript_MegaQuake .word 0x00000001, 0x0000003C, 0x00016680, 0x00016880, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008C064 +dlabel ItemScript_SleepStomp .word 0x00000001, 0x0000003C, 0x000168C0, 0x00016AC0, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008C084 +dlabel ItemScript_SmashCharge .word 0x00000001, 0x0000003C, 0x00016B00, 0x00016D00, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008C0A4 +dlabel ItemScript_SSmashChg .word 0x00000001, 0x0000003C, 0x00016D40, 0x00016F40, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008C0C4 +dlabel ItemScript_AutoSmash .word 0x00000001, 0x0000003C, 0x00016F80, 0x00017180, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008C0E4 +dlabel ItemScript_FireShield .word 0x00000001, 0x0000003C, 0x000171C0, 0x000173C0, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008C104 +dlabel ItemScript_JumpCharge .word 0x00000001, 0x0000003C, 0x00017400, 0x00017600, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008C124 +dlabel ItemScript_SJumpChg .word 0x00000001, 0x0000003C, 0x00017640, 0x00017840, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008C144 +dlabel ItemScript_AutoJump .word 0x00000001, 0x0000003C, 0x00017880, 0x00017A80, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008C164 +dlabel ItemScript_DDownPound .word 0x00000001, 0x0000003C, 0x00017AC0, 0x00017CC0, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008C184 +dlabel ItemScript_AutoMultibounce .word 0x00000001, 0x0000003C, 0x00017D00, 0x00017F00, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008C1A4 +dlabel ItemScript_DizzyStomp .word 0x00000001, 0x0000003C, 0x00017F40, 0x00018140, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008C1C4 +dlabel ItemScript_HammerThrow .word 0x00000001, 0x0000003C, 0x00018180, 0x00018380, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008C1E4 +dlabel ItemScript_SmashCharge0 .word 0x00000001, 0x0000003C, 0x000183C0, 0x000185C0, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008C204 +dlabel ItemScript_PrettyLucky .word 0x00000001, 0x0000003C, 0x00018600, 0x00018800, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008C224 +dlabel ItemScript_FeelingFine .word 0x00000001, 0x0000003C, 0x00018840, 0x00018A40, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008C244 +dlabel ItemScript_AttackFXA .word 0x00000001, 0x0000003C, 0x00018A80, 0x00018C80, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008C264 +dlabel ItemScript_AllorNothing .word 0x00000001, 0x0000003C, 0x00018CC0, 0x00018EC0, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008C284 +dlabel ItemScript_HPDrain .word 0x00000001, 0x0000003C, 0x00018F00, 0x00019100, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008C2A4 +dlabel ItemScript_JumpCharge0 .word 0x00000001, 0x0000003C, 0x00019140, 0x00019340, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008C2C4 +dlabel ItemScript_SlowGo .word 0x00000001, 0x0000003C, 0x00019380, 0x00019580, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008C2E4 +dlabel ItemScript_FPPlus .word 0x00000001, 0x0000003C, 0x000195C0, 0x000197C0, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008C304 +dlabel ItemScript_MegaRush .word 0x00000001, 0x0000003C, 0x00019800, 0x00019A00, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008C324 +dlabel ItemScript_IcePower .word 0x00000001, 0x0000003C, 0x00019A40, 0x00019C40, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008C344 +dlabel ItemScript_DefendPlus .word 0x00000001, 0x0000003C, 0x00019C80, 0x00019E80, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008C364 +dlabel ItemScript_PayOff .word 0x00000001, 0x0000003C, 0x00019EC0, 0x0001A0C0, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008C384 +dlabel ItemScript_MoneyMoney .word 0x00000001, 0x0000003C, 0x0001A100, 0x0001A300, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008C3A4 +dlabel ItemScript_ChillOut .word 0x00000001, 0x0000003C, 0x0001A340, 0x0001A540, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008C3C4 +dlabel ItemScript_HappyHeart .word 0x00000001, 0x0000003C, 0x0001A580, 0x0001A780, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008C3E4 +dlabel ItemScript_ZapTap .word 0x00000001, 0x0000003C, 0x0001A7C0, 0x0001A9C0, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008C404 +dlabel ItemScript_Berserker .word 0x00000001, 0x0000003C, 0x0001AA00, 0x0001AC00, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008C424 +dlabel ItemScript_RightOn .word 0x00000001, 0x0000003C, 0x0001AC40, 0x0001AE40, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008C444 +dlabel ItemScript_RunawayPay .word 0x00000001, 0x0000003C, 0x0001AE80, 0x0001B080, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008C464 +dlabel ItemScript_Refund .word 0x00000001, 0x0000003C, 0x0001B0C0, 0x0001B2C0, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008C484 +dlabel ItemScript_FlowerSaver .word 0x00000001, 0x0000003C, 0x0001B300, 0x0001B500, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008C4A4 +dlabel ItemScript_TripleDip .word 0x00000001, 0x0000003C, 0x0001B540, 0x0001B740, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008C4C4 +dlabel ItemScript_FlowerFanatic .word 0x00000001, 0x0000003C, 0x0001B780, 0x0001B980, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008C4E4 +dlabel ItemScript_PowerJump .word 0x00000001, 0x0000003C, 0x0001B9C0, 0x0001BBC0, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008C504 +dlabel ItemScript_SuperJump .word 0x00000001, 0x0000003C, 0x0001BC00, 0x0001BE00, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008C524 +dlabel ItemScript_MegaJump .word 0x00000001, 0x0000003C, 0x0001BE40, 0x0001C040, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008C544 +dlabel ItemScript_PowerSmash .word 0x00000001, 0x0000003C, 0x0001C080, 0x0001C280, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008C564 +dlabel ItemScript_SuperSmash .word 0x00000001, 0x0000003C, 0x0001C2C0, 0x0001C4C0, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008C584 +dlabel ItemScript_MegaSmash .word 0x00000001, 0x0000003C, 0x0001C500, 0x0001C700, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008C5A4 +dlabel ItemScript_LuckyDay .word 0x00000001, 0x0000003C, 0x0001C740, 0x0001C940, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008C5C4 +dlabel ItemScript_MegaHPDrain .word 0x00000001, 0x0000003C, 0x0001C980, 0x0001CB80, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008C5E4 +dlabel ItemScript_BumpAttack .word 0x00000001, 0x0000003C, 0x0001CBC0, 0x0001CDC0, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008C604 +dlabel ItemScript_PUpDDown .word 0x00000001, 0x0000003C, 0x0001CE00, 0x0001D000, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008C624 +dlabel ItemScript_PDownDUp .word 0x00000001, 0x0000003C, 0x0001D040, 0x0001D240, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008C644 +dlabel ItemScript_HeartFinder .word 0x00000001, 0x0000003C, 0x0001D280, 0x0001D480, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008C664 +dlabel ItemScript_FlowerFinder .word 0x00000001, 0x0000003C, 0x0001D4C0, 0x0001D6C0, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008C684 +dlabel ItemScript_DizzyAttack .word 0x00000001, 0x0000003C, 0x0001D700, 0x0001D900, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008C6A4 +dlabel ItemScript_SpeedySpin .word 0x00000001, 0x0000003C, 0x0001D940, 0x0001DB40, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008C6C4 +dlabel ItemScript_SpinAttack .word 0x00000001, 0x0000003C, 0x0001DB80, 0x0001DD80, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008C6E4 +dlabel ItemScript_ISpy .word 0x00000001, 0x0000003C, 0x0001DDC0, 0x0001DFC0, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008C704 +dlabel ItemScript_PowerRush .word 0x00000001, 0x0000003C, 0x0001E000, 0x0001E200, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008C724 +dlabel ItemScript_LastStand .word 0x00000001, 0x0000003C, 0x0001E240, 0x0001E440, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008C744 +dlabel ItemScript_CloseCall .word 0x00000001, 0x0000003C, 0x0001E480, 0x0001E680, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008C764 -.word 0x00000001, 0x0000003C, 0x0001E6C0, 0x0001E8C0, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x0000003C, 0x0001E900, 0x0001EB00, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x0000003C, 0x0001EB40, 0x0001ED40, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x0000003C, 0x0001ED80, 0x0001EF80, 0x00000000, 0x00000000, 0x00000002, 0x00000000 +dlabel ItemScript_CrazyHeart +.word 0x00000001, 0x0000003C, 0x0001E6C0, 0x0001E8C0, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008C7E4 +dlabel ItemScript_ITEM_0D5 +.word 0x00000001, 0x0000003C, 0x0001E900, 0x0001EB00, 0x00000000, 0x00000000, 0x00000002, 0x00000000 + +dlabel ItemScript_ITEM_0D6 +.word 0x00000001, 0x0000003C, 0x0001EB40, 0x0001ED40, 0x00000000, 0x00000000, 0x00000002, 0x00000000 + +dlabel ItemScript_ITEM_0D7 +.word 0x00000001, 0x0000003C, 0x0001ED80, 0x0001EF80, 0x00000000, 0x00000000, 0x00000002, 0x00000000 + +dlabel ItemScript_ShrinkSmash .word 0x00000001, 0x0000003C, 0x0001EFC0, 0x0001F1C0, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008C804 +dlabel ItemScript_ShrinkStomp .word 0x00000001, 0x0000003C, 0x0001F200, 0x0001F400, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008C824 +dlabel ItemScript_DDownJump .word 0x00000001, 0x0000003C, 0x0001F440, 0x0001F640, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008C844 +dlabel ItemScript_DamageDodge .word 0x00000001, 0x0000003C, 0x0001F680, 0x0001F880, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008C864 +dlabel ItemScript_EarthquakeJump .word 0x00000001, 0x0000003C, 0x0001F8C0, 0x0001FAC0, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008C884 -.word 0x00000001, 0x0000003C, 0x0001FB00, 0x0001FD00, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x0000003C, 0x0001FD40, 0x0001FF40, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x0000003C, 0x0001FF80, 0x00020180, 0x00000000, 0x00000000, 0x00000002, 0x00000000 +dlabel ItemScript_HappyFlower +.word 0x00000001, 0x0000003C, 0x0001FB00, 0x0001FD00, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008C8E4 +dlabel ItemScript_HappyCoin +.word 0x00000001, 0x0000003C, 0x0001FD40, 0x0001FF40, 0x00000000, 0x00000000, 0x00000002, 0x00000000 + +dlabel ItemScript_ITEM_0DF +.word 0x00000001, 0x0000003C, 0x0001FF80, 0x00020180, 0x00000000, 0x00000000, 0x00000002, 0x00000000 + +dlabel ItemScript_DeepFocus .word 0x00000001, 0x0000003C, 0x000201C0, 0x000203C0, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008C904 +dlabel ItemScript_SuperFocus .word 0x00000001, 0x0000003C, 0x00020400, 0x00020600, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008C924 +dlabel ItemScript_Kaiden .word 0x00000001, 0x0000003C, 0x00020640, 0x00020840, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008C944 -.word 0x00000001, 0x0000003C, 0x00020880, 0x00020A80, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x0000003C, 0x00020AC0, 0x00020CC0, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x0000003C, 0x00020D00, 0x00020F00, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x0000003C, 0x00020F40, 0x00021140, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x0000003C, 0x00021180, 0x00021380, 0x00000000, 0x00000000, 0x00000002, 0x00000000 +dlabel ItemScript_QuickChange +.word 0x00000001, 0x0000003C, 0x00020880, 0x00020A80, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008C9E4 +dlabel ItemScript_ITEM_0E4 +.word 0x00000001, 0x0000003C, 0x00020AC0, 0x00020CC0, 0x00000000, 0x00000000, 0x00000002, 0x00000000 + +dlabel ItemScript_ITEM_0E5 +.word 0x00000001, 0x0000003C, 0x00020D00, 0x00020F00, 0x00000000, 0x00000000, 0x00000002, 0x00000000 + +dlabel ItemScript_ITEM_0E6 +.word 0x00000001, 0x0000003C, 0x00020F40, 0x00021140, 0x00000000, 0x00000000, 0x00000002, 0x00000000 + +dlabel ItemScript_ITEM_0E7 +.word 0x00000001, 0x0000003C, 0x00021180, 0x00021380, 0x00000000, 0x00000000, 0x00000002, 0x00000000 + +dlabel ItemScript_Peekaboo .word 0x00000001, 0x0000003C, 0x000213C0, 0x000215C0, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008CA04 +dlabel ItemScript_GroupFocus .word 0x00000001, 0x0000003C, 0x00021600, 0x00021800, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008CA24 +dlabel ItemScript_AttackFXD .word 0x00000001, 0x0000003C, 0x00021840, 0x00021A40, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008CA44 +dlabel ItemScript_AttackFXB .word 0x00000001, 0x0000003C, 0x00021A80, 0x00021C80, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008CA64 +dlabel ItemScript_AttackFXE .word 0x00000001, 0x0000003C, 0x00021CC0, 0x00021EC0, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008CA84 +dlabel ItemScript_AttackFXC .word 0x00000001, 0x0000003C, 0x00021F00, 0x00022100, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008CAA4 -.word 0x00000001, 0x0000003C, 0x00022140, 0x00022340, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x0000003C, 0x00022380, 0x00022580, 0x00000000, 0x00000000, 0x00000002, 0x00000000 +dlabel ItemScript_AttackFXF +.word 0x00000001, 0x0000003C, 0x00022140, 0x00022340, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008CAE4 -.word 0x00000001, 0x0000003C, 0x000225C0, 0x000227C0, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x0000003C, 0x00022800, 0x00022A00, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x0000003C, 0x00022A40, 0x00022C40, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x0000003C, 0x00022C80, 0x00022E80, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x0000003C, 0x00022EC0, 0x000230C0, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x0000003C, 0x00023100, 0x00023300, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x0000003C, 0x00023340, 0x00023540, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x0000003C, 0x00023580, 0x00023780, 0x00000000, 0x00000000, 0x00000002, 0x00000000 +dlabel ItemScript_ITEM_0EF +.word 0x00000001, 0x0000003C, 0x00022380, 0x00022580, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008CBE4 +dlabel ItemScript_HealthyHealthy +.word 0x00000001, 0x0000003C, 0x000225C0, 0x000227C0, 0x00000000, 0x00000000, 0x00000002, 0x00000000 + +dlabel ItemScript_ITEM_0F1 +.word 0x00000001, 0x0000003C, 0x00022800, 0x00022A00, 0x00000000, 0x00000000, 0x00000002, 0x00000000 + +dlabel ItemScript_ITEM_0F2 +.word 0x00000001, 0x0000003C, 0x00022A40, 0x00022C40, 0x00000000, 0x00000000, 0x00000002, 0x00000000 + +dlabel ItemScript_ITEM_0F3 +.word 0x00000001, 0x0000003C, 0x00022C80, 0x00022E80, 0x00000000, 0x00000000, 0x00000002, 0x00000000 + +dlabel ItemScript_ITEM_0F4 +.word 0x00000001, 0x0000003C, 0x00022EC0, 0x000230C0, 0x00000000, 0x00000000, 0x00000002, 0x00000000 + +dlabel ItemScript_ITEM_0F5 +.word 0x00000001, 0x0000003C, 0x00023100, 0x00023300, 0x00000000, 0x00000000, 0x00000002, 0x00000000 + +dlabel ItemScript_ITEM_0F6 +.word 0x00000001, 0x0000003C, 0x00023340, 0x00023540, 0x00000000, 0x00000000, 0x00000002, 0x00000000 + +dlabel ItemScript_ITEM_0F7 +.word 0x00000001, 0x0000003C, 0x00023580, 0x00023780, 0x00000000, 0x00000000, 0x00000002, 0x00000000 + +dlabel ItemScript_Heart .word 0x00000001, 0x0000000A, 0x00030A60, 0x00030B80, 0x00000000, 0x00000000, 0x00000001, 0x00000006, 0x00030BA0, 0x00030CC0, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008CC1C +dlabel ItemScript_Coin .word 0x00000003, 0x00000001, 0x00000003, 0x0002F5C0, 0x0002F6E0, 0x00000000, 0x00000000, 0x00000001, 0x00000003, 0x0002F700, 0x0002F820, 0x00000000, 0x00000000, 0x00000001, 0x00000003, 0x0002FAC0, 0x0002FBE0, 0x00000000, 0x00000000, 0x00000001, 0x00000003, 0x0002FC00, 0x0002FD20, 0x00000000, 0x00000000, 0x00000001, 0x00000003, 0x0002FD40, 0x0002FE60, 0x00000000, 0x00000000, 0x00000001, 0x00000003, 0x0002FE80, 0x0002FFA0, 0x00000000, 0x00000000, 0x00000001, 0x00000003, 0x0002FFC0, 0x000300E0, 0x00000000, 0x00000000, 0x00000001, 0x00000003, 0x00030100, 0x00030220, 0x00000000, 0x00000000, 0x00000004, 0x00000064, 0x00000032, 0x00000001, 0x00000003, 0x0002F5C0, 0x0002F6E0, 0x00000000, 0x00000000, 0x00000001, 0x00000002, 0x0002F700, 0x0002F820, 0x00000000, 0x00000000, 0x00000001, 0x00000001, 0x0002F840, 0x0002F960, 0x00000000, 0x00000000, 0x00000001, 0x00000001, 0x0002F980, 0x0002FAA0, 0x00000000, 0x00000000, 0x00000001, 0x00000002, 0x0002FAC0, 0x0002FBE0, 0x00000000, 0x00000000, 0x00000001, 0x00000003, 0x0002FC00, 0x0002FD20, 0x00000000, 0x00000000, 0x00000001, 0x00000003, 0x0002FD40, 0x0002FE60, 0x00000000, 0x00000000, 0x00000001, 0x00000003, 0x0002FE80, 0x0002FFA0, 0x00000000, 0x00000000, 0x00000001, 0x00000003, 0x0002FFC0, 0x000300E0, 0x00000000, 0x00000000, 0x00000001, 0x00000003, 0x00030100, 0x00030220, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008CDE4 +dlabel ItemScript_HeartPiece .word 0x00000001, 0x0000003C, 0x00030CE0, 0x00030E00, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008CE04 +dlabel ItemScript_StarPoint .word 0x00000001, 0x00000002, 0x00030E20, 0x00030F40, 0x00000000, 0x00000000, 0x00000001, 0x00000002, 0x00030F60, 0x00031080, 0x00000000, 0x00000000, 0x00000001, 0x00000002, 0x000310A0, 0x000311C0, 0x00000000, 0x00000000, 0x00000001, 0x00000002, 0x000311E0, 0x00031300, 0x00000000, 0x00000000, 0x00000001, 0x00000002, 0x00031320, 0x00031440, 0x00000000, 0x00000000, 0x00000001, 0x00000002, 0x00031460, 0x00031580, 0x00000000, 0x00000000, 0x00000001, 0x00000002, 0x000315A0, 0x000316C0, 0x00000000, 0x00000000, 0x00000001, 0x00000002, 0x000316E0, 0x00031800, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008CECC +dlabel ItemScript_HeartPoint .word 0x00000001, 0x00000008, 0x0002E900, 0x0002EB00, 0x00000000, 0x00000000, 0x00000001, 0x00000005, 0x0002EB20, 0x0002ED20, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x0002ED40, 0x0002EF40, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008CF1C +dlabel ItemScript_FlowerPoint .word 0x00000001, 0x00000008, 0x0002EF60, 0x0002F160, 0x00000000, 0x00000000, 0x00000001, 0x00000005, 0x0002F180, 0x0002F380, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x0002F3A0, 0x0002F5A0, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008CF6C +dlabel ItemScript_StarPiece .word 0x00000001, 0x0000000C, 0x00030400, 0x00030600, 0x00000000, 0x00000000, 0x00000001, 0x00000004, 0x00030620, 0x00030820, 0x00000000, 0x00000000, 0x00000001, 0x0000000C, 0x00030840, 0x00030A40, 0x00000000, 0x00000000, 0x00000001, 0x00000004, 0x00030620, 0x00030820, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008CFD4 +dlabel ItemScript_SpicySoup .word 0x00000001, 0x0000003C, 0x00002420, 0x00002620, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008CFF4 +dlabel ItemScript_ApplePie .word 0x00000001, 0x0000003C, 0x00002660, 0x00002860, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008D014 +dlabel ItemScript_HoneyUltra .word 0x00000001, 0x0000003C, 0x000028A0, 0x00002AA0, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008D034 +dlabel ItemScript_MapleUltra .word 0x00000001, 0x0000003C, 0x00002AE0, 0x00002CE0, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008D054 +dlabel ItemScript_JellyUltra .word 0x00000001, 0x0000003C, 0x00002D20, 0x00002F20, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008D074 +dlabel ItemScript_Koopasta .word 0x00000001, 0x0000003C, 0x00002F60, 0x00003160, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008D094 +dlabel ItemScript_FriedShroom .word 0x00000001, 0x0000003C, 0x000031A0, 0x000033A0, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008D0B4 +dlabel ItemScript_ShroomCake .word 0x00000001, 0x0000003C, 0x000033E0, 0x000035E0, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008D0D4 +dlabel ItemScript_ShroomSteak .word 0x00000001, 0x0000003C, 0x00003620, 0x00003820, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008D0F4 +dlabel ItemScript_HotShroom .word 0x00000001, 0x0000003C, 0x00003860, 0x00003A60, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008D114 +dlabel ItemScript_SweetShroom .word 0x00000001, 0x0000003C, 0x00003AA0, 0x00003CA0, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008D134 +dlabel ItemScript_HealthyJuice .word 0x00000001, 0x0000003C, 0x00003CE0, 0x00003EE0, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008D154 +dlabel ItemScript_BlandMeal .word 0x00000001, 0x0000003C, 0x00003F20, 0x00004120, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008D174 +dlabel ItemScript_YummyMeal .word 0x00000001, 0x0000003C, 0x00004160, 0x00004360, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008D194 +dlabel ItemScript_DeluxeFeast .word 0x00000001, 0x0000003C, 0x000043A0, 0x000045A0, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008D1B4 +dlabel ItemScript_SpecialShake .word 0x00000001, 0x0000003C, 0x000045E0, 0x000047E0, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008D1D4 +dlabel ItemScript_BigCookie .word 0x00000001, 0x0000003C, 0x00004820, 0x00004A20, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008D1F4 +dlabel ItemScript_Cake .word 0x00000001, 0x0000003C, 0x00004A60, 0x00004C60, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008D214 +dlabel ItemScript_Mistake .word 0x00000001, 0x0000003C, 0x00004CA0, 0x00004EA0, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008D234 +dlabel ItemScript_KoopaTea .word 0x00000001, 0x0000003C, 0x00004EE0, 0x000050E0, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008D254 +dlabel ItemScript_HoneySuper .word 0x00000001, 0x0000003C, 0x00005120, 0x00005320, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008D274 +dlabel ItemScript_MapleSuper .word 0x00000001, 0x0000003C, 0x00005360, 0x00005560, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008D294 +dlabel ItemScript_JellySuper .word 0x00000001, 0x0000003C, 0x000055A0, 0x000057A0, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008D2B4 +dlabel ItemScript_Spaghetti .word 0x00000001, 0x0000003C, 0x000057E0, 0x000059E0, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008D2D4 +dlabel ItemScript_EggMissile .word 0x00000001, 0x0000003C, 0x00005A20, 0x00005C20, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008D2F4 +dlabel ItemScript_FriedEgg .word 0x00000001, 0x0000003C, 0x00005C60, 0x00005E60, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008D314 +dlabel ItemScript_HoneyShroom .word 0x00000001, 0x0000003C, 0x00005EA0, 0x000060A0, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008D334 +dlabel ItemScript_HoneyCandy .word 0x00000001, 0x0000003C, 0x000060E0, 0x000062E0, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008D354 +dlabel ItemScript_ElectroPop .word 0x00000001, 0x0000003C, 0x00006320, 0x00006520, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008D374 +dlabel ItemScript_FirePop .word 0x00000001, 0x0000003C, 0x00006560, 0x00006760, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008D394 +dlabel ItemScript_LimeCandy .word 0x00000001, 0x0000003C, 0x000067A0, 0x000069A0, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008D3B4 +dlabel ItemScript_CocoPop .word 0x00000001, 0x0000003C, 0x000069E0, 0x00006BE0, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008D3D4 +dlabel ItemScript_LemonCandy .word 0x00000001, 0x0000003C, 0x00006C20, 0x00006E20, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008D3F4 +dlabel ItemScript_JellyPop .word 0x00000001, 0x0000003C, 0x00006E60, 0x00007060, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008D414 +dlabel ItemScript_StrangeCake .word 0x00000001, 0x0000003C, 0x000070A0, 0x000072A0, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008D434 +dlabel ItemScript_KookyCookie .word 0x00000001, 0x0000003C, 0x000072E0, 0x000074E0, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008D454 +dlabel ItemScript_FrozenFries .word 0x00000001, 0x0000003C, 0x00007520, 0x00007720, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008D474 +dlabel ItemScript_PotatoSalad .word 0x00000001, 0x0000003C, 0x00007760, 0x00007960, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008D494 +dlabel ItemScript_NuttyCake .word 0x00000001, 0x0000003C, 0x000079A0, 0x00007BA0, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008D4B4 +dlabel ItemScript_MapleShroom .word 0x00000001, 0x0000003C, 0x00007BE0, 0x00007DE0, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008D4D4 +dlabel ItemScript_BoiledEgg .word 0x00000001, 0x0000003C, 0x00007E20, 0x00008020, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008D4F4 +dlabel ItemScript_YoshiCookie .word 0x00000001, 0x0000003C, 0x00008060, 0x00008260, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008D514 -.word 0x00000001, 0x0000003C, 0x000082A0, 0x000084A0, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x0000003C, 0x000084E0, 0x000086E0, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x0000003C, 0x00008720, 0x00008920, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x0000003C, 0x00008960, 0x00008B60, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x0000003C, 0x00008BA0, 0x00008DA0, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x0000003C, 0x00008DE0, 0x00008FE0, 0x00000000, 0x00000000, 0x00000002, 0x00000000 +dlabel ItemScript_JellyShroom +.word 0x00000001, 0x0000003C, 0x000082A0, 0x000084A0, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008D5D4 +dlabel ItemScript_ITEM_02C +.word 0x00000001, 0x0000003C, 0x000084E0, 0x000086E0, 0x00000000, 0x00000000, 0x00000002, 0x00000000 + +dlabel ItemScript_ITEM_02D +.word 0x00000001, 0x0000003C, 0x00008720, 0x00008920, 0x00000000, 0x00000000, 0x00000002, 0x00000000 + +dlabel ItemScript_ITEM_02E +.word 0x00000001, 0x0000003C, 0x00008960, 0x00008B60, 0x00000000, 0x00000000, 0x00000002, 0x00000000 + +dlabel ItemScript_ITEM_02F +.word 0x00000001, 0x0000003C, 0x00008BA0, 0x00008DA0, 0x00000000, 0x00000000, 0x00000002, 0x00000000 + +dlabel ItemScript_ITEM_030 +.word 0x00000001, 0x0000003C, 0x00008DE0, 0x00008FE0, 0x00000000, 0x00000000, 0x00000002, 0x00000000 + +dlabel ItemScript_FireFlower .word 0x00000001, 0x0000003C, 0x0002A3C0, 0x0002A5C0, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008D5F4 +dlabel ItemScript_SnowmanDoll .word 0x00000001, 0x0000003C, 0x0002A600, 0x0002A800, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008D614 +dlabel ItemScript_ThunderRage .word 0x00000001, 0x0000003C, 0x0002A840, 0x0002AA40, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008D634 +dlabel ItemScript_ThunderBolt .word 0x00000001, 0x0000003C, 0x0002AA80, 0x0002AC80, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008D654 +dlabel ItemScript_ShootingStar .word 0x00000001, 0x0000003C, 0x0002ACC0, 0x0002AEC0, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008D674 +dlabel ItemScript_DustyHammer .word 0x00000001, 0x0000003C, 0x0002AF00, 0x0002B100, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008D694 -.word 0x00000001, 0x0000003C, 0x0002B140, 0x0002B340, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x0000003C, 0x0002B380, 0x0002B580, 0x00000000, 0x00000000, 0x00000002, 0x00000000 +dlabel ItemScript_Pebble +.word 0x00000001, 0x0000003C, 0x0002B140, 0x0002B340, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008D6D4 +dlabel ItemScript_ITEM_127 +.word 0x00000001, 0x0000003C, 0x0002B380, 0x0002B580, 0x00000000, 0x00000000, 0x00000002, 0x00000000 + +dlabel ItemScript_StoneCap .word 0x00000001, 0x0000003C, 0x0002B5C0, 0x0002B7C0, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008D6F4 -.word 0x00000001, 0x0000003C, 0x0002B800, 0x0002BA00, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x0000003C, 0x0002BA40, 0x0002BC40, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x0000003C, 0x0002BC80, 0x0002BE80, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x0000003C, 0x0002BEC0, 0x0002C0C0, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x0000003C, 0x0002C100, 0x0002C300, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x0000003C, 0x0002C340, 0x0002C540, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x0000003C, 0x0002C580, 0x0002C780, 0x00000000, 0x00000000, 0x00000002, 0x00000000 +dlabel ItemScript_VoltShroom +.word 0x00000001, 0x0000003C, 0x0002B800, 0x0002BA00, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008D7D4 +dlabel ItemScript_PowerStar +.word 0x00000001, 0x0000003C, 0x0002BA40, 0x0002BC40, 0x00000000, 0x00000000, 0x00000002, 0x00000000 + +dlabel ItemScript_Parasol +.word 0x00000001, 0x0000003C, 0x0002BC80, 0x0002BE80, 0x00000000, 0x00000000, 0x00000002, 0x00000000 + +dlabel ItemScript_MagicMirror +.word 0x00000001, 0x0000003C, 0x0002BEC0, 0x0002C0C0, 0x00000000, 0x00000000, 0x00000002, 0x00000000 + +dlabel ItemScript_ITEM_12D +.word 0x00000001, 0x0000003C, 0x0002C100, 0x0002C300, 0x00000000, 0x00000000, 0x00000002, 0x00000000 + +dlabel ItemScript_ITEM_12E +.word 0x00000001, 0x0000003C, 0x0002C340, 0x0002C540, 0x00000000, 0x00000000, 0x00000002, 0x00000000 + +dlabel ItemScript_ITEM_12F +.word 0x00000001, 0x0000003C, 0x0002C580, 0x0002C780, 0x00000000, 0x00000000, 0x00000002, 0x00000000 + +dlabel ItemScript_Mushroom .word 0x00000001, 0x0000003C, 0x000237C0, 0x000239C0, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008D7F4 +dlabel ItemScript_SuperShroom .word 0x00000001, 0x0000003C, 0x00023A00, 0x00023C00, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008D814 +dlabel ItemScript_UltraShroom .word 0x00000001, 0x0000003C, 0x00023C40, 0x00023E40, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008D834 +dlabel ItemScript_LifeShroom .word 0x00000001, 0x0000003C, 0x00023E80, 0x00024080, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008D854 +dlabel ItemScript_DriedShroom .word 0x00000001, 0x0000003C, 0x000240C0, 0x000242C0, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008D874 +dlabel ItemScript_TastyTonic .word 0x00000001, 0x0000003C, 0x00024300, 0x00024500, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008D894 +dlabel ItemScript_SuperSoda .word 0x00000001, 0x0000003C, 0x00024540, 0x00024740, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008D8B4 +dlabel ItemScript_BlueBerry .word 0x00000001, 0x0000003C, 0x00024780, 0x00024980, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008D8D4 +dlabel ItemScript_RedBerry .word 0x00000001, 0x0000003C, 0x000249C0, 0x00024BC0, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008D8F4 +dlabel ItemScript_YellowBerry .word 0x00000001, 0x0000003C, 0x00024C00, 0x00024E00, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008D914 +dlabel ItemScript_BubbleBerry .word 0x00000001, 0x0000003C, 0x00024E40, 0x00025040, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008D934 +dlabel ItemScript_Goomnut .word 0x00000001, 0x0000003C, 0x00025080, 0x00025280, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008D954 +dlabel ItemScript_KoopaLeaf .word 0x00000001, 0x0000003C, 0x000252C0, 0x000254C0, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008D974 +dlabel ItemScript_DriedPasta .word 0x00000001, 0x0000003C, 0x00025500, 0x00025700, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008D994 +dlabel ItemScript_Lime .word 0x00000001, 0x0000003C, 0x00025740, 0x00025940, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008D9B4 +dlabel ItemScript_Lemon .word 0x00000001, 0x0000003C, 0x00025980, 0x00025B80, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008D9D4 +dlabel ItemScript_DriedFruit .word 0x00000001, 0x0000003C, 0x00025BC0, 0x00025DC0, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008D9F4 +dlabel ItemScript_StrangeLeaf .word 0x00000001, 0x0000003C, 0x00025E00, 0x00026000, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008DA14 +dlabel ItemScript_CakeMix .word 0x00000001, 0x0000003C, 0x00026040, 0x00026240, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008DA34 +dlabel ItemScript_Egg .word 0x00000001, 0x0000003C, 0x00026280, 0x00026480, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008DA54 +dlabel ItemScript_Coconut .word 0x00000001, 0x0000003C, 0x000264C0, 0x000266C0, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008DA74 +dlabel ItemScript_Melon .word 0x00000001, 0x0000003C, 0x00026700, 0x00026900, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008DA94 +dlabel ItemScript_StinkyHerb .word 0x00000001, 0x0000003C, 0x00026940, 0x00026B40, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008DAB4 +dlabel ItemScript_IcedPotato .word 0x00000001, 0x0000003C, 0x00026B80, 0x00026D80, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008DAD4 +dlabel ItemScript_HoneySyrup .word 0x00000001, 0x0000003C, 0x00026DC0, 0x00026FC0, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008DAF4 +dlabel ItemScript_MapleSyrup .word 0x00000001, 0x0000003C, 0x00027000, 0x00027200, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008DB14 +dlabel ItemScript_JamminJelly .word 0x00000001, 0x0000003C, 0x00027240, 0x00027440, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008DB34 +dlabel ItemScript_WhackasBump .word 0x00000001, 0x0000003C, 0x00027480, 0x00027680, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008DB54 +dlabel ItemScript_Apple .word 0x00000001, 0x0000003C, 0x000276C0, 0x000278C0, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008DB74 +dlabel ItemScript_BakingSalt .word 0x00000001, 0x0000003C, 0x00027900, 0x00027B00, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008DB94 +dlabel ItemScript_BakingSugar .word 0x00000001, 0x0000003C, 0x00027B40, 0x00027D40, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008DBB4 +dlabel ItemScript_BakingEgg .word 0x00000001, 0x0000003C, 0x00027D80, 0x00027F80, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008DBD4 +dlabel ItemScript_BakingCream .word 0x00000001, 0x0000003C, 0x00027FC0, 0x000281C0, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008DBF4 +dlabel ItemScript_BakingStrawberry .word 0x00000001, 0x0000003C, 0x00028200, 0x00028400, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008DC14 +dlabel ItemScript_BakingButter .word 0x00000001, 0x0000003C, 0x00028440, 0x00028640, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008DC34 +dlabel ItemScript_BakingCleanser .word 0x00000001, 0x0000003C, 0x00028680, 0x00028880, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008DC54 +dlabel ItemScript_BakingWater .word 0x00000001, 0x0000003C, 0x000288C0, 0x00028AC0, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008DC74 +dlabel ItemScript_BakingFlour .word 0x00000001, 0x0000003C, 0x00028B00, 0x00028D00, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008DC94 -.word 0x00000001, 0x0000003C, 0x00028D40, 0x00028F40, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x0000003C, 0x00028F80, 0x00029180, 0x00000000, 0x00000000, 0x00000002, 0x00000000 +dlabel ItemScript_BakingMilk +.word 0x00000001, 0x0000003C, 0x00028D40, 0x00028F40, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008DCD4 -.word 0x00000001, 0x0000003C, 0x000291C0, 0x000293C0, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x0000003C, 0x00029400, 0x00029600, 0x00000000, 0x00000000, 0x00000002, 0x00000000 +dlabel ItemScript_ITEM_118 +.word 0x00000001, 0x0000003C, 0x00028F80, 0x00029180, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008DD14 +dlabel ItemScript_SleepySheep +.word 0x00000001, 0x0000003C, 0x000291C0, 0x000293C0, 0x00000000, 0x00000000, 0x00000002, 0x00000000 + +dlabel ItemScript_XBandage +.word 0x00000001, 0x0000003C, 0x00029400, 0x00029600, 0x00000000, 0x00000000, 0x00000002, 0x00000000 + +dlabel ItemScript_POWBlock .word 0x00000001, 0x0000003C, 0x00029640, 0x00029840, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008DD34 +dlabel ItemScript_HustleDrink .word 0x00000001, 0x0000003C, 0x00029880, 0x00029A80, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008DD54 +dlabel ItemScript_StopWatch .word 0x00000001, 0x0000003C, 0x00029AC0, 0x00029CC0, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008DD74 -.word 0x00000001, 0x0000003C, 0x00029D00, 0x00029F00, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x0000003C, 0x00029F40, 0x0002A140, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x0000003C, 0x0002A180, 0x0002A380, 0x00000000, 0x00000000, 0x00000002, 0x00000000 +dlabel ItemScript_DizzyDial +.word 0x00000001, 0x0000003C, 0x00029D00, 0x00029F00, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008DDD4 -.word D_8008B108, D_8008B3E4, D_8008B404, D_8008B424, D_8008B444, D_8008B464, D_8008B484, D_8008B4A4, D_8008B108, D_8008B108, D_8008BBE4, D_8008BC04, D_8008BC24, D_8008BC44, D_8008BC64, D_8008B924, D_8008B4E4, D_8008B504, D_8008B5C4, D_8008B524, D_8008B544, D_8008B664, D_8008B624, D_8008B644, D_8008B604, D_8008B5A4, D_8008B564, D_8008B684, D_8008B6E4, D_8008B704, D_8008B884, D_8008B724, D_8008B744, D_8008B764, D_8008B6C4, D_8008B784, D_8008B7A4, D_8008B7C4, D_8008B7E4, D_8008BC84, D_8008B984, D_8008B9A4, D_8008B9C4, D_8008B804, D_8008B824, D_8008B844, D_8008B864, D_8008B944, D_8008B964, D_8008B9E4, D_8008BA04, D_8008BA24, D_8008BA44, D_8008BDE4, D_8008BDE4, D_8008BDE4, D_8008BDE4, D_8008BDE4, D_8008BDE4, D_8008BDE4, D_8008BDE4, D_8008BDE4, D_8008BDE4, D_8008BDE4, D_8008BDE4, D_8008BDE4, D_8008BDE4, D_8008BDE4, D_8008BDE4, D_8008BDE4, D_8008BDE4, D_8008BDE4, D_8008BDE4, D_8008BDE4, D_8008BDE4, D_8008BDE4, D_8008BDE4, D_8008BDE4, D_8008BDE4, D_8008BDE4, D_8008BDE4, D_8008BDE4, D_8008BDE4, D_8008B5E4, D_8008BDE4, D_8008BDE4, D_8008B584, D_8008B8A4, D_8008B8C4, D_8008B8E4, D_8008B904, D_8008B604, D_8008BD04, D_8008DB94, D_8008DB74, D_8008DBB4, D_8008DBD4, D_8008DBF4, D_8008DC14, D_8008DC34, D_8008DC54, D_8008DC74, D_8008DC94, D_8008BAC4, D_8008BAA4, D_8008BAE4, D_8008BB44, D_8008B744, D_8008BB04, D_8008BB24, D_8008BCE4, D_8008BD24, D_8008BD44, D_8008BD64, D_8008BD84, D_8008BDA4, D_8008BDC4, D_8008BDA4, D_8008BA64, D_8008BA84, D_8008BB44, D_8008B744, D_8008B744, D_8008BCC4, D_8008BCA4, D_8008B108, D_8008B108, D_8008B108, D_8008D5D4, D_8008D5F4, D_8008D614, D_8008D654, D_8008D634, D_8008D694, D_8008D674, D_8008B384, D_8008D6D4, D_8008D874, D_8008D7D4, D_8008D6F4, D_8008D7F4, D_8008D854, D_8008D814, D_8008DCD4, D_8008DD14, D_8008DD34, D_8008DD54, D_8008DB34, D_8008DB54, D_8008D834, D_8008B344, D_8008B364, D_8008B324, D_8008B2E4, D_8008DD74, D_8008D894, D_8008D9B4, D_8008D994, D_8008D8B4, D_8008D8D4, D_8008D8F4, D_8008D914, D_8008DB14, D_8008DAF4, D_8008DAD4, D_8008D934, D_8008D954, D_8008D974, D_8008D9D4, D_8008D9F4, D_8008DA14, D_8008DA34, D_8008DA54, D_8008DA74, D_8008DA94, D_8008DAB4, D_8008CFD4, D_8008CFF4, D_8008D014, D_8008D034, D_8008D054, D_8008D074, D_8008D094, D_8008D0B4, D_8008D0D4, D_8008D0F4, D_8008D114, D_8008D174, D_8008D134, D_8008D154, D_8008D194, D_8008D1B4, D_8008D1D4, D_8008D1F4, D_8008D214, D_8008D234, D_8008D254, D_8008D274, D_8008D294, D_8008D2B4, D_8008D2D4, D_8008D2F4, D_8008D314, D_8008D334, D_8008D354, D_8008D374, D_8008D394, D_8008D3B4, D_8008D3D4, D_8008D3F4, D_8008D414, D_8008D434, D_8008D454, D_8008D474, D_8008D494, D_8008D4B4, D_8008D4D4, D_8008D4F4, D_8008D514, D_8008B108, D_8008B108, D_8008B108, D_8008B108, D_8008B108, D_8008BEE4, D_8008BF04, D_8008BF24, D_8008BF44, D_8008BF64, D_8008BF84, D_8008BFA4, D_8008BFC4, D_8008BFE4, D_8008C004, D_8008B108, D_8008C064, D_8008C0E4, D_8008C944, D_8008C164, D_8008C1A4, D_8008C1E4, D_8008C204, D_8008C224, D_8008C244, D_8008C264, D_8008C284, D_8008C2A4, D_8008C2C4, D_8008C2E4, D_8008C304, D_8008C324, D_8008C344, D_8008C364, D_8008C384, D_8008C3A4, D_8008C3C4, D_8008C3E4, D_8008C404, D_8008C424, D_8008C444, D_8008C464, D_8008C484, D_8008C4A4, D_8008C1C4, D_8008C044, D_8008C084, D_8008C104, D_8008C0A4, D_8008C124, D_8008C704, D_8008C144, D_8008C0C4, D_8008C764, D_8008C724, D_8008C744, D_8008C604, D_8008C5A4, D_8008C5C4, D_8008C624, D_8008C024, D_8008C184, D_8008C4C4, D_8008C644, D_8008C664, D_8008C6C4, D_8008C684, D_8008C6E4, D_8008C6A4, D_8008C5E4, D_8008C4E4, D_8008C504, D_8008C524, D_8008C544, D_8008C564, D_8008C584, D_8008B108, D_8008B108, D_8008C8E4, D_8008C904, D_8008C7E4, D_8008B108, D_8008C924, D_8008C824, D_8008C804, D_8008C844, D_8008C864, D_8008C8E4, D_8008C904, D_8008BFC4, D_8008C2E4, D_8008C3C4, D_8008C3C4, D_8008C484, D_8008C484, D_8008C844, D_8008C844, D_8008BF24, D_8008BF24, D_8008C344, D_8008C344, D_8008C884, D_8008C884, D_8008C884, D_8008CA04, D_8008C9E4, D_8008CA24, D_8008CA44, D_8008CA64, D_8008CA84, D_8008CAA4, D_8008BFC4, D_8008BFC4, D_8008BFC4, D_8008C2E4, D_8008C2E4, D_8008C2E4, D_8008CAE4, D_8008B108, D_8008B108, D_8008B108, D_8008B108, D_8008B108, D_8008CBE4, D_8008CC1C, D_8008CDE4, D_8008CE04, D_8008CECC, D_8008CF1C, D_8008CF6C, D_8008B124, D_8008B140, D_8008B15C, D_8008B178, D_8008B194, D_8008B1B0, D_8008B1CC, D_8008B1E8, D_8008B204, D_8008B220, D_8008B23C, D_8008B258, D_8008B274, D_8008B290, D_8008B2AC, D_8008B2C8, D_8008B108, D_8008B108, D_8008B108, D_8008B108, D_8008B108, D_8008B108, D_8008B108, D_8008B108, D_8008B108, D_8008B108, D_8008B108, D_8008B108, D_8008B108, D_8008B108, D_8008B108, D_8008B108, D_8008B108, D_8008B108, D_8008B108, D_8008B108 +dlabel ItemScript_ITEM_136 +.word 0x00000001, 0x0000003C, 0x00029F40, 0x0002A140, 0x00000000, 0x00000000, 0x00000002, 0x00000000 -dlabel D_8008E3D8 +dlabel ItemScript_ITEM_137 +.word 0x00000001, 0x0000003C, 0x0002A180, 0x0002A380, 0x00000000, 0x00000000, 0x00000002, 0x00000000 + +dlabel gItemEntityScripts +.word ItemScript_Jump, ItemScript_GearBoots1, ItemScript_GearBoots2, ItemScript_GearBoots3, ItemScript_GearHammer1, ItemScript_GearHammer2, ItemScript_GearHammer3, ItemScript_LuckyStar, ItemScript_Jump, ItemScript_Jump, ItemScript_DojoCard1, ItemScript_DojoCard2, ItemScript_DojoCard3, ItemScript_DojoCard4, ItemScript_DojoCard5, ItemScript_UltraStone, ItemScript_KoopaFortressKey, ItemScript_RuinsKey, ItemScript_PulseStone, ItemScript_TubbaCastleKey, ItemScript_IcePalaceKey, ItemScript_RuinsStoneMoon, ItemScript_RuinsStonePyramid, ItemScript_RuinsStoneStar, ItemScript_AncientVase, ItemScript_KooperShell, ItemScript_BowserCastleKey, ItemScript_ForestPass, ItemScript_BooWeight, ItemScript_BoosPortrait, ItemScript_CrystalBerry, ItemScript_MysticKey, ItemScript_StoreroomKey, ItemScript_ToyTrain, ItemScript_BooRecord, ItemScript_FryingPan, ItemScript_Dictionary, ItemScript_MysteryNote, ItemScript_SuspiciousNote, ItemScript_CrystalBall, ItemScript_Screwdriver, ItemScript_Cookbook, ItemScript_JadeRaven, ItemScript_MagicalSeed1, ItemScript_MagicalSeed2, ItemScript_MagicalSeed3, ItemScript_MagicalSeed4, ItemScript_ToadDoll, ItemScript_Calculator, ItemScript_SnowmanBucket, ItemScript_SnowmanScarf, ItemScript_RedKey, ItemScript_BlueKey, ItemScript_Letter, ItemScript_Letter, ItemScript_Letter, ItemScript_Letter, ItemScript_Letter, ItemScript_Letter, ItemScript_Letter, ItemScript_Letter, ItemScript_Letter, ItemScript_Letter, ItemScript_Letter, ItemScript_Letter, ItemScript_Letter, ItemScript_Letter, ItemScript_Letter, ItemScript_Letter, ItemScript_Letter, ItemScript_Letter, ItemScript_Letter, ItemScript_Letter, ItemScript_Letter, ItemScript_Letter, ItemScript_Letter, ItemScript_Letter, ItemScript_Letter, ItemScript_Letter, ItemScript_Letter, ItemScript_Letter, ItemScript_Letter, ItemScript_Letter, ItemScript_Artifact, ItemScript_Letter, ItemScript_Letter, ItemScript_Dolly, ItemScript_WaterStone, ItemScript_MagicalBean, ItemScript_FertileSoil, ItemScript_MiracleWater, ItemScript_AncientVase, ItemScript_KootTheTape, ItemScript_BakingSugar, ItemScript_BakingSalt, ItemScript_BakingEgg, ItemScript_BakingCream, ItemScript_BakingStrawberry, ItemScript_BakingButter, ItemScript_BakingCleanser, ItemScript_BakingWater, ItemScript_BakingFlour, ItemScript_BakingMilk, ItemScript_Lyrics, ItemScript_Melody, ItemScript_Mailbag, ItemScript_PeachKey, ItemScript_StoreroomKey, ItemScript_StarStone, ItemScript_SneakyParasol, ItemScript_KootBook, ItemScript_KootAutographMerluvlee, ItemScript_KootEmptyWallet, ItemScript_KootAutographLuigi, ItemScript_KootKoopaShell, ItemScript_KootOldPhoto, ItemScript_KootGlasses, ItemScript_KootOldPhoto, ItemScript_KootPackage, ItemScript_KootRedJar, ItemScript_PeachKey, ItemScript_StoreroomKey, ItemScript_StoreroomKey, ItemScript_SilverCard, ItemScript_GoldCard, ItemScript_Jump, ItemScript_Jump, ItemScript_Jump, ItemScript_FireFlower, ItemScript_SnowmanDoll, ItemScript_ThunderRage, ItemScript_ShootingStar, ItemScript_ThunderBolt, ItemScript_Pebble, ItemScript_DustyHammer, ItemScript_InsecticideHerb, ItemScript_StoneCap, ItemScript_TastyTonic, ItemScript_Mushroom, ItemScript_VoltShroom, ItemScript_SuperShroom, ItemScript_DriedShroom, ItemScript_UltraShroom, ItemScript_SleepySheep, ItemScript_POWBlock, ItemScript_HustleDrink, ItemScript_StopWatch, ItemScript_WhackasBump, ItemScript_Apple, ItemScript_LifeShroom, ItemScript_Mystery, ItemScript_RepelGel, ItemScript_FrightJar, ItemScript_PleaseComeBack, ItemScript_DizzyDial, ItemScript_SuperSoda, ItemScript_Lemon, ItemScript_Lime, ItemScript_BlueBerry, ItemScript_RedBerry, ItemScript_YellowBerry, ItemScript_BubbleBerry, ItemScript_JamminJelly, ItemScript_MapleSyrup, ItemScript_HoneySyrup, ItemScript_Goomnut, ItemScript_KoopaLeaf, ItemScript_DriedPasta, ItemScript_DriedFruit, ItemScript_StrangeLeaf, ItemScript_CakeMix, ItemScript_Egg, ItemScript_Coconut, ItemScript_Melon, ItemScript_StinkyHerb, ItemScript_IcedPotato, ItemScript_SpicySoup, ItemScript_ApplePie, ItemScript_HoneyUltra, ItemScript_MapleUltra, ItemScript_JellyUltra, ItemScript_Koopasta, ItemScript_FriedShroom, ItemScript_ShroomCake, ItemScript_ShroomSteak, ItemScript_HotShroom, ItemScript_SweetShroom, ItemScript_YummyMeal, ItemScript_HealthyJuice, ItemScript_BlandMeal, ItemScript_DeluxeFeast, ItemScript_SpecialShake, ItemScript_BigCookie, ItemScript_Cake, ItemScript_Mistake, ItemScript_KoopaTea, ItemScript_HoneySuper, ItemScript_MapleSuper, ItemScript_JellySuper, ItemScript_Spaghetti, ItemScript_EggMissile, ItemScript_FriedEgg, ItemScript_HoneyShroom, ItemScript_HoneyCandy, ItemScript_ElectroPop, ItemScript_FirePop, ItemScript_LimeCandy, ItemScript_CocoPop, ItemScript_LemonCandy, ItemScript_JellyPop, ItemScript_StrangeCake, ItemScript_KookyCookie, ItemScript_FrozenFries, ItemScript_PotatoSalad, ItemScript_NuttyCake, ItemScript_MapleShroom, ItemScript_BoiledEgg, ItemScript_YoshiCookie, ItemScript_JellyShroom, ItemScript_Jump, ItemScript_Jump, ItemScript_Jump, ItemScript_Jump, ItemScript_Jump, ItemScript_SpinSmash, ItemScript_Multibounce, ItemScript_PowerPlus, ItemScript_DodgeMaster, ItemScript_PowerBounce, ItemScript_SpikeShield, ItemScript_FirstAttack, ItemScript_HPPlus, ItemScript_QuakeHammer, ItemScript_DoubleDip, ItemScript_Jump, ItemScript_SleepStomp, ItemScript_FireShield, ItemScript_QuickChange, ItemScript_DDownPound, ItemScript_DizzyStomp, ItemScript_SmashCharge0, ItemScript_PrettyLucky, ItemScript_FeelingFine, ItemScript_AttackFXA, ItemScript_AllorNothing, ItemScript_HPDrain, ItemScript_JumpCharge0, ItemScript_SlowGo, ItemScript_FPPlus, ItemScript_MegaRush, ItemScript_IcePower, ItemScript_DefendPlus, ItemScript_PayOff, ItemScript_MoneyMoney, ItemScript_ChillOut, ItemScript_HappyHeart, ItemScript_ZapTap, ItemScript_Berserker, ItemScript_RightOn, ItemScript_RunawayPay, ItemScript_Refund, ItemScript_FlowerSaver, ItemScript_TripleDip, ItemScript_HammerThrow, ItemScript_MegaQuake, ItemScript_SmashCharge, ItemScript_JumpCharge, ItemScript_SSmashChg, ItemScript_SJumpChg, ItemScript_PowerRush, ItemScript_AutoJump, ItemScript_AutoSmash, ItemScript_CrazyHeart, ItemScript_LastStand, ItemScript_CloseCall, ItemScript_PUpDDown, ItemScript_LuckyDay, ItemScript_MegaHPDrain, ItemScript_PDownDUp, ItemScript_PowerQuake, ItemScript_AutoMultibounce, ItemScript_FlowerFanatic, ItemScript_HeartFinder, ItemScript_FlowerFinder, ItemScript_SpinAttack, ItemScript_DizzyAttack, ItemScript_ISpy, ItemScript_SpeedySpin, ItemScript_BumpAttack, ItemScript_PowerJump, ItemScript_SuperJump, ItemScript_MegaJump, ItemScript_PowerSmash, ItemScript_SuperSmash, ItemScript_MegaSmash, ItemScript_Jump, ItemScript_Jump, ItemScript_DeepFocus, ItemScript_SuperFocus, ItemScript_ShrinkSmash, ItemScript_Jump, ItemScript_Kaiden, ItemScript_DDownJump, ItemScript_ShrinkStomp, ItemScript_DamageDodge, ItemScript_EarthquakeJump, ItemScript_DeepFocus, ItemScript_SuperFocus, ItemScript_HPPlus, ItemScript_FPPlus, ItemScript_HappyHeart, ItemScript_HappyHeart, ItemScript_FlowerSaver, ItemScript_FlowerSaver, ItemScript_DamageDodge, ItemScript_DamageDodge, ItemScript_PowerPlus, ItemScript_PowerPlus, ItemScript_DefendPlus, ItemScript_DefendPlus, ItemScript_HappyFlower, ItemScript_HappyFlower, ItemScript_HappyFlower, ItemScript_GroupFocus, ItemScript_Peekaboo, ItemScript_AttackFXD, ItemScript_AttackFXB, ItemScript_AttackFXE, ItemScript_AttackFXC, ItemScript_AttackFXF, ItemScript_HPPlus, ItemScript_HPPlus, ItemScript_HPPlus, ItemScript_FPPlus, ItemScript_FPPlus, ItemScript_FPPlus, ItemScript_HealthyHealthy, ItemScript_Jump, ItemScript_Jump, ItemScript_Jump, ItemScript_Jump, ItemScript_Jump, ItemScript_Heart, ItemScript_Coin, ItemScript_HeartPiece, ItemScript_StarPoint, ItemScript_HeartPoint, ItemScript_FlowerPoint, ItemScript_StarPiece, ItemScript_CompleteCake, ItemScript_CakeDone, ItemScript_CakeBaked, ItemScript_CakePan, ItemScript_CakeBatter, ItemScript_CakeBowl, ItemScript_CakeMixed, ItemScript_CakeIcing, ItemScript_CakeBerries, ItemScript_Hammer1, ItemScript_Hammer2, ItemScript_Hammer3, ItemScript_Boots1, ItemScript_Boots2, ItemScript_Boots3, ItemScript_Items, ItemScript_Jump, ItemScript_Jump, ItemScript_Jump, ItemScript_Jump, ItemScript_Jump, ItemScript_Jump, ItemScript_Jump, ItemScript_Jump, ItemScript_Jump, ItemScript_Jump, ItemScript_Jump, ItemScript_Jump, ItemScript_Jump, ItemScript_Jump, ItemScript_Jump, ItemScript_Jump, ItemScript_Jump, ItemScript_Jump, ItemScript_Jump, ItemScript_Jump + +dlabel gItemIconRasterOffsets .word 0x00000000, 0x00001320, 0x00001540, 0x00001760, 0x00001980, 0x00001BA0, 0x00001DC0, 0x00001FE0, 0x00000000, 0x00000000, 0x00010780, 0x000109A0, 0x00010BC0, 0x00010E00, 0x00011020, 0x0000D860, 0x00009020, 0x00009240, 0x00009F00, 0x00009460, 0x00009680, 0x0000A9A0, 0x0000A560, 0x0000A780, 0x0000A340, 0x00009CE0, 0x000098A0, 0x0000ABC0, 0x0000B220, 0x0000B440, 0x0000CDC0, 0x0000B660, 0x0000B880, 0x0000BAA0, 0x0000B000, 0x0000BCC0, 0x0000BEE0, 0x0000C100, 0x0000C320, 0x00011240, 0x0000DEE0, 0x0000E100, 0x0000E320, 0x0000C540, 0x0000C760, 0x0000C980, 0x0000CBA0, 0x0000DAA0, 0x0000DCC0, 0x0000E540, 0x0000E760, 0x0000E980, 0x0000EBC0, 0x000129C0, 0x000129C0, 0x000129C0, 0x000129C0, 0x000129C0, 0x000129C0, 0x000129C0, 0x000129C0, 0x000129C0, 0x000129C0, 0x000129C0, 0x000129C0, 0x000129C0, 0x000129C0, 0x000129C0, 0x000129C0, 0x000129C0, 0x000129C0, 0x000129C0, 0x000129C0, 0x000129C0, 0x000129C0, 0x000129C0, 0x000129C0, 0x000129C0, 0x000129C0, 0x000129C0, 0x000129C0, 0x000129C0, 0x000129C0, 0x0000A120, 0x000129C0, 0x000129C0, 0x00009AC0, 0x0000CFE0, 0x0000D200, 0x0000D420, 0x0000D640, 0x0000A340, 0x00011AC0, 0x00027B40, 0x00027900, 0x00027D80, 0x00027FC0, 0x00028200, 0x00028440, 0x00028680, 0x000288C0, 0x00028B00, 0x00028D40, 0x0000F440, 0x0000F220, 0x0000F660, 0x0000FCE0, 0x0000B880, 0x0000F880, 0x0000FAA0, 0x000118A0, 0x00011CE0, 0x00011F20, 0x00012140, 0x00012360, 0x00012580, 0x000127A0, 0x00012580, 0x0000EDE0, 0x0000F000, 0x0000FCE0, 0x0000B880, 0x0000B880, 0x00011680, 0x00011460, 0x00000000, 0x00000000, 0x00000000, 0x0002A3C0, 0x0002A600, 0x0002A840, 0x0002ACC0, 0x0002AA80, 0x0002B140, 0x0002AF00, 0x00014700, 0x0002B5C0, 0x00024300, 0x000237C0, 0x0002B800, 0x00023A00, 0x000240C0, 0x00023C40, 0x000291C0, 0x00029640, 0x00029880, 0x00029AC0, 0x00027480, 0x000276C0, 0x00023E80, 0x00014280, 0x000144C0, 0x00014040, 0x00013BC0, 0x00029D00, 0x00024540, 0x00025980, 0x00025740, 0x00024780, 0x000249C0, 0x00024C00, 0x00024E40, 0x00027240, 0x00027000, 0x00026DC0, 0x00025080, 0x000252C0, 0x00025500, 0x00025BC0, 0x00025E00, 0x00026040, 0x00026280, 0x000264C0, 0x00026700, 0x00026940, 0x00026B80, 0x00002420, 0x00002660, 0x000028A0, 0x00002AE0, 0x00002D20, 0x00002F60, 0x000031A0, 0x000033E0, 0x00003620, 0x00003860, 0x00003AA0, 0x00004160, 0x00003CE0, 0x00003F20, 0x000043A0, 0x000045E0, 0x00004820, 0x00004A60, 0x00004CA0, 0x00004EE0, 0x00005120, 0x00005360, 0x000055A0, 0x000057E0, 0x00005A20, 0x00005C60, 0x00005EA0, 0x000060E0, 0x00006320, 0x00006560, 0x000067A0, 0x000069E0, 0x00006C20, 0x00006E60, 0x000070A0, 0x000072E0, 0x00007520, 0x00007760, 0x000079A0, 0x00007BE0, 0x00007E20, 0x00008060, 0x000082A0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00014DC0, 0x00015000, 0x00015240, 0x00015480, 0x000156C0, 0x00015900, 0x00015B40, 0x00015D80, 0x00015FC0, 0x00016200, 0x00000000, 0x000168C0, 0x000171C0, 0x00020880, 0x00017AC0, 0x00017F40, 0x000183C0, 0x00018600, 0x00018840, 0x00018A80, 0x00018CC0, 0x00018F00, 0x00019140, 0x00019380, 0x000195C0, 0x00019800, 0x00019A40, 0x00019C80, 0x00019EC0, 0x0001A100, 0x0001A340, 0x0001A580, 0x0001A7C0, 0x0001AA00, 0x0001AC40, 0x0001AE80, 0x0001B0C0, 0x0001B300, 0x0001B540, 0x00018180, 0x00016680, 0x00016B00, 0x00017400, 0x00016D40, 0x00017640, 0x0001E000, 0x00017880, 0x00016F80, 0x0001E6C0, 0x0001E240, 0x0001E480, 0x0001CE00, 0x0001C740, 0x0001C980, 0x0001D040, 0x00016440, 0x00017D00, 0x0001B780, 0x0001D280, 0x0001D4C0, 0x0001DB80, 0x0001D700, 0x0001DDC0, 0x0001D940, 0x0001CBC0, 0x0001B9C0, 0x0001BC00, 0x0001BE40, 0x0001C080, 0x0001C2C0, 0x0001C500, 0x00000000, 0x00000000, 0x000201C0, 0x00020400, 0x0001EFC0, 0x00000000, 0x00020640, 0x0001F440, 0x0001F200, 0x0001F680, 0x0001F8C0, 0x000201C0, 0x00020400, 0x00015D80, 0x000195C0, 0x0001A580, 0x0001A580, 0x0001B300, 0x0001B300, 0x0001F680, 0x0001F680, 0x00015240, 0x00015240, 0x00019C80, 0x00019C80, 0x0001FB00, 0x0001FB00, 0x0001FB00, 0x00021600, 0x000213C0, 0x00021840, 0x00021A80, 0x00021CC0, 0x00021F00, 0x00022140, 0x00015D80, 0x00015D80, 0x00015D80, 0x000195C0, 0x000195C0, 0x000195C0, 0x000225C0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00030A60, 0x0002F5C0, 0x00030CE0, 0x00030E20, 0x0002E900, 0x0002EF60, 0x00030400 -dlabel D_8008E94C +dlabel gItemIconPaletteOffsets .word 0x00000200, 0x00001520, 0x00001740, 0x00001960, 0x00001B80, 0x00001DA0, 0x00001FC0, 0x000021E0, 0x00000200, 0x00000200, 0x00010980, 0x00010BA0, 0x00010DC0, 0x00011000, 0x00011220, 0x0000DA60, 0x00009220, 0x00009440, 0x0000A100, 0x00009660, 0x00009880, 0x0000ABA0, 0x0000A760, 0x0000A980, 0x0000A540, 0x00009EE0, 0x00009AA0, 0x0000ADC0, 0x0000B420, 0x0000B640, 0x0000CFC0, 0x0000B860, 0x0000BA80, 0x0000BCA0, 0x0000B200, 0x0000BEC0, 0x0000C0E0, 0x0000C300, 0x0000C520, 0x00011440, 0x0000E0E0, 0x0000E300, 0x0000E520, 0x0000C740, 0x0000C960, 0x0000CB80, 0x0000CDA0, 0x0000DCA0, 0x0000DEC0, 0x0000E740, 0x0000E960, 0x0000EB80, 0x0000EDC0, 0x00012BC0, 0x00012BC0, 0x00012BC0, 0x00012BC0, 0x00012BC0, 0x00012BC0, 0x00012BC0, 0x00012BC0, 0x00012BC0, 0x00012BC0, 0x00012BC0, 0x00012BC0, 0x00012BC0, 0x00012BC0, 0x00012BC0, 0x00012BC0, 0x00012BC0, 0x00012BC0, 0x00012BC0, 0x00012BC0, 0x00012BC0, 0x00012BC0, 0x00012BC0, 0x00012BC0, 0x00012BC0, 0x00012BC0, 0x00012BC0, 0x00012BC0, 0x00012BC0, 0x00012BC0, 0x0000A320, 0x00012BC0, 0x00012BC0, 0x00009CC0, 0x0000D1E0, 0x0000D400, 0x0000D620, 0x0000D840, 0x0000A540, 0x00011CC0, 0x00027D40, 0x00027B00, 0x00027F80, 0x000281C0, 0x00028400, 0x00028640, 0x00028880, 0x00028AC0, 0x00028D00, 0x00028F40, 0x0000F640, 0x0000F420, 0x0000F860, 0x0000FEE0, 0x0000BA80, 0x0000FA80, 0x0000FCA0, 0x00011AA0, 0x00011EE0, 0x00012120, 0x00012340, 0x00012560, 0x00012780, 0x000129A0, 0x00012780, 0x0000EFE0, 0x0000F200, 0x0000FEE0, 0x0000BA80, 0x0000BA80, 0x00011880, 0x00011660, 0x00000200, 0x00000200, 0x00000200, 0x0002A5C0, 0x0002A800, 0x0002AA40, 0x0002AEC0, 0x0002AC80, 0x0002B340, 0x0002B100, 0x00014900, 0x0002B7C0, 0x00024500, 0x000239C0, 0x0002BA00, 0x00023C00, 0x000242C0, 0x00023E40, 0x000293C0, 0x00029840, 0x00029A80, 0x00029CC0, 0x00027680, 0x000278C0, 0x00024080, 0x00014480, 0x000146C0, 0x00014240, 0x00013DC0, 0x00029F00, 0x00024740, 0x00025B80, 0x00025940, 0x00024980, 0x00024BC0, 0x00024E00, 0x00025040, 0x00027440, 0x00027200, 0x00026FC0, 0x00025280, 0x000254C0, 0x00025700, 0x00025DC0, 0x00026000, 0x00026240, 0x00026480, 0x000266C0, 0x00026900, 0x00026B40, 0x00026D80, 0x00002620, 0x00002860, 0x00002AA0, 0x00002CE0, 0x00002F20, 0x00003160, 0x000033A0, 0x000035E0, 0x00003820, 0x00003A60, 0x00003CA0, 0x00004360, 0x00003EE0, 0x00004120, 0x000045A0, 0x000047E0, 0x00004A20, 0x00004C60, 0x00004EA0, 0x000050E0, 0x00005320, 0x00005560, 0x000057A0, 0x000059E0, 0x00005C20, 0x00005E60, 0x000060A0, 0x000062E0, 0x00006520, 0x00006760, 0x000069A0, 0x00006BE0, 0x00006E20, 0x00007060, 0x000072A0, 0x000074E0, 0x00007720, 0x00007960, 0x00007BA0, 0x00007DE0, 0x00008020, 0x00008260, 0x000084A0, 0x00000200, 0x00000200, 0x00000200, 0x00000200, 0x00000200, 0x00014FC0, 0x00015200, 0x00015440, 0x00015680, 0x000158C0, 0x00015B00, 0x00015D40, 0x00015F80, 0x000161C0, 0x00016400, 0x00000200, 0x00016AC0, 0x000173C0, 0x00020A80, 0x00017CC0, 0x00018140, 0x000185C0, 0x00018800, 0x00018A40, 0x00018C80, 0x00018EC0, 0x00019100, 0x00019340, 0x00019580, 0x000197C0, 0x00019A00, 0x00019C40, 0x00019E80, 0x0001A0C0, 0x0001A300, 0x0001A540, 0x0001A780, 0x0001A9C0, 0x0001AC00, 0x0001AE40, 0x0001B080, 0x0001B2C0, 0x0001B500, 0x0001B740, 0x00018380, 0x00016880, 0x00016D00, 0x00017600, 0x00016F40, 0x00017840, 0x0001E200, 0x00017A80, 0x00017180, 0x0001E8C0, 0x0001E440, 0x0001E680, 0x0001D000, 0x0001C940, 0x0001CB80, 0x0001D240, 0x00016640, 0x00017F00, 0x0001B980, 0x0001D480, 0x0001D6C0, 0x0001DD80, 0x0001D900, 0x0001DFC0, 0x0001DB40, 0x0001CDC0, 0x0001BBC0, 0x0001BE00, 0x0001C040, 0x0001C280, 0x0001C4C0, 0x0001C700, 0x00000200, 0x00000200, 0x000203C0, 0x00020600, 0x0001F1C0, 0x00000200, 0x00020840, 0x0001F640, 0x0001F400, 0x0001F880, 0x0001FAC0, 0x000203C0, 0x00020600, 0x00015F80, 0x000197C0, 0x0001A780, 0x0001A780, 0x0001B500, 0x0001B500, 0x0001F880, 0x0001F880, 0x00015440, 0x00015440, 0x00019E80, 0x00019E80, 0x0001FD00, 0x0001FD00, 0x0001FD00, 0x00021800, 0x000215C0, 0x00021A40, 0x00021C80, 0x00021EC0, 0x00022100, 0x00022340, 0x00015F80, 0x00015F80, 0x00015F80, 0x000197C0, 0x000197C0, 0x000197C0, 0x000227C0, 0x00000200, 0x00000200, 0x00000200, 0x00000200, 0x00000200, 0x00030B80, 0x0002F6E0, 0x00030E00, 0x00030F40, 0x0002EB00, 0x0002F160, 0x00030600, 0x00000000 dlabel D_8008EEC4 @@ -2612,8 +2771,11 @@ dlabel D_8008EEC4 dlabel D_8008EEF0 .word 0x00000000, 0x00000001, 0x00000002, 0x00000003, 0x00000004, 0x00000000, 0x00000006, 0x00000007, 0x00000008, 0x00000005, 0x00000000, 0x00000000 -dlabel D_8008EF20 -.word D_800989A0, 0x00000000, 0x00000000, 0x00000000, 0x001D0007, 0x00000002, 0x00280000, 0x00280001, 0x001D0008, 0x00000003, 0x0028000D, 0x0028000E, 0x001D0009, 0x00000004, 0x0028001A, 0x0028001B, 0x001D000A, 0x00000005, 0x00280027, 0x00280028, 0x001D000B, 0x00000001, 0x00000000, 0x00000000, 0x001D000C, 0x00000007, 0x00280041, 0x00280042, 0x001D000D, 0x00000008, 0x0028004E, 0x0028004F, 0x001D000E, 0x00000009, 0x0028005B, 0x0028005C, 0x001D000F, 0x00000006, 0x00280034, 0x00280035, 0x001D0010, 0x00000001, 0x00000000, 0x00000000, 0x001D0011, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80107CA8, D_80107CD0, D_80107CF8, D_80107D20, D_80107D48, D_80107D70, D_80107D98, D_80107DC0, D_80107DE8, D_80107E10, D_80107E38, D_80107E60, D_80107E88, D_80107EB0, D_80107ED8, D_80107F00, D_80107F28, D_80107F50, 0x80107F78, 0x80107FA0, D_80107FC8, D_80107FF0, 0x80108018, 0x80108040, 0x80108018, 0x80108040 +dlabel gPartnerPopupProperties +.word D_800989A0, 0x00000000, 0x00000000, 0x00000000, 0x001D0007, 0x00000002, 0x00280000, 0x00280001, 0x001D0008, 0x00000003, 0x0028000D, 0x0028000E, 0x001D0009, 0x00000004, 0x0028001A, 0x0028001B, 0x001D000A, 0x00000005, 0x00280027, 0x00280028, 0x001D000B, 0x00000001, 0x00000000, 0x00000000, 0x001D000C, 0x00000007, 0x00280041, 0x00280042, 0x001D000D, 0x00000008, 0x0028004E, 0x0028004F, 0x001D000E, 0x00000009, 0x0028005B, 0x0028005C, 0x001D000F, 0x00000006, 0x00280034, 0x00280035, 0x001D0010, 0x00000001, 0x00000000, 0x00000000, 0x001D0011, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 + +dlabel gPartnerIconHudScripts +.word HudScript_Partner0, HudScript_Partner0Disabled, HudScript_Goombario, HudScript_GoombarioDisabled, HudScript_Kooper, HudScript_KooperDisabled, HudScript_Bombette, HudScript_BombetteDisabled, HudScript_Parakarry, HudScript_ParakarryDisabled, HudScript_Bow, HudScript_BowDisabled, HudScript_Watt, HudScript_WattDisabled, HudScript_Sushie, HudScript_SushieDisabled, HudScript_Lakilester, HudScript_LakilesterDisabled, 0x80107F78, 0x80107FA0, HudScript_PartnerA, HudScript_PartnerADisabled, 0x80108018, 0x80108040, 0x80108018, 0x80108040 dlabel gMoveTable .word 0x00000000 @@ -2672,5 +2834,5 @@ dlabel D_8008FA8C dlabel D_8008FC44 .word 0x00010003, 0x0028002A, 0x00280031, 0x0B030005, 0x002B000E, 0x00008403, 0x0028002B, 0x00280032, 0x0B030003, 0x002B000F, 0x00008002, 0x0028002C, 0x00280033, 0x0B060004, 0x800989D0, 0x00000003, 0x00000000, 0x00000000, 0x0B000000, 0x800989D0, 0x00000003, 0x00000000, 0x00000000, 0x0B000000, 0x800989D0, 0x00000003, 0x00000000, 0x00000000, 0x0B000000, 0x800989C0, 0x00000004, 0x00000000, 0x00000000, 0x0B000000, 0x800989B4, 0x00000003, 0x00000000, 0x00000000, 0x0B000000, 0x800989A8, 0x00000003, 0x00000000, 0x00000000, 0x0B000000, 0x002B0014, 0x00000003, 0x00280043, 0x00280048, 0x0B00000F, 0x002B0014, 0x00000003, 0x00280043, 0x00280049, 0x0B00000F, 0x002B0014, 0x00000003, 0x00280043, 0x0028004A, 0x0B00000F, 0x002B0015, 0x00000003, 0x00280044, 0x0028004B, 0x0B020003, 0x002B0016, 0x00000008, 0x00280045, 0x0028004C, 0x0B03000A, 0x002B0017, 0x00008002, 0x00280046, 0x0028004D, 0x0B05000C, 0x002B0018, 0x00054881, 0x00280050, 0x00280055, 0x0B000001, 0x002B0018, 0x00054881, 0x00280050, 0x00280056, 0x0B000001, 0x002B0018, 0x00054881, 0x00280050, 0x00280057, 0x0B000001, 0x002B0019, 0x00000003, 0x00280051, 0x00280058, 0x0B03000E, 0x002B001A, 0x00000008, 0x00280052, 0x00280059, 0x0B03000A, 0x002B001B, 0x00008002, 0x00280053, 0x0028005A, 0x0B060008, 0x002B001C, 0x00000003, 0x0028005D, 0x00280062, 0x0B000010, 0x002B001C, 0x00000003, 0x0028005D, 0x00280063, 0x0B000010, 0x002B001C, 0x00000003, 0x0028005D, 0x00280064, 0x0B000010, 0x002B001D, 0x00008002, 0x0028005E, 0x00280065, 0x0B040004, 0x002B001E, 0x00000008, 0x0028005F, 0x00280066, 0x0B04000A, 0x002B001F, 0x00008002, 0x00280060, 0x00280067, 0x0B05000C, 0x002B0010, 0x00000003, 0x00280036, 0x0028003B, 0x0B000004, 0x002B0010, 0x00000003, 0x00280036, 0x0028003C, 0x0B000004, 0x002B0010, 0x00000003, 0x00280036, 0x0028003D, 0x0B000004, 0x002B0011, 0x00000008, 0x00280037, 0x0028003E, 0x0B0200FF, 0x002B0012, 0x00008002, 0x00280038, 0x0028003F, 0x0B030004, 0x002B0013, 0x00000003, 0x00280039, 0x00280040, 0x0B050004, 0x00000000, 0x00000000, 0x00000000 -dlabel D_8008FEE0 +dlabel gMessageBoxFrameParts .word 0x802EBFF0, 0x802EC010, 0x802EC030, 0x802EC050, 0x802EC070, 0x802EC090, 0x802EC0B0, 0x802EC0D0, 0x802EC0F0, 0x802EC110, 0x802EC130, 0x802EC150, 0x802EC170, 0x802EC190, 0x802EC1B0, 0x802EC1D0, 0x802EC1F0, 0x802EC210, 0x802EC230, 0x802EC250, 0x802EC270, 0x802EC290, 0x802EC2B0, 0x802EC2D0, 0x802EC2F0, 0x802EC310, 0x802EC330, 0x802EC350, 0x802EC370, 0x802EC390, 0x802EC3B0, 0x802EC3D0 diff --git a/ver/us/asm/data/9DE60.data.s b/ver/us/asm/data/9DE60.data.s index 512224773f..83e88a206c 100644 --- a/ver/us/asm/data/9DE60.data.s +++ b/ver/us/asm/data/9DE60.data.s @@ -2,335 +2,596 @@ .section .data -dlabel D_801049B0 -.word 0x00000008, 0x00000005, 0x00000001, 0x00000004, 0x00000002, 0x0000003C, 0x800FBA20, 0x800FBAA0, 0x00000003, 0x00000000, 0x00000008, 0x00000005, 0x00000001, 0x00000004, 0x00000002, 0x0000003C, 0x800FBAC0, 0x800FBB40, 0x00000003, 0x00000000 +dlabel HudScript_ArrowLeft +.word 0x00000008, 0x00000005, 0x00000001, 0x00000004, 0x00000002, 0x0000003C, 0x800FBA20, 0x800FBAA0, 0x00000003, 0x00000000 -dlabel D_80104A00 +dlabel HudScript_ArrowRight +.word 0x00000008, 0x00000005, 0x00000001, 0x00000004, 0x00000002, 0x0000003C, 0x800FBAC0, 0x800FBB40, 0x00000003, 0x00000000 + +dlabel HudScript_HandPointer .word 0x00000008, 0x00000005, 0x00000001, 0x00000004, 0x00000002, 0x0000003C, D_800FBB60, D_800FBBE0, 0x00000003, 0x00000000 -dlabel D_80104A28 -.word 0x00000008, 0x00000005, 0x00000001, 0x00000004, 0x0000000A, 0xFFFFFFFF, 0x00000002, 0x00000004, D_800FBB60, D_800FBBE0, 0x0000000A, 0x00000001, 0x00000002, 0x00000008, D_800FBB60, D_800FBBE0, 0x00000003, 0x00000000, 0x00000008, 0x00000005, 0x00000000, 0x00000004, 0x00000002, 0x0000003C, 0x800FBC00, 0x800FBC20, 0x00000003, 0x00000000, 0x00000008, 0x00000005, 0x00000000, 0x00000004, 0x00000002, 0x0000003C, 0x800FBC40, 0x800FBC60, 0x00000003, 0x00000000 +dlabel HudScript_AnimatedHandPointer +.word 0x00000008, 0x00000005, 0x00000001, 0x00000004, 0x0000000A, 0xFFFFFFFF, 0x00000002, 0x00000004, D_800FBB60, D_800FBBE0, 0x0000000A, 0x00000001, 0x00000002, 0x00000008, D_800FBB60, D_800FBBE0, 0x00000003, 0x00000000 -dlabel D_80104AC0 +dlabel HudScript_FilledCircle +.word 0x00000008, 0x00000005, 0x00000000, 0x00000004, 0x00000002, 0x0000003C, 0x800FBC00, 0x800FBC20, 0x00000003, 0x00000000 + +dlabel HudScript_EmptyCircle +.word 0x00000008, 0x00000005, 0x00000000, 0x00000004, 0x00000002, 0x0000003C, 0x800FBC40, 0x800FBC60, 0x00000003, 0x00000000 + +dlabel SparkleScript_Coin .word 0x00000004, 0x0000000D, 0x00000007, 0x00000001, D_800FBC80, 0x800FBCA0, 0x00000008, 0x00000008, 0x00000007, 0x00000001, 0x800FBCC0, 0x800FBCE0, 0x00000008, 0x00000008, 0x00000007, 0x00000001, 0x800FBD00, 0x800FBD20, 0x00000008, 0x00000008, 0x00000007, 0x00000002, 0x800FBE00, 0x800FBE20, 0x00000008, 0x00000008, 0x00000007, 0x00000001, 0x800FBD00, 0x800FBD20, 0x00000008, 0x00000008, 0x00000007, 0x00000001, 0x800FBD40, 0x800FBD60, 0x00000008, 0x00000008, 0x00000007, 0x00000001, 0x800FBE00, 0x800FBE20, 0x00000008, 0x00000008, 0x00000007, 0x00000001, 0x800FBD80, 0x800FBDA0, 0x00000008, 0x00000008, 0x00000007, 0x00000001, 0x800FBE00, 0x800FBE20, 0x00000008, 0x00000008, 0x00000007, 0x00000001, 0x800FBDC0, 0x800FBDE0, 0x00000008, 0x00000008, 0x00000007, 0x0000007F, 0x800FBE00, 0x800FBE20, 0x00000008, 0x00000008, 0x00000007, 0x0000007F, 0x800FBE00, 0x800FBE20, 0x00000008, 0x00000008, 0x00000000 -dlabel D_80104BEC +dlabel HudScript_StatusSPShine .word 0x00000012, 0x00000005, 0x00000002, 0x00000004, 0x00000001, 0x0000003C, 0x800FBE40, 0x00000003, 0x00000000 -dlabel D_80104C10 -.word 0x00000008, 0x00000005, 0x00000001, 0x00000004, 0x00000002, 0x0000000C, 0x800FC080, 0x800FC100, 0x00000002, 0x00000004, 0x800FC120, 0x800FC1A0, 0x00000002, 0x0000000C, 0x800FC1C0, 0x800FC240, 0x00000002, 0x00000004, 0x800FC120, 0x800FC1A0, 0x00000003, 0x00000000, 0x00000008, 0x00000013, 0x00000010, 0x00000010, 0x00000004, 0x00000002, 0x00000008, 0x80101C80, 0x80101D00, 0x00000002, 0x00000004, 0x80101D20, 0x80101DA0, 0x00000002, 0x00000008, 0x80101DC0, 0x80101E40, 0x00000002, 0x00000004, 0x80101D20, 0x80101DA0, 0x00000003, 0x00000000 +dlabel HudScript_StatusStarPiece +.word 0x00000008, 0x00000005, 0x00000001, 0x00000004, 0x00000002, 0x0000000C, 0x800FC080, 0x800FC100, 0x00000002, 0x00000004, 0x800FC120, 0x800FC1A0, 0x00000002, 0x0000000C, 0x800FC1C0, 0x800FC240, 0x00000002, 0x00000004, 0x800FC120, 0x800FC1A0, 0x00000003, 0x00000000 -dlabel D_80104CC4 +dlabel HudScript_AsleepLoop +.word 0x00000008, 0x00000013, 0x00000010, 0x00000010, 0x00000004, 0x00000002, 0x00000008, 0x80101C80, 0x80101D00, 0x00000002, 0x00000004, 0x80101D20, 0x80101DA0, 0x00000002, 0x00000008, 0x80101DC0, 0x80101E40, 0x00000002, 0x00000004, 0x80101D20, 0x80101DA0, 0x00000003, 0x00000000 + +dlabel HudScript_AsleepBegin .word 0x00000008, 0x00000013, 0x00000010, 0x00000010, 0x0000000F, 0x0000001E, 0x0000000C, 0x0000000A, 0xFFFFFFF6, 0x00000002, 0x00000001, 0x80101C80, 0x80101D00, 0x0000000F, 0x00000032, 0x0000000C, 0x00000008, 0xFFFFFFF8, 0x00000002, 0x00000001, 0x80101C80, 0x80101D00, 0x0000000F, 0x00000050, 0x0000000C, 0x00000006, 0xFFFFFFFA, 0x00000002, 0x00000001, 0x80101C80, 0x80101D00, 0x0000000F, 0x00000078, 0x0000000C, 0x00000005, 0xFFFFFFFB, 0x00000002, 0x00000001, 0x80101C80, 0x80101D00, 0x0000000F, 0x000000AA, 0x0000000C, 0x00000004, 0xFFFFFFFC, 0x00000002, 0x00000001, 0x80101C80, 0x80101D00, 0x0000000F, 0x000000C8, 0x0000000C, 0x00000003, 0xFFFFFFFD, 0x00000002, 0x00000001, 0x80101C80, 0x80101D00, 0x0000000F, 0x000000DC, 0x0000000C, 0x00000002, 0xFFFFFFFE, 0x00000002, 0x00000001, 0x80101C80, 0x80101D00, 0x0000000F, 0x000000F0, 0x0000000C, 0x00000001, 0xFFFFFFFF, 0x00000002, 0x00000001, 0x80101C80, 0x80101D00, 0x0000000F, 0x000000FF, 0x0000000C, 0x00000000, 0x00000000, 0x00000002, 0x00000001, 0x80101C80, 0x80101D00, 0x00000004, 0x00000002, 0x00000008, 0x80101C80, 0x80101D00, 0x00000002, 0x00000004, 0x80101D20, 0x80101DA0, 0x00000002, 0x00000008, 0x80101DC0, 0x80101E40, 0x00000002, 0x00000004, 0x80101D20, 0x80101DA0, 0x00000003, 0x00000000 -dlabel D_80104E64 -.word 0x00000008, 0x00000013, 0x00000010, 0x00000010, 0x0000000F, 0x000000FF, 0x0000000C, 0x00000000, 0x00000000, 0x00000002, 0x00000001, 0x80101C80, 0x80101D00, 0x0000000F, 0x000000F0, 0x0000000C, 0x00000001, 0xFFFFFFFF, 0x00000002, 0x00000001, 0x80101C80, 0x80101D00, 0x0000000F, 0x000000DC, 0x0000000C, 0x00000002, 0xFFFFFFFE, 0x00000002, 0x00000001, 0x80101C80, 0x80101D00, 0x0000000F, 0x000000C8, 0x0000000C, 0x00000003, 0xFFFFFFFD, 0x00000002, 0x00000001, 0x80101C80, 0x80101D00, 0x0000000F, 0x000000AA, 0x0000000C, 0x00000004, 0xFFFFFFFC, 0x00000002, 0x00000001, 0x80101C80, 0x80101D00, 0x0000000F, 0x00000078, 0x0000000C, 0x00000005, 0xFFFFFFFB, 0x00000002, 0x00000001, 0x80101C80, 0x80101D00, 0x0000000F, 0x00000050, 0x0000000C, 0x00000006, 0xFFFFFFFA, 0x00000002, 0x00000001, 0x80101C80, 0x80101D00, 0x0000000F, 0x00000032, 0x0000000C, 0x00000008, 0xFFFFFFF8, 0x00000002, 0x00000001, 0x80101C80, 0x80101D00, 0x0000000F, 0x0000001E, 0x0000000C, 0x0000000A, 0xFFFFFFF6, 0x00000002, 0x00000001, 0x80101C80, 0x80101D00, 0x00000000, 0x00000008, 0x00000013, 0x00000010, 0x00000010, 0x00000004, 0x00000002, 0x00000018, 0x80101E60, 0x80101EE0, 0x00000002, 0x00000001, 0x80101F00, 0x80101F80, 0x00000002, 0x00000001, 0x80101E60, 0x80101EE0, 0x00000002, 0x00000001, 0x80101F00, 0x80101F80, 0x00000002, 0x00000031, 0x80101E60, 0x80101EE0, 0x00000002, 0x00000001, 0x80101F00, 0x80101F80, 0x00000002, 0x00000001, 0x80101E60, 0x80101EE0, 0x00000002, 0x00000001, 0x80101F00, 0x80101EE0, 0x00000002, 0x00000001, 0x80101E60, 0x80101F80, 0x00000002, 0x00000001, 0x80101F00, 0x80101EE0, 0x00000002, 0x00000001, 0x80101E60, 0x80101F80, 0x00000002, 0x00000001, 0x80101F00, 0x80101EE0, 0x00000002, 0x00000001, 0x80101E60, 0x80101F80, 0x00000003, 0x00000000 +dlabel HudScript_AsleepEnd +.word 0x00000008, 0x00000013, 0x00000010, 0x00000010, 0x0000000F, 0x000000FF, 0x0000000C, 0x00000000, 0x00000000, 0x00000002, 0x00000001, 0x80101C80, 0x80101D00, 0x0000000F, 0x000000F0, 0x0000000C, 0x00000001, 0xFFFFFFFF, 0x00000002, 0x00000001, 0x80101C80, 0x80101D00, 0x0000000F, 0x000000DC, 0x0000000C, 0x00000002, 0xFFFFFFFE, 0x00000002, 0x00000001, 0x80101C80, 0x80101D00, 0x0000000F, 0x000000C8, 0x0000000C, 0x00000003, 0xFFFFFFFD, 0x00000002, 0x00000001, 0x80101C80, 0x80101D00, 0x0000000F, 0x000000AA, 0x0000000C, 0x00000004, 0xFFFFFFFC, 0x00000002, 0x00000001, 0x80101C80, 0x80101D00, 0x0000000F, 0x00000078, 0x0000000C, 0x00000005, 0xFFFFFFFB, 0x00000002, 0x00000001, 0x80101C80, 0x80101D00, 0x0000000F, 0x00000050, 0x0000000C, 0x00000006, 0xFFFFFFFA, 0x00000002, 0x00000001, 0x80101C80, 0x80101D00, 0x0000000F, 0x00000032, 0x0000000C, 0x00000008, 0xFFFFFFF8, 0x00000002, 0x00000001, 0x80101C80, 0x80101D00, 0x0000000F, 0x0000001E, 0x0000000C, 0x0000000A, 0xFFFFFFF6, 0x00000002, 0x00000001, 0x80101C80, 0x80101D00, 0x00000000 -dlabel D_801050A8 +dlabel HudScript_ElectrifiedLoop +.word 0x00000008, 0x00000013, 0x00000010, 0x00000010, 0x00000004, 0x00000002, 0x00000018, 0x80101E60, 0x80101EE0, 0x00000002, 0x00000001, 0x80101F00, 0x80101F80, 0x00000002, 0x00000001, 0x80101E60, 0x80101EE0, 0x00000002, 0x00000001, 0x80101F00, 0x80101F80, 0x00000002, 0x00000031, 0x80101E60, 0x80101EE0, 0x00000002, 0x00000001, 0x80101F00, 0x80101F80, 0x00000002, 0x00000001, 0x80101E60, 0x80101EE0, 0x00000002, 0x00000001, 0x80101F00, 0x80101EE0, 0x00000002, 0x00000001, 0x80101E60, 0x80101F80, 0x00000002, 0x00000001, 0x80101F00, 0x80101EE0, 0x00000002, 0x00000001, 0x80101E60, 0x80101F80, 0x00000002, 0x00000001, 0x80101F00, 0x80101EE0, 0x00000002, 0x00000001, 0x80101E60, 0x80101F80, 0x00000003, 0x00000000 + +dlabel HudScript_ElectrifiedBegin .word 0x00000008, 0x00000013, 0x00000010, 0x00000010, 0x0000000F, 0x0000001E, 0x0000000C, 0x0000000A, 0xFFFFFFF6, 0x00000002, 0x00000001, 0x80101E60, 0x80101EE0, 0x0000000F, 0x00000032, 0x0000000C, 0x00000008, 0xFFFFFFF8, 0x00000002, 0x00000001, 0x80101E60, 0x80101EE0, 0x0000000F, 0x00000050, 0x0000000C, 0x00000006, 0xFFFFFFFA, 0x00000002, 0x00000001, 0x80101E60, 0x80101EE0, 0x0000000F, 0x00000078, 0x0000000C, 0x00000005, 0xFFFFFFFB, 0x00000002, 0x00000001, 0x80101E60, 0x80101EE0, 0x0000000F, 0x000000AA, 0x0000000C, 0x00000004, 0xFFFFFFFC, 0x00000002, 0x00000001, 0x80101E60, 0x80101EE0, 0x0000000F, 0x000000C8, 0x0000000C, 0x00000003, 0xFFFFFFFD, 0x00000002, 0x00000001, 0x80101E60, 0x80101EE0, 0x0000000F, 0x000000DC, 0x0000000C, 0x00000002, 0xFFFFFFFE, 0x00000002, 0x00000001, 0x80101E60, 0x80101EE0, 0x0000000F, 0x000000F0, 0x0000000C, 0x00000001, 0xFFFFFFFF, 0x00000002, 0x00000001, 0x80101E60, 0x80101EE0, 0x0000000F, 0x000000FF, 0x0000000C, 0x00000000, 0x00000000, 0x00000002, 0x00000001, 0x80101E60, 0x80101EE0, 0x00000004, 0x00000002, 0x00000018, 0x80101E60, 0x80101EE0, 0x00000002, 0x00000001, 0x80101F00, 0x80101F80, 0x00000002, 0x00000001, 0x80101E60, 0x80101EE0, 0x00000002, 0x00000001, 0x80101F00, 0x80101F80, 0x00000002, 0x00000031, 0x80101E60, 0x80101EE0, 0x00000002, 0x00000001, 0x80101F00, 0x80101F80, 0x00000002, 0x00000001, 0x80101E60, 0x80101EE0, 0x00000002, 0x00000001, 0x80101F00, 0x80101EE0, 0x00000002, 0x00000001, 0x80101E60, 0x80101F80, 0x00000002, 0x00000001, 0x80101F00, 0x80101EE0, 0x00000002, 0x00000001, 0x80101E60, 0x80101F80, 0x00000002, 0x00000001, 0x80101F00, 0x80101EE0, 0x00000002, 0x00000001, 0x80101E60, 0x80101F80, 0x00000003, 0x00000000 -dlabel D_801052D8 -.word 0x00000008, 0x00000013, 0x00000010, 0x00000010, 0x0000000F, 0x000000FF, 0x0000000C, 0x00000000, 0x00000000, 0x00000002, 0x00000001, 0x80101E60, 0x80101EE0, 0x0000000F, 0x000000F0, 0x0000000C, 0x00000001, 0xFFFFFFFF, 0x00000002, 0x00000001, 0x80101E60, 0x80101EE0, 0x0000000F, 0x000000DC, 0x0000000C, 0x00000002, 0xFFFFFFFE, 0x00000002, 0x00000001, 0x80101E60, 0x80101EE0, 0x0000000F, 0x000000C8, 0x0000000C, 0x00000003, 0xFFFFFFFD, 0x00000002, 0x00000001, 0x80101E60, 0x80101EE0, 0x0000000F, 0x000000AA, 0x0000000C, 0x00000004, 0xFFFFFFFC, 0x00000002, 0x00000001, 0x80101E60, 0x80101EE0, 0x0000000F, 0x00000078, 0x0000000C, 0x00000005, 0xFFFFFFFB, 0x00000002, 0x00000001, 0x80101E60, 0x80101EE0, 0x0000000F, 0x00000050, 0x0000000C, 0x00000006, 0xFFFFFFFA, 0x00000002, 0x00000001, 0x80101E60, 0x80101EE0, 0x0000000F, 0x00000032, 0x0000000C, 0x00000008, 0xFFFFFFF8, 0x00000002, 0x00000001, 0x80101E60, 0x80101EE0, 0x0000000F, 0x0000001E, 0x0000000C, 0x0000000A, 0xFFFFFFF6, 0x00000002, 0x00000001, 0x80101E60, 0x80101EE0, 0x00000000, 0x00000008, 0x00000013, 0x00000010, 0x00000010, 0x00000004, 0x00000002, 0x00000018, 0x80101FA0, 0x80102020, 0x00000002, 0x00000001, 0x80102040, 0x801020C0, 0x00000002, 0x00000001, 0x80101FA0, 0x80102020, 0x00000002, 0x00000001, 0x80102040, 0x801020C0, 0x00000002, 0x00000031, 0x80101FA0, 0x80102020, 0x00000002, 0x00000001, 0x80102040, 0x801020C0, 0x00000002, 0x00000001, 0x80101FA0, 0x80102020, 0x00000002, 0x00000001, 0x80102040, 0x80102020, 0x00000002, 0x00000001, 0x80101FA0, 0x801020C0, 0x00000002, 0x00000001, 0x80102040, 0x80102020, 0x00000002, 0x00000001, 0x80101FA0, 0x801020C0, 0x00000002, 0x00000001, 0x80102040, 0x80102020, 0x00000002, 0x00000001, 0x80101FA0, 0x801020C0, 0x00000003, 0x00000000 +dlabel HudScript_ElectrifiedEnd +.word 0x00000008, 0x00000013, 0x00000010, 0x00000010, 0x0000000F, 0x000000FF, 0x0000000C, 0x00000000, 0x00000000, 0x00000002, 0x00000001, 0x80101E60, 0x80101EE0, 0x0000000F, 0x000000F0, 0x0000000C, 0x00000001, 0xFFFFFFFF, 0x00000002, 0x00000001, 0x80101E60, 0x80101EE0, 0x0000000F, 0x000000DC, 0x0000000C, 0x00000002, 0xFFFFFFFE, 0x00000002, 0x00000001, 0x80101E60, 0x80101EE0, 0x0000000F, 0x000000C8, 0x0000000C, 0x00000003, 0xFFFFFFFD, 0x00000002, 0x00000001, 0x80101E60, 0x80101EE0, 0x0000000F, 0x000000AA, 0x0000000C, 0x00000004, 0xFFFFFFFC, 0x00000002, 0x00000001, 0x80101E60, 0x80101EE0, 0x0000000F, 0x00000078, 0x0000000C, 0x00000005, 0xFFFFFFFB, 0x00000002, 0x00000001, 0x80101E60, 0x80101EE0, 0x0000000F, 0x00000050, 0x0000000C, 0x00000006, 0xFFFFFFFA, 0x00000002, 0x00000001, 0x80101E60, 0x80101EE0, 0x0000000F, 0x00000032, 0x0000000C, 0x00000008, 0xFFFFFFF8, 0x00000002, 0x00000001, 0x80101E60, 0x80101EE0, 0x0000000F, 0x0000001E, 0x0000000C, 0x0000000A, 0xFFFFFFF6, 0x00000002, 0x00000001, 0x80101E60, 0x80101EE0, 0x00000000 -dlabel D_8010551C +dlabel HudScript_ParalyzedLoop +.word 0x00000008, 0x00000013, 0x00000010, 0x00000010, 0x00000004, 0x00000002, 0x00000018, 0x80101FA0, 0x80102020, 0x00000002, 0x00000001, 0x80102040, 0x801020C0, 0x00000002, 0x00000001, 0x80101FA0, 0x80102020, 0x00000002, 0x00000001, 0x80102040, 0x801020C0, 0x00000002, 0x00000031, 0x80101FA0, 0x80102020, 0x00000002, 0x00000001, 0x80102040, 0x801020C0, 0x00000002, 0x00000001, 0x80101FA0, 0x80102020, 0x00000002, 0x00000001, 0x80102040, 0x80102020, 0x00000002, 0x00000001, 0x80101FA0, 0x801020C0, 0x00000002, 0x00000001, 0x80102040, 0x80102020, 0x00000002, 0x00000001, 0x80101FA0, 0x801020C0, 0x00000002, 0x00000001, 0x80102040, 0x80102020, 0x00000002, 0x00000001, 0x80101FA0, 0x801020C0, 0x00000003, 0x00000000 + +dlabel HudScript_ParalyzedBegin .word 0x00000008, 0x00000013, 0x00000010, 0x00000010, 0x0000000F, 0x0000001E, 0x0000000C, 0x0000000A, 0xFFFFFFF6, 0x00000002, 0x00000001, 0x80101FA0, 0x80102020, 0x0000000F, 0x00000032, 0x0000000C, 0x00000008, 0xFFFFFFF8, 0x00000002, 0x00000001, 0x80101FA0, 0x80102020, 0x0000000F, 0x00000050, 0x0000000C, 0x00000006, 0xFFFFFFFA, 0x00000002, 0x00000001, 0x80101FA0, 0x80102020, 0x0000000F, 0x00000078, 0x0000000C, 0x00000005, 0xFFFFFFFB, 0x00000002, 0x00000001, 0x80101FA0, 0x80102020, 0x0000000F, 0x000000AA, 0x0000000C, 0x00000004, 0xFFFFFFFC, 0x00000002, 0x00000001, 0x80101FA0, 0x80102020, 0x0000000F, 0x000000C8, 0x0000000C, 0x00000003, 0xFFFFFFFD, 0x00000002, 0x00000001, 0x80101FA0, 0x80102020, 0x0000000F, 0x000000DC, 0x0000000C, 0x00000002, 0xFFFFFFFE, 0x00000002, 0x00000001, 0x80101FA0, 0x80102020, 0x0000000F, 0x000000F0, 0x0000000C, 0x00000001, 0xFFFFFFFF, 0x00000002, 0x00000001, 0x80101FA0, 0x80102020, 0x0000000F, 0x000000FF, 0x0000000C, 0x00000000, 0x00000000, 0x00000002, 0x00000001, 0x80101FA0, 0x80102020, 0x00000004, 0x00000002, 0x00000018, 0x80101FA0, 0x80102020, 0x00000002, 0x00000001, 0x80102040, 0x801020C0, 0x00000002, 0x00000001, 0x80101FA0, 0x80102020, 0x00000002, 0x00000001, 0x80102040, 0x801020C0, 0x00000002, 0x00000031, 0x80101FA0, 0x80102020, 0x00000002, 0x00000001, 0x80102040, 0x801020C0, 0x00000002, 0x00000001, 0x80101FA0, 0x80102020, 0x00000002, 0x00000001, 0x80102040, 0x80102020, 0x00000002, 0x00000001, 0x80101FA0, 0x801020C0, 0x00000002, 0x00000001, 0x80102040, 0x80102020, 0x00000002, 0x00000001, 0x80101FA0, 0x801020C0, 0x00000002, 0x00000001, 0x80102040, 0x80102020, 0x00000002, 0x00000001, 0x80101FA0, 0x801020C0, 0x00000003, 0x00000000 -dlabel D_8010574C -.word 0x00000008, 0x00000013, 0x00000010, 0x00000010, 0x0000000F, 0x000000FF, 0x0000000C, 0x00000000, 0x00000000, 0x00000002, 0x00000001, 0x80101FA0, 0x80102020, 0x0000000F, 0x000000F0, 0x0000000C, 0x00000001, 0xFFFFFFFF, 0x00000002, 0x00000001, 0x80101FA0, 0x80102020, 0x0000000F, 0x000000DC, 0x0000000C, 0x00000002, 0xFFFFFFFE, 0x00000002, 0x00000001, 0x80101FA0, 0x80102020, 0x0000000F, 0x000000C8, 0x0000000C, 0x00000003, 0xFFFFFFFD, 0x00000002, 0x00000001, 0x80101FA0, 0x80102020, 0x0000000F, 0x000000AA, 0x0000000C, 0x00000004, 0xFFFFFFFC, 0x00000002, 0x00000001, 0x80101FA0, 0x80102020, 0x0000000F, 0x00000078, 0x0000000C, 0x00000005, 0xFFFFFFFB, 0x00000002, 0x00000001, 0x80101FA0, 0x80102020, 0x0000000F, 0x00000050, 0x0000000C, 0x00000006, 0xFFFFFFFA, 0x00000002, 0x00000001, 0x80101FA0, 0x80102020, 0x0000000F, 0x00000032, 0x0000000C, 0x00000008, 0xFFFFFFF8, 0x00000002, 0x00000001, 0x80101FA0, 0x80102020, 0x0000000F, 0x0000001E, 0x0000000C, 0x0000000A, 0xFFFFFFF6, 0x00000002, 0x00000001, 0x80101FA0, 0x80102020, 0x00000000, 0x00000008, 0x00000013, 0x00000010, 0x00000010, 0x00000004, 0x00000002, 0x00000004, 0x801020E0, 0x80102160, 0x00000002, 0x00000004, 0x80102180, 0x80102200, 0x00000002, 0x00000004, 0x80102220, 0x801022A0, 0x00000002, 0x00000004, 0x801022C0, 0x80102340, 0x00000003, 0x00000000 +dlabel HudScript_ParalyzedEnd +.word 0x00000008, 0x00000013, 0x00000010, 0x00000010, 0x0000000F, 0x000000FF, 0x0000000C, 0x00000000, 0x00000000, 0x00000002, 0x00000001, 0x80101FA0, 0x80102020, 0x0000000F, 0x000000F0, 0x0000000C, 0x00000001, 0xFFFFFFFF, 0x00000002, 0x00000001, 0x80101FA0, 0x80102020, 0x0000000F, 0x000000DC, 0x0000000C, 0x00000002, 0xFFFFFFFE, 0x00000002, 0x00000001, 0x80101FA0, 0x80102020, 0x0000000F, 0x000000C8, 0x0000000C, 0x00000003, 0xFFFFFFFD, 0x00000002, 0x00000001, 0x80101FA0, 0x80102020, 0x0000000F, 0x000000AA, 0x0000000C, 0x00000004, 0xFFFFFFFC, 0x00000002, 0x00000001, 0x80101FA0, 0x80102020, 0x0000000F, 0x00000078, 0x0000000C, 0x00000005, 0xFFFFFFFB, 0x00000002, 0x00000001, 0x80101FA0, 0x80102020, 0x0000000F, 0x00000050, 0x0000000C, 0x00000006, 0xFFFFFFFA, 0x00000002, 0x00000001, 0x80101FA0, 0x80102020, 0x0000000F, 0x00000032, 0x0000000C, 0x00000008, 0xFFFFFFF8, 0x00000002, 0x00000001, 0x80101FA0, 0x80102020, 0x0000000F, 0x0000001E, 0x0000000C, 0x0000000A, 0xFFFFFFF6, 0x00000002, 0x00000001, 0x80101FA0, 0x80102020, 0x00000000 -dlabel D_80105900 +dlabel HudScript_DizzyLoop +.word 0x00000008, 0x00000013, 0x00000010, 0x00000010, 0x00000004, 0x00000002, 0x00000004, 0x801020E0, 0x80102160, 0x00000002, 0x00000004, 0x80102180, 0x80102200, 0x00000002, 0x00000004, 0x80102220, 0x801022A0, 0x00000002, 0x00000004, 0x801022C0, 0x80102340, 0x00000003, 0x00000000 + +dlabel HudScript_DizzyBegin .word 0x00000008, 0x00000013, 0x00000010, 0x00000010, 0x0000000F, 0x0000001E, 0x0000000C, 0x0000000A, 0xFFFFFFF6, 0x00000002, 0x00000001, 0x801020E0, 0x80102160, 0x0000000F, 0x00000032, 0x0000000C, 0x00000008, 0xFFFFFFF8, 0x00000002, 0x00000001, 0x801020E0, 0x80102160, 0x0000000F, 0x00000050, 0x0000000C, 0x00000006, 0xFFFFFFFA, 0x00000002, 0x00000001, 0x801020E0, 0x80102160, 0x0000000F, 0x00000078, 0x0000000C, 0x00000005, 0xFFFFFFFB, 0x00000002, 0x00000001, 0x801020E0, 0x80102160, 0x0000000F, 0x000000AA, 0x0000000C, 0x00000004, 0xFFFFFFFC, 0x00000002, 0x00000001, 0x801020E0, 0x80102160, 0x0000000F, 0x000000C8, 0x0000000C, 0x00000003, 0xFFFFFFFD, 0x00000002, 0x00000001, 0x801020E0, 0x80102160, 0x0000000F, 0x000000DC, 0x0000000C, 0x00000002, 0xFFFFFFFE, 0x00000002, 0x00000001, 0x801020E0, 0x80102160, 0x0000000F, 0x000000F0, 0x0000000C, 0x00000001, 0xFFFFFFFF, 0x00000002, 0x00000001, 0x801020E0, 0x80102160, 0x0000000F, 0x000000FF, 0x0000000C, 0x00000000, 0x00000000, 0x00000002, 0x00000001, 0x801020E0, 0x80102160, 0x00000004, 0x00000002, 0x00000004, 0x801020E0, 0x80102160, 0x00000002, 0x00000004, 0x80102180, 0x80102200, 0x00000002, 0x00000004, 0x80102220, 0x801022A0, 0x00000002, 0x00000004, 0x801022C0, 0x80102340, 0x00000003, 0x00000000 -dlabel D_80105AA0 -.word 0x00000008, 0x00000013, 0x00000010, 0x00000010, 0x0000000F, 0x000000FF, 0x0000000C, 0x00000000, 0x00000000, 0x00000002, 0x00000001, 0x801020E0, 0x80102160, 0x0000000F, 0x000000F0, 0x0000000C, 0x00000001, 0xFFFFFFFF, 0x00000002, 0x00000001, 0x801020E0, 0x80102160, 0x0000000F, 0x000000DC, 0x0000000C, 0x00000002, 0xFFFFFFFE, 0x00000002, 0x00000001, 0x801020E0, 0x80102160, 0x0000000F, 0x000000C8, 0x0000000C, 0x00000003, 0xFFFFFFFD, 0x00000002, 0x00000001, 0x801020E0, 0x80102160, 0x0000000F, 0x000000AA, 0x0000000C, 0x00000004, 0xFFFFFFFC, 0x00000002, 0x00000001, 0x801020E0, 0x80102160, 0x0000000F, 0x00000078, 0x0000000C, 0x00000005, 0xFFFFFFFB, 0x00000002, 0x00000001, 0x801020E0, 0x80102160, 0x0000000F, 0x00000050, 0x0000000C, 0x00000006, 0xFFFFFFFA, 0x00000002, 0x00000001, 0x801020E0, 0x80102160, 0x0000000F, 0x00000032, 0x0000000C, 0x00000008, 0xFFFFFFF8, 0x00000002, 0x00000001, 0x801020E0, 0x80102160, 0x0000000F, 0x0000001E, 0x0000000C, 0x0000000A, 0xFFFFFFF6, 0x00000002, 0x00000001, 0x801020E0, 0x80102160, 0x00000000, 0x00000008, 0x00000013, 0x00000010, 0x00000010, 0x00000004, 0x00000002, 0x0000001B, 0x80102360, 0x801023E0, 0x00000002, 0x00000003, 0x80102400, 0x80102480, 0x00000002, 0x00000003, 0x80102360, 0x801023E0, 0x00000002, 0x00000003, 0x80102400, 0x80102480, 0x00000003, 0x00000000 +dlabel HudScript_DizzyEnd +.word 0x00000008, 0x00000013, 0x00000010, 0x00000010, 0x0000000F, 0x000000FF, 0x0000000C, 0x00000000, 0x00000000, 0x00000002, 0x00000001, 0x801020E0, 0x80102160, 0x0000000F, 0x000000F0, 0x0000000C, 0x00000001, 0xFFFFFFFF, 0x00000002, 0x00000001, 0x801020E0, 0x80102160, 0x0000000F, 0x000000DC, 0x0000000C, 0x00000002, 0xFFFFFFFE, 0x00000002, 0x00000001, 0x801020E0, 0x80102160, 0x0000000F, 0x000000C8, 0x0000000C, 0x00000003, 0xFFFFFFFD, 0x00000002, 0x00000001, 0x801020E0, 0x80102160, 0x0000000F, 0x000000AA, 0x0000000C, 0x00000004, 0xFFFFFFFC, 0x00000002, 0x00000001, 0x801020E0, 0x80102160, 0x0000000F, 0x00000078, 0x0000000C, 0x00000005, 0xFFFFFFFB, 0x00000002, 0x00000001, 0x801020E0, 0x80102160, 0x0000000F, 0x00000050, 0x0000000C, 0x00000006, 0xFFFFFFFA, 0x00000002, 0x00000001, 0x801020E0, 0x80102160, 0x0000000F, 0x00000032, 0x0000000C, 0x00000008, 0xFFFFFFF8, 0x00000002, 0x00000001, 0x801020E0, 0x80102160, 0x0000000F, 0x0000001E, 0x0000000C, 0x0000000A, 0xFFFFFFF6, 0x00000002, 0x00000001, 0x801020E0, 0x80102160, 0x00000000 -dlabel D_80105C54 +dlabel HudScript_PoisonedLoop +.word 0x00000008, 0x00000013, 0x00000010, 0x00000010, 0x00000004, 0x00000002, 0x0000001B, 0x80102360, 0x801023E0, 0x00000002, 0x00000003, 0x80102400, 0x80102480, 0x00000002, 0x00000003, 0x80102360, 0x801023E0, 0x00000002, 0x00000003, 0x80102400, 0x80102480, 0x00000003, 0x00000000 + +dlabel HudScript_PoisonedBegin .word 0x00000008, 0x00000013, 0x00000010, 0x00000010, 0x0000000F, 0x0000001E, 0x0000000C, 0x0000000A, 0xFFFFFFF6, 0x00000002, 0x00000001, 0x80102360, 0x801023E0, 0x0000000F, 0x00000032, 0x0000000C, 0x00000008, 0xFFFFFFF8, 0x00000002, 0x00000001, 0x80102360, 0x801023E0, 0x0000000F, 0x00000050, 0x0000000C, 0x00000006, 0xFFFFFFFA, 0x00000002, 0x00000001, 0x80102360, 0x801023E0, 0x0000000F, 0x00000078, 0x0000000C, 0x00000005, 0xFFFFFFFB, 0x00000002, 0x00000001, 0x80102360, 0x801023E0, 0x0000000F, 0x000000AA, 0x0000000C, 0x00000004, 0xFFFFFFFC, 0x00000002, 0x00000001, 0x80102360, 0x801023E0, 0x0000000F, 0x000000C8, 0x0000000C, 0x00000003, 0xFFFFFFFD, 0x00000002, 0x00000001, 0x80102360, 0x801023E0, 0x0000000F, 0x000000DC, 0x0000000C, 0x00000002, 0xFFFFFFFE, 0x00000002, 0x00000001, 0x80102360, 0x801023E0, 0x0000000F, 0x000000F0, 0x0000000C, 0x00000001, 0xFFFFFFFF, 0x00000002, 0x00000001, 0x80102360, 0x801023E0, 0x0000000F, 0x000000FF, 0x0000000C, 0x00000000, 0x00000000, 0x00000002, 0x00000001, 0x80102360, 0x801023E0, 0x00000004, 0x00000002, 0x0000001B, 0x80102360, 0x801023E0, 0x00000002, 0x00000003, 0x80102400, 0x80102480, 0x00000002, 0x00000003, 0x80102360, 0x801023E0, 0x00000002, 0x00000003, 0x80102400, 0x80102480, 0x00000003, 0x00000000 -dlabel D_80105DF4 -.word 0x00000008, 0x00000013, 0x00000010, 0x00000010, 0x0000000F, 0x000000FF, 0x0000000C, 0x00000000, 0x00000000, 0x00000002, 0x00000001, 0x80102360, 0x801023E0, 0x0000000F, 0x000000F0, 0x0000000C, 0x00000001, 0xFFFFFFFF, 0x00000002, 0x00000001, 0x80102360, 0x801023E0, 0x0000000F, 0x000000DC, 0x0000000C, 0x00000002, 0xFFFFFFFE, 0x00000002, 0x00000001, 0x80102360, 0x801023E0, 0x0000000F, 0x000000C8, 0x0000000C, 0x00000003, 0xFFFFFFFD, 0x00000002, 0x00000001, 0x80102360, 0x801023E0, 0x0000000F, 0x000000AA, 0x0000000C, 0x00000004, 0xFFFFFFFC, 0x00000002, 0x00000001, 0x80102360, 0x801023E0, 0x0000000F, 0x00000078, 0x0000000C, 0x00000005, 0xFFFFFFFB, 0x00000002, 0x00000001, 0x80102360, 0x801023E0, 0x0000000F, 0x00000050, 0x0000000C, 0x00000006, 0xFFFFFFFA, 0x00000002, 0x00000001, 0x80102360, 0x801023E0, 0x0000000F, 0x00000032, 0x0000000C, 0x00000008, 0xFFFFFFF8, 0x00000002, 0x00000001, 0x80102360, 0x801023E0, 0x0000000F, 0x0000001E, 0x0000000C, 0x0000000A, 0xFFFFFFF6, 0x00000002, 0x00000001, 0x80102360, 0x801023E0, 0x00000000, 0x00000008, 0x00000013, 0x00000010, 0x00000010, 0x00000004, 0x00000002, 0x00000018, 0x801024A0, 0x80102520, 0x00000002, 0x00000003, 0x80102540, 0x801025C0, 0x00000002, 0x00000004, 0x801025E0, 0x80102660, 0x00000002, 0x00000003, 0x80102680, 0x80102700, 0x00000003, 0x00000000 +dlabel HudScript_PoisonedEnd +.word 0x00000008, 0x00000013, 0x00000010, 0x00000010, 0x0000000F, 0x000000FF, 0x0000000C, 0x00000000, 0x00000000, 0x00000002, 0x00000001, 0x80102360, 0x801023E0, 0x0000000F, 0x000000F0, 0x0000000C, 0x00000001, 0xFFFFFFFF, 0x00000002, 0x00000001, 0x80102360, 0x801023E0, 0x0000000F, 0x000000DC, 0x0000000C, 0x00000002, 0xFFFFFFFE, 0x00000002, 0x00000001, 0x80102360, 0x801023E0, 0x0000000F, 0x000000C8, 0x0000000C, 0x00000003, 0xFFFFFFFD, 0x00000002, 0x00000001, 0x80102360, 0x801023E0, 0x0000000F, 0x000000AA, 0x0000000C, 0x00000004, 0xFFFFFFFC, 0x00000002, 0x00000001, 0x80102360, 0x801023E0, 0x0000000F, 0x00000078, 0x0000000C, 0x00000005, 0xFFFFFFFB, 0x00000002, 0x00000001, 0x80102360, 0x801023E0, 0x0000000F, 0x00000050, 0x0000000C, 0x00000006, 0xFFFFFFFA, 0x00000002, 0x00000001, 0x80102360, 0x801023E0, 0x0000000F, 0x00000032, 0x0000000C, 0x00000008, 0xFFFFFFF8, 0x00000002, 0x00000001, 0x80102360, 0x801023E0, 0x0000000F, 0x0000001E, 0x0000000C, 0x0000000A, 0xFFFFFFF6, 0x00000002, 0x00000001, 0x80102360, 0x801023E0, 0x00000000 -dlabel D_80105FA8 +dlabel HudScript_FrozenLoop +.word 0x00000008, 0x00000013, 0x00000010, 0x00000010, 0x00000004, 0x00000002, 0x00000018, 0x801024A0, 0x80102520, 0x00000002, 0x00000003, 0x80102540, 0x801025C0, 0x00000002, 0x00000004, 0x801025E0, 0x80102660, 0x00000002, 0x00000003, 0x80102680, 0x80102700, 0x00000003, 0x00000000 + +dlabel HudScript_FrozenBegin .word 0x00000008, 0x00000013, 0x00000010, 0x00000010, 0x0000000F, 0x0000001E, 0x0000000C, 0x0000000A, 0xFFFFFFF6, 0x00000002, 0x00000001, 0x801024A0, 0x80102520, 0x0000000F, 0x00000032, 0x0000000C, 0x00000008, 0xFFFFFFF8, 0x00000002, 0x00000001, 0x801024A0, 0x80102520, 0x0000000F, 0x00000050, 0x0000000C, 0x00000006, 0xFFFFFFFA, 0x00000002, 0x00000001, 0x801024A0, 0x80102520, 0x0000000F, 0x00000078, 0x0000000C, 0x00000005, 0xFFFFFFFB, 0x00000002, 0x00000001, 0x801024A0, 0x80102520, 0x0000000F, 0x000000AA, 0x0000000C, 0x00000004, 0xFFFFFFFC, 0x00000002, 0x00000001, 0x801024A0, 0x80102520, 0x0000000F, 0x000000C8, 0x0000000C, 0x00000003, 0xFFFFFFFD, 0x00000002, 0x00000001, 0x801024A0, 0x80102520, 0x0000000F, 0x000000DC, 0x0000000C, 0x00000002, 0xFFFFFFFE, 0x00000002, 0x00000001, 0x801024A0, 0x80102520, 0x0000000F, 0x000000F0, 0x0000000C, 0x00000001, 0xFFFFFFFF, 0x00000002, 0x00000001, 0x801024A0, 0x80102520, 0x0000000F, 0x000000FF, 0x0000000C, 0x00000000, 0x00000000, 0x00000002, 0x00000001, 0x801024A0, 0x80102520, 0x00000004, 0x00000002, 0x00000018, 0x801024A0, 0x80102520, 0x00000002, 0x00000003, 0x80102540, 0x801025C0, 0x00000002, 0x00000004, 0x801025E0, 0x80102660, 0x00000002, 0x00000003, 0x80102680, 0x80102700, 0x00000003, 0x00000000 -dlabel D_80106148 +dlabel HudScript_FrozenEnd .word 0x00000008, 0x00000013, 0x00000010, 0x00000010, 0x0000000F, 0x000000FF, 0x0000000C, 0x00000000, 0x00000000, 0x00000002, 0x00000001, 0x801024A0, 0x80102520, 0x0000000F, 0x000000F0, 0x0000000C, 0x00000001, 0xFFFFFFFF, 0x00000002, 0x00000001, 0x801024A0, 0x80102520, 0x0000000F, 0x000000DC, 0x0000000C, 0x00000002, 0xFFFFFFFE, 0x00000002, 0x00000001, 0x801024A0, 0x80102520, 0x0000000F, 0x000000C8, 0x0000000C, 0x00000003, 0xFFFFFFFD, 0x00000002, 0x00000001, 0x801024A0, 0x80102520, 0x0000000F, 0x000000AA, 0x0000000C, 0x00000004, 0xFFFFFFFC, 0x00000002, 0x00000001, 0x801024A0, 0x80102520, 0x0000000F, 0x00000078, 0x0000000C, 0x00000005, 0xFFFFFFFB, 0x00000002, 0x00000001, 0x801024A0, 0x80102520, 0x0000000F, 0x00000050, 0x0000000C, 0x00000006, 0xFFFFFFFA, 0x00000002, 0x00000001, 0x801024A0, 0x80102520, 0x0000000F, 0x00000032, 0x0000000C, 0x00000008, 0xFFFFFFF8, 0x00000002, 0x00000001, 0x801024A0, 0x80102520, 0x0000000F, 0x0000001E, 0x0000000C, 0x0000000A, 0xFFFFFFF6, 0x00000002, 0x00000001, 0x801024A0, 0x80102520, 0x00000000 -dlabel D_801062A0 +dlabel HudScript_WeakenedLoop .word 0x00000008, 0x00000013, 0x00000010, 0x00000010, 0x00000004, 0x00000002, 0x00000006, 0x801029A0, 0x80102A20, 0x00000002, 0x00000006, 0x80102A40, 0x80102AC0, 0x00000003, 0x00000000 -dlabel D_801062DC +dlabel HudScript_WeakenedBegin .word 0x00000008, 0x00000013, 0x00000010, 0x00000010, 0x0000000F, 0x0000001E, 0x0000000C, 0x0000000A, 0xFFFFFFF6, 0x00000002, 0x00000001, 0x801029A0, 0x80102A20, 0x0000000F, 0x00000032, 0x0000000C, 0x00000008, 0xFFFFFFF8, 0x00000002, 0x00000001, 0x801029A0, 0x80102A20, 0x0000000F, 0x00000050, 0x0000000C, 0x00000006, 0xFFFFFFFA, 0x00000002, 0x00000001, 0x801029A0, 0x80102A20, 0x0000000F, 0x00000078, 0x0000000C, 0x00000005, 0xFFFFFFFB, 0x00000002, 0x00000001, 0x801029A0, 0x80102A20, 0x0000000F, 0x000000AA, 0x0000000C, 0x00000004, 0xFFFFFFFC, 0x00000002, 0x00000001, 0x801029A0, 0x80102A20, 0x0000000F, 0x000000C8, 0x0000000C, 0x00000003, 0xFFFFFFFD, 0x00000002, 0x00000001, 0x801029A0, 0x80102A20, 0x0000000F, 0x000000DC, 0x0000000C, 0x00000002, 0xFFFFFFFE, 0x00000002, 0x00000001, 0x801029A0, 0x80102A20, 0x0000000F, 0x000000F0, 0x0000000C, 0x00000001, 0xFFFFFFFF, 0x00000002, 0x00000001, 0x801029A0, 0x80102A20, 0x0000000F, 0x000000FF, 0x0000000C, 0x00000000, 0x00000000, 0x00000002, 0x00000001, 0x801029A0, 0x80102A20, 0x00000004, 0x00000002, 0x00000006, 0x801029A0, 0x80102A20, 0x00000002, 0x00000006, 0x80102A40, 0x80102AC0, 0x00000003, 0x00000000 -dlabel D_8010645C -.word 0x00000008, 0x00000013, 0x00000010, 0x00000010, 0x0000000F, 0x000000FF, 0x0000000C, 0x00000000, 0x00000000, 0x00000002, 0x00000001, 0x801029A0, 0x80102A20, 0x0000000F, 0x000000F0, 0x0000000C, 0x00000001, 0xFFFFFFFF, 0x00000002, 0x00000001, 0x801029A0, 0x80102A20, 0x0000000F, 0x000000DC, 0x0000000C, 0x00000002, 0xFFFFFFFE, 0x00000002, 0x00000001, 0x801029A0, 0x80102A20, 0x0000000F, 0x000000C8, 0x0000000C, 0x00000003, 0xFFFFFFFD, 0x00000002, 0x00000001, 0x801029A0, 0x80102A20, 0x0000000F, 0x000000AA, 0x0000000C, 0x00000004, 0xFFFFFFFC, 0x00000002, 0x00000001, 0x801029A0, 0x80102A20, 0x0000000F, 0x00000078, 0x0000000C, 0x00000005, 0xFFFFFFFB, 0x00000002, 0x00000001, 0x801029A0, 0x80102A20, 0x0000000F, 0x00000050, 0x0000000C, 0x00000006, 0xFFFFFFFA, 0x00000002, 0x00000001, 0x801029A0, 0x80102A20, 0x0000000F, 0x00000032, 0x0000000C, 0x00000008, 0xFFFFFFF8, 0x00000002, 0x00000001, 0x801029A0, 0x80102A20, 0x0000000F, 0x0000001E, 0x0000000C, 0x0000000A, 0xFFFFFFF6, 0x00000002, 0x00000001, 0x801029A0, 0x80102A20, 0x00000000, 0x00000008, 0x00000013, 0x00000010, 0x00000010, 0x00000004, 0x00000002, 0x00000005, 0x80102720, 0x801027A0, 0x00000002, 0x00000005, 0x801027C0, 0x80102840, 0x00000002, 0x00000005, 0x80102860, 0x801028E0, 0x00000002, 0x00000005, 0x80102900, 0x80102980, 0x00000003, 0x00000000 +dlabel HudScript_WeakenedEnd +.word 0x00000008, 0x00000013, 0x00000010, 0x00000010, 0x0000000F, 0x000000FF, 0x0000000C, 0x00000000, 0x00000000, 0x00000002, 0x00000001, 0x801029A0, 0x80102A20, 0x0000000F, 0x000000F0, 0x0000000C, 0x00000001, 0xFFFFFFFF, 0x00000002, 0x00000001, 0x801029A0, 0x80102A20, 0x0000000F, 0x000000DC, 0x0000000C, 0x00000002, 0xFFFFFFFE, 0x00000002, 0x00000001, 0x801029A0, 0x80102A20, 0x0000000F, 0x000000C8, 0x0000000C, 0x00000003, 0xFFFFFFFD, 0x00000002, 0x00000001, 0x801029A0, 0x80102A20, 0x0000000F, 0x000000AA, 0x0000000C, 0x00000004, 0xFFFFFFFC, 0x00000002, 0x00000001, 0x801029A0, 0x80102A20, 0x0000000F, 0x00000078, 0x0000000C, 0x00000005, 0xFFFFFFFB, 0x00000002, 0x00000001, 0x801029A0, 0x80102A20, 0x0000000F, 0x00000050, 0x0000000C, 0x00000006, 0xFFFFFFFA, 0x00000002, 0x00000001, 0x801029A0, 0x80102A20, 0x0000000F, 0x00000032, 0x0000000C, 0x00000008, 0xFFFFFFF8, 0x00000002, 0x00000001, 0x801029A0, 0x80102A20, 0x0000000F, 0x0000001E, 0x0000000C, 0x0000000A, 0xFFFFFFF6, 0x00000002, 0x00000001, 0x801029A0, 0x80102A20, 0x00000000 -dlabel D_80106610 +dlabel HudScript_StoppedLoop +.word 0x00000008, 0x00000013, 0x00000010, 0x00000010, 0x00000004, 0x00000002, 0x00000005, 0x80102720, 0x801027A0, 0x00000002, 0x00000005, 0x801027C0, 0x80102840, 0x00000002, 0x00000005, 0x80102860, 0x801028E0, 0x00000002, 0x00000005, 0x80102900, 0x80102980, 0x00000003, 0x00000000 + +dlabel HudScript_StoppedBegin .word 0x00000008, 0x00000013, 0x00000010, 0x00000010, 0x0000000F, 0x0000001E, 0x0000000C, 0x0000000A, 0xFFFFFFF6, 0x00000002, 0x00000001, 0x80102720, 0x801027A0, 0x0000000F, 0x00000032, 0x0000000C, 0x00000008, 0xFFFFFFF8, 0x00000002, 0x00000001, 0x80102720, 0x801027A0, 0x0000000F, 0x00000050, 0x0000000C, 0x00000006, 0xFFFFFFFA, 0x00000002, 0x00000001, 0x80102720, 0x801027A0, 0x0000000F, 0x00000078, 0x0000000C, 0x00000005, 0xFFFFFFFB, 0x00000002, 0x00000001, 0x80102720, 0x801027A0, 0x0000000F, 0x000000AA, 0x0000000C, 0x00000004, 0xFFFFFFFC, 0x00000002, 0x00000001, 0x80102720, 0x801027A0, 0x0000000F, 0x000000C8, 0x0000000C, 0x00000003, 0xFFFFFFFD, 0x00000002, 0x00000001, 0x80102720, 0x801027A0, 0x0000000F, 0x000000DC, 0x0000000C, 0x00000002, 0xFFFFFFFE, 0x00000002, 0x00000001, 0x80102720, 0x801027A0, 0x0000000F, 0x000000F0, 0x0000000C, 0x00000001, 0xFFFFFFFF, 0x00000002, 0x00000001, 0x80102720, 0x801027A0, 0x0000000F, 0x000000FF, 0x0000000C, 0x00000000, 0x00000000, 0x00000002, 0x00000001, 0x80102720, 0x801027A0, 0x00000004, 0x00000002, 0x00000005, 0x80102720, 0x801027A0, 0x00000002, 0x00000005, 0x801027C0, 0x80102840, 0x00000002, 0x00000005, 0x80102860, 0x801028E0, 0x00000002, 0x00000005, 0x80102900, 0x80102980, 0x00000003, 0x00000000 -dlabel D_801067B0 -.word 0x00000008, 0x00000013, 0x00000010, 0x00000010, 0x0000000F, 0x000000FF, 0x0000000C, 0x00000000, 0x00000000, 0x00000002, 0x00000001, 0x80102720, 0x801027A0, 0x0000000F, 0x000000F0, 0x0000000C, 0x00000001, 0xFFFFFFFF, 0x00000002, 0x00000001, 0x80102720, 0x801027A0, 0x0000000F, 0x000000DC, 0x0000000C, 0x00000002, 0xFFFFFFFE, 0x00000002, 0x00000001, 0x80102720, 0x801027A0, 0x0000000F, 0x000000C8, 0x0000000C, 0x00000003, 0xFFFFFFFD, 0x00000002, 0x00000001, 0x80102720, 0x801027A0, 0x0000000F, 0x000000AA, 0x0000000C, 0x00000004, 0xFFFFFFFC, 0x00000002, 0x00000001, 0x80102720, 0x801027A0, 0x0000000F, 0x00000078, 0x0000000C, 0x00000005, 0xFFFFFFFB, 0x00000002, 0x00000001, 0x80102720, 0x801027A0, 0x0000000F, 0x00000050, 0x0000000C, 0x00000006, 0xFFFFFFFA, 0x00000002, 0x00000001, 0x80102720, 0x801027A0, 0x0000000F, 0x00000032, 0x0000000C, 0x00000008, 0xFFFFFFF8, 0x00000002, 0x00000001, 0x80102720, 0x801027A0, 0x0000000F, 0x0000001E, 0x0000000C, 0x0000000A, 0xFFFFFFF6, 0x00000002, 0x00000001, 0x80102720, 0x801027A0, 0x00000000, 0x00000008, 0x00000013, 0x00000010, 0x00000010, 0x00000004, 0x00000002, 0x00000005, 0x80102AE0, 0x80102B60, 0x00000002, 0x00000006, 0x80102B80, 0x80102C00, 0x00000002, 0x00000006, 0x80102C20, 0x80102CA0, 0x00000002, 0x00000005, 0x80102CC0, 0x80102D40, 0x00000003, 0x00000000 +dlabel HudScript_StoppedEnd +.word 0x00000008, 0x00000013, 0x00000010, 0x00000010, 0x0000000F, 0x000000FF, 0x0000000C, 0x00000000, 0x00000000, 0x00000002, 0x00000001, 0x80102720, 0x801027A0, 0x0000000F, 0x000000F0, 0x0000000C, 0x00000001, 0xFFFFFFFF, 0x00000002, 0x00000001, 0x80102720, 0x801027A0, 0x0000000F, 0x000000DC, 0x0000000C, 0x00000002, 0xFFFFFFFE, 0x00000002, 0x00000001, 0x80102720, 0x801027A0, 0x0000000F, 0x000000C8, 0x0000000C, 0x00000003, 0xFFFFFFFD, 0x00000002, 0x00000001, 0x80102720, 0x801027A0, 0x0000000F, 0x000000AA, 0x0000000C, 0x00000004, 0xFFFFFFFC, 0x00000002, 0x00000001, 0x80102720, 0x801027A0, 0x0000000F, 0x00000078, 0x0000000C, 0x00000005, 0xFFFFFFFB, 0x00000002, 0x00000001, 0x80102720, 0x801027A0, 0x0000000F, 0x00000050, 0x0000000C, 0x00000006, 0xFFFFFFFA, 0x00000002, 0x00000001, 0x80102720, 0x801027A0, 0x0000000F, 0x00000032, 0x0000000C, 0x00000008, 0xFFFFFFF8, 0x00000002, 0x00000001, 0x80102720, 0x801027A0, 0x0000000F, 0x0000001E, 0x0000000C, 0x0000000A, 0xFFFFFFF6, 0x00000002, 0x00000001, 0x80102720, 0x801027A0, 0x00000000 -dlabel D_80106964 +dlabel HudScript_ShrunkLoop +.word 0x00000008, 0x00000013, 0x00000010, 0x00000010, 0x00000004, 0x00000002, 0x00000005, 0x80102AE0, 0x80102B60, 0x00000002, 0x00000006, 0x80102B80, 0x80102C00, 0x00000002, 0x00000006, 0x80102C20, 0x80102CA0, 0x00000002, 0x00000005, 0x80102CC0, 0x80102D40, 0x00000003, 0x00000000 + +dlabel HudScript_ShrunkBegin .word 0x00000008, 0x00000013, 0x00000010, 0x00000010, 0x0000000F, 0x0000001E, 0x0000000C, 0x0000000A, 0xFFFFFFF6, 0x00000002, 0x00000001, 0x80102AE0, 0x80102B60, 0x0000000F, 0x00000032, 0x0000000C, 0x00000008, 0xFFFFFFF8, 0x00000002, 0x00000001, 0x80102AE0, 0x80102B60, 0x0000000F, 0x00000050, 0x0000000C, 0x00000006, 0xFFFFFFFA, 0x00000002, 0x00000001, 0x80102AE0, 0x80102B60, 0x0000000F, 0x00000078, 0x0000000C, 0x00000005, 0xFFFFFFFB, 0x00000002, 0x00000001, 0x80102AE0, 0x80102B60, 0x0000000F, 0x000000AA, 0x0000000C, 0x00000004, 0xFFFFFFFC, 0x00000002, 0x00000001, 0x80102AE0, 0x80102B60, 0x0000000F, 0x000000C8, 0x0000000C, 0x00000003, 0xFFFFFFFD, 0x00000002, 0x00000001, 0x80102AE0, 0x80102B60, 0x0000000F, 0x000000DC, 0x0000000C, 0x00000002, 0xFFFFFFFE, 0x00000002, 0x00000001, 0x80102AE0, 0x80102B60, 0x0000000F, 0x000000F0, 0x0000000C, 0x00000001, 0xFFFFFFFF, 0x00000002, 0x00000001, 0x80102AE0, 0x80102B60, 0x0000000F, 0x000000FF, 0x0000000C, 0x00000000, 0x00000000, 0x00000002, 0x00000001, 0x80102AE0, 0x80102B60, 0x00000004, 0x00000002, 0x00000005, 0x80102AE0, 0x80102B60, 0x00000002, 0x00000006, 0x80102B80, 0x80102C00, 0x00000002, 0x00000006, 0x80102C20, 0x80102CA0, 0x00000002, 0x00000005, 0x80102CC0, 0x80102D40, 0x00000003, 0x00000000 -dlabel D_80106B04 -.word 0x00000008, 0x00000013, 0x00000010, 0x00000010, 0x0000000F, 0x000000FF, 0x0000000C, 0x00000000, 0x00000000, 0x00000002, 0x00000001, 0x80102AE0, 0x80102B60, 0x0000000F, 0x000000F0, 0x0000000C, 0x00000001, 0xFFFFFFFF, 0x00000002, 0x00000001, 0x80102AE0, 0x80102B60, 0x0000000F, 0x000000DC, 0x0000000C, 0x00000002, 0xFFFFFFFE, 0x00000002, 0x00000001, 0x80102AE0, 0x80102B60, 0x0000000F, 0x000000C8, 0x0000000C, 0x00000003, 0xFFFFFFFD, 0x00000002, 0x00000001, 0x80102AE0, 0x80102B60, 0x0000000F, 0x000000AA, 0x0000000C, 0x00000004, 0xFFFFFFFC, 0x00000002, 0x00000001, 0x80102AE0, 0x80102B60, 0x0000000F, 0x00000078, 0x0000000C, 0x00000005, 0xFFFFFFFB, 0x00000002, 0x00000001, 0x80102AE0, 0x80102B60, 0x0000000F, 0x00000050, 0x0000000C, 0x00000006, 0xFFFFFFFA, 0x00000002, 0x00000001, 0x80102AE0, 0x80102B60, 0x0000000F, 0x00000032, 0x0000000C, 0x00000008, 0xFFFFFFF8, 0x00000002, 0x00000001, 0x80102AE0, 0x80102B60, 0x0000000F, 0x0000001E, 0x0000000C, 0x0000000A, 0xFFFFFFF6, 0x00000002, 0x00000001, 0x80102AE0, 0x80102B60, 0x00000000, 0x00000008, 0x00000013, 0x00000010, 0x00000010, 0x00000004, 0x00000002, 0x00000003, 0x80102D60, 0x80102DE0, 0x00000002, 0x00000003, 0x80102E00, 0x80102E80, 0x00000002, 0x00000003, 0x80102EA0, 0x80102F20, 0x00000002, 0x00000003, 0x80102F40, 0x80102FC0, 0x00000002, 0x00000003, 0x80102FE0, 0x80103060, 0x00000002, 0x00000003, 0x80103080, 0x80103100, 0x00000003, 0x00000000 +dlabel HudScript_ShrunkEnd +.word 0x00000008, 0x00000013, 0x00000010, 0x00000010, 0x0000000F, 0x000000FF, 0x0000000C, 0x00000000, 0x00000000, 0x00000002, 0x00000001, 0x80102AE0, 0x80102B60, 0x0000000F, 0x000000F0, 0x0000000C, 0x00000001, 0xFFFFFFFF, 0x00000002, 0x00000001, 0x80102AE0, 0x80102B60, 0x0000000F, 0x000000DC, 0x0000000C, 0x00000002, 0xFFFFFFFE, 0x00000002, 0x00000001, 0x80102AE0, 0x80102B60, 0x0000000F, 0x000000C8, 0x0000000C, 0x00000003, 0xFFFFFFFD, 0x00000002, 0x00000001, 0x80102AE0, 0x80102B60, 0x0000000F, 0x000000AA, 0x0000000C, 0x00000004, 0xFFFFFFFC, 0x00000002, 0x00000001, 0x80102AE0, 0x80102B60, 0x0000000F, 0x00000078, 0x0000000C, 0x00000005, 0xFFFFFFFB, 0x00000002, 0x00000001, 0x80102AE0, 0x80102B60, 0x0000000F, 0x00000050, 0x0000000C, 0x00000006, 0xFFFFFFFA, 0x00000002, 0x00000001, 0x80102AE0, 0x80102B60, 0x0000000F, 0x00000032, 0x0000000C, 0x00000008, 0xFFFFFFF8, 0x00000002, 0x00000001, 0x80102AE0, 0x80102B60, 0x0000000F, 0x0000001E, 0x0000000C, 0x0000000A, 0xFFFFFFF6, 0x00000002, 0x00000001, 0x80102AE0, 0x80102B60, 0x00000000 -dlabel D_80106CD8 +dlabel HudScript_TransparentLoop +.word 0x00000008, 0x00000013, 0x00000010, 0x00000010, 0x00000004, 0x00000002, 0x00000003, 0x80102D60, 0x80102DE0, 0x00000002, 0x00000003, 0x80102E00, 0x80102E80, 0x00000002, 0x00000003, 0x80102EA0, 0x80102F20, 0x00000002, 0x00000003, 0x80102F40, 0x80102FC0, 0x00000002, 0x00000003, 0x80102FE0, 0x80103060, 0x00000002, 0x00000003, 0x80103080, 0x80103100, 0x00000003, 0x00000000 + +dlabel HudScript_TransparentBegin .word 0x00000008, 0x00000013, 0x00000010, 0x00000010, 0x0000000F, 0x0000001E, 0x0000000C, 0x0000000A, 0xFFFFFFF6, 0x00000002, 0x00000001, 0x80102D60, 0x80102DE0, 0x0000000F, 0x00000032, 0x0000000C, 0x00000008, 0xFFFFFFF8, 0x00000002, 0x00000001, 0x80102D60, 0x80102DE0, 0x0000000F, 0x00000050, 0x0000000C, 0x00000006, 0xFFFFFFFA, 0x00000002, 0x00000001, 0x80102D60, 0x80102DE0, 0x0000000F, 0x00000078, 0x0000000C, 0x00000005, 0xFFFFFFFB, 0x00000002, 0x00000001, 0x80102D60, 0x80102DE0, 0x0000000F, 0x000000AA, 0x0000000C, 0x00000004, 0xFFFFFFFC, 0x00000002, 0x00000001, 0x80102D60, 0x80102DE0, 0x0000000F, 0x000000C8, 0x0000000C, 0x00000003, 0xFFFFFFFD, 0x00000002, 0x00000001, 0x80102D60, 0x80102DE0, 0x0000000F, 0x000000DC, 0x0000000C, 0x00000002, 0xFFFFFFFE, 0x00000002, 0x00000001, 0x80102D60, 0x80102DE0, 0x0000000F, 0x000000F0, 0x0000000C, 0x00000001, 0xFFFFFFFF, 0x00000002, 0x00000001, 0x80102D60, 0x80102DE0, 0x0000000F, 0x000000FF, 0x0000000C, 0x00000000, 0x00000000, 0x00000002, 0x00000001, 0x80102D60, 0x80102DE0, 0x00000004, 0x00000002, 0x00000003, 0x80102D60, 0x80102DE0, 0x00000002, 0x00000003, 0x80102E00, 0x80102E80, 0x00000002, 0x00000003, 0x80102EA0, 0x80102F20, 0x00000002, 0x00000003, 0x80102F40, 0x80102FC0, 0x00000002, 0x00000003, 0x80102FE0, 0x80103060, 0x00000002, 0x00000003, 0x80103080, 0x80103100, 0x00000003, 0x00000000 -dlabel D_80106E98 -.word 0x00000008, 0x00000013, 0x00000010, 0x00000010, 0x0000000F, 0x000000FF, 0x0000000C, 0x00000000, 0x00000000, 0x00000002, 0x00000001, 0x80102D60, 0x80102DE0, 0x0000000F, 0x000000F0, 0x0000000C, 0x00000001, 0xFFFFFFFF, 0x00000002, 0x00000001, 0x80102D60, 0x80102DE0, 0x0000000F, 0x000000DC, 0x0000000C, 0x00000002, 0xFFFFFFFE, 0x00000002, 0x00000001, 0x80102D60, 0x80102DE0, 0x0000000F, 0x000000C8, 0x0000000C, 0x00000003, 0xFFFFFFFD, 0x00000002, 0x00000001, 0x80102D60, 0x80102DE0, 0x0000000F, 0x000000AA, 0x0000000C, 0x00000004, 0xFFFFFFFC, 0x00000002, 0x00000001, 0x80102D60, 0x80102DE0, 0x0000000F, 0x00000078, 0x0000000C, 0x00000005, 0xFFFFFFFB, 0x00000002, 0x00000001, 0x80102D60, 0x80102DE0, 0x0000000F, 0x00000050, 0x0000000C, 0x00000006, 0xFFFFFFFA, 0x00000002, 0x00000001, 0x80102D60, 0x80102DE0, 0x0000000F, 0x00000032, 0x0000000C, 0x00000008, 0xFFFFFFF8, 0x00000002, 0x00000001, 0x80102D60, 0x80102DE0, 0x0000000F, 0x0000001E, 0x0000000C, 0x0000000A, 0xFFFFFFF6, 0x00000002, 0x00000001, 0x80102D60, 0x80102DE0, 0x00000000, 0x00000008, 0x00000013, 0x00000018, 0x00000018, 0x00000004, 0x00000002, 0x0000003C, 0x80101780, 0x801018A0, 0x00000003, 0x00000000 +dlabel HudScript_TransparentEnd +.word 0x00000008, 0x00000013, 0x00000010, 0x00000010, 0x0000000F, 0x000000FF, 0x0000000C, 0x00000000, 0x00000000, 0x00000002, 0x00000001, 0x80102D60, 0x80102DE0, 0x0000000F, 0x000000F0, 0x0000000C, 0x00000001, 0xFFFFFFFF, 0x00000002, 0x00000001, 0x80102D60, 0x80102DE0, 0x0000000F, 0x000000DC, 0x0000000C, 0x00000002, 0xFFFFFFFE, 0x00000002, 0x00000001, 0x80102D60, 0x80102DE0, 0x0000000F, 0x000000C8, 0x0000000C, 0x00000003, 0xFFFFFFFD, 0x00000002, 0x00000001, 0x80102D60, 0x80102DE0, 0x0000000F, 0x000000AA, 0x0000000C, 0x00000004, 0xFFFFFFFC, 0x00000002, 0x00000001, 0x80102D60, 0x80102DE0, 0x0000000F, 0x00000078, 0x0000000C, 0x00000005, 0xFFFFFFFB, 0x00000002, 0x00000001, 0x80102D60, 0x80102DE0, 0x0000000F, 0x00000050, 0x0000000C, 0x00000006, 0xFFFFFFFA, 0x00000002, 0x00000001, 0x80102D60, 0x80102DE0, 0x0000000F, 0x00000032, 0x0000000C, 0x00000008, 0xFFFFFFF8, 0x00000002, 0x00000001, 0x80102D60, 0x80102DE0, 0x0000000F, 0x0000001E, 0x0000000C, 0x0000000A, 0xFFFFFFF6, 0x00000002, 0x00000001, 0x80102D60, 0x80102DE0, 0x00000000 -dlabel D_8010701C +dlabel HudScript_BoostJumpLoop +.word 0x00000008, 0x00000013, 0x00000018, 0x00000018, 0x00000004, 0x00000002, 0x0000003C, 0x80101780, 0x801018A0, 0x00000003, 0x00000000 + +dlabel HudScript_BoostJumpBegin .word 0x00000008, 0x00000013, 0x00000018, 0x00000018, 0x0000000F, 0x0000001E, 0x0000000C, 0x00000000, 0xFFFFFFF6, 0x00000002, 0x00000001, 0x80101780, 0x801018A0, 0x0000000F, 0x00000032, 0x0000000C, 0x00000000, 0xFFFFFFF8, 0x00000002, 0x00000001, 0x80101780, 0x801018A0, 0x0000000F, 0x00000050, 0x0000000C, 0x00000000, 0xFFFFFFFA, 0x00000002, 0x00000001, 0x80101780, 0x801018A0, 0x0000000F, 0x00000078, 0x0000000C, 0x00000000, 0xFFFFFFFB, 0x00000002, 0x00000001, 0x80101780, 0x801018A0, 0x0000000F, 0x000000AA, 0x0000000C, 0x00000000, 0xFFFFFFFC, 0x00000002, 0x00000001, 0x80101780, 0x801018A0, 0x0000000F, 0x000000C8, 0x0000000C, 0x00000000, 0xFFFFFFFD, 0x00000002, 0x00000001, 0x80101780, 0x801018A0, 0x0000000F, 0x000000DC, 0x0000000C, 0x00000000, 0xFFFFFFFE, 0x00000002, 0x00000001, 0x80101780, 0x801018A0, 0x0000000F, 0x000000F0, 0x0000000C, 0x00000000, 0xFFFFFFFF, 0x00000002, 0x00000001, 0x80101780, 0x801018A0, 0x0000000F, 0x000000FF, 0x0000000C, 0x00000000, 0x00000000, 0x00000004, 0x00000002, 0x0000003C, 0x80101780, 0x801018A0, 0x00000003, 0x00000000 -dlabel D_8010717C -.word 0x00000008, 0x00000013, 0x00000018, 0x00000018, 0x0000000F, 0x000000F0, 0x0000000C, 0x00000000, 0xFFFFFFFF, 0x00000002, 0x00000001, 0x80101780, 0x801018A0, 0x0000000F, 0x000000DC, 0x0000000C, 0xFFFFFFFD, 0xFFFFFFFD, 0x00000002, 0x00000001, 0x80101780, 0x801018A0, 0x0000000F, 0x000000C8, 0x0000000C, 0xFFFFFFFA, 0xFFFFFFFB, 0x00000002, 0x00000001, 0x80101780, 0x801018A0, 0x0000000F, 0x000000AA, 0x0000000C, 0xFFFFFFF8, 0xFFFFFFFA, 0x00000002, 0x00000001, 0x80101780, 0x801018A0, 0x0000000F, 0x00000078, 0x0000000C, 0xFFFFFFF6, 0xFFFFFFFB, 0x00000002, 0x00000001, 0x80101780, 0x801018A0, 0x0000000F, 0x00000050, 0x0000000C, 0xFFFFFFF4, 0xFFFFFFFD, 0x00000002, 0x00000001, 0x80101780, 0x801018A0, 0x0000000F, 0x00000032, 0x0000000C, 0xFFFFFFF3, 0x00000000, 0x00000002, 0x00000001, 0x80101780, 0x801018A0, 0x0000000F, 0x0000001E, 0x0000000C, 0xFFFFFFF2, 0x00000004, 0x00000002, 0x00000001, 0x80101780, 0x801018A0, 0x0000000C, 0xFFFFFFF1, 0x00000009, 0x00000002, 0x00000001, 0x80101780, 0x801018A0, 0x0000000C, 0xFFFFFFF1, 0x0000000F, 0x00000002, 0x00000001, 0x80101780, 0x801018A0, 0x00000000, 0x00000008, 0x00000013, 0x00000018, 0x00000018, 0x00000004, 0x00000002, 0x0000003C, 0x801018C0, 0x801019E0, 0x00000003, 0x00000000 +dlabel HudScript_BoostJumpEnd +.word 0x00000008, 0x00000013, 0x00000018, 0x00000018, 0x0000000F, 0x000000F0, 0x0000000C, 0x00000000, 0xFFFFFFFF, 0x00000002, 0x00000001, 0x80101780, 0x801018A0, 0x0000000F, 0x000000DC, 0x0000000C, 0xFFFFFFFD, 0xFFFFFFFD, 0x00000002, 0x00000001, 0x80101780, 0x801018A0, 0x0000000F, 0x000000C8, 0x0000000C, 0xFFFFFFFA, 0xFFFFFFFB, 0x00000002, 0x00000001, 0x80101780, 0x801018A0, 0x0000000F, 0x000000AA, 0x0000000C, 0xFFFFFFF8, 0xFFFFFFFA, 0x00000002, 0x00000001, 0x80101780, 0x801018A0, 0x0000000F, 0x00000078, 0x0000000C, 0xFFFFFFF6, 0xFFFFFFFB, 0x00000002, 0x00000001, 0x80101780, 0x801018A0, 0x0000000F, 0x00000050, 0x0000000C, 0xFFFFFFF4, 0xFFFFFFFD, 0x00000002, 0x00000001, 0x80101780, 0x801018A0, 0x0000000F, 0x00000032, 0x0000000C, 0xFFFFFFF3, 0x00000000, 0x00000002, 0x00000001, 0x80101780, 0x801018A0, 0x0000000F, 0x0000001E, 0x0000000C, 0xFFFFFFF2, 0x00000004, 0x00000002, 0x00000001, 0x80101780, 0x801018A0, 0x0000000C, 0xFFFFFFF1, 0x00000009, 0x00000002, 0x00000001, 0x80101780, 0x801018A0, 0x0000000C, 0xFFFFFFF1, 0x0000000F, 0x00000002, 0x00000001, 0x80101780, 0x801018A0, 0x00000000 -dlabel D_80107314 +dlabel HudScript_BoostHammerLoop +.word 0x00000008, 0x00000013, 0x00000018, 0x00000018, 0x00000004, 0x00000002, 0x0000003C, 0x801018C0, 0x801019E0, 0x00000003, 0x00000000 + +dlabel HudScript_BoostHammerBegin .word 0x00000008, 0x00000013, 0x00000018, 0x00000018, 0x0000000F, 0x0000001E, 0x0000000C, 0x00000000, 0xFFFFFFF6, 0x00000002, 0x00000001, 0x801018C0, 0x801019E0, 0x0000000F, 0x00000032, 0x0000000C, 0x00000000, 0xFFFFFFF8, 0x00000002, 0x00000001, 0x801018C0, 0x801019E0, 0x0000000F, 0x00000050, 0x0000000C, 0x00000000, 0xFFFFFFFA, 0x00000002, 0x00000001, 0x801018C0, 0x801019E0, 0x0000000F, 0x00000078, 0x0000000C, 0x00000000, 0xFFFFFFFB, 0x00000002, 0x00000001, 0x801018C0, 0x801019E0, 0x0000000F, 0x000000AA, 0x0000000C, 0x00000000, 0xFFFFFFFC, 0x00000002, 0x00000001, 0x801018C0, 0x801019E0, 0x0000000F, 0x000000C8, 0x0000000C, 0x00000000, 0xFFFFFFFD, 0x00000002, 0x00000001, 0x801018C0, 0x801019E0, 0x0000000F, 0x000000DC, 0x0000000C, 0x00000000, 0xFFFFFFFE, 0x00000002, 0x00000001, 0x801018C0, 0x801019E0, 0x0000000F, 0x000000F0, 0x0000000C, 0x00000000, 0xFFFFFFFF, 0x00000002, 0x00000001, 0x801018C0, 0x801019E0, 0x0000000F, 0x000000FF, 0x0000000C, 0x00000000, 0x00000000, 0x00000004, 0x00000002, 0x0000003C, 0x801018C0, 0x801019E0, 0x00000003, 0x00000000 -dlabel D_80107474 +dlabel HudScript_BoostHammerEnd .word 0x00000008, 0x00000013, 0x00000018, 0x00000018, 0x0000000F, 0x000000F0, 0x0000000C, 0x00000000, 0xFFFFFFFF, 0x00000002, 0x00000001, 0x801018C0, 0x801019E0, 0x0000000F, 0x000000DC, 0x0000000C, 0xFFFFFFFD, 0xFFFFFFFD, 0x00000002, 0x00000001, 0x801018C0, 0x801019E0, 0x0000000F, 0x000000C8, 0x0000000C, 0xFFFFFFFA, 0xFFFFFFFB, 0x00000002, 0x00000001, 0x801018C0, 0x801019E0, 0x0000000F, 0x000000AA, 0x0000000C, 0xFFFFFFF8, 0xFFFFFFFA, 0x00000002, 0x00000001, 0x801018C0, 0x801019E0, 0x0000000F, 0x00000078, 0x0000000C, 0xFFFFFFF6, 0xFFFFFFFB, 0x00000002, 0x00000001, 0x801018C0, 0x801019E0, 0x0000000F, 0x00000050, 0x0000000C, 0xFFFFFFF4, 0xFFFFFFFD, 0x00000002, 0x00000001, 0x801018C0, 0x801019E0, 0x0000000F, 0x00000032, 0x0000000C, 0xFFFFFFF3, 0x00000000, 0x00000002, 0x00000001, 0x801018C0, 0x801019E0, 0x0000000F, 0x0000001E, 0x0000000C, 0xFFFFFFF2, 0x00000004, 0x00000002, 0x00000001, 0x801018C0, 0x801019E0, 0x0000000C, 0xFFFFFFF1, 0x00000009, 0x00000002, 0x00000001, 0x801018C0, 0x801019E0, 0x0000000C, 0xFFFFFFF1, 0x0000000F, 0x00000002, 0x00000001, 0x801018C0, 0x801019E0, 0x00000000 -dlabel D_801075E0 +dlabel HudScript_BoostPartner .word 0x00000008, 0x00000013, 0x00000018, 0x00000018, 0x00000004, 0x00000002, 0x0000003C, 0x80101A00, 0x80101B20, 0x00000003, 0x00000000 -dlabel D_8010760C +dlabel HudScript_Surprise .word 0x00000008, 0x00000013, 0x00000018, 0x00000018, 0x00000004, 0x00000002, 0x0000003C, 0x80101B40, 0x80101C60, 0x00000003, 0x00000000 -dlabel D_80107638 +dlabel HudScript_FPCost .word 0x00000008, 0x00000013, 0x00000010, 0x00000008, 0x00000004, 0x00000002, 0x0000003C, 0x800FC2A0, 0x800FC2E0, 0x00000003, 0x00000000 -dlabel D_80107664 +dlabel HudScript_FPCostReduced .word 0x00000008, 0x00000013, 0x00000010, 0x00000008, 0x00000004, 0x00000002, 0x0000003C, 0x800FC2A0, 0x800FC300, 0x00000003, 0x00000000 -dlabel D_80107690 +dlabel HudScript_FPCostReducedTwice .word 0x00000008, 0x00000013, 0x00000010, 0x00000008, 0x00000004, 0x00000002, 0x0000003C, 0x800FC2A0, 0x800FC320, 0x00000003, 0x00000000 -dlabel D_801076BC +dlabel HudScript_NotEnoughFP .word 0x00000008, 0x00000013, 0x00000010, 0x00000008, 0x00000004, 0x00000002, 0x0000003C, 0x800FC2A0, 0x800FC340, 0x00000003, 0x00000000 -dlabel D_801076E8 +dlabel HudScript_POWCost .word 0x00000008, 0x00000013, 0x00000010, 0x00000008, 0x00000004, 0x00000002, 0x0000003C, 0x800FC360, 0x800FC3A0, 0x00000003, 0x00000000 -dlabel D_80107714 +dlabel HudScript_POWCostReduced .word 0x00000008, 0x00000013, 0x00000010, 0x00000008, 0x00000004, 0x00000002, 0x0000003C, 0x800FC360, 0x800FC3C0, 0x00000003, 0x00000000 -dlabel D_80107740 +dlabel HudScript_POWCostReducedTwice .word 0x00000008, 0x00000013, 0x00000010, 0x00000008, 0x00000004, 0x00000002, 0x0000003C, 0x800FC360, 0x800FC3E0, 0x00000003, 0x00000000 -dlabel D_8010776C +dlabel HudScript_NotEnoughPOW .word 0x00000008, 0x00000013, 0x00000010, 0x00000008, 0x00000004, 0x00000002, 0x0000003C, 0x800FC360, 0x800FC400, 0x00000003, 0x00000000 -dlabel D_80107798 +dlabel HudScript_GreenArrowDown .word 0x00000008, 0x00000013, 0x00000010, 0x00000008, 0x00000004, 0x00000019, 0x00200000, 0x00000002, 0x00000009, 0x800FC420, 0x800FC460, 0x00000018, 0x00200000, 0x00000002, 0x00000006, 0x800FC420, 0x800FC460, 0x00000003, 0x00000000 -dlabel D_801077E4 -.word 0x00000008, 0x00000013, 0x00000010, 0x00000008, 0x00000004, 0x00000019, 0x00200000, 0x00000002, 0x00000009, 0x800FC480, 0x800FC4C0, 0x00000018, 0x00200000, 0x00000002, 0x00000006, 0x800FC480, 0x800FC4C0, 0x00000003, 0x00000000, 0x00000008, 0x00000013, 0x00000038, 0x00000018, 0x00000004, 0x00000002, 0x0000003C, 0x800FC4E0, 0x800FC780, 0x00000003, 0x00000000, 0x00000008, 0x00000013, 0x00000010, 0x00000010, 0x00000004, 0x00000002, 0x0000003C, 0x800FC7A0, 0x800FC820, 0x00000003, 0x00000000, 0x00000008, 0x00000013, 0x00000010, 0x00000010, 0x00000004, 0x00000002, 0x0000003C, 0x800FC840, 0x800FC8C0, 0x00000003, 0x00000000, 0x00000008, 0x00000013, 0x00000010, 0x00000010, 0x00000004, 0x00000002, 0x0000003C, 0x800FC8E0, 0x800FC960, 0x00000003, 0x00000000, 0x00000008, 0x00000013, 0x00000070, 0x00000008, 0x00000004, 0x00000002, 0x0000003C, D_800FC980, 0x800FCB40, 0x00000003, 0x00000000 +dlabel HudScript_GreenArrowUp +.word 0x00000008, 0x00000013, 0x00000010, 0x00000008, 0x00000004, 0x00000019, 0x00200000, 0x00000002, 0x00000009, 0x800FC480, 0x800FC4C0, 0x00000018, 0x00200000, 0x00000002, 0x00000006, 0x800FC480, 0x800FC4C0, 0x00000003, 0x00000000 -dlabel D_8010790C -.word 0x00000008, 0x00000013, 0x00000070, 0x00000008, 0x00000004, 0x00000002, 0x0000003C, 0x800FCB60, 0x800FCD20, 0x00000003, 0x00000000, 0x00000008, 0x00000013, 0x00000068, 0x00000008, 0x00000004, 0x00000002, 0x0000003C, 0x800FCD40, 0x800FCEE0, 0x00000003, 0x00000000, 0x00000008, 0x00000013, 0x00000010, 0x00000010, 0x00000004, 0x00000002, 0x0000003C, 0x800FE340, 0x800FE3C0, 0x00000003, 0x00000000, 0x00000008, 0x00000013, 0x00000020, 0x00000020, 0x00000004, 0x00000002, 0x0000003C, 0x800FCF00, 0x800FD100, 0x00000003, 0x00000000, 0x00000008, 0x00000013, 0x00000020, 0x00000020, 0x00000004, 0x00000002, 0x0000003C, 0x800FCF00, 0x800FD120, 0x00000003, 0x00000000, 0x00000008, 0x00000013, 0x00000020, 0x00000020, 0x00000004, 0x00000002, 0x0000003C, 0x800FD140, 0x800FD340, 0x00000003, 0x00000000, 0x00000008, 0x00000013, 0x00000020, 0x00000020, 0x00000004, 0x00000002, 0x0000003C, 0x800FD140, 0x800FD360, 0x00000003, 0x00000000, 0x00000008, 0x00000013, 0x00000020, 0x00000020, 0x00000004, 0x00000002, 0x0000003C, 0x800FD380, 0x800FD580, 0x00000003, 0x00000000, 0x00000008, 0x00000013, 0x00000020, 0x00000020, 0x00000004, 0x00000002, 0x0000003C, 0x800FD380, 0x800FD5A0, 0x00000003, 0x00000000, 0x00000008, 0x00000013, 0x00000020, 0x00000020, 0x00000004, 0x00000002, 0x0000003C, 0x800FD5C0, 0x800FD7C0, 0x00000003, 0x00000000, 0x00000008, 0x00000013, 0x00000020, 0x00000020, 0x00000004, 0x00000002, 0x0000003C, 0x800FD5C0, 0x800FD7E0, 0x00000003, 0x00000000, 0x00000008, 0x00000013, 0x00000020, 0x00000020, 0x00000004, 0x00000002, 0x0000003C, 0x800FD800, 0x800FDA00, 0x00000003, 0x00000000, 0x00000008, 0x00000013, 0x00000020, 0x00000020, 0x00000004, 0x00000002, 0x0000003C, 0x800FD800, 0x800FDA20, 0x00000003, 0x00000000, 0x00000008, 0x00000013, 0x00000020, 0x00000020, 0x00000004, 0x00000002, 0x0000003C, 0x800FDA40, 0x800FDC40, 0x00000003, 0x00000000, 0x00000008, 0x00000013, 0x00000020, 0x00000020, 0x00000004, 0x00000002, 0x0000003C, 0x800FDA40, 0x800FDC60, 0x00000003, 0x00000000, 0x00000008, 0x00000013, 0x00000020, 0x00000020, 0x00000004, 0x00000002, 0x0000003C, 0x800FDC80, 0x800FDE80, 0x00000003, 0x00000000, 0x00000008, 0x00000013, 0x00000020, 0x00000020, 0x00000004, 0x00000002, 0x0000003C, 0x800FDC80, 0x800FDEA0, 0x00000003, 0x00000000, 0x00000008, 0x00000013, 0x00000020, 0x00000020, 0x00000004, 0x00000002, 0x0000003C, 0x800FDEC0, 0x800FE0C0, 0x00000003, 0x00000000, 0x00000008, 0x00000013, 0x00000020, 0x00000020, 0x00000004, 0x00000002, 0x0000003C, 0x800FDEC0, 0x800FE0E0, 0x00000003, 0x00000000, 0x00000008, 0x00000013, 0x00000020, 0x00000020, 0x00000004, 0x00000002, 0x0000003C, 0x800FE100, 0x800FE300, 0x00000003, 0x00000000, 0x00000008, 0x00000013, 0x00000020, 0x00000020, 0x00000004, 0x00000002, 0x0000003C, 0x800FE100, 0x800FE320, 0x00000003, 0x00000000 +dlabel HudScript_UnusedPinkFrame +.word 0x00000008, 0x00000013, 0x00000038, 0x00000018, 0x00000004, 0x00000002, 0x0000003C, 0x800FC4E0, 0x800FC780, 0x00000003, 0x00000000 -dlabel D_80107CA8 +dlabel HudScript_UnusedDigit1 +.word 0x00000008, 0x00000013, 0x00000010, 0x00000010, 0x00000004, 0x00000002, 0x0000003C, 0x800FC7A0, 0x800FC820, 0x00000003, 0x00000000 + +dlabel HudScript_UnusedDigit2 +.word 0x00000008, 0x00000013, 0x00000010, 0x00000010, 0x00000004, 0x00000002, 0x0000003C, 0x800FC840, 0x800FC8C0, 0x00000003, 0x00000000 + +dlabel HudScript_UnusedDigit3 +.word 0x00000008, 0x00000013, 0x00000010, 0x00000010, 0x00000004, 0x00000002, 0x0000003C, 0x800FC8E0, 0x800FC960, 0x00000003, 0x00000000 + +dlabel HudScript_RedBar1 +.word 0x00000008, 0x00000013, 0x00000070, 0x00000008, 0x00000004, 0x00000002, 0x0000003C, D_800FC980, 0x800FCB40, 0x00000003, 0x00000000 + +dlabel HudScript_EmptyBar +.word 0x00000008, 0x00000013, 0x00000070, 0x00000008, 0x00000004, 0x00000002, 0x0000003C, 0x800FCB60, 0x800FCD20, 0x00000003, 0x00000000 + +dlabel HudScript_RedBar2 +.word 0x00000008, 0x00000013, 0x00000068, 0x00000008, 0x00000004, 0x00000002, 0x0000003C, 0x800FCD40, 0x800FCEE0, 0x00000003, 0x00000000 + +dlabel HudScript_MarioHead +.word 0x00000008, 0x00000013, 0x00000010, 0x00000010, 0x00000004, 0x00000002, 0x0000003C, 0x800FE340, 0x800FE3C0, 0x00000003, 0x00000000 + +dlabel HudScript_Eldstar +.word 0x00000008, 0x00000013, 0x00000020, 0x00000020, 0x00000004, 0x00000002, 0x0000003C, 0x800FCF00, 0x800FD100, 0x00000003, 0x00000000 + +dlabel HudScript_EldstarDisabled +.word 0x00000008, 0x00000013, 0x00000020, 0x00000020, 0x00000004, 0x00000002, 0x0000003C, 0x800FCF00, 0x800FD120, 0x00000003, 0x00000000 + +dlabel HudScript_Mamar +.word 0x00000008, 0x00000013, 0x00000020, 0x00000020, 0x00000004, 0x00000002, 0x0000003C, 0x800FD140, 0x800FD340, 0x00000003, 0x00000000 + +dlabel HudScript_MamarDisabled +.word 0x00000008, 0x00000013, 0x00000020, 0x00000020, 0x00000004, 0x00000002, 0x0000003C, 0x800FD140, 0x800FD360, 0x00000003, 0x00000000 + +dlabel HudScript_Skolar +.word 0x00000008, 0x00000013, 0x00000020, 0x00000020, 0x00000004, 0x00000002, 0x0000003C, 0x800FD380, 0x800FD580, 0x00000003, 0x00000000 + +dlabel HudScript_SkolarDisabled +.word 0x00000008, 0x00000013, 0x00000020, 0x00000020, 0x00000004, 0x00000002, 0x0000003C, 0x800FD380, 0x800FD5A0, 0x00000003, 0x00000000 + +dlabel HudScript_Muskular +.word 0x00000008, 0x00000013, 0x00000020, 0x00000020, 0x00000004, 0x00000002, 0x0000003C, 0x800FD5C0, 0x800FD7C0, 0x00000003, 0x00000000 + +dlabel HudScript_MuskularDisabled +.word 0x00000008, 0x00000013, 0x00000020, 0x00000020, 0x00000004, 0x00000002, 0x0000003C, 0x800FD5C0, 0x800FD7E0, 0x00000003, 0x00000000 + +dlabel HudScript_Misstar +.word 0x00000008, 0x00000013, 0x00000020, 0x00000020, 0x00000004, 0x00000002, 0x0000003C, 0x800FD800, 0x800FDA00, 0x00000003, 0x00000000 + +dlabel HudScript_MisstarDisabled +.word 0x00000008, 0x00000013, 0x00000020, 0x00000020, 0x00000004, 0x00000002, 0x0000003C, 0x800FD800, 0x800FDA20, 0x00000003, 0x00000000 + +dlabel HudScript_Klevar +.word 0x00000008, 0x00000013, 0x00000020, 0x00000020, 0x00000004, 0x00000002, 0x0000003C, 0x800FDA40, 0x800FDC40, 0x00000003, 0x00000000 + +dlabel HudScript_KlevarDisabled +.word 0x00000008, 0x00000013, 0x00000020, 0x00000020, 0x00000004, 0x00000002, 0x0000003C, 0x800FDA40, 0x800FDC60, 0x00000003, 0x00000000 + +dlabel HudScript_Kalmar +.word 0x00000008, 0x00000013, 0x00000020, 0x00000020, 0x00000004, 0x00000002, 0x0000003C, 0x800FDC80, 0x800FDE80, 0x00000003, 0x00000000 + +dlabel HudScript_KalmarDisabled +.word 0x00000008, 0x00000013, 0x00000020, 0x00000020, 0x00000004, 0x00000002, 0x0000003C, 0x800FDC80, 0x800FDEA0, 0x00000003, 0x00000000 + +dlabel HudScript_StarBeam +.word 0x00000008, 0x00000013, 0x00000020, 0x00000020, 0x00000004, 0x00000002, 0x0000003C, 0x800FDEC0, 0x800FE0C0, 0x00000003, 0x00000000 + +dlabel HudScript_StarBeamDisabled +.word 0x00000008, 0x00000013, 0x00000020, 0x00000020, 0x00000004, 0x00000002, 0x0000003C, 0x800FDEC0, 0x800FE0E0, 0x00000003, 0x00000000 + +dlabel HudScript_PeachBeam +.word 0x00000008, 0x00000013, 0x00000020, 0x00000020, 0x00000004, 0x00000002, 0x0000003C, 0x800FE100, 0x800FE300, 0x00000003, 0x00000000 + +dlabel HudScript_PeachBeamDisabled +.word 0x00000008, 0x00000013, 0x00000020, 0x00000020, 0x00000004, 0x00000002, 0x0000003C, 0x800FE100, 0x800FE320, 0x00000003, 0x00000000 + +dlabel HudScript_Partner0 .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x00000002, 0x0000003C, 0x800FE3E0, 0x800FE5E0, 0x00000003, 0x00000000 -dlabel D_80107CD0 +dlabel HudScript_Partner0Disabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x00000002, 0x0000003C, 0x800FE3E0, 0x800FE600, 0x00000003, 0x00000000 -dlabel D_80107CF8 +dlabel HudScript_Goombario .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x00000002, 0x0000003C, 0x800FE620, 0x800FE820, 0x00000003, 0x00000000 -dlabel D_80107D20 +dlabel HudScript_GoombarioDisabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x00000002, 0x0000003C, 0x800FE620, 0x800FE840, 0x00000003, 0x00000000 -dlabel D_80107D48 +dlabel HudScript_Kooper .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x00000002, 0x0000003C, 0x800FE860, 0x800FEA60, 0x00000003, 0x00000000 -dlabel D_80107D70 +dlabel HudScript_KooperDisabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x00000002, 0x0000003C, 0x800FE860, 0x800FEA80, 0x00000003, 0x00000000 -dlabel D_80107D98 +dlabel HudScript_Bombette .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x00000002, 0x0000003C, 0x800FEAA0, 0x800FECA0, 0x00000003, 0x00000000 -dlabel D_80107DC0 +dlabel HudScript_BombetteDisabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x00000002, 0x0000003C, 0x800FEAA0, 0x800FECC0, 0x00000003, 0x00000000 -dlabel D_80107DE8 +dlabel HudScript_Parakarry .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x00000002, 0x0000003C, 0x800FECE0, 0x800FEEE0, 0x00000003, 0x00000000 -dlabel D_80107E10 +dlabel HudScript_ParakarryDisabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x00000002, 0x0000003C, 0x800FECE0, 0x800FEF00, 0x00000003, 0x00000000 -dlabel D_80107E38 +dlabel HudScript_Bow .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x00000002, 0x0000003C, 0x800FEF20, 0x800FF120, 0x00000003, 0x00000000 -dlabel D_80107E60 +dlabel HudScript_BowDisabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x00000002, 0x0000003C, 0x800FEF20, 0x800FF140, 0x00000003, 0x00000000 -dlabel D_80107E88 +dlabel HudScript_Watt .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x00000002, 0x0000003C, 0x800FF160, 0x800FF360, 0x00000003, 0x00000000 -dlabel D_80107EB0 +dlabel HudScript_WattDisabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x00000002, 0x0000003C, 0x800FF160, 0x800FF380, 0x00000003, 0x00000000 -dlabel D_80107ED8 +dlabel HudScript_Sushie .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x00000002, 0x0000003C, 0x800FF3A0, 0x800FF5A0, 0x00000003, 0x00000000 -dlabel D_80107F00 +dlabel HudScript_SushieDisabled .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x00000002, 0x0000003C, 0x800FF3A0, 0x800FF5C0, 0x00000003, 0x00000000 -dlabel D_80107F28 +dlabel HudScript_Lakilester .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x00000002, 0x0000003C, 0x800FF5E0, 0x800FF7E0, 0x00000003, 0x00000000 -dlabel D_80107F50 -.word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x00000002, 0x0000003C, 0x800FF5E0, 0x800FF800, 0x00000003, 0x00000000, 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x00000002, 0x0000003C, 0x800FF820, 0x800FFA20, 0x00000003, 0x00000000, 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x00000002, 0x0000003C, 0x800FF820, 0x800FFA40, 0x00000003, 0x00000000 +dlabel HudScript_LakilesterDisabled +.word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x00000002, 0x0000003C, 0x800FF5E0, 0x800FF800, 0x00000003, 0x00000000 -dlabel D_80107FC8 +dlabel HudScript_Partner9 +.word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x00000002, 0x0000003C, 0x800FF820, 0x800FFA20, 0x00000003, 0x00000000 + +dlabel HudScript_Partner9Disabled +.word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x00000002, 0x0000003C, 0x800FF820, 0x800FFA40, 0x00000003, 0x00000000 + +dlabel HudScript_PartnerA .word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x00000002, 0x0000003C, 0x800FFA60, 0x800FFC60, 0x00000003, 0x00000000 -dlabel D_80107FF0 -.word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x00000002, 0x0000003C, 0x800FFA60, 0x800FFC80, 0x00000003, 0x00000000, 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x00000002, 0x0000003C, 0x800FFCA0, 0x800FFEA0, 0x00000003, 0x00000000, 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x00000002, 0x0000003C, 0x800FFCA0, 0x800FFEC0, 0x00000003, 0x00000000 +dlabel HudScript_PartnerADisabled +.word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x00000002, 0x0000003C, 0x800FFA60, 0x800FFC80, 0x00000003, 0x00000000 -dlabel D_80108068 -.word 0x00000008, 0x00000005, 0x00000000, 0x00000004, 0x00000002, 0x0000003C, D_800FFEE0, 0x800FFF00, 0x00000003, 0x00000000, 0x00000008, 0x00000005, 0x00000006, 0x00000004, 0x00000002, 0x0000003C, 0x800FFF20, 0x800FFF60, 0x00000003, 0x00000000 +dlabel HudScript_PartnerB +.word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x00000002, 0x0000003C, 0x800FFCA0, 0x800FFEA0, 0x00000003, 0x00000000 -dlabel D_801080B8 +dlabel HudScript_PartnerBDisabled +.word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x00000002, 0x0000003C, 0x800FFCA0, 0x800FFEC0, 0x00000003, 0x00000000 + +dlabel HudScript_StatusTimes +.word 0x00000008, 0x00000005, 0x00000000, 0x00000004, 0x00000002, 0x0000003C, D_800FFEE0, 0x800FFF00, 0x00000003, 0x00000000 + +dlabel HudScript_StatusSlash +.word 0x00000008, 0x00000005, 0x00000006, 0x00000004, 0x00000002, 0x0000003C, 0x800FFF20, 0x800FFF60, 0x00000003, 0x00000000 + +dlabel HudScript_StatusDigit0 .word 0x00000008, 0x00000005, 0x00000001, 0x00000004, 0x00000002, 0x0000003C, 0x800FFF80, 0x80100000, 0x00000003, 0x00000000 -dlabel D_801080E0 +dlabel HudScript_StatusDigit1 .word 0x00000008, 0x00000005, 0x00000001, 0x00000004, 0x00000002, 0x0000003C, 0x80100020, D_801000A0, 0x00000003, 0x00000000 -dlabel D_80108108 +dlabel HudScript_StatusDigit2 .word 0x00000008, 0x00000005, 0x00000001, 0x00000004, 0x00000002, 0x0000003C, 0x801000C0, 0x80100140, 0x00000003, 0x00000000 -dlabel D_80108130 +dlabel HudScript_StatusDigit3 .word 0x00000008, 0x00000005, 0x00000001, 0x00000004, 0x00000002, 0x0000003C, 0x80100160, 0x801001E0, 0x00000003, 0x00000000 -dlabel D_80108158 +dlabel HudScript_StatusDigit4 .word 0x00000008, 0x00000005, 0x00000001, 0x00000004, 0x00000002, 0x0000003C, 0x80100200, 0x80100280, 0x00000003, 0x00000000 -dlabel D_80108180 +dlabel HudScript_StatusDigit5 .word 0x00000008, 0x00000005, 0x00000001, 0x00000004, 0x00000002, 0x0000003C, 0x801002A0, 0x80100320, 0x00000003, 0x00000000 -dlabel D_801081A8 +dlabel HudScript_StatusDigit6 .word 0x00000008, 0x00000005, 0x00000001, 0x00000004, 0x00000002, 0x0000003C, 0x80100340, 0x801003C0, 0x00000003, 0x00000000 -dlabel D_801081D0 +dlabel HudScript_StatusDigit7 .word 0x00000008, 0x00000005, 0x00000001, 0x00000004, 0x00000002, 0x0000003C, 0x801003E0, 0x80100460, 0x00000003, 0x00000000 -dlabel D_801081F8 +dlabel HudScript_StatusDigit8 .word 0x00000008, 0x00000005, 0x00000001, 0x00000004, 0x00000002, 0x0000003C, 0x80100480, 0x80100500, 0x00000003, 0x00000000 -dlabel D_80108220 +dlabel HudScript_StatusDigit9 .word 0x00000008, 0x00000005, 0x00000001, 0x00000004, 0x00000002, 0x0000003C, 0x80100520, 0x801005A0, 0x00000003, 0x00000000 -dlabel D_80108248 +dlabel HudScript_StatusHP .word 0x00000008, 0x00000005, 0x00000001, 0x00000004, 0x00000002, 0x0000003C, 0x801005C0, 0x80100640, 0x00000003, 0x00000000 -dlabel D_80108270 -.word 0x00000008, 0x00000005, 0x00000001, 0x00000004, 0x00000002, 0x0000003C, 0x80100660, 0x801006E0, 0x00000003, 0x00000000, 0x00000008, 0x00000005, 0x00000000, 0x00000004, 0x00000002, 0x0000003C, D_80100700, 0x80100720, 0x00000003, 0x00000000, 0x00000008, 0x00000005, 0x00000000, 0x00000004, 0x00000002, 0x0000003C, 0x80100740, 0x80100760, 0x00000003, 0x00000000, 0x00000008, 0x00000005, 0x00000000, 0x00000004, 0x00000002, 0x0000003C, 0x80100780, 0x801007A0, 0x00000003, 0x00000000, 0x00000008, 0x00000005, 0x00000000, 0x00000004, 0x00000002, 0x0000003C, 0x801007C0, 0x801007E0, 0x00000003, 0x00000000, 0x00000008, 0x00000005, 0x00000000, 0x00000004, 0x00000002, 0x0000003C, 0x80100800, 0x80100820, 0x00000003, 0x00000000, 0x00000008, 0x00000005, 0x00000000, 0x00000004, 0x00000002, 0x0000003C, 0x80100840, 0x80100860, 0x00000003, 0x00000000, 0x00000008, 0x00000005, 0x00000000, 0x00000004, 0x00000002, 0x0000003C, 0x80100880, 0x801008A0, 0x00000003, 0x00000000 +dlabel HudScript_StatusFP +.word 0x00000008, 0x00000005, 0x00000001, 0x00000004, 0x00000002, 0x0000003C, 0x80100660, 0x801006E0, 0x00000003, 0x00000000 -dlabel D_801083B0 +dlabel HudScript_StatusSPIncrement1 +.word 0x00000008, 0x00000005, 0x00000000, 0x00000004, 0x00000002, 0x0000003C, D_80100700, 0x80100720, 0x00000003, 0x00000000 + +dlabel HudScript_StatusSPIncrement2 +.word 0x00000008, 0x00000005, 0x00000000, 0x00000004, 0x00000002, 0x0000003C, 0x80100740, 0x80100760, 0x00000003, 0x00000000 + +dlabel HudScript_StatusSPIncrement3 +.word 0x00000008, 0x00000005, 0x00000000, 0x00000004, 0x00000002, 0x0000003C, 0x80100780, 0x801007A0, 0x00000003, 0x00000000 + +dlabel HudScript_StatusSPIncrement4 +.word 0x00000008, 0x00000005, 0x00000000, 0x00000004, 0x00000002, 0x0000003C, 0x801007C0, 0x801007E0, 0x00000003, 0x00000000 + +dlabel HudScript_StatusSPIncrement5 +.word 0x00000008, 0x00000005, 0x00000000, 0x00000004, 0x00000002, 0x0000003C, 0x80100800, 0x80100820, 0x00000003, 0x00000000 + +dlabel HudScript_StatusSPIncrement6 +.word 0x00000008, 0x00000005, 0x00000000, 0x00000004, 0x00000002, 0x0000003C, 0x80100840, 0x80100860, 0x00000003, 0x00000000 + +dlabel HudScript_StatusSPIncrement7 +.word 0x00000008, 0x00000005, 0x00000000, 0x00000004, 0x00000002, 0x0000003C, 0x80100880, 0x801008A0, 0x00000003, 0x00000000 + +dlabel HudScript_StatusSPEmptyIncrement .word 0x00000008, 0x00000005, 0x00000000, 0x00000004, 0x00000002, 0x0000003C, 0x801008C0, 0x801008E0, 0x00000003, 0x00000000 -dlabel D_801083D8 -.word 0x00000008, 0x00000005, 0x00000000, 0x00000004, 0x00000002, 0x0000003C, 0x80100900, 0x80100920, 0x00000003, 0x00000000, 0x00000008, 0x00000005, 0x00000000, 0x00000004, 0x00000002, 0x0000003C, 0x80100940, 0x80100960, 0x00000003, 0x00000000, 0x00000008, 0x00000005, 0x00000000, 0x00000004, 0x00000002, 0x0000003C, 0x80100980, 0x801009A0, 0x00000003, 0x00000000, 0x00000008, 0x00000005, 0x00000000, 0x00000004, 0x00000002, 0x0000003C, 0x801009C0, 0x801009E0, 0x00000003, 0x00000000, 0x00000008, 0x00000005, 0x00000000, 0x00000004, 0x00000002, 0x0000003C, 0x80100A00, 0x80100A20, 0x00000003, 0x00000000, 0x00000008, 0x00000005, 0x00000000, 0x00000004, 0x00000002, 0x0000003C, 0x80100A40, 0x80100A60, 0x00000003, 0x00000000, 0x00000008, 0x00000005, 0x00000000, 0x00000004, 0x00000002, 0x0000003C, 0x80100A80, 0x80100AA0, 0x00000003, 0x00000000 +dlabel HudScript_StatusStar1 +.word 0x00000008, 0x00000005, 0x00000000, 0x00000004, 0x00000002, 0x0000003C, 0x80100900, 0x80100920, 0x00000003, 0x00000000 -dlabel D_801084F0 +dlabel HudScript_StatusStar2 +.word 0x00000008, 0x00000005, 0x00000000, 0x00000004, 0x00000002, 0x0000003C, 0x80100940, 0x80100960, 0x00000003, 0x00000000 + +dlabel HudScript_StatusStar3 +.word 0x00000008, 0x00000005, 0x00000000, 0x00000004, 0x00000002, 0x0000003C, 0x80100980, 0x801009A0, 0x00000003, 0x00000000 + +dlabel HudScript_StatusStar4 +.word 0x00000008, 0x00000005, 0x00000000, 0x00000004, 0x00000002, 0x0000003C, 0x801009C0, 0x801009E0, 0x00000003, 0x00000000 + +dlabel HudScript_StatusStar5 +.word 0x00000008, 0x00000005, 0x00000000, 0x00000004, 0x00000002, 0x0000003C, 0x80100A00, 0x80100A20, 0x00000003, 0x00000000 + +dlabel HudScript_StatusStar6 +.word 0x00000008, 0x00000005, 0x00000000, 0x00000004, 0x00000002, 0x0000003C, 0x80100A40, 0x80100A60, 0x00000003, 0x00000000 + +dlabel HudScript_StatusStar7 +.word 0x00000008, 0x00000005, 0x00000000, 0x00000004, 0x00000002, 0x0000003C, 0x80100A80, 0x80100AA0, 0x00000003, 0x00000000 + +dlabel HudScript_StatusStarEmpty .word 0x00000008, 0x00000005, 0x00000000, 0x00000004, 0x00000002, 0x0000003C, 0x80100AC0, 0x80100AE0, 0x00000003, 0x00000000 -dlabel D_80108518 +dlabel HudScript_StatusHeart .word 0x00000005, 0x00000001, 0x00000004, 0x00000001, 0x0000003C, 0x801041A8, 0x00000003, 0x00000000 -dlabel D_80108538 +dlabel HudScript_StatusFlower .word 0x00000005, 0x00000001, 0x00000004, 0x00000001, 0x0000003C, 0x801045B0, 0x00000003, 0x00000000 -dlabel D_80108558 +dlabel HudScript_StatusCoin .word 0x00000008, 0x00000005, 0x00000001, 0x00000004, 0x00000015, 0x00000000, 0x00000002, 0x00000003, 0x80100B00, 0x80100B80, 0x00000002, 0x00000003, 0x80100BA0, 0x80100C20, 0x00000002, 0x00000003, 0x80100D80, 0x80100E00, 0x00000002, 0x00000003, 0x80100E20, 0x80100EA0, 0x00000002, 0x00000003, 0x80100EC0, 0x80100F40, 0x00000002, 0x00000003, 0x80100F60, 0x80100FE0, 0x00000002, 0x00000003, 0x80101000, 0x80101080, 0x00000002, 0x00000003, 0x801010A0, 0x80101120, 0x00000014, 0x00000064, 0x00000046, 0x00000015, 0x00000001, 0x00000002, 0x00000003, 0x80100B00, 0x80100B80, 0x00000002, 0x00000002, 0x80100BA0, 0x80100C20, 0x00000002, 0x00000001, 0x80100C40, 0x80100CC0, 0x00000002, 0x00000001, 0x80100CE0, 0x80100D60, 0x00000002, 0x00000002, 0x80100D80, 0x80100E00, 0x00000002, 0x00000003, 0x80100E20, 0x80100EA0, 0x00000002, 0x00000003, 0x80100EC0, 0x80100F40, 0x00000002, 0x00000003, 0x80100F60, 0x80100FE0, 0x00000002, 0x00000003, 0x80101000, 0x80101080, 0x00000002, 0x00000003, 0x801010A0, 0x80101120, 0x00000003, 0x00000000 -dlabel D_801086AC -.word 0x00000008, 0x00000005, 0x00000001, 0x00000004, 0x00000002, 0x00000002, 0x80101140, 0x801011C0, 0x00000002, 0x00000002, 0x801011E0, 0x80101260, 0x00000002, 0x00000002, 0x80101280, 0x80101300, 0x00000002, 0x00000002, 0x80101320, 0x801013A0, 0x00000002, 0x00000002, 0x801013C0, 0x80101440, 0x00000002, 0x00000002, 0x80101460, 0x801014E0, 0x00000002, 0x00000002, 0x80101500, 0x80101580, 0x00000002, 0x00000002, 0x801015A0, 0x80101620, 0x00000003, 0x00000000, 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x00000002, 0x0000003C, 0x800FAEE0, 0x800FB0E0, 0x00000003, 0x00000000, 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x00000002, 0x0000003C, 0x800FAEE0, 0x800FB100, 0x00000003, 0x00000000, 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x00000002, 0x0000003C, 0x800FB120, 0x800FB320, 0x00000003, 0x00000000, 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x00000002, 0x0000003C, 0x800FB120, 0x800FB340, 0x00000003, 0x00000000, 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x00000002, 0x0000003C, 0x800FB360, 0x800FB560, 0x00000003, 0x00000000, 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x00000002, 0x0000003C, 0x800FB360, 0x800FB580, 0x00000003, 0x00000000, 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x00000002, 0x0000003C, 0x800FA820, 0x800FAA20, 0x00000003, 0x00000000, 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x00000002, 0x0000003C, 0x800FA820, 0x800FAA40, 0x00000003, 0x00000000, 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x00000002, 0x0000003C, 0x800FAA60, 0x800FAC60, 0x00000003, 0x00000000, 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x00000002, 0x0000003C, 0x800FAA60, 0x800FAC80, 0x00000003, 0x00000000, 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x00000002, 0x0000003C, 0x800FACA0, 0x800FAEA0, 0x00000003, 0x00000000, 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x00000002, 0x0000003C, 0x800FACA0, 0x800FAEC0, 0x00000003, 0x00000000, 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x00000002, 0x0000003C, 0x800FB5A0, 0x800FB7A0, 0x00000003, 0x00000000, 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x00000002, 0x0000003C, 0x800FB5A0, 0x800FB7C0, 0x00000003, 0x00000000 +dlabel HudScript_StatusStarPoint +.word 0x00000008, 0x00000005, 0x00000001, 0x00000004, 0x00000002, 0x00000002, 0x80101140, 0x801011C0, 0x00000002, 0x00000002, 0x801011E0, 0x80101260, 0x00000002, 0x00000002, 0x80101280, 0x80101300, 0x00000002, 0x00000002, 0x80101320, 0x801013A0, 0x00000002, 0x00000002, 0x801013C0, 0x80101440, 0x00000002, 0x00000002, 0x80101460, 0x801014E0, 0x00000002, 0x00000002, 0x80101500, 0x80101580, 0x00000002, 0x00000002, 0x801015A0, 0x80101620, 0x00000003, 0x00000000 -dlabel D_80108974 -.word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x00000002, 0x0000003C, 0x800FB7E0, 0x800FB9E0, 0x00000003, 0x00000000, 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x00000002, 0x0000003C, 0x800FB7E0, 0x800FBA00, 0x00000003, 0x00000000 +dlabel HudScript_MenuBoots1 +.word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x00000002, 0x0000003C, 0x800FAEE0, 0x800FB0E0, 0x00000003, 0x00000000 -dlabel D_801089C4 +dlabel HudScript_MenuBoots1Disabled +.word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x00000002, 0x0000003C, 0x800FAEE0, 0x800FB100, 0x00000003, 0x00000000 + +dlabel HudScript_MenuBoots2 +.word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x00000002, 0x0000003C, 0x800FB120, 0x800FB320, 0x00000003, 0x00000000 + +dlabel HudScript_MenuBoots2Disabled +.word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x00000002, 0x0000003C, 0x800FB120, 0x800FB340, 0x00000003, 0x00000000 + +dlabel HudScript_MenuBoots3 +.word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x00000002, 0x0000003C, 0x800FB360, 0x800FB560, 0x00000003, 0x00000000 + +dlabel HudScript_MenuBoots3Disabled +.word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x00000002, 0x0000003C, 0x800FB360, 0x800FB580, 0x00000003, 0x00000000 + +dlabel HudScript_MenuHammer1 +.word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x00000002, 0x0000003C, 0x800FA820, 0x800FAA20, 0x00000003, 0x00000000 + +dlabel HudScript_MenuHammer1Disabled +.word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x00000002, 0x0000003C, 0x800FA820, 0x800FAA40, 0x00000003, 0x00000000 + +dlabel HudScript_MenuHammer2 +.word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x00000002, 0x0000003C, 0x800FAA60, 0x800FAC60, 0x00000003, 0x00000000 + +dlabel HudScript_MenuHammer2Disabled +.word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x00000002, 0x0000003C, 0x800FAA60, 0x800FAC80, 0x00000003, 0x00000000 + +dlabel HudScript_MenuHammer3 +.word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x00000002, 0x0000003C, 0x800FACA0, 0x800FAEA0, 0x00000003, 0x00000000 + +dlabel HudScript_MenuHammer3Disabled +.word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x00000002, 0x0000003C, 0x800FACA0, 0x800FAEC0, 0x00000003, 0x00000000 + +dlabel HudScript_MenuItem +.word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x00000002, 0x0000003C, 0x800FB5A0, 0x800FB7A0, 0x00000003, 0x00000000 + +dlabel HudScript_MenuItemDisabled +.word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x00000002, 0x0000003C, 0x800FB5A0, 0x800FB7C0, 0x00000003, 0x00000000 + +dlabel HudScript_MenuStarPower +.word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x00000002, 0x0000003C, 0x800FB7E0, 0x800FB9E0, 0x00000003, 0x00000000 + +dlabel HudScript_MenuStarPowerDisabled +.word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x00000002, 0x0000003C, 0x800FB7E0, 0x800FBA00, 0x00000003, 0x00000000 + +dlabel HudScript_Peril .word 0x00000008, 0x00000005, 0x00000016, 0x00000004, 0x0000001A, 0x000003F2, 0x00000019, 0x00200000, 0x00000002, 0x0000000F, 0x80103120, 0x80103260, 0x00000018, 0x00200000, 0x00000002, 0x0000000A, 0x80103120, 0x80103260, 0x00000003, 0x00000000 -dlabel D_80108A14 +dlabel HudScript_Danger .word 0x00000008, 0x00000005, 0x00000016, 0x00000004, 0x0000001A, 0x000003F1, 0x00000019, 0x00200000, 0x00000002, 0x0000000F, 0x80103280, 0x801033C0, 0x00000018, 0x00200000, 0x00000002, 0x0000000A, 0x80103280, 0x801033C0, 0x00000003, 0x00000000 -dlabel D_80108A64 +dlabel HudScript_Refund .word 0x00000008, 0x00000005, 0x00000017, 0x00000004, 0x00000019, 0x00200000, 0x00000002, 0x00000008, 0x801033E0, 0x801035C0, 0x00000018, 0x00200000, 0x00000002, 0x00000004, 0x801033E0, 0x801035C0, 0x00000003, 0x00000000 -dlabel D_80108AAC +dlabel HudScript_Happy .word 0x00000008, 0x00000005, 0x00000016, 0x00000004, 0x00000002, 0x0000003C, 0x801035E0, 0x80103720, 0x00000003, 0x00000000 -dlabel D_80108AD4 +dlabel HudScript_HPDrain .word 0x00000008, 0x00000005, 0x00000016, 0x00000004, 0x00000002, 0x0000003C, 0x80103740, 0x80103880, 0x00000003, 0x00000000 -dlabel D_80108AFC +dlabel HudScript_BlueMeter .word 0x00000008, 0x00000013, 0x00000048, 0x00000010, 0x00000004, 0x00000002, 0x0000003C, 0x800F9CA0, 0x800F9EE0, 0x00000003, 0x00000000 -dlabel D_80108B28 +dlabel HudScript_AButton .word 0x00000008, 0x00000013, 0x00000030, 0x00000028, 0x00000004, 0x00000002, 0x0000003C, 0x800F8500, 0x800F88C0, 0x00000003, 0x00000000 -dlabel D_80108B54 +dlabel HudScript_AButtonDown .word 0x00000008, 0x00000013, 0x00000030, 0x00000028, 0x00000004, 0x00000002, 0x0000003C, 0x800F88E0, 0x800F8CA0, 0x00000003, 0x00000000 -dlabel D_80108B80 +dlabel HudScript_MashAButton .word 0x00000008, 0x00000013, 0x00000030, 0x00000028, 0x00000004, 0x00000002, 0x00000002, 0x800F8500, 0x800F88C0, 0x00000002, 0x00000002, 0x800F88E0, 0x800F8CA0, 0x00000003, 0x00000000 -dlabel D_80108BBC -.word 0x00000008, 0x00000013, 0x00000030, 0x00000028, 0x00000004, 0x00000002, 0x0000000A, 0x800F8500, 0x800F88C0, 0x00000002, 0x0000000A, 0x800F88E0, 0x800F8CA0, 0x00000003, 0x00000000, 0x00000008, 0x00000013, 0x00000030, 0x00000028, 0x00000004, 0x00000002, 0x0000001E, 0x800F8500, 0x800F88C0, 0x00000002, 0x0000001E, 0x800F88E0, 0x800F8CA0, 0x00000003, 0x00000000 +dlabel HudScript_PressAButton +.word 0x00000008, 0x00000013, 0x00000030, 0x00000028, 0x00000004, 0x00000002, 0x0000000A, 0x800F8500, 0x800F88C0, 0x00000002, 0x0000000A, 0x800F88E0, 0x800F8CA0, 0x00000003, 0x00000000 -dlabel D_80108C34 -.word 0x00000008, 0x00000013, 0x00000030, 0x00000028, 0x00000004, 0x00000002, 0x00000004, 0x800F8500, 0x800F88C0, 0x00000002, 0x00000004, 0x800F88E0, 0x800F8CA0, 0x00000003, 0x00000000, 0x00000008, 0x00000013, 0x00000030, 0x00000028, 0x00000004, 0x00000002, 0x0000003C, 0x800F9FE0, 0x800FA3A0, 0x00000003, 0x00000000, 0x00000008, 0x00000013, 0x00000030, 0x00000028, 0x00000004, 0x00000002, 0x0000003C, 0x800FA3C0, 0x800FA780, 0x00000003, 0x00000000, 0x00000008, 0x00000013, 0x00000030, 0x00000028, 0x00000004, 0x00000002, 0x00000002, 0x800F9FE0, 0x800FA3A0, 0x00000002, 0x00000002, 0x800FA3C0, 0x800FA780, 0x00000003, 0x00000000, 0x00000008, 0x00000013, 0x00000030, 0x00000028, 0x00000004, 0x00000002, 0x0000000A, 0x800F9FE0, 0x800FA3A0, 0x00000002, 0x0000000A, 0x800FA3C0, 0x800FA780, 0x00000003, 0x00000000, 0x00000008, 0x00000013, 0x00000018, 0x00000008, 0x00000004, 0x00000002, 0x0000003C, 0x800FA7A0, 0x800FA800, 0x00000003, 0x00000000 +dlabel HudScript_SlowlyPressAButton +.word 0x00000008, 0x00000013, 0x00000030, 0x00000028, 0x00000004, 0x00000002, 0x0000001E, 0x800F8500, 0x800F88C0, 0x00000002, 0x0000001E, 0x800F88E0, 0x800F8CA0, 0x00000003, 0x00000000 -dlabel D_80108D6C +dlabel HudScript_SlowlyMashAButton +.word 0x00000008, 0x00000013, 0x00000030, 0x00000028, 0x00000004, 0x00000002, 0x00000004, 0x800F8500, 0x800F88C0, 0x00000002, 0x00000004, 0x800F88E0, 0x800F8CA0, 0x00000003, 0x00000000 + +dlabel HudScript_StartButton +.word 0x00000008, 0x00000013, 0x00000030, 0x00000028, 0x00000004, 0x00000002, 0x0000003C, 0x800F9FE0, 0x800FA3A0, 0x00000003, 0x00000000 + +dlabel HudScript_StartButtonDown +.word 0x00000008, 0x00000013, 0x00000030, 0x00000028, 0x00000004, 0x00000002, 0x0000003C, 0x800FA3C0, 0x800FA780, 0x00000003, 0x00000000 + +dlabel HudScript_MashStartButton +.word 0x00000008, 0x00000013, 0x00000030, 0x00000028, 0x00000004, 0x00000002, 0x00000002, 0x800F9FE0, 0x800FA3A0, 0x00000002, 0x00000002, 0x800FA3C0, 0x800FA780, 0x00000003, 0x00000000 + +dlabel HudScript_PressStartButton +.word 0x00000008, 0x00000013, 0x00000030, 0x00000028, 0x00000004, 0x00000002, 0x0000000A, 0x800F9FE0, 0x800FA3A0, 0x00000002, 0x0000000A, 0x800FA3C0, 0x800FA780, 0x00000003, 0x00000000 + +dlabel HudScript_StartButtonText +.word 0x00000008, 0x00000013, 0x00000018, 0x00000008, 0x00000004, 0x00000002, 0x0000003C, 0x800FA7A0, 0x800FA800, 0x00000003, 0x00000000 + +dlabel HudScript_RotateStickCW .word 0x00000008, 0x00000004, 0x00000013, 0x00000020, 0x00000020, 0x0000000C, 0x00000000, 0x00000000, 0x00000002, 0x00000002, 0x800F9A80, 0x800F9C80, 0x00000013, 0x00000028, 0x00000020, 0x0000000C, 0x00000005, 0x00000000, 0x00000002, 0x00000002, 0x800F93A0, 0x800F9620, 0x00000013, 0x00000020, 0x00000020, 0x0000000C, 0x00000000, 0x00000000, 0x00000002, 0x00000002, 0x800F9860, 0x800F9A60, 0x00000013, 0x00000028, 0x00000020, 0x0000000C, 0xFFFFFFFC, 0x00000000, 0x00000002, 0x00000002, 0x800F8EE0, 0x800F9160, 0x00000003, 0x00000000 -dlabel D_80108E1C +dlabel HudScript_StickNeutral .word 0x00000008, 0x00000013, 0x00000020, 0x00000020, 0x00000004, 0x00000002, 0x0000003C, 0x800F8CC0, 0x800F8EC0, 0x00000003, 0x00000000 -dlabel D_80108E48 +dlabel HudScript_StickHoldLeft .word 0x00000008, 0x00000013, 0x00000028, 0x00000020, 0x0000000C, 0xFFFFFFFC, 0x00000000, 0x00000004, 0x00000002, 0x0000003C, 0x800F8EE0, 0x800F9160, 0x00000003, 0x00000000 -dlabel D_80108E80 +dlabel HudScript_StickBackAndForth .word 0x00000008, 0x00000004, 0x00000013, 0x00000028, 0x00000020, 0x0000000C, 0xFFFFFFFC, 0x00000000, 0x00000002, 0x00000002, 0x800F8EE0, 0x800F9160, 0x00000013, 0x00000020, 0x00000020, 0x0000000C, 0x00000000, 0x00000000, 0x00000002, 0x00000001, 0x800F9640, 0x800F9840, 0x00000013, 0x00000028, 0x00000020, 0x0000000C, 0x00000005, 0x00000000, 0x00000002, 0x00000002, 0x800F93A0, 0x800F9620, 0x00000013, 0x00000020, 0x00000020, 0x0000000C, 0x00000000, 0x00000000, 0x00000002, 0x00000001, 0x800F9180, 0x800F9380, 0x00000003, 0x00000000 -dlabel D_80108F30 +dlabel HudScript_StickMashLeft .word 0x00000008, 0x00000004, 0x00000013, 0x00000028, 0x00000020, 0x0000000C, 0xFFFFFFFC, 0x00000000, 0x00000002, 0x00000006, 0x800F8EE0, 0x800F9160, 0x00000013, 0x00000020, 0x00000020, 0x0000000C, 0x00000000, 0x00000000, 0x00000002, 0x00000001, 0x800F8CC0, 0x800F8EC0, 0x00000003, 0x00000000 -dlabel D_80108F90 +dlabel HudScript_StickTapLeft .word 0x00000008, 0x00000004, 0x00000013, 0x00000028, 0x00000020, 0x0000000C, 0xFFFFFFFC, 0x00000000, 0x00000002, 0x00000016, 0x800F8EE0, 0x800F9160, 0x00000013, 0x00000020, 0x00000020, 0x0000000C, 0x00000000, 0x00000000, 0x00000002, 0x00000008, 0x800F8CC0, 0x800F8EC0, 0x00000003, 0x00000000 -dlabel D_80108FF0 +dlabel HudScript_StickTapNeutral .word 0x00000008, 0x00000013, 0x00000020, 0x00000020, 0x0000000C, 0x00000000, 0x00000000, 0x00000002, 0x00000001, 0x800F9640, 0x800F9840, 0x00000013, 0x00000020, 0x00000020, 0x00000002, 0x00000001, 0x800F9180, 0x800F9380, 0x00000013, 0x00000020, 0x00000020, 0x00000002, 0x00000001, 0x800F9640, 0x800F9840, 0x00000013, 0x00000020, 0x00000020, 0x00000002, 0x00000014, 0x800F9180, 0x800F9380, 0x00000004, 0x00000002, 0x0000003C, 0x800F9180, 0x800F9380, 0x00000003, 0x00000000, 0x00000008, 0x00000013, 0x00000020, 0x00000020, 0x0000000C, 0x00000000, 0x00000000, 0x00000004, 0x00000002, 0x0000003C, 0x800F9860, 0x800F9A60, 0x00000003, 0x00000000, 0x00000008, 0x00000004, 0x00000013, 0x00000020, 0x00000020, 0x0000000C, 0x00000000, 0x00000000, 0x00000002, 0x00000002, 0x800F8CC0, 0x800F8EC0, 0x00000013, 0x00000020, 0x00000020, 0x0000000C, 0x00000000, 0x00000000, 0x00000002, 0x00000001, 0x800F9860, 0x800F9A60, 0x00000003, 0x00000000, 0x00000008, 0x00000004, 0x00000013, 0x00000020, 0x00000020, 0x0000000C, 0x00000000, 0x00000000, 0x00000002, 0x0000000C, 0x800F8CC0, 0x800F8EC0, 0x00000013, 0x00000020, 0x00000020, 0x0000000C, 0x00000000, 0x00000000, 0x00000002, 0x0000000A, 0x800F9860, 0x800F9A60, 0x00000003, 0x00000000, 0x00000008, 0x00000004, 0x00000013, 0x00000020, 0x00000020, 0x0000000C, 0x00000000, 0x00000000, 0x00000002, 0x00000006, 0x800F8CC0, 0x800F8EC0, 0x00000013, 0x00000020, 0x00000020, 0x0000000C, 0x00000000, 0x00000000, 0x00000002, 0x00000001, 0x800F9860, 0x800F9A60, 0x00000003, 0x00000000 -dlabel D_801091E4 +dlabel HudScript_StickTapRight .word 0x00000008, 0x00000004, 0x00000013, 0x00000020, 0x00000020, 0x0000000C, 0x00000000, 0x00000000, 0x00000002, 0x00000006, 0x800F8CC0, 0x800F8EC0, 0x00000013, 0x00000028, 0x00000020, 0x0000000C, 0x00000005, 0x00000000, 0x00000002, 0x00000002, 0x800F93A0, 0x800F9620, 0x00000003, 0x00000000 -dlabel D_80109244 +dlabel HudScript_RunAwayOK .word 0x00000008, 0x00000004, 0x00000013, 0x00000018, 0x00000010, 0x00000002, 0x0000003C, 0x800F9F00, 0x800F9FC0, 0x00000003, 0x00000000 -dlabel D_80109270 +dlabel HudScript_MenuTimes .word 0x00000008, 0x00000005, 0x00000000, 0x00000004, 0x00000002, 0x0000003C, 0x800FC260, 0x800FC280, 0x00000003, 0x00000000 -dlabel D_80109298 +dlabel HudScript_PartnerRank1A .word 0x00000008, 0x00000005, 0x00000001, 0x00000004, 0x00000002, 0x0000003C, 0x80101640, 0x801016C0, 0x00000003, 0x00000000 -dlabel D_801092C0 +dlabel HudScript_PartnerRank1B .word 0x00000008, 0x00000005, 0x00000001, 0x00000004, 0x00000002, 0x0000003C, 0x80101640, 0x801016C0, 0x00000003, 0x00000000 -dlabel D_801092E8 +dlabel HudScript_PartnerRank2A .word 0x00000008, 0x00000005, 0x00000001, 0x00000004, 0x00000002, 0x0000003C, 0x801016E0, 0x80101760, 0x00000003, 0x00000000 -dlabel D_80109310 -.word 0x00000008, 0x00000005, 0x00000001, 0x00000004, 0x00000002, 0x0000003C, 0x801016E0, 0x80101760, 0x00000003, 0x00000000, 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x00000002, 0x0000003C, 0x801038A0, 0x80103AA0, 0x00000003, 0x00000000, 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x00000002, 0x0000003C, 0x80103AE0, 0x80103CE0, 0x00000003, 0x00000000, 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x00000002, 0x0000003C, 0x80103D20, 0x80103F20, 0x00000003, 0x00000000, 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x00000002, 0x0000003C, 0x80103F60, 0x80104160, 0x00000003, 0x00000000, 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x00000002, 0x0000003C, 0x801038A0, 0x80103AC0, 0x00000003, 0x00000000, 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x00000002, 0x0000003C, 0x80103AE0, 0x80103D00, 0x00000003, 0x00000000, 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x00000002, 0x0000003C, 0x80103D20, 0x80103F40, 0x00000003, 0x00000000, 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x00000002, 0x0000003C, 0x80103F60, 0x80104180, 0x00000003, 0x00000000, 0x00000000, 0x00000000 +dlabel HudScript_PartnerRank2B +.word 0x00000008, 0x00000005, 0x00000001, 0x00000004, 0x00000002, 0x0000003C, 0x801016E0, 0x80101760, 0x00000003, 0x00000000 + +dlabel HudScript_MoveDiamond +.word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x00000002, 0x0000003C, 0x801038A0, 0x80103AA0, 0x00000003, 0x00000000 + +dlabel HudScript_MoveBlueOrb +.word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x00000002, 0x0000003C, 0x80103AE0, 0x80103CE0, 0x00000003, 0x00000000 + +dlabel HudScript_MoveGreenOrb +.word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x00000002, 0x0000003C, 0x80103D20, 0x80103F20, 0x00000003, 0x00000000 + +dlabel HudScript_MoveRedOrb +.word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x00000002, 0x0000003C, 0x80103F60, 0x80104160, 0x00000003, 0x00000000 + +dlabel HudScript_MoveDiamondDisabled +.word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x00000002, 0x0000003C, 0x801038A0, 0x80103AC0, 0x00000003, 0x00000000 + +dlabel HudScript_MoveBlueOrbDisabled +.word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x00000002, 0x0000003C, 0x80103AE0, 0x80103D00, 0x00000003, 0x00000000 + +dlabel HudScript_MoveGreenOrbDisabled +.word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x00000002, 0x0000003C, 0x80103D20, 0x80103F40, 0x00000003, 0x00000000 + +dlabel HudScript_MoveRedOrbDisabled +.word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x00000002, 0x0000003C, 0x80103F60, 0x80104180, 0x00000003, 0x00000000 + +dlabel D_80109478 +.word 0x00000000, 0x00000000 dlabel D_80109480 .word 0x00000000 diff --git a/ver/us/asm/data/battle/action_cmd/42CEB0.data.s b/ver/us/asm/data/battle/action_cmd/42CEB0.data.s index 92c6fa3044..0a54cebf9d 100644 --- a/ver/us/asm/data/battle/action_cmd/42CEB0.data.s +++ b/ver/us/asm/data/battle/action_cmd/42CEB0.data.s @@ -3,7 +3,7 @@ .section .data dlabel D_802A97C0_42CEB0 -.word D_80108BBC, D_802923B0, D_802926C4 +.word HudScript_PressAButton, HudScript_PressBButton, HudScript_PressCDownButton dlabel D_802A97CC_42CEBC -.word D_80108B54, 0x80292348, 0x8029265C, 0x00000000, 0x00000000 +.word HudScript_AButtonDown, 0x80292348, 0x8029265C, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/pause/1422A0.data.s b/ver/us/asm/data/pause/1422A0.data.s index 2321ef11fc..eac27c7e8a 100644 --- a/ver/us/asm/data/pause/1422A0.data.s +++ b/ver/us/asm/data/pause/1422A0.data.s @@ -3,7 +3,7 @@ .section .data dlabel gPauseMenuIconScripts -.word D_80241ECC, 0x802427D4, nok_02_UnkMovePartner, 0x80241E00, D_801091E4, D_80108BBC, 0x80108D04, 0x80108D40 +.word D_80241ECC, 0x802427D4, 0x80242820, 0x80241E00, HudScript_StickTapRight, HudScript_PressAButton, HudScript_PressStartButton, HudScript_StartButtonText dlabel gPauseMenuPanels .word D_8024F314, D_8024F4AC, D_8024F54C, D_8024F5E4, D_8024F88C, D_8024FA10 @@ -135,7 +135,7 @@ dlabel D_8024F314 .word 0x00000000, 0x00060100, D_8024F1C8, pause_tabs_init, pause_tabs_handle_input, pause_tabs_update, pause_tabs_cleanup dlabel gStatsMenuElements -.word arn_03_802429D4, flo_00_npcAISettings_8024286C, 0x8024290C, D_80108558, D_801086AC, dgb_18_idle_80242A24, 0x802429FC, D_80108518, func_80242AD4_825D94, 0x802429AC, D_801083D8, 0x80242B24 +.word arn_03_802429D4, flo_00_npcAISettings_8024286C, 0x8024290C, HudScript_StatusCoin, HudScript_StatusStarPoint, dgb_18_idle_80242A24, 0x802429FC, HudScript_StatusHeart, func_80242AD4_825D94, 0x802429AC, HudScript_StatusStar1, 0x80242B24 dlabel D_8024F360 .word flo_00_npcAISettings_8024286C, mac_05_UnkYawFunc, flo_00_npcSettings_802428BC, 0x802428E4 @@ -162,7 +162,7 @@ dlabel D_8024F434 .word 0x80108298, 0x801082E8, 0x801082C0, 0x80108310, 0x80108338, 0x80108360, 0x80108388 dlabel D_8024F450 -.word D_801083D8, 0x80108428, 0x80108400, 0x80108450, 0x80108478, 0x801084A0, 0x801084C8 +.word HudScript_StatusStar1, HudScript_StatusStar3, HudScript_StatusStar2, HudScript_StatusStar4, HudScript_StatusStar5, HudScript_StatusStar6, HudScript_StatusStar7 dlabel D_8024F46C .word 0xFFFFFFFF @@ -192,7 +192,7 @@ dlabel D_8024F4AC .word 0x00000000, 0x00020700, D_8024F3A0, pause_stats_init, pause_stats_handle_input, 0x00000000, pause_stats_cleanup, 0x00000000, 0x00000000 dlabel gBadgeMenuElements -.word 0x802429AC, 0x802429AC, 0x802429AC, 0x802429AC, 0x802429AC, 0x802429AC, 0x802429AC, 0x802429AC, 0x802429AC, 0x802429AC, 0x802429AC, 0x802429AC, 0x802429AC, 0x802429AC, 0x802429AC, 0x802429AC, 0x802429AC, func_802426A0_8B2710, 0x802426CC, 0x802427A8, jan_02_TransformFoliage, D_801083D8 +.word 0x802429AC, 0x802429AC, 0x802429AC, 0x802429AC, 0x802429AC, 0x802429AC, 0x802429AC, 0x802429AC, 0x802429AC, 0x802429AC, 0x802429AC, 0x802429AC, 0x802429AC, 0x802429AC, 0x802429AC, 0x802429AC, 0x802429AC, func_802426A0_8B2710, 0x802426CC, 0x802427A8, jan_02_TransformFoliage, HudScript_StatusStar1 dlabel gBadgeMenuWindowBPs .word 0x20000003, 0x00100121, 0x009A0100, pause_badges_draw_contents, 0x00000000, 0x16000000, 0x00000002, 0x00000000, 0x8026FC80 @@ -201,7 +201,7 @@ dlabel D_8024F54C .word 0x00000000, 0x00000000, 0x00000000, pause_badges_init, pause_badges_handle_input, pause_badges_update, pause_badges_cleanup, 0x00000000, 0x00000000 dlabel D_8024F570 -.word 0x802429AC, 0x802429AC, 0x802429AC, 0x802429AC, 0x802429AC, 0x802429AC, 0x802429AC, 0x802429AC, 0x802429AC, 0x802429AC, 0x802429AC, 0x802429AC, 0x802429AC, 0x802429AC, 0x802429AC, 0x802429AC, func_802426A0_8B2710, 0x802426CC, 0x802427A8, D_801083D8 +.word 0x802429AC, 0x802429AC, 0x802429AC, 0x802429AC, 0x802429AC, 0x802429AC, 0x802429AC, 0x802429AC, 0x802429AC, 0x802429AC, 0x802429AC, 0x802429AC, 0x802429AC, 0x802429AC, 0x802429AC, 0x802429AC, func_802426A0_8B2710, 0x802426CC, 0x802427A8, HudScript_StatusStar1 dlabel D_8024F5C0 .word 0x21000003, 0x00100121, 0x009A0100, pause_items_draw_contents, 0x00000000, 0x16000000, 0x00000002, 0x00000000, 0x8026FD28 @@ -210,7 +210,7 @@ dlabel D_8024F5E4 .word 0x00000000, 0x00000000, 0x00000000, pause_items_init, pause_items_handle_input, pause_items_update, pause_items_cleanup dlabel D_8024F600 -.word D_80107638, func_80242AD4_825D94, 0x80242B4C, 0x80242B4C, 0x80109338, 0x80109360, 0x80109388, 0x801093B0 +.word HudScript_FPCost, func_80242AD4_825D94, 0x80242B4C, 0x80242B4C, 0x80109338, 0x80109360, 0x80109388, 0x801093B0 dlabel D_8024F620 .word 0x028001E0, 0x01FF0000, 0x028001E0, 0x01FF0000 diff --git a/ver/us/asm/data/pause_icon_table.data.s b/ver/us/asm/data/pause_icon_table.data.s new file mode 100644 index 0000000000..1ba4c9e038 --- /dev/null +++ b/ver/us/asm/data/pause_icon_table.data.s @@ -0,0 +1,228 @@ +.include "macro.inc" + +.section .data + +dlabel HudScript_UnusedBadge +.word 0x00000008, 0x00000005, 0x00000002, 0x00000004, 0x00000002, 0x0000003C, 0x8023E000, 0x8023E120, 0x00000003, 0x00000000 + +dlabel HudScript_UnusedBadge_disabled +.word 0x00000008, 0x00000005, 0x00000002, 0x00000004, 0x00000002, 0x0000003C, 0x8023E000, 0x8023E140, 0x00000003, 0x00000000 + +dlabel HudScript_UnusedCompass +.word 0x00000008, 0x00000005, 0x00000002, 0x00000004, 0x00000002, 0x0000003C, 0x8023E160, 0x8023E280, 0x00000003, 0x00000000 + +dlabel HudScript_UnusedCompass_disabled +.word 0x00000008, 0x00000005, 0x00000002, 0x00000004, 0x00000002, 0x0000003C, 0x8023E160, 0x8023E2A0, 0x00000003, 0x00000000 + +dlabel HudScript_CursorHand +.word 0x00000008, 0x00000013, 0x00000010, 0x00000010, 0x00000004, 0x00000002, 0x0000003C, 0x8023E2C0, 0x8023E340, 0x00000003, 0x00000000 + +dlabel HudScript_AnimatedCursorHand +.word 0x00000008, 0x00000013, 0x00000010, 0x00000010, 0x00000004, 0x0000000A, 0xFFFFFFFF, 0x00000002, 0x00000004, 0x8023E2C0, 0x8023E340, 0x0000000A, 0x00000001, 0x00000002, 0x00000008, 0x8023E2C0, 0x8023E340, 0x00000003, 0x00000000 + +dlabel HudScript_JpSuper +.word 0x00000008, 0x00000013, 0x00000028, 0x00000010, 0x00000004, 0x00000002, 0x0000003C, 0x80240800, 0x80240940, 0x00000003, 0x00000000 + +dlabel HudScript_JpUltra +.word 0x00000008, 0x00000013, 0x00000028, 0x00000010, 0x00000004, 0x00000002, 0x0000003C, 0x80240960, 0x80240AA0, 0x00000003, 0x00000000 + +dlabel HudScript_FilenameCaret +.word 0x00000008, 0x00000013, 0x00000010, 0x00000010, 0x00000004, 0x00000019, 0x00200000, 0x00000002, 0x00000009, 0x8023E360, 0x8023E3E0, 0x00000018, 0x00200000, 0x00000002, 0x00000006, 0x8023E360, 0x8023E3E0, 0x00000003, 0x00000000 + +dlabel HudScript_FilenameSpace +.word 0x00000008, 0x00000013, 0x00000008, 0x00000008, 0x00000004, 0x00000002, 0x0000003C, 0x8023E400, 0x8023E420, 0x00000003, 0x00000000 + +dlabel HudScript_HeaderStats +.word 0x00000008, 0x00000013, 0x00000030, 0x00000010, 0x00000004, 0x00000002, 0x0000003C, 0x8023E440, 0x8023E5C0, 0x00000003, 0x00000000 + +dlabel HudScript_HeaderBadges +.word 0x00000008, 0x00000013, 0x00000030, 0x00000010, 0x00000004, 0x00000002, 0x0000003C, 0x8023E5E0, 0x8023E760, 0x00000003, 0x00000000 + +dlabel HudScript_HeaderItems +.word 0x00000008, 0x00000013, 0x00000030, 0x00000010, 0x00000004, 0x00000002, 0x0000003C, 0x8023E780, 0x8023E900, 0x00000003, 0x00000000 + +dlabel HudScript_HeaderParty +.word 0x00000008, 0x00000013, 0x00000030, 0x00000010, 0x00000004, 0x00000002, 0x0000003C, 0x8023E920, 0x8023EAA0, 0x00000003, 0x00000000 + +dlabel HudScript_HeaderSpirits +.word 0x00000008, 0x00000013, 0x00000030, 0x00000010, 0x00000004, 0x00000002, 0x0000003C, 0x8023EAC0, 0x8023EC40, 0x00000003, 0x00000000 + +dlabel HudScript_HeaderMap +.word 0x00000008, 0x00000013, 0x00000030, 0x00000010, 0x00000004, 0x00000002, 0x0000003C, 0x8023EC60, 0x8023EDE0, 0x00000003, 0x00000000 + +dlabel HudScript_SmallText0 +.word 0x00000008, 0x00000013, 0x00000008, 0x00000008, 0x00000004, 0x00000002, 0x0000003C, 0x8023EE00, 0x8023EE20, 0x00000003, 0x00000000 + +dlabel HudScript_SmallText1 +.word 0x00000008, 0x00000013, 0x00000008, 0x00000008, 0x00000004, 0x00000002, 0x0000003C, 0x8023EE40, 0x8023EE60, 0x00000003, 0x00000000 + +dlabel HudScript_SmallText2 +.word 0x00000008, 0x00000013, 0x00000008, 0x00000008, 0x00000004, 0x00000002, 0x0000003C, 0x8023EE80, 0x8023EEA0, 0x00000003, 0x00000000 + +dlabel HudScript_SmallText3 +.word 0x00000008, 0x00000013, 0x00000008, 0x00000008, 0x00000004, 0x00000002, 0x0000003C, 0x8023EEC0, 0x8023EEE0, 0x00000003, 0x00000000 + +dlabel HudScript_SmallText4 +.word 0x00000008, 0x00000013, 0x00000008, 0x00000008, 0x00000004, 0x00000002, 0x0000003C, 0x8023EF00, 0x8023EF20, 0x00000003, 0x00000000 + +dlabel HudScript_SmallText5 +.word 0x00000008, 0x00000013, 0x00000008, 0x00000008, 0x00000004, 0x00000002, 0x0000003C, 0x8023EF40, 0x8023EF60, 0x00000003, 0x00000000 + +dlabel HudScript_SmallText6 +.word 0x00000008, 0x00000013, 0x00000008, 0x00000008, 0x00000004, 0x00000002, 0x0000003C, 0x8023EF80, 0x8023EFA0, 0x00000003, 0x00000000 + +dlabel HudScript_SmallText7 +.word 0x00000008, 0x00000013, 0x00000008, 0x00000008, 0x00000004, 0x00000002, 0x0000003C, 0x8023EFC0, 0x8023EFE0, 0x00000003, 0x00000000 + +dlabel HudScript_SmallText8 +.word 0x00000008, 0x00000013, 0x00000008, 0x00000008, 0x00000004, 0x00000002, 0x0000003C, 0x8023F000, 0x8023F020, 0x00000003, 0x00000000 + +dlabel HudScript_SmallText9 +.word 0x00000008, 0x00000013, 0x00000008, 0x00000008, 0x00000004, 0x00000002, 0x0000003C, 0x8023F040, 0x8023F060, 0x00000003, 0x00000000 + +dlabel HudScript_SmallTextBp +.word 0x00000008, 0x00000013, 0x00000008, 0x00000008, 0x00000004, 0x00000002, 0x0000003C, 0x8023F080, 0x8023F0A0, 0x00000003, 0x00000000 + +dlabel HudScript_JpFile +.word 0x00000008, 0x00000013, 0x00000020, 0x00000010, 0x00000004, 0x00000002, 0x0000003C, 0x8023F0C0, 0x8023F1C0, 0x00000003, 0x00000000 + +dlabel HudScript_JpFileDisabled +.word 0x00000008, 0x00000013, 0x00000020, 0x00000010, 0x00000004, 0x00000002, 0x0000003C, 0x8023F1E0, 0x8023F2E0, 0x00000003, 0x00000000 + +dlabel HudScript_OptionMonoOn +.word 0x00000008, 0x00000013, 0x00000040, 0x00000010, 0x00000004, 0x00000002, 0x0000003C, 0x8023F300, 0x8023F500, 0x00000003, 0x00000000 + +dlabel HudScript_OptionMonoOff +.word 0x00000008, 0x00000013, 0x00000040, 0x00000010, 0x00000004, 0x00000002, 0x0000003C, 0x8023F520, 0x8023F720, 0x00000003, 0x00000000 + +dlabel HudScript_OptionStereoOn +.word 0x00000008, 0x00000013, 0x00000040, 0x00000010, 0x00000004, 0x00000002, 0x0000003C, 0x8023F740, 0x8023F940, 0x00000003, 0x00000000 + +dlabel HudScript_OptionStereoOff +.word 0x00000008, 0x00000013, 0x00000040, 0x00000010, 0x00000004, 0x00000002, 0x0000003C, 0x8023F960, 0x8023FB60, 0x00000003, 0x00000000 + +dlabel HudScript_Spirit1 +.word 0x00000008, 0x00000013, 0x00000010, 0x00000010, 0x00000004, 0x00000002, 0x0000003C, 0x8023FB80, 0x8023FC00, 0x00000003, 0x00000000 + +dlabel HudScript_Spirit1Missing +.word 0x00000008, 0x00000013, 0x00000010, 0x00000010, 0x00000004, 0x00000002, 0x0000003C, 0x8023FC20, 0x8023FCA0, 0x00000003, 0x00000000 + +dlabel HudScript_Spirit2 +.word 0x00000008, 0x00000013, 0x00000010, 0x00000010, 0x00000004, 0x00000002, 0x0000003C, 0x8023FCC0, 0x8023FD40, 0x00000003, 0x00000000 + +dlabel HudScript_Spirit2Missing +.word 0x00000008, 0x00000013, 0x00000010, 0x00000010, 0x00000004, 0x00000002, 0x0000003C, 0x8023FD60, 0x8023FDE0, 0x00000003, 0x00000000 + +dlabel HudScript_Spirit3 +.word 0x00000008, 0x00000013, 0x00000010, 0x00000010, 0x00000004, 0x00000002, 0x0000003C, 0x8023FE00, 0x8023FE80, 0x00000003, 0x00000000 + +dlabel HudScript_Spirit3Missing +.word 0x00000008, 0x00000013, 0x00000010, 0x00000010, 0x00000004, 0x00000002, 0x0000003C, 0x8023FEA0, 0x8023FF20, 0x00000003, 0x00000000 + +dlabel HudScript_Spirit4 +.word 0x00000008, 0x00000013, 0x00000010, 0x00000010, 0x00000004, 0x00000002, 0x0000003C, 0x8023FF40, 0x8023FFC0, 0x00000003, 0x00000000 + +dlabel HudScript_Spirit4Missing +.word 0x00000008, 0x00000013, 0x00000010, 0x00000010, 0x00000004, 0x00000002, 0x0000003C, 0x8023FFE0, 0x80240060, 0x00000003, 0x00000000 + +dlabel HudScript_Spirit5 +.word 0x00000008, 0x00000013, 0x00000010, 0x00000010, 0x00000004, 0x00000002, 0x0000003C, 0x80240080, 0x80240100, 0x00000003, 0x00000000 + +dlabel HudScript_Spirit5Missing +.word 0x00000008, 0x00000013, 0x00000010, 0x00000010, 0x00000004, 0x00000002, 0x0000003C, 0x80240120, 0x802401A0, 0x00000003, 0x00000000 + +dlabel HudScript_Spirit6 +.word 0x00000008, 0x00000013, 0x00000010, 0x00000010, 0x00000004, 0x00000002, 0x0000003C, 0x802401C0, 0x80240240, 0x00000003, 0x00000000 + +dlabel HudScript_Spirit6Missing +.word 0x00000008, 0x00000013, 0x00000010, 0x00000010, 0x00000004, 0x00000002, 0x0000003C, 0x80240260, 0x802402E0, 0x00000003, 0x00000000 + +dlabel HudScript_Spirit7 +.word 0x00000008, 0x00000013, 0x00000010, 0x00000010, 0x00000004, 0x00000002, 0x0000003C, 0x80240300, 0x80240380, 0x00000003, 0x00000000 + +dlabel HudScript_Spirit7Missing +.word 0x00000008, 0x00000013, 0x00000010, 0x00000010, 0x00000004, 0x00000002, 0x0000003C, 0x802403A0, 0x80240420, 0x00000003, 0x00000000 + +dlabel HudScript_MapWalk0 +.word 0x00000008, 0x00000013, 0x00000018, 0x00000018, 0x00000004, 0x00000002, 0x00000010, 0x80240440, 0x80240560, 0x00000002, 0x00000005, 0x80240580, 0x802406A0, 0x00000002, 0x00000010, 0x802406C0, 0x802407E0, 0x00000002, 0x00000004, 0x80240580, 0x802406A0, 0x00000003, 0x00000000 + +dlabel HudScript_ListPrevPage +.word 0x00000008, 0x00000013, 0x00000010, 0x00000010, 0x00000004, 0x00000002, 0x0000003C, 0x80240AC0, 0x80240B40, 0x00000003, 0x00000000 + +dlabel HudScript_ListNextPage +.word 0x00000008, 0x00000013, 0x00000010, 0x00000010, 0x00000004, 0x00000002, 0x0000003C, 0x80240B60, 0x80240BE0, 0x00000003, 0x00000000 + +dlabel HudScript_133F40_133FC0 +.word 0x00000008, 0x00000013, 0x00000010, 0x00000010, 0x00000004, 0x00000002, 0x0000003C, 0x80240C00, 0x80240C80, 0x00000003, 0x00000000 + +dlabel HudScript_133FE0_134060 +.word 0x00000008, 0x00000013, 0x00000010, 0x00000010, 0x00000004, 0x00000002, 0x0000003C, 0x80240CA0, 0x80240D20, 0x00000003, 0x00000000 + +dlabel HudScript_LabelBpNeeded +.word 0x00000008, 0x00000013, 0x00000030, 0x00000008, 0x00000004, 0x00000002, 0x0000003C, 0x80240E80, 0x80240F40, 0x00000003, 0x00000000 + +dlabel HudScript_MarioHeadLarge +.word 0x00000008, 0x00000013, 0x00000020, 0x00000020, 0x00000004, 0x00000002, 0x0000003C, 0x80240F60, 0x80241160, 0x00000003, 0x00000000 + +dlabel HudScript_Dash +.word 0x00000008, 0x00000013, 0x00000010, 0x00000008, 0x00000004, 0x00000002, 0x0000003C, 0x80241180, 0x802411C0, 0x00000003, 0x00000000 + +dlabel HudScript_DescMsgPrev +.word 0x00000008, 0x00000013, 0x00000010, 0x00000010, 0x00000004, 0x00000019, 0x00200000, 0x00000002, 0x00000009, 0x80240D40, 0x80240DC0, 0x00000018, 0x00200000, 0x00000002, 0x00000006, 0x80240D40, 0x80240DC0, 0x00000003, 0x00000000 + +dlabel HudScript_DescMsgNext +.word 0x00000008, 0x00000013, 0x00000010, 0x00000010, 0x00000004, 0x00000019, 0x00200000, 0x00000002, 0x00000009, 0x80240DE0, 0x80240E60, 0x00000018, 0x00200000, 0x00000002, 0x00000006, 0x80240DE0, 0x80240E60, 0x00000003, 0x00000000 + +dlabel HudScript_StatBoots0 +.word 0x00000008, 0x00000005, 0x00000001, 0x00000004, 0x00000002, 0x0000003C, 0x80241680, 0x80241700, 0x00000003, 0x00000000 + +dlabel HudScript_StatBoots1 +.word 0x00000008, 0x00000005, 0x00000001, 0x00000004, 0x00000002, 0x0000003C, 0x80241720, 0x802417A0, 0x00000003, 0x00000000 + +dlabel HudScript_StatBoots2 +.word 0x00000008, 0x00000005, 0x00000001, 0x00000004, 0x00000002, 0x0000003C, 0x802417C0, 0x80241840, 0x00000003, 0x00000000 + +dlabel HudScript_StatBoots3 +.word 0x00000008, 0x00000005, 0x00000001, 0x00000004, 0x00000002, 0x0000003C, 0x80241860, 0x802418E0, 0x00000003, 0x00000000 + +dlabel HudScript_StatHammer0 +.word 0x00000008, 0x00000005, 0x00000001, 0x00000004, 0x00000002, 0x0000003C, 0x80241900, 0x80241980, 0x00000003, 0x00000000 + +dlabel HudScript_StatHammer1 +.word 0x00000008, 0x00000005, 0x00000001, 0x00000004, 0x00000002, 0x0000003C, 0x802419A0, 0x80241A20, 0x00000003, 0x00000000 + +dlabel HudScript_StatHammer2 +.word 0x00000008, 0x00000005, 0x00000001, 0x00000004, 0x00000002, 0x0000003C, 0x80241A40, 0x80241AC0, 0x00000003, 0x00000000 + +dlabel HudScript_StatHammer3 +.word 0x00000008, 0x00000005, 0x00000001, 0x00000004, 0x00000002, 0x0000003C, 0x80241AE0, 0x80241B60, 0x00000003, 0x00000000 + +dlabel HudScript_StatBp +.word 0x00000008, 0x00000005, 0x00000001, 0x00000004, 0x00000002, 0x0000003C, 0x802411E0, 0x80241260, 0x00000003, 0x00000000 + +dlabel HudScript_MarioHeadSmall +.word 0x00000008, 0x00000005, 0x00000001, 0x00000004, 0x00000002, 0x0000003C, 0x80241280, 0x80241300, 0x00000003, 0x00000000 + +dlabel HudScript_Clock +.word 0x00000008, 0x00000005, 0x00000001, 0x00000004, 0x00000002, 0x0000003C, 0x80241320, 0x802413A0, 0x00000003, 0x00000000 + +dlabel HudScript_StatStarPiece_1 +.word 0x00000008, 0x00000005, 0x00000001, 0x00000004, 0x00000002, 0x0000000C, 0x802413C0, 0x80241440, 0x00000002, 0x00000004, 0x80241460, 0x802414E0, 0x00000002, 0x0000000C, 0x80241500, 0x80241580, 0x00000002, 0x00000004, 0x80241460, 0x802414E0, 0x00000003, 0x00000000 + +dlabel HudScript_StatStarPiece_2 +.word 0x00000008, 0x00000005, 0x00000001, 0x00000004, 0x00000002, 0x0000000C, 0x802413C0, 0x80241440, 0x00000002, 0x00000004, 0x80241460, 0x802414E0, 0x00000002, 0x0000000C, 0x80241500, 0x80241580, 0x00000002, 0x00000004, 0x80241460, 0x802414E0, 0x00000003, 0x00000000 + +dlabel HudScript_StatFp_1 +.word 0x00000008, 0x00000005, 0x00000001, 0x00000004, 0x00000002, 0x0000003C, 0x802415A0, 0x80241620, 0x00000003, 0x00000000 + +dlabel HudScript_StatFp_2 +.word 0x00000008, 0x00000005, 0x00000001, 0x00000004, 0x00000002, 0x0000003C, 0x802415A0, 0x80241620, 0x00000003, 0x00000000 + +dlabel HudScript_StatTimes +.word 0x00000008, 0x00000005, 0x00000000, 0x00000004, 0x00000002, 0x0000003C, 0x80241640, 0x80241660, 0x00000003, 0x00000000 + +dlabel HudScript_PartnerRank +.word 0x00000008, 0x00000005, 0x00000001, 0x00000004, 0x00000002, 0x0000003C, 0x80241B80, 0x80241C00, 0x00000003, 0x00000000 + +dlabel HudScript_134F60_135120 +.word 0x00000008, 0x00000013, 0x00000038, 0x00000010, 0x00000004, 0x00000002, 0x0000003C, 0x80241C20, 0x80241DE0, 0x00000003, 0x00000000 diff --git a/ver/us/asm/data/world/area_arn/arn_03/BE3570.data.s b/ver/us/asm/data/world/area_arn/arn_03/BE3570.data.s index f40a5bd913..a5468f806d 100644 --- a/ver/us/asm/data/world/area_arn/arn_03/BE3570.data.s +++ b/ver/us/asm/data/world/area_arn/arn_03/BE3570.data.s @@ -3,4 +3,4 @@ .section .data dlabel D_802447E0_BE3570 -.word 0x00000043, 0x00000008, MakeEntity, 0x802EA564, 0x0000012C, 0x000000ED, 0x0000003C, 0x00000000, 0x00000157, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405F6F, 0x00000043, 0x00000007, MakeEntity, D_802E9A18, 0x000000FA, 0x000000ED, 0x0000007D, 0x00000000, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 +.word 0x00000043, 0x00000008, MakeEntity, 0x802EA564, 0x0000012C, 0x000000ED, 0x0000003C, 0x00000000, 0x00000157, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405F6F, 0x00000043, 0x00000007, MakeEntity, Entity_SavePoint, 0x000000FA, 0x000000ED, 0x0000007D, 0x00000000, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_flo/flo_00/CA7050.data.s b/ver/us/asm/data/world/area_flo/flo_00/CA7050.data.s index 9dbae4a2c6..cf89861bb7 100644 --- a/ver/us/asm/data/world/area_flo/flo_00/CA7050.data.s +++ b/ver/us/asm/data/world/area_flo/flo_00/CA7050.data.s @@ -3,4 +3,4 @@ .section .data dlabel D_80249130_CA7050 -.word 0x0000000C, 0x00000002, 0xF5DE0180, 0x00000060, 0x00000043, 0x00000007, MakeEntity, D_802E9A18, 0x0000006E, 0x0000003C, 0xFFFFFF9C, 0x00000000, 0x80000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 +.word 0x0000000C, 0x00000002, 0xF5DE0180, 0x00000060, 0x00000043, 0x00000007, MakeEntity, Entity_SavePoint, 0x0000006E, 0x0000003C, 0xFFFFFF9C, 0x00000000, 0x80000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_hos/hos_03/A26E00.data.s b/ver/us/asm/data/world/area_hos/hos_03/A26E00.data.s index 671ad2dda4..f92c34fc08 100644 --- a/ver/us/asm/data/world/area_hos/hos_03/A26E00.data.s +++ b/ver/us/asm/data/world/area_hos/hos_03/A26E00.data.s @@ -3,4 +3,4 @@ .section .data dlabel D_8024BD00_A26E00 -.word 0x00000043, 0x00000007, MakeEntity, D_802E9A18, 0x000000C8, 0x0000003C, 0x00000113, 0x00000000, 0x80000000, 0x00000043, 0x00000002, SetEntityCullMode, 0x00000003, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000043, 0x00000007, MakeEntity, Entity_SavePoint, 0x000000C8, 0x0000003C, 0x00000113, 0x00000000, 0x80000000, 0x00000043, 0x00000002, SetEntityCullMode, 0x00000003, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_isk/isk_01/9785C0.data.s b/ver/us/asm/data/world/area_isk/isk_01/9785C0.data.s index 63a2c44213..76af63e9d1 100644 --- a/ver/us/asm/data/world/area_isk/isk_01/9785C0.data.s +++ b/ver/us/asm/data/world/area_isk/isk_01/9785C0.data.s @@ -3,4 +3,4 @@ .section .data dlabel D_80240480_9785C0 -.word 0xE3001A01, 0x00000020, 0xDF000000, 0x00000000, 0x00000043, 0x00000003, SetTexPanner, 0x0000001A, 0x00000002, 0x00000043, 0x00000003, EnableTexPanning, 0x0000001A, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, SetCustomGfx, 0x00000000, D_80240480_9785C0, 0x00000000, 0x00000043, 0x00000004, SetModelFlags, 0x0000001A, 0x00000010, 0x00000001, 0x00000003, 0x00000001, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0x00000046, 0x00000043, 0x00000005, SetTexPanOffset, 0x00000002, 0x00000000, 0xFE363C80, 0x00000000, 0x0000000D, 0x00000002, 0xFE363C80, 0x00004000, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFC000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, D_802E9A18, 0xFFFFFDEE, 0x0000003C, 0x0000002B, 0x00000000, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 +.word 0xE3001A01, 0x00000020, 0xDF000000, 0x00000000, 0x00000043, 0x00000003, SetTexPanner, 0x0000001A, 0x00000002, 0x00000043, 0x00000003, EnableTexPanning, 0x0000001A, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, SetCustomGfx, 0x00000000, D_80240480_9785C0, 0x00000000, 0x00000043, 0x00000004, SetModelFlags, 0x0000001A, 0x00000010, 0x00000001, 0x00000003, 0x00000001, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0x00000046, 0x00000043, 0x00000005, SetTexPanOffset, 0x00000002, 0x00000000, 0xFE363C80, 0x00000000, 0x0000000D, 0x00000002, 0xFE363C80, 0x00004000, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFC000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_SavePoint, 0xFFFFFDEE, 0x0000003C, 0x0000002B, 0x00000000, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_isk/isk_19/999BA0.data.s b/ver/us/asm/data/world/area_isk/isk_19/999BA0.data.s index c573e1d16d..b83cc848db 100644 --- a/ver/us/asm/data/world/area_isk/isk_19/999BA0.data.s +++ b/ver/us/asm/data/world/area_isk/isk_19/999BA0.data.s @@ -3,4 +3,4 @@ .section .data dlabel D_80240460_999BA0 -.word 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0x000001E6, 0xFFFFFCB3, 0x00000082, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0x000001F3, 0xFFFFFCB3, 0x0000002A, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000007, MakeEntity, D_802E9A18, 0x00000230, 0xFFFFFCAE, 0x00000064, 0xFFFFFFF6, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 +.word 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0x000001E6, 0xFFFFFCB3, 0x00000082, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0x000001F3, 0xFFFFFCB3, 0x0000002A, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_SavePoint, 0x00000230, 0xFFFFFCAE, 0x00000064, 0xFFFFFFF6, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_iwa/iwa_01/912990.data.s b/ver/us/asm/data/world/area_iwa/iwa_01/912990.data.s index 44681e354f..349bba2043 100644 --- a/ver/us/asm/data/world/area_iwa/iwa_01/912990.data.s +++ b/ver/us/asm/data/world/area_iwa/iwa_01/912990.data.s @@ -30,4 +30,4 @@ dlabel D_80243708_912DB8 .word 0x00000024, 0x00000002, 0xF5DE0329, 0x00000008, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, MakeNpcs, 0x00000001, 0x80245DB0, 0x00000046, 0x00000001, D_802438B0_912F60, 0x00000044, 0x00000001, D_802434D0_912B80, 0x00000044, 0x00000001, D_80243568_912C18, 0x00000046, 0x00000001, 0x80243EC8, 0x00000044, 0x00000001, 0x802462F0, 0x00000044, 0x00000001, 0x80246290, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000016, 0x00000000, 0x00000008, 0x00000043, 0x00000006, PlaySoundAtF, 0x8000000D, 0x00000001, 0xFFFFFDC6, 0xFFFFFF4C, 0x000001A9, 0x00000043, 0x00000006, PlaySoundAtF, 0x8000000E, 0x00000001, 0x000002E4, 0xFFFFFF56, 0x0000014A, 0x00000043, 0x00000002, GetLoadType, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000044, 0x00000001, EnterSavePoint, 0x00000044, 0x00000001, D_80243688_912D38, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80243688_912D38, 0x00000044, 0x00000001, EnterWalk, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802438B0_912F60 -.word 0x00000043, 0x00000007, MakeEntity, D_802E9A18, 0xFFFFFD76, 0x0000007B, 0x00000177, 0x00000000, 0x80000000, 0x00000043, 0x00000008, MakeEntity, 0x802BCD9C, 0xFFFFFE09, 0x0000003F, 0x000000E1, 0x00000000, 0x0000005A, 0x80000000, 0x00000043, 0x00000008, MakeEntity, 0x802BCD9C, 0x00000339, 0x000000AA, 0x00000073, 0x00000000, 0x0000005A, 0x80000000, 0x00000043, 0x00000007, MakeItemEntity, 0x000000E8, 0x000000A0, 0x0000007D, 0x0000007D, 0x00000011, 0xF8405E2E, 0x00000043, 0x00000007, MakeItemEntity, 0x00000036, 0x0000019A, 0x0000008C, 0x00000087, 0x00000000, 0xF8405E41, 0x00000043, 0x00000008, MakeEntity, 0x802EAB04, 0x0000002D, 0x0000000A, 0x0000003C, 0x00000000, 0x00000002, 0x80000000, 0x00000043, 0x00000002, AssignPanelFlag, 0xF8405E4D, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000043, 0x00000007, MakeEntity, Entity_SavePoint, 0xFFFFFD76, 0x0000007B, 0x00000177, 0x00000000, 0x80000000, 0x00000043, 0x00000008, MakeEntity, 0x802BCD9C, 0xFFFFFE09, 0x0000003F, 0x000000E1, 0x00000000, 0x0000005A, 0x80000000, 0x00000043, 0x00000008, MakeEntity, 0x802BCD9C, 0x00000339, 0x000000AA, 0x00000073, 0x00000000, 0x0000005A, 0x80000000, 0x00000043, 0x00000007, MakeItemEntity, 0x000000E8, 0x000000A0, 0x0000007D, 0x0000007D, 0x00000011, 0xF8405E2E, 0x00000043, 0x00000007, MakeItemEntity, 0x00000036, 0x0000019A, 0x0000008C, 0x00000087, 0x00000000, 0xF8405E41, 0x00000043, 0x00000008, MakeEntity, 0x802EAB04, 0x0000002D, 0x0000000A, 0x0000003C, 0x00000000, 0x00000002, 0x80000000, 0x00000043, 0x00000002, AssignPanelFlag, 0xF8405E4D, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_iwa/iwa_10/923FD0.data.s b/ver/us/asm/data/world/area_iwa/iwa_10/923FD0.data.s index bfc36236c4..61cb8bddbc 100644 --- a/ver/us/asm/data/world/area_iwa/iwa_10/923FD0.data.s +++ b/ver/us/asm/data/world/area_iwa/iwa_10/923FD0.data.s @@ -21,4 +21,4 @@ dlabel D_80245C28_924198 .word 0x0000000A, 0x00000002, 0xF8405E51, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, iwa_10_UnkFunc40, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000001, 0x00200000, 0x00000043, 0x00000001, iwa_10_SetOverrideFlags_40, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, iwa_10_UnkFunc20, 0xFD050F8B, 0xFE363C89, 0x00000043, 0x00000003, FindKeyItem, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, iwa_10_UnkFunc38, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, iwa_10_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, iwa_10_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_802404BC_91EA2C, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, iwa_10_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, iwa_10_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, iwa_10_SwitchToPartner, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, iwa_10_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, iwa_10_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80245AC4_924034, 0x00000043, 0x00000003, iwa_10_UnkFunc18, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF8405E51, 0x00000001, 0x00000043, 0x00000002, iwa_10_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000001, iwa_10_UnkFunc19, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, iwa_10_UnkFunc17, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802460A8_924618 -.word 0x00000024, 0x00000002, 0xF8405E50, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF8405E50, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA1E4, 0xFFFFFBF0, 0x000000A0, 0xFFFFFE57, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_802460A8_924618, 0x00000013, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA910, 0xFFFFFABA, 0x000000DC, 0xFFFFFF2E, 0x00000000, 0x80000000, 0x00000024, 0x00000002, 0xFD050F8B, 0xFE363C80, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405E51, 0x00000043, 0x00000002, AssignScript, D_80245C28_924198, 0x00000043, 0x00000008, MakeEntity, 0x802BCD9C, 0xFFFFFCF4, 0x00000000, 0xFFFFFF1D, 0xFFFFFFF1, 0x0000010E, 0x80000000, 0x00000043, 0x00000008, MakeEntity, 0x802BCD9C, 0xFFFFFB7B, 0x00000046, 0xFFFFFEE6, 0x00000028, 0x00000078, 0x80000000, 0x00000043, 0x00000008, MakeEntity, 0x802BCD9C, 0xFFFFFC7B, 0x000000B9, 0xFFFFFDD5, 0x00000000, 0x00000078, 0x80000000, 0x00000043, 0x00000007, MakeEntity, D_802E9A18, 0xFFFFFDF3, 0x00000050, 0x00000073, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA7E0, 0xFFFFFD26, 0x00000113, 0xFFFFFE02, 0x00000000, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000024, 0x00000002, 0xF8405E50, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF8405E50, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA1E4, 0xFFFFFBF0, 0x000000A0, 0xFFFFFE57, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_802460A8_924618, 0x00000013, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA910, 0xFFFFFABA, 0x000000DC, 0xFFFFFF2E, 0x00000000, 0x80000000, 0x00000024, 0x00000002, 0xFD050F8B, 0xFE363C80, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405E51, 0x00000043, 0x00000002, AssignScript, D_80245C28_924198, 0x00000043, 0x00000008, MakeEntity, 0x802BCD9C, 0xFFFFFCF4, 0x00000000, 0xFFFFFF1D, 0xFFFFFFF1, 0x0000010E, 0x80000000, 0x00000043, 0x00000008, MakeEntity, 0x802BCD9C, 0xFFFFFB7B, 0x00000046, 0xFFFFFEE6, 0x00000028, 0x00000078, 0x80000000, 0x00000043, 0x00000008, MakeEntity, 0x802BCD9C, 0xFFFFFC7B, 0x000000B9, 0xFFFFFDD5, 0x00000000, 0x00000078, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_SavePoint, 0xFFFFFDF3, 0x00000050, 0x00000073, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA7E0, 0xFFFFFD26, 0x00000113, 0xFFFFFE02, 0x00000000, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_jan/jan_03/B435D0.data.s b/ver/us/asm/data/world/area_jan/jan_03/B435D0.data.s index dd754e6de1..c601bbe920 100644 --- a/ver/us/asm/data/world/area_jan/jan_03/B435D0.data.s +++ b/ver/us/asm/data/world/area_jan/jan_03/B435D0.data.s @@ -9,4 +9,4 @@ dlabel D_8024EA30_B43600 .word 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetCamTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024EA98_B43668 -.word 0x00000043, 0x00000001, func_80242FA0_B37B70, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000006, 0x00000008, 0x00000001, 0x00000001, 0x00000045, 0x00000002, D_8024EA30_B43600, 0xFE363C8A, 0x00000043, 0x00000002, SetPlayerJumpscale, 0xF24A7AE7, 0x00000043, 0x00000005, PlayerJump, 0xFFFFFDD4, 0x0000012C, 0xFFFFFF3D, 0x0000000F, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000004, func_802D2884, 0xFFFFFD8A, 0xFFFFFFCE, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010008, 0x00000043, 0x00000002, SetPlayerJumpscale, 0xF24A7E80, 0x00000043, 0x00000005, PlayerJump2, 0xFFFFFDA7, 0x00000178, 0xFFFFFF97, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF8406315, 0x00000000, 0x0000000A, 0x00000002, 0xF840630E, 0x00000001, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000003, 0x00000024, 0x00000002, 0xF8406315, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x0000000A, MakeEntity, 0x802EAF80, 0xFFFFFDE4, 0x00000000, 0x000000C3, 0x0000001E, 0x00000003, D_8024EA00_B435D0, 0x00000795, 0x80000000, 0x00000043, 0x00000007, MakeEntity, D_802E9A18, 0x00000064, 0x0000003C, 0xFFFFFFE7, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, 0x802EAA30, 0xFFFFFDD4, 0x00000000, 0xFFFFFF3D, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_8024EA98_B43668, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000043, 0x00000001, func_80242FA0_B37B70, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000006, 0x00000008, 0x00000001, 0x00000001, 0x00000045, 0x00000002, D_8024EA30_B43600, 0xFE363C8A, 0x00000043, 0x00000002, SetPlayerJumpscale, 0xF24A7AE7, 0x00000043, 0x00000005, PlayerJump, 0xFFFFFDD4, 0x0000012C, 0xFFFFFF3D, 0x0000000F, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000004, func_802D2884, 0xFFFFFD8A, 0xFFFFFFCE, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010008, 0x00000043, 0x00000002, SetPlayerJumpscale, 0xF24A7E80, 0x00000043, 0x00000005, PlayerJump2, 0xFFFFFDA7, 0x00000178, 0xFFFFFF97, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF8406315, 0x00000000, 0x0000000A, 0x00000002, 0xF840630E, 0x00000001, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000003, 0x00000024, 0x00000002, 0xF8406315, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x0000000A, MakeEntity, 0x802EAF80, 0xFFFFFDE4, 0x00000000, 0x000000C3, 0x0000001E, 0x00000003, D_8024EA00_B435D0, 0x00000795, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_SavePoint, 0x00000064, 0x0000003C, 0xFFFFFFE7, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, 0x802EAA30, 0xFFFFFDD4, 0x00000000, 0xFFFFFF3D, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_8024EA98_B43668, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_jan/jan_17/B83B20.data.s b/ver/us/asm/data/world/area_jan/jan_17/B83B20.data.s index 5bcff6e625..5e645e82b5 100644 --- a/ver/us/asm/data/world/area_jan/jan_17/B83B20.data.s +++ b/ver/us/asm/data/world/area_jan/jan_17/B83B20.data.s @@ -3,4 +3,4 @@ .section .data dlabel D_80240360_B83B20 -.word 0x00000043, 0x00000007, MakeEntity, D_802E9A18, 0x00000000, 0x0000003C, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, 0x802BC7AC, 0xFFFFFFC3, 0x00000000, 0xFFFFFFF9, 0x00000000, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000043, 0x00000007, MakeEntity, Entity_SavePoint, 0x00000000, 0x0000003C, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, 0x802BC7AC, 0xFFFFFFC3, 0x00000000, 0xFFFFFFF9, 0x00000000, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kkj/kkj_24/B069B0.data.s b/ver/us/asm/data/world/area_kkj/kkj_24/B069B0.data.s index a43c7ac95b..234a9c08e8 100644 --- a/ver/us/asm/data/world/area_kkj/kkj_24/B069B0.data.s +++ b/ver/us/asm/data/world/area_kkj/kkj_24/B069B0.data.s @@ -3,4 +3,4 @@ .section .data dlabel D_80240440_B069B0 -.word 0x00000043, 0x00000007, MakeEntity, D_802E9A18, 0xFFFFFFE7, 0x0000003C, 0xFFFFFFCE, 0x00000000, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000043, 0x00000007, MakeEntity, Entity_SavePoint, 0xFFFFFFE7, 0x0000003C, 0xFFFFFFCE, 0x00000000, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kkj/kkj_25/B0F280.data.s b/ver/us/asm/data/world/area_kkj/kkj_25/B0F280.data.s index ee7ebd3c27..89b1a81840 100644 --- a/ver/us/asm/data/world/area_kkj/kkj_25/B0F280.data.s +++ b/ver/us/asm/data/world/area_kkj/kkj_25/B0F280.data.s @@ -21,4 +21,4 @@ dlabel D_8024ADF8_B117F8 .word 0x00000190, 0xFFFFFFF6, 0x00000190, 0x00000014, 0x0000015E, 0xFFFFFFCE, 0x00000172, 0x00000019, 0x0000012C, 0xFFFFFFE2, 0x00000154, 0x00000019, 0x0000015E, 0xFFFFFFD8, 0x00000136, 0x00000014, 0x0000012C, 0xFFFFFFB0, 0x00000118, 0x00000014, 0x00000118, 0xFFFFFFC4, 0x000000FA, 0x00000014, 0x0000012C, 0xFFFFFFCE, 0x000000DC, 0x00000014, 0x000000FA, 0xFFFFFF9C, 0x000000BE, 0x00000014, 0x00000118, 0xFFFFFFBA, 0x000000A0, 0x00000014, 0x000000FA, 0xFFFFFFCE, 0x00000082, 0x00000014, 0x000000E6, 0xFFFFFF9C, 0x00000064, 0x00000014 dlabel D_8024AEA8_B118A8 -.word 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0x0000000F, 0xF24A7AE7, 0x00000043, 0x00000006, NpcJump0, 0x0000000F, 0x000002BC, 0xFFFFFFCE, 0x000003E8, 0x00000064, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0xFFFFF8F8, 0x00000064, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetNpcRotation, 0x0000000F, 0x00000000, 0x00000000, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000011, 0xF24A7AE7, 0x00000043, 0x00000006, NpcJump0, 0x00000011, 0x00000258, 0xFFFFFF06, 0x000003E8, 0x00000064, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0xFFFFF790, 0x00000064, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetNpcRotation, 0x00000011, 0x00000000, 0x00000000, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8C, 0x0000000A, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFF6A, 0xFFFFFE52, 0x00000064, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000024, 0x00000002, 0xFE363C82, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C82, 0x00000096, 0x0000002A, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x00000005, TranslateGroup, 0x0000005E, 0xFE363C80, 0xFE363C82, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x00000073, 0xFE363C80, 0xFE363C82, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x0000007E, 0xFE363C80, 0xFE363C82, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x000000A8, 0xFE363C80, 0xFE363C82, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000030, 0x00000001, D_8024ADF8_B117F8, 0x00000005, 0x00000001, 0x0000000B, 0x00000034, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000006, PlaySoundAt, 0xB000001C, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000024, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xF24A8280, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0xFE363C83, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000078, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000044, 0x00000001, D_8024AA8C_B1148C, 0x00000043, 0x00000004, SetPlayerPos, 0x00000096, 0x00000000, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000005A, 0x00000000, 0x00000043, 0x00000002, PartnerIsFlying, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x0000006E, 0x0000000A, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x0000006E, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, SetNpcYaw, 0xFFFFFFFC, 0x0000005A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000043, 0x00000005, GetNpcPos, 0x0000000F, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFD8, 0x00000027, 0x00000002, 0xFE363C81, 0x0000003C, 0x00000024, 0x00000002, 0xFE363C83, 0x00000014, 0x00000024, 0x00000002, 0xFE363C84, 0x00000003, 0x00000043, 0x00000001, func_80240EB8_B078B8, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000004, SetCamType, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x0000012C, 0x00000000, 0x00000032, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x0000012C, 0x00000000, 0x00000032, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x00000177, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ABE80, 0xF24A5680, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0x00000000, 0x0000001E, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0x00000000, 0x00000014, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x0000001E, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7C80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000024, 0x00000002, 0xFE363C80, 0xFD050F80, 0x00000043, 0x00000001, func_80240F2C_B0792C, 0x00000057, 0x00000000, 0x00000043, 0x00000003, FadeOutMusic, 0x00000000, 0x00000096, 0x00000043, 0x00000002, ClearAmbientSounds, 0x00000096, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000006F, 0x00000000, 0x00000008, 0x00000043, 0x00000006, NpcJump0, 0x00000013, 0x000000E6, 0x00000012, 0x00000000, 0x00000019, 0x00000043, 0x00000006, NpcJump0, 0x00000013, 0x000000BE, 0x00000012, 0x00000000, 0x00000014, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0006000C, 0x00000057, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000013, 0x00000096, 0x0000003C, 0x00000000, 0x0000000F, 0x00000043, 0x0000000F, PlayEffect, 0x00000033, 0x0000000E, 0x00000096, 0x0000003C, 0x00000000, 0x00000001, 0x0000014A, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000136, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001300AA, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, PlaySound, 0x0000022D, 0x00000043, 0x00000002, RemoveNpc, 0x00000013, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010032, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0x00010009, 0x00000016, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFE363C81, 0x00020010, 0x00000016, 0x00000001, 0x00000003, 0x00000024, 0x00000002, 0xFE363C81, 0x0003000F, 0x00000016, 0x00000001, 0x00000004, 0x00000024, 0x00000002, 0xFE363C81, 0x00040007, 0x00000016, 0x00000001, 0x00000009, 0x00000024, 0x00000002, 0xFE363C81, 0x0005000A, 0x00000016, 0x00000001, 0x00000006, 0x00000024, 0x00000002, 0xFE363C81, 0x00060006, 0x00000016, 0x00000001, 0x00000007, 0x00000024, 0x00000002, 0xFE363C81, 0x00070006, 0x00000016, 0x00000001, 0x00000008, 0x00000024, 0x00000002, 0xFE363C81, 0x0008000D, 0x00000023, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0xFE363C81, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001D, 0x00000001, 0x00000007, 0x0000001D, 0x00000001, 0x00000009, 0x00000008, 0x00000001, 0x0000001E, 0x00000020, 0x00000000, 0x0000001C, 0x00000000, 0x00000005, 0x00000001, 0x00000003, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFC, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x0000000A, 0x00000006, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000010, 0x000C0000, 0x000A0001, 0x00000000, 0x001300AB, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000010, 0x000A0002, 0x00000043, 0x00000005, NpcMoveTo, 0x00000010, 0x000000C8, 0x00000000, 0x00000055, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000010, 0x000A0001, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000019, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x00000113, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ABE80, 0xF24A5480, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7F4D, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000057, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000012, 0x000000E6, 0x0000001E, 0x00000055, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000010, 0x000C0000, 0x000A0001, 0x00000000, 0x001300AC, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, PlaySound, 0x8000006B, 0x00000024, 0x00000002, 0xFD050F8C, 0x00000001, 0x00000043, 0x00000003, PlaySoundAtPlayer, 0x00000262, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0x00000000, 0x00000000, 0x00000000, 0x00000014, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000010, 0x00000262, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0x00000010, 0x00000000, 0x00000000, 0x00000014, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000010E, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000010, 0x0000005A, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000005A, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000010, 0x0000010E, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, GetNpcPos, 0x0000000F, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24A8680, 0xF24A7480, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x000002EE, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000006, PlaySoundAt, 0x0000203C, 0x00000000, 0x000000DC, 0xFFFFFFD5, 0x0000015E, 0x00000043, 0x0000000F, PlayEffect, 0x00000024, 0x00000000, 0x000000DC, 0xFFFFFFD5, 0x0000015E, 0xF24A9A80, 0x00000028, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8C, 0x00000002, 0x00000008, 0x00000001, 0x00000032, 0x00000024, 0x00000002, 0xFD050F8B, 0x0000000A, 0x00000043, 0x00000005, GetNpcPos, 0x0000000F, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ABE80, 0xF24A5080, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x0000012C, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000010, 0x000C0006, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000012, 0x0020000E, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000F, 0x0080000D, 0x00000043, 0x00000003, SetNpcJumpscale, 0x0000000F, 0xF24A7E80, 0x00000043, 0x00000006, NpcJump0, 0x0000000F, 0x0000012C, 0x00000000, 0x00000028, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000F, 0x00800002, 0x00000043, 0x00000005, SetNpcRotation, 0x0000000F, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, InterpNpcYaw, 0x0000000F, 0x0000005A, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, InterpNpcYaw, 0x0000000F, 0x0000010E, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, InterpNpcYaw, 0x0000000F, 0x0000005A, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000006, SpeakToPlayer, 0x0000000F, 0x00800006, 0x00800002, 0x00000200, 0x001300AD, 0x00000043, 0x00000006, PlaySoundAt, 0x0000203C, 0x00000000, 0x00000172, 0xFFFFFFF6, 0x000000B4, 0x00000043, 0x0000000F, PlayEffect, 0x00000024, 0x00000000, 0x00000172, 0xFFFFFFF6, 0x000000B4, 0xF24A9280, 0x00000028, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8C, 0x00000003, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000010, 0x0000005A, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000012, 0x0000005A, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000005, GetNpcPos, 0x0000000F, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24A9280, 0xF24A8E80, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x0000044C, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000F, 0x00800004, 0x00000043, 0x00000005, NpcMoveTo, 0x0000000F, 0x000001C2, 0x00000000, 0x0000008C, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000F, 0x00800002, 0x00000057, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8C, 0x00000004, 0x00000008, 0x00000001, 0x0000009B, 0x00000043, 0x00000005, GetNpcPos, 0x0000000F, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000032, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ABE80, 0xF24A5080, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x0000015E, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000007, SpeakToNpc, 0x0000000F, 0x00800006, 0x00800002, 0x00000200, 0x00000011, 0x001300AE, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, PlaySoundAt, 0x0000203C, 0x00000000, 0x0000015E, 0x00000032, 0xFFFFFF9C, 0x00000043, 0x0000000F, PlayEffect, 0x00000024, 0x00000000, 0x0000015E, 0x00000032, 0xFFFFFF9C, 0xF24A8A80, 0x00000014, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8C, 0x00000005, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000007, SpeakToNpc, 0x00000011, 0x00610006, 0x00610004, 0x00000200, 0x0000000F, 0x001300AF, 0x00000008, 0x00000001, 0x0000000A, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000F, 0x0080000D, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000F, 0x00800002, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000006, PlaySoundAt, 0x0000203C, 0x00000000, 0x0000023A, 0x00000000, 0x00000064, 0x00000043, 0x0000000F, PlayEffect, 0x00000024, 0x00000000, 0x0000023A, 0x00000000, 0x00000064, 0xF24A8A80, 0x00000014, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8C, 0x00000006, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000007, SpeakToNpc, 0x0000000F, 0x00800006, 0x00800002, 0x00000200, 0x00000011, 0x001300B0, 0x00000024, 0x00000002, 0xFD050F8B, 0xFFFFFFFF, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, StopSound, 0x000003BC, 0x00000043, 0x00000006, PlaySoundAt, 0x00000230, 0x00000000, 0x000001F4, 0x00000000, 0x00000064, 0x00000043, 0x0000000F, PlayEffect, 0x00000024, 0x00000000, 0x000001F4, 0x00000000, 0x00000064, 0xF24A9A80, 0x0000005A, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8C, 0x00000007, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000F, 0x0080000D, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001300B1, 0x000000A0, 0x00000028, 0x00000043, 0x00000001, func_80240D30_B07730, 0x00000043, 0x00000005, TranslateGroup, 0x000000AD, 0xFFFFFF38, 0x00000000, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000000B, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFF38, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, GetNpcPos, 0x00000010, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFF38, 0x00000043, 0x00000005, SetNpcPos, 0x00000010, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, GetNpcPos, 0x00000012, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFF38, 0x00000043, 0x00000005, SetNpcPos, 0x00000012, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C80, 0x000001F4, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24A7A80, 0xF24A5E80, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x0000044C, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000F, 0x00800002, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000011, 0x0000005A, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, func_802CDE68, 0x0000000F, 0x00000022, 0x00000043, 0x00000003, func_802CDE68, 0x00000011, 0x0000000C, 0x00000008, 0x00000001, 0x0000000A, 0x00000056, 0x00000000, 0x00000043, 0x00000001, func_80240E54_B07854, 0x00000057, 0x00000000, 0x00000046, 0x00000001, D_8024AEA8_B118A8, 0x00000043, 0x00000003, GotoMap, 0x8024C718, 0x00000005, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D7C, 0x00000000, 0x00000043, 0x00000007, MakeEntity, D_802E9C1C, 0x0000012C, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000002, AssignAreaFlag, 0x0000001A, 0x00000047, 0x00000005, 0x802463F4, 0x00020000, 0xF971889A, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0x0000000F, 0xF24A7AE7, 0x00000043, 0x00000006, NpcJump0, 0x0000000F, 0x000002BC, 0xFFFFFFCE, 0x000003E8, 0x00000064, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0xFFFFF8F8, 0x00000064, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetNpcRotation, 0x0000000F, 0x00000000, 0x00000000, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000011, 0xF24A7AE7, 0x00000043, 0x00000006, NpcJump0, 0x00000011, 0x00000258, 0xFFFFFF06, 0x000003E8, 0x00000064, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0xFFFFF790, 0x00000064, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetNpcRotation, 0x00000011, 0x00000000, 0x00000000, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8C, 0x0000000A, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFF6A, 0xFFFFFE52, 0x00000064, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000024, 0x00000002, 0xFE363C82, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C82, 0x00000096, 0x0000002A, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x00000005, TranslateGroup, 0x0000005E, 0xFE363C80, 0xFE363C82, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x00000073, 0xFE363C80, 0xFE363C82, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x0000007E, 0xFE363C80, 0xFE363C82, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x000000A8, 0xFE363C80, 0xFE363C82, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000030, 0x00000001, D_8024ADF8_B117F8, 0x00000005, 0x00000001, 0x0000000B, 0x00000034, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000006, PlaySoundAt, 0xB000001C, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000024, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xF24A8280, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0xFE363C83, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000078, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000044, 0x00000001, D_8024AA8C_B1148C, 0x00000043, 0x00000004, SetPlayerPos, 0x00000096, 0x00000000, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000005A, 0x00000000, 0x00000043, 0x00000002, PartnerIsFlying, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x0000006E, 0x0000000A, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x0000006E, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, SetNpcYaw, 0xFFFFFFFC, 0x0000005A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000043, 0x00000005, GetNpcPos, 0x0000000F, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFD8, 0x00000027, 0x00000002, 0xFE363C81, 0x0000003C, 0x00000024, 0x00000002, 0xFE363C83, 0x00000014, 0x00000024, 0x00000002, 0xFE363C84, 0x00000003, 0x00000043, 0x00000001, func_80240EB8_B078B8, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000004, SetCamType, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x0000012C, 0x00000000, 0x00000032, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x0000012C, 0x00000000, 0x00000032, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x00000177, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ABE80, 0xF24A5680, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0x00000000, 0x0000001E, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0x00000000, 0x00000014, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x0000001E, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7C80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000024, 0x00000002, 0xFE363C80, 0xFD050F80, 0x00000043, 0x00000001, func_80240F2C_B0792C, 0x00000057, 0x00000000, 0x00000043, 0x00000003, FadeOutMusic, 0x00000000, 0x00000096, 0x00000043, 0x00000002, ClearAmbientSounds, 0x00000096, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000006F, 0x00000000, 0x00000008, 0x00000043, 0x00000006, NpcJump0, 0x00000013, 0x000000E6, 0x00000012, 0x00000000, 0x00000019, 0x00000043, 0x00000006, NpcJump0, 0x00000013, 0x000000BE, 0x00000012, 0x00000000, 0x00000014, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0006000C, 0x00000057, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000013, 0x00000096, 0x0000003C, 0x00000000, 0x0000000F, 0x00000043, 0x0000000F, PlayEffect, 0x00000033, 0x0000000E, 0x00000096, 0x0000003C, 0x00000000, 0x00000001, 0x0000014A, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000136, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001300AA, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, PlaySound, 0x0000022D, 0x00000043, 0x00000002, RemoveNpc, 0x00000013, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010032, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0x00010009, 0x00000016, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFE363C81, 0x00020010, 0x00000016, 0x00000001, 0x00000003, 0x00000024, 0x00000002, 0xFE363C81, 0x0003000F, 0x00000016, 0x00000001, 0x00000004, 0x00000024, 0x00000002, 0xFE363C81, 0x00040007, 0x00000016, 0x00000001, 0x00000009, 0x00000024, 0x00000002, 0xFE363C81, 0x0005000A, 0x00000016, 0x00000001, 0x00000006, 0x00000024, 0x00000002, 0xFE363C81, 0x00060006, 0x00000016, 0x00000001, 0x00000007, 0x00000024, 0x00000002, 0xFE363C81, 0x00070006, 0x00000016, 0x00000001, 0x00000008, 0x00000024, 0x00000002, 0xFE363C81, 0x0008000D, 0x00000023, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0xFE363C81, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001D, 0x00000001, 0x00000007, 0x0000001D, 0x00000001, 0x00000009, 0x00000008, 0x00000001, 0x0000001E, 0x00000020, 0x00000000, 0x0000001C, 0x00000000, 0x00000005, 0x00000001, 0x00000003, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFC, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x0000000A, 0x00000006, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000010, 0x000C0000, 0x000A0001, 0x00000000, 0x001300AB, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000010, 0x000A0002, 0x00000043, 0x00000005, NpcMoveTo, 0x00000010, 0x000000C8, 0x00000000, 0x00000055, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000010, 0x000A0001, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000019, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x00000113, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ABE80, 0xF24A5480, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7F4D, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000057, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000012, 0x000000E6, 0x0000001E, 0x00000055, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000010, 0x000C0000, 0x000A0001, 0x00000000, 0x001300AC, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, PlaySound, 0x8000006B, 0x00000024, 0x00000002, 0xFD050F8C, 0x00000001, 0x00000043, 0x00000003, PlaySoundAtPlayer, 0x00000262, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0x00000000, 0x00000000, 0x00000000, 0x00000014, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000010, 0x00000262, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0x00000010, 0x00000000, 0x00000000, 0x00000014, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000010E, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000010, 0x0000005A, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000005A, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000010, 0x0000010E, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, GetNpcPos, 0x0000000F, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24A8680, 0xF24A7480, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x000002EE, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000006, PlaySoundAt, 0x0000203C, 0x00000000, 0x000000DC, 0xFFFFFFD5, 0x0000015E, 0x00000043, 0x0000000F, PlayEffect, 0x00000024, 0x00000000, 0x000000DC, 0xFFFFFFD5, 0x0000015E, 0xF24A9A80, 0x00000028, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8C, 0x00000002, 0x00000008, 0x00000001, 0x00000032, 0x00000024, 0x00000002, 0xFD050F8B, 0x0000000A, 0x00000043, 0x00000005, GetNpcPos, 0x0000000F, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ABE80, 0xF24A5080, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x0000012C, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000010, 0x000C0006, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000012, 0x0020000E, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000F, 0x0080000D, 0x00000043, 0x00000003, SetNpcJumpscale, 0x0000000F, 0xF24A7E80, 0x00000043, 0x00000006, NpcJump0, 0x0000000F, 0x0000012C, 0x00000000, 0x00000028, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000F, 0x00800002, 0x00000043, 0x00000005, SetNpcRotation, 0x0000000F, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, InterpNpcYaw, 0x0000000F, 0x0000005A, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, InterpNpcYaw, 0x0000000F, 0x0000010E, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, InterpNpcYaw, 0x0000000F, 0x0000005A, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000006, SpeakToPlayer, 0x0000000F, 0x00800006, 0x00800002, 0x00000200, 0x001300AD, 0x00000043, 0x00000006, PlaySoundAt, 0x0000203C, 0x00000000, 0x00000172, 0xFFFFFFF6, 0x000000B4, 0x00000043, 0x0000000F, PlayEffect, 0x00000024, 0x00000000, 0x00000172, 0xFFFFFFF6, 0x000000B4, 0xF24A9280, 0x00000028, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8C, 0x00000003, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000010, 0x0000005A, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000012, 0x0000005A, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000005, GetNpcPos, 0x0000000F, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24A9280, 0xF24A8E80, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x0000044C, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000F, 0x00800004, 0x00000043, 0x00000005, NpcMoveTo, 0x0000000F, 0x000001C2, 0x00000000, 0x0000008C, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000F, 0x00800002, 0x00000057, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8C, 0x00000004, 0x00000008, 0x00000001, 0x0000009B, 0x00000043, 0x00000005, GetNpcPos, 0x0000000F, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000032, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ABE80, 0xF24A5080, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x0000015E, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000007, SpeakToNpc, 0x0000000F, 0x00800006, 0x00800002, 0x00000200, 0x00000011, 0x001300AE, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, PlaySoundAt, 0x0000203C, 0x00000000, 0x0000015E, 0x00000032, 0xFFFFFF9C, 0x00000043, 0x0000000F, PlayEffect, 0x00000024, 0x00000000, 0x0000015E, 0x00000032, 0xFFFFFF9C, 0xF24A8A80, 0x00000014, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8C, 0x00000005, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000007, SpeakToNpc, 0x00000011, 0x00610006, 0x00610004, 0x00000200, 0x0000000F, 0x001300AF, 0x00000008, 0x00000001, 0x0000000A, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000F, 0x0080000D, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000F, 0x00800002, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000006, PlaySoundAt, 0x0000203C, 0x00000000, 0x0000023A, 0x00000000, 0x00000064, 0x00000043, 0x0000000F, PlayEffect, 0x00000024, 0x00000000, 0x0000023A, 0x00000000, 0x00000064, 0xF24A8A80, 0x00000014, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8C, 0x00000006, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000007, SpeakToNpc, 0x0000000F, 0x00800006, 0x00800002, 0x00000200, 0x00000011, 0x001300B0, 0x00000024, 0x00000002, 0xFD050F8B, 0xFFFFFFFF, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, StopSound, 0x000003BC, 0x00000043, 0x00000006, PlaySoundAt, 0x00000230, 0x00000000, 0x000001F4, 0x00000000, 0x00000064, 0x00000043, 0x0000000F, PlayEffect, 0x00000024, 0x00000000, 0x000001F4, 0x00000000, 0x00000064, 0xF24A9A80, 0x0000005A, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8C, 0x00000007, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000F, 0x0080000D, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001300B1, 0x000000A0, 0x00000028, 0x00000043, 0x00000001, func_80240D30_B07730, 0x00000043, 0x00000005, TranslateGroup, 0x000000AD, 0xFFFFFF38, 0x00000000, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000000B, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFF38, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, GetNpcPos, 0x00000010, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFF38, 0x00000043, 0x00000005, SetNpcPos, 0x00000010, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, GetNpcPos, 0x00000012, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFF38, 0x00000043, 0x00000005, SetNpcPos, 0x00000012, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C80, 0x000001F4, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24A7A80, 0xF24A5E80, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x0000044C, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000F, 0x00800002, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000011, 0x0000005A, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, func_802CDE68, 0x0000000F, 0x00000022, 0x00000043, 0x00000003, func_802CDE68, 0x00000011, 0x0000000C, 0x00000008, 0x00000001, 0x0000000A, 0x00000056, 0x00000000, 0x00000043, 0x00000001, func_80240E54_B07854, 0x00000057, 0x00000000, 0x00000046, 0x00000001, D_8024AEA8_B118A8, 0x00000043, 0x00000003, GotoMap, 0x8024C718, 0x00000005, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D7C, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_GreenStompSwitch, 0x0000012C, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000002, AssignAreaFlag, 0x0000001A, 0x00000047, 0x00000005, 0x802463F4, 0x00020000, 0xF971889A, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kmr/kmr_02/8C4A40.data.s b/ver/us/asm/data/world/area_kmr/kmr_02/8C4A40.data.s index db2f05a97e..01b36365b3 100644 --- a/ver/us/asm/data/world/area_kmr/kmr_02/8C4A40.data.s +++ b/ver/us/asm/data/world/area_kmr/kmr_02/8C4A40.data.s @@ -6,4 +6,4 @@ dlabel D_802549D0_8C4A40 .word 0x00000043, 0x00000003, GotoMap, 0x80257F00, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80254A00_8C4A70 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x00A00004, 0x00A00001, 0x00000000, 0x000B0066, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, func_80243370_8B33E0, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x00A00004, 0x00A00001, 0x00000000, 0x000B0067, 0x00000008, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000014, 0x7FFFFE00, 0x00000024, 0x00000002, 0xF5DE0180, 0xFFFFFF8E, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, PlaySoundAt, 0x0000207A, 0x00000000, 0x00000175, 0x00000058, 0x000000FF, 0x00000043, 0x00000005, GetNpcPos, 0x00000007, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000013, 0x00000000, 0x00000175, 0x00000058, 0x000000FF, 0x00000001, 0x00000064, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000006, PlaySoundAt, 0x0000207B, 0x00000000, 0x00000146, 0x00000096, 0x00000105, 0x00000043, 0x0000000F, PlayEffect, 0x00000013, 0x00000001, 0x00000146, 0x00000096, 0x00000105, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x0000000F, PlayEffect, 0x00000013, 0x00000001, 0x00000146, 0x00000096, 0x00000105, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x0000000F, PlayEffect, 0x00000013, 0x00000001, 0x00000146, 0x00000096, 0x00000105, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x0000000F, PlayEffect, 0x00000013, 0x00000001, 0x00000146, 0x00000096, 0x00000105, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x0000000F, PlayEffect, 0x00000013, 0x00000001, 0x00000146, 0x00000096, 0x00000105, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA10C, 0x00000146, 0x00000078, 0x00000105, 0x00000094, 0x80000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000043, 0x00000002, AssignScript, D_80254A00_8C4A70, 0x00000043, 0x00000001, func_80243514_8B3584, 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C8A, 0x00000043, 0x00000005, kmr_02_GetEntityPosition, 0xFE363C89, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000005, MakeLerp, 0xFE363C83, 0x0000012C, 0x00000014, 0x00000001, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, kmr_02_SetEntityPositionF, 0xFE363C89, 0xFE363C82, 0xFE363C80, 0xFE363C84, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000043, 0x00000006, PlaySoundAt, 0x0000207C, 0x00000000, 0xFE363C82, 0xFE363C80, 0xFE363C84, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000007, 0x0060000F, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x0000000F, PlayEffect, 0x00000006, 0x00000004, 0xFE363C82, 0x00000000, 0xFE363C84, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000006, PlaySoundAt, 0x0000207D, 0x00000000, 0xFE363C82, 0xFE363C80, 0xFE363C84, 0x00000043, 0x00000005, MakeLerp, 0x0000012C, 0x00000000, 0x00000014, 0x00000002, 0x00000003, 0x00000001, 0x00000014, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, kmr_02_SetEntityPositionF, 0xFE363C89, 0xFE363C82, 0xFE363C80, 0xFE363C84, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000014, 0x00000013, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x000000B8, 0x00000001, 0x00000043, 0x00000003, EnableGroup, 0x000000B4, 0x00000000, 0x00000043, 0x00000006, PlaySoundAt, 0x000000DD, 0x00000000, 0xFE363C82, 0xFE363C80, 0xFE363C84, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x0000000F, 0xF24A7E80, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFF85, 0x00000018, 0x00000001, 0xFFFFFF8E, 0x00000043, 0x00000007, MakeEntity, 0x802EA130, 0x00000146, 0x00000000, 0x00000105, 0x0000010E, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80254A00_8C4A70, 0x00000018, 0x00000001, 0xFFFFFF98, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000014, 0x7FFFFE00, 0x00000023, 0x00000000, 0x0000000A, 0x00000002, 0xF8406311, 0x00000000, 0x0000000A, 0x00000002, 0xF840630D, 0x00000001, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000003, 0x00000024, 0x00000002, 0xF8406311, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x0000000A, MakeEntity, 0x802EAF80, 0x00000000, 0x00000000, 0x00000163, 0x00000000, 0x00000003, D_802549D0_8C4A40, 0x00000791, 0x80000000, 0x00000043, 0x00000007, MakeEntity, D_802E9A18, 0x000000FA, 0x0000003C, 0x0000004B, 0xFFFFFFF1, 0x80000000, 0x0000000F, 0x00000002, 0xF5DE0180, 0xFFFFFF98, 0x00000043, 0x00000007, MakeItemEntity, 0x00000083, 0x000001FE, 0x00000000, 0xFFFFFEAC, 0x00000011, 0xF8405BAE, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 +.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x00A00004, 0x00A00001, 0x00000000, 0x000B0066, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, func_80243370_8B33E0, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x00A00004, 0x00A00001, 0x00000000, 0x000B0067, 0x00000008, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000014, 0x7FFFFE00, 0x00000024, 0x00000002, 0xF5DE0180, 0xFFFFFF8E, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, PlaySoundAt, 0x0000207A, 0x00000000, 0x00000175, 0x00000058, 0x000000FF, 0x00000043, 0x00000005, GetNpcPos, 0x00000007, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000013, 0x00000000, 0x00000175, 0x00000058, 0x000000FF, 0x00000001, 0x00000064, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000006, PlaySoundAt, 0x0000207B, 0x00000000, 0x00000146, 0x00000096, 0x00000105, 0x00000043, 0x0000000F, PlayEffect, 0x00000013, 0x00000001, 0x00000146, 0x00000096, 0x00000105, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x0000000F, PlayEffect, 0x00000013, 0x00000001, 0x00000146, 0x00000096, 0x00000105, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x0000000F, PlayEffect, 0x00000013, 0x00000001, 0x00000146, 0x00000096, 0x00000105, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x0000000F, PlayEffect, 0x00000013, 0x00000001, 0x00000146, 0x00000096, 0x00000105, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x0000000F, PlayEffect, 0x00000013, 0x00000001, 0x00000146, 0x00000096, 0x00000105, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA10C, 0x00000146, 0x00000078, 0x00000105, 0x00000094, 0x80000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000043, 0x00000002, AssignScript, D_80254A00_8C4A70, 0x00000043, 0x00000001, func_80243514_8B3584, 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C8A, 0x00000043, 0x00000005, kmr_02_GetEntityPosition, 0xFE363C89, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000005, MakeLerp, 0xFE363C83, 0x0000012C, 0x00000014, 0x00000001, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, kmr_02_SetEntityPositionF, 0xFE363C89, 0xFE363C82, 0xFE363C80, 0xFE363C84, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000043, 0x00000006, PlaySoundAt, 0x0000207C, 0x00000000, 0xFE363C82, 0xFE363C80, 0xFE363C84, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000007, 0x0060000F, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x0000000F, PlayEffect, 0x00000006, 0x00000004, 0xFE363C82, 0x00000000, 0xFE363C84, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000006, PlaySoundAt, 0x0000207D, 0x00000000, 0xFE363C82, 0xFE363C80, 0xFE363C84, 0x00000043, 0x00000005, MakeLerp, 0x0000012C, 0x00000000, 0x00000014, 0x00000002, 0x00000003, 0x00000001, 0x00000014, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, kmr_02_SetEntityPositionF, 0xFE363C89, 0xFE363C82, 0xFE363C80, 0xFE363C84, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000014, 0x00000013, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x000000B8, 0x00000001, 0x00000043, 0x00000003, EnableGroup, 0x000000B4, 0x00000000, 0x00000043, 0x00000006, PlaySoundAt, 0x000000DD, 0x00000000, 0xFE363C82, 0xFE363C80, 0xFE363C84, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x0000000F, 0xF24A7E80, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFF85, 0x00000018, 0x00000001, 0xFFFFFF8E, 0x00000043, 0x00000007, MakeEntity, 0x802EA130, 0x00000146, 0x00000000, 0x00000105, 0x0000010E, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80254A00_8C4A70, 0x00000018, 0x00000001, 0xFFFFFF98, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000014, 0x7FFFFE00, 0x00000023, 0x00000000, 0x0000000A, 0x00000002, 0xF8406311, 0x00000000, 0x0000000A, 0x00000002, 0xF840630D, 0x00000001, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000003, 0x00000024, 0x00000002, 0xF8406311, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x0000000A, MakeEntity, 0x802EAF80, 0x00000000, 0x00000000, 0x00000163, 0x00000000, 0x00000003, D_802549D0_8C4A40, 0x00000791, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_SavePoint, 0x000000FA, 0x0000003C, 0x0000004B, 0xFFFFFFF1, 0x80000000, 0x0000000F, 0x00000002, 0xF5DE0180, 0xFFFFFF98, 0x00000043, 0x00000007, MakeItemEntity, 0x00000083, 0x000001FE, 0x00000000, 0xFFFFFEAC, 0x00000011, 0xF8405BAE, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kmr/kmr_04/8CB160.data.s b/ver/us/asm/data/world/area_kmr/kmr_04/8CB160.data.s index 97564b1057..c4f907d5e2 100644 --- a/ver/us/asm/data/world/area_kmr/kmr_04/8CB160.data.s +++ b/ver/us/asm/data/world/area_kmr/kmr_04/8CB160.data.s @@ -39,4 +39,4 @@ dlabel D_8024186C_8CC16C .word 0x00000001, D_802415E8_8CBEE8, 0xC2680000, 0x00000000, 0x43020000, 0x00200100, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, D_8024167C_8CBF7C, 0x02020000, 0x00000001, D_8024186C_8CC16C, 0x00000000, 0x00000000, 0x00000000, 0x00000000 dlabel D_80241A80_8CC380 -.word 0x00000024, 0x00000002, 0xF8405BC7, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF8405BC7, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA10C, 0xFFFFFFB0, 0x00000000, 0x00000190, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80241A80_8CC380, 0x00000013, 0x00000000, 0x00000043, 0x00000007, MakeEntity, D_802EA0C4, 0xFFFFFF1A, 0x0000003C, 0xFFFFFF74, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, D_802EA0C4, 0xFFFFFE48, 0x0000003C, 0x00000014, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, D_802EA0C4, 0x0000003C, 0x00000000, 0x00000172, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, D_802EA0C4, 0x00000055, 0x00000000, 0x0000018B, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA0E8, 0x00000064, 0x00000000, 0xFFFFFFBA, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405BC6, 0x00000043, 0x00000007, MakeEntity, D_802E9A18, 0x00000000, 0x0000003C, 0x00000000, 0x00000000, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000024, 0x00000002, 0xF8405BC7, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF8405BC7, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA10C, 0xFFFFFFB0, 0x00000000, 0x00000190, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80241A80_8CC380, 0x00000013, 0x00000000, 0x00000043, 0x00000007, MakeEntity, D_802EA0C4, 0xFFFFFF1A, 0x0000003C, 0xFFFFFF74, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, D_802EA0C4, 0xFFFFFE48, 0x0000003C, 0x00000014, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, D_802EA0C4, 0x0000003C, 0x00000000, 0x00000172, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, D_802EA0C4, 0x00000055, 0x00000000, 0x0000018B, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA0E8, 0x00000064, 0x00000000, 0xFFFFFFBA, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405BC6, 0x00000043, 0x00000007, MakeEntity, Entity_SavePoint, 0x00000000, 0x0000003C, 0x00000000, 0x00000000, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kmr/kmr_07/8D49A0.data.s b/ver/us/asm/data/world/area_kmr/kmr_07/8D49A0.data.s index 7bd7952be1..89a44e8c7e 100644 --- a/ver/us/asm/data/world/area_kmr/kmr_07/8D49A0.data.s +++ b/ver/us/asm/data/world/area_kmr/kmr_07/8D49A0.data.s @@ -51,4 +51,4 @@ dlabel D_80241DF8_8D5BB8 .word 0x00000002, D_80241A18_8D57D8, 0x01000002, 0x00000000, 0x00000000, 0x00000000 dlabel D_80241E10_8D5BD0 -.word 0x00000043, 0x00000008, MakeEntity, 0x802EAA54, 0x00000136, 0x00000000, 0x0000002D, 0x00000000, 0x00000041, 0x80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000007, MakeEntity, D_802E9A18, 0x000001FE, 0x0000003C, 0x0000006E, 0x00000000, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 +.word 0x00000043, 0x00000008, MakeEntity, 0x802EAA54, 0x00000136, 0x00000000, 0x0000002D, 0x00000000, 0x00000041, 0x80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000007, MakeEntity, Entity_SavePoint, 0x000001FE, 0x0000003C, 0x0000006E, 0x00000000, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kmr/kmr_11/8DFBB0.data.s b/ver/us/asm/data/world/area_kmr/kmr_11/8DFBB0.data.s index 61e464cd3b..3a6b1f3012 100644 --- a/ver/us/asm/data/world/area_kmr/kmr_11/8DFBB0.data.s +++ b/ver/us/asm/data/world/area_kmr/kmr_11/8DFBB0.data.s @@ -9,4 +9,4 @@ dlabel D_80245C0C_8DFD0C .word 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C8A, 0xFD050F80, 0x00000043, 0x00000001, func_80240EC0_8DAFC0, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000F, 0x00000002, 0xF5DE0180, 0xFFFFFF91, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0xFFFFFE87, 0xFFFFFFF8, 0x00000051, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x01000000, 0x00000001, 0x00000045, 0x00000002, D_80245C0C_8DFD0C, 0xFE363C8B, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000000, 0xF24A8280, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFFFFFE43, 0x00000000, 0x0000005C, 0x0000000F, 0x00000043, 0x00000006, PlaySoundAt, 0x00000048, 0x00000000, 0xFFFFFE2B, 0x00000001, 0x0000005C, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000000, 0xF24A8280, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFFFFFE2B, 0x00000000, 0x0000005C, 0x00000007, 0x00000049, 0x00000001, 0xFE363C8B, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0180, 0xFFFFFF91, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80245DCC_8DFECC -.word 0x00000043, 0x00000002, PlaySound, 0x0000000B, 0x00000043, 0x00000006, PlaySoundAt, 0x00002108, 0x00000000, 0x00000299, 0x00000023, 0x00000046, 0x00000043, 0x0000000F, PlayEffect, 0x00000011, 0x00000000, 0x00000299, 0x00000030, 0x00000046, 0x0000000A, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000008, MakeEntity, 0x802EA564, 0x00000299, 0x00000023, 0x00000046, 0x0000002D, 0x0000008C, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405BD1, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000E, 0x00000002, 0xF5DE0180, 0xFFFFFF91, 0x0000000A, 0x00000002, 0xF5DE0180, 0xFFFFFF91, 0x00000043, 0x00000007, MakeEntity, D_802E9BD4, 0xFFFFFE2B, 0x00000000, 0x00000099, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignAreaFlag, 0x00000004, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000047, 0x00000005, 0x80242CF4, 0x00020000, 0xF9718884, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80245AB0_8DFBB0, 0x00000100, 0x00000005, 0x00000001, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000007, MakeEntity, D_802E9BD4, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignAreaFlag, 0x00000004, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000047, 0x00000005, 0x80242CF4, 0x00020000, 0xF9718884, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80245AB0_8DFBB0, 0x00000100, 0x00000005, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000007, MakeEntity, D_802EA0C4, 0x00000271, 0xFFFFFFE7, 0x0000006E, 0x0000002D, 0x80000000, 0x0000000A, 0x00000002, 0xF8405BD1, 0x00000000, 0x00000043, 0x00000002, AssignScript, D_80245DCC_8DFECC, 0x00000012, 0x00000000, 0x00000043, 0x00000008, MakeEntity, 0x802EA564, 0x00000299, 0x00000023, 0x00000046, 0x0000002D, 0x0000008C, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405BD1, 0x00000013, 0x00000000, 0x00000043, 0x00000008, MakeEntity, 0x802EAB04, 0x00000226, 0x00000000, 0xFFFFFDDA, 0x00000000, 0x00000042, 0x80000000, 0x00000043, 0x00000002, AssignPanelFlag, 0xF8405BDA, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 +.word 0x00000043, 0x00000002, PlaySound, 0x0000000B, 0x00000043, 0x00000006, PlaySoundAt, 0x00002108, 0x00000000, 0x00000299, 0x00000023, 0x00000046, 0x00000043, 0x0000000F, PlayEffect, 0x00000011, 0x00000000, 0x00000299, 0x00000030, 0x00000046, 0x0000000A, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000008, MakeEntity, 0x802EA564, 0x00000299, 0x00000023, 0x00000046, 0x0000002D, 0x0000008C, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405BD1, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000E, 0x00000002, 0xF5DE0180, 0xFFFFFF91, 0x0000000A, 0x00000002, 0xF5DE0180, 0xFFFFFF91, 0x00000043, 0x00000007, MakeEntity, Entity_BlueSwitch, 0xFFFFFE2B, 0x00000000, 0x00000099, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignAreaFlag, 0x00000004, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000047, 0x00000005, 0x80242CF4, 0x00020000, 0xF9718884, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80245AB0_8DFBB0, 0x00000100, 0x00000005, 0x00000001, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_BlueSwitch, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignAreaFlag, 0x00000004, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000047, 0x00000005, 0x80242CF4, 0x00020000, 0xF9718884, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80245AB0_8DFBB0, 0x00000100, 0x00000005, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000007, MakeEntity, D_802EA0C4, 0x00000271, 0xFFFFFFE7, 0x0000006E, 0x0000002D, 0x80000000, 0x0000000A, 0x00000002, 0xF8405BD1, 0x00000000, 0x00000043, 0x00000002, AssignScript, D_80245DCC_8DFECC, 0x00000012, 0x00000000, 0x00000043, 0x00000008, MakeEntity, 0x802EA564, 0x00000299, 0x00000023, 0x00000046, 0x0000002D, 0x0000008C, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405BD1, 0x00000013, 0x00000000, 0x00000043, 0x00000008, MakeEntity, 0x802EAB04, 0x00000226, 0x00000000, 0xFFFFFDDA, 0x00000000, 0x00000042, 0x80000000, 0x00000043, 0x00000002, AssignPanelFlag, 0xF8405BDA, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_08/A4E250.data.s b/ver/us/asm/data/world/area_kpa/kpa_08/A4E250.data.s index 51835abe6b..6d41e6da63 100644 --- a/ver/us/asm/data/world/area_kpa/kpa_08/A4E250.data.s +++ b/ver/us/asm/data/world/area_kpa/kpa_08/A4E250.data.s @@ -3,4 +3,4 @@ .section .data dlabel D_80241830_A4E250 -.word 0x0000000B, 0x00000002, 0xF9718883, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF9718883, 0x00000001, 0x00000043, 0x00000001, kpa_08_UnsetCamera0MoveFlag1, 0x00000056, 0x00000000, 0x0000004D, 0x00000001, 0x000000EF, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x0000000F, 0x00000227, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFFCE, 0x00000000, 0x0000000F, 0x0000000A, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000003, func_8024001C_A4CA3C, 0x0000000F, 0x00000064, 0x00000043, 0x00000005, TranslateGroup, 0x00000040, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000000F, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000050, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x0000000F, 0x00000228, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0xFFFFFFCE, 0x00000014, 0x0000000A, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000003, func_8024001C_A4CA3C, 0x0000000F, 0x00000064, 0x00000043, 0x00000005, TranslateGroup, 0x00000040, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000000F, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000004D, 0x00000001, 0x000000EF, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000011, 0x00000227, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFF9D, 0x00000000, 0x0000000F, 0x0000000A, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000003, func_8024001C_A4CA3C, 0x00000011, 0x00000064, 0x00000043, 0x00000005, TranslateGroup, 0x00000043, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000011, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000008, 0x00000001, 0x00000050, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000011, 0x00000228, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0xFFFFFF9D, 0x0000000F, 0x0000000A, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000003, func_8024001C_A4CA3C, 0x00000011, 0x00000064, 0x00000043, 0x00000005, TranslateGroup, 0x00000043, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000011, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x00000043, 0x00000000, 0xFFFFFF9D, 0xFFFFFFFF, 0x00000024, 0x00000002, 0xF9718883, 0x00000000, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF9718883, 0x00000000, 0x00000043, 0x00000007, MakeEntity, D_802E9BB0, 0x0000000A, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80241830_A4E250, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000000F, 0x0000003F, 0x00000043, 0x00000005, TranslateGroup, 0x00000040, 0x00000000, 0xFFFFFFCE, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000000F, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000011, 0x00000042, 0x00000043, 0x00000005, TranslateGroup, 0x00000043, 0x00000000, 0xFFFFFF9D, 0xFFFFFFFF, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000011, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 +.word 0x0000000B, 0x00000002, 0xF9718883, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF9718883, 0x00000001, 0x00000043, 0x00000001, kpa_08_UnsetCamera0MoveFlag1, 0x00000056, 0x00000000, 0x0000004D, 0x00000001, 0x000000EF, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x0000000F, 0x00000227, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFFCE, 0x00000000, 0x0000000F, 0x0000000A, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000003, func_8024001C_A4CA3C, 0x0000000F, 0x00000064, 0x00000043, 0x00000005, TranslateGroup, 0x00000040, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000000F, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000050, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x0000000F, 0x00000228, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0xFFFFFFCE, 0x00000014, 0x0000000A, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000003, func_8024001C_A4CA3C, 0x0000000F, 0x00000064, 0x00000043, 0x00000005, TranslateGroup, 0x00000040, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000000F, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000004D, 0x00000001, 0x000000EF, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000011, 0x00000227, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFF9D, 0x00000000, 0x0000000F, 0x0000000A, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000003, func_8024001C_A4CA3C, 0x00000011, 0x00000064, 0x00000043, 0x00000005, TranslateGroup, 0x00000043, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000011, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000008, 0x00000001, 0x00000050, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000011, 0x00000228, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0xFFFFFF9D, 0x0000000F, 0x0000000A, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000003, func_8024001C_A4CA3C, 0x00000011, 0x00000064, 0x00000043, 0x00000005, TranslateGroup, 0x00000043, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000011, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x00000043, 0x00000000, 0xFFFFFF9D, 0xFFFFFFFF, 0x00000024, 0x00000002, 0xF9718883, 0x00000000, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF9718883, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_RedSwitch, 0x0000000A, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80241830_A4E250, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000000F, 0x0000003F, 0x00000043, 0x00000005, TranslateGroup, 0x00000040, 0x00000000, 0xFFFFFFCE, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000000F, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000011, 0x00000042, 0x00000043, 0x00000005, TranslateGroup, 0x00000043, 0x00000000, 0xFFFFFF9D, 0xFFFFFFFF, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000011, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_09/A506D0.data.s b/ver/us/asm/data/world/area_kpa/kpa_09/A506D0.data.s index c896f3d7e8..933795410d 100644 --- a/ver/us/asm/data/world/area_kpa/kpa_09/A506D0.data.s +++ b/ver/us/asm/data/world/area_kpa/kpa_09/A506D0.data.s @@ -3,4 +3,4 @@ .section .data dlabel D_802416D0_A506D0 -.word 0x0000000B, 0x00000002, 0xF9718884, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF9718884, 0x00000001, 0x00000043, 0x00000001, kpa_09_UnsetCamera0MoveFlag1, 0x00000056, 0x00000000, 0x0000004D, 0x00000001, 0x000000EF, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000010, 0x00000227, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFFCE, 0x00000000, 0x0000000F, 0x0000000A, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000003, func_8024001C_A4F01C, 0x00000010, 0x00000064, 0x00000043, 0x00000005, TranslateGroup, 0x00000041, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000010, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000050, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000010, 0x00000228, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0xFFFFFFCE, 0x0000000F, 0x0000000A, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000003, func_8024001C_A4F01C, 0x00000010, 0x00000064, 0x00000043, 0x00000005, TranslateGroup, 0x00000041, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000010, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000004D, 0x00000001, 0x000000EF, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000012, 0x00000227, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x00000044, 0x00000001, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFFCE, 0x00000000, 0x0000000F, 0x0000000A, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000003, func_8024001C_A4F01C, 0x00000012, 0x00000064, 0x00000043, 0x00000005, TranslateGroup, 0x00000044, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000012, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000008, 0x00000001, 0x00000050, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000012, 0x00000228, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0xFFFFFFCE, 0x0000000F, 0x0000000A, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000003, func_8024001C_A4F01C, 0x00000012, 0x00000064, 0x00000043, 0x00000005, TranslateGroup, 0x00000044, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000012, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xF9718884, 0x00000000, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF9718884, 0x00000000, 0x00000043, 0x00000007, MakeEntity, D_802E9BB0, 0xFFFFFEBB, 0x00000000, 0xFFFFFFF8, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_802416D0_A506D0, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000010, 0x00000040, 0x00000043, 0x00000005, TranslateGroup, 0x00000041, 0x00000000, 0xFFFFFFCE, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000010, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000012, 0x00000043, 0x00000043, 0x00000005, TranslateGroup, 0x00000044, 0x00000000, 0xFFFFFFCE, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000012, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 +.word 0x0000000B, 0x00000002, 0xF9718884, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF9718884, 0x00000001, 0x00000043, 0x00000001, kpa_09_UnsetCamera0MoveFlag1, 0x00000056, 0x00000000, 0x0000004D, 0x00000001, 0x000000EF, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000010, 0x00000227, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFFCE, 0x00000000, 0x0000000F, 0x0000000A, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000003, func_8024001C_A4F01C, 0x00000010, 0x00000064, 0x00000043, 0x00000005, TranslateGroup, 0x00000041, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000010, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000050, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000010, 0x00000228, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0xFFFFFFCE, 0x0000000F, 0x0000000A, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000003, func_8024001C_A4F01C, 0x00000010, 0x00000064, 0x00000043, 0x00000005, TranslateGroup, 0x00000041, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000010, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000004D, 0x00000001, 0x000000EF, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000012, 0x00000227, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x00000044, 0x00000001, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFFCE, 0x00000000, 0x0000000F, 0x0000000A, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000003, func_8024001C_A4F01C, 0x00000012, 0x00000064, 0x00000043, 0x00000005, TranslateGroup, 0x00000044, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000012, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000008, 0x00000001, 0x00000050, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000012, 0x00000228, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0xFFFFFFCE, 0x0000000F, 0x0000000A, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000003, func_8024001C_A4F01C, 0x00000012, 0x00000064, 0x00000043, 0x00000005, TranslateGroup, 0x00000044, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000012, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xF9718884, 0x00000000, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF9718884, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_RedSwitch, 0xFFFFFEBB, 0x00000000, 0xFFFFFFF8, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_802416D0_A506D0, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000010, 0x00000040, 0x00000043, 0x00000005, TranslateGroup, 0x00000041, 0x00000000, 0xFFFFFFCE, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000010, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000012, 0x00000043, 0x00000043, 0x00000005, TranslateGroup, 0x00000044, 0x00000000, 0xFFFFFFCE, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000012, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_10/A51D90.data.s b/ver/us/asm/data/world/area_kpa/kpa_10/A51D90.data.s index ec45c8b96e..58a0e9a238 100644 --- a/ver/us/asm/data/world/area_kpa/kpa_10/A51D90.data.s +++ b/ver/us/asm/data/world/area_kpa/kpa_10/A51D90.data.s @@ -36,4 +36,4 @@ dlabel D_80240E98_A52818 .word 0x00000003, D_802408C8_A52248, 0x00000003, 0x00000000, 0x00000000, 0x00000000 dlabel D_80240EB0_A52830 -.word 0x00000043, 0x00000007, MakeEntity, D_802E9A18, 0x00000578, 0x0000005A, 0xFFFFFC95, 0x00000000, 0x80000000, 0x00000043, 0x00000008, MakeEntity, 0x802EA564, 0x00000578, 0x0000005A, 0xFFFFFE89, 0x00000000, 0x00000095, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF840618B, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 +.word 0x00000043, 0x00000007, MakeEntity, Entity_SavePoint, 0x00000578, 0x0000005A, 0xFFFFFC95, 0x00000000, 0x80000000, 0x00000043, 0x00000008, MakeEntity, 0x802EA564, 0x00000578, 0x0000005A, 0xFFFFFE89, 0x00000000, 0x00000095, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF840618B, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_11/A53D80.data.s b/ver/us/asm/data/world/area_kpa/kpa_11/A53D80.data.s index bf7a7ed3e1..286030416a 100644 --- a/ver/us/asm/data/world/area_kpa/kpa_11/A53D80.data.s +++ b/ver/us/asm/data/world/area_kpa/kpa_11/A53D80.data.s @@ -3,4 +3,4 @@ .section .data dlabel D_802414C0_A53D80 -.word 0x00000043, 0x00000007, MakeEntity, D_802E9A18, 0x00000578, 0x0000005A, 0xFFFFFC95, 0x00000000, 0x80000000, 0x0000000A, 0x00000002, 0xF840618C, 0x00000001, 0x00000043, 0x00000007, MakeItemEntity, 0x0000001A, 0x00000226, 0x0000001E, 0xFFFFFF6F, 0x00000011, 0xF840618D, 0x00000013, 0x00000000, 0x00000043, 0x00000008, MakeEntity, 0x802EA564, 0x00000578, 0x0000005A, 0xFFFFFE89, 0x00000000, 0x00000095, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF840618B, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000043, 0x00000007, MakeEntity, Entity_SavePoint, 0x00000578, 0x0000005A, 0xFFFFFC95, 0x00000000, 0x80000000, 0x0000000A, 0x00000002, 0xF840618C, 0x00000001, 0x00000043, 0x00000007, MakeItemEntity, 0x0000001A, 0x00000226, 0x0000001E, 0xFFFFFF6F, 0x00000011, 0xF840618D, 0x00000013, 0x00000000, 0x00000043, 0x00000008, MakeEntity, 0x802EA564, 0x00000578, 0x0000005A, 0xFFFFFE89, 0x00000000, 0x00000095, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF840618B, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_113/A9DA60.data.s b/ver/us/asm/data/world/area_kpa/kpa_113/A9DA60.data.s index 4261608c61..fd6686df14 100644 --- a/ver/us/asm/data/world/area_kpa/kpa_113/A9DA60.data.s +++ b/ver/us/asm/data/world/area_kpa/kpa_113/A9DA60.data.s @@ -9,4 +9,4 @@ dlabel D_80240E38_A9DA68 .word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0x00000026, 0x00000024, 0x00000002, 0xFE363C82, 0x00000033, 0x00000024, 0x00000002, 0xFE363C83, 0x00000035, 0x00000044, 0x00000001, ExitDoubleDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x80241CE0, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80240EDC_A9DB0C -.word 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00D8, 0x000000A0, 0x00000028, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000269, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000024, 0x00000002, 0xF84061AF, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFD050F81, 0x00000043, 0x00000001, kpa_113_SetEntityFlags100000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000047, 0x00000005, D_80240E38_A9DA68, 0x00000100, 0x00000026, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF84061AF, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802BCD68, 0x000001A2, 0x0000000A, 0x00000064, 0x00000118, 0x80000000, 0x00000024, 0x00000002, 0xFD050F81, 0xFE363C80, 0x0000004E, 0x00000006, D_80240EDC_A9DB0C, 0x00000100, 0x00004000, D_80240E30_A9DA60, 0x00000000, 0x00000001, 0x00000012, 0x00000000, 0x00000047, 0x00000005, D_80240E38_A9DA68, 0x00000100, 0x00000026, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000007, MakeEntity, D_802E9A18, 0x00000177, 0x0000003C, 0x00000032, 0x00000000, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00D8, 0x000000A0, 0x00000028, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000269, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000024, 0x00000002, 0xF84061AF, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFD050F81, 0x00000043, 0x00000001, kpa_113_SetEntityFlags100000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000047, 0x00000005, D_80240E38_A9DA68, 0x00000100, 0x00000026, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF84061AF, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802BCD68, 0x000001A2, 0x0000000A, 0x00000064, 0x00000118, 0x80000000, 0x00000024, 0x00000002, 0xFD050F81, 0xFE363C80, 0x0000004E, 0x00000006, D_80240EDC_A9DB0C, 0x00000100, 0x00004000, D_80240E30_A9DA60, 0x00000000, 0x00000001, 0x00000012, 0x00000000, 0x00000047, 0x00000005, D_80240E38_A9DA68, 0x00000100, 0x00000026, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_SavePoint, 0x00000177, 0x0000003C, 0x00000032, 0x00000000, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_13/A56BD0.data.s b/ver/us/asm/data/world/area_kpa/kpa_13/A56BD0.data.s index d8c898d4de..ee7667d7eb 100644 --- a/ver/us/asm/data/world/area_kpa/kpa_13/A56BD0.data.s +++ b/ver/us/asm/data/world/area_kpa/kpa_13/A56BD0.data.s @@ -3,4 +3,4 @@ .section .data dlabel D_80240CB0_A56BD0 -.word 0x00000024, 0x00000002, 0xF9718885, 0x00000000, 0x00000024, 0x00000002, 0xF9718886, 0x00000000, 0x0000000A, 0x00000002, 0xF840618E, 0x00000000, 0x00000043, 0x00000007, MakeEntity, D_802E9BD4, 0x0000011D, 0x0000000A, 0xFFFFFFC9, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignAreaFlag, 0x00000005, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF840618F, 0x00000000, 0x00000043, 0x00000007, MakeEntity, D_802E9BD4, 0x000003A7, 0x0000000A, 0xFFFFFFC9, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignAreaFlag, 0x00000006, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000024, 0x00000002, 0xF9718885, 0x00000000, 0x00000024, 0x00000002, 0xF9718886, 0x00000000, 0x0000000A, 0x00000002, 0xF840618E, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_BlueSwitch, 0x0000011D, 0x0000000A, 0xFFFFFFC9, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignAreaFlag, 0x00000005, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF840618F, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_BlueSwitch, 0x000003A7, 0x0000000A, 0xFFFFFFC9, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignAreaFlag, 0x00000006, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_133/AA8290.data.s b/ver/us/asm/data/world/area_kpa/kpa_133/AA8290.data.s index b293c31b89..55ddd4d117 100644 --- a/ver/us/asm/data/world/area_kpa/kpa_133/AA8290.data.s +++ b/ver/us/asm/data/world/area_kpa/kpa_133/AA8290.data.s @@ -3,7 +3,7 @@ .section .data dlabel D_80240E10_AA8290 -.word 0x0000000A, 0x00000002, 0xF84061B3, 0x00000000, 0x00000043, 0x00000007, MakeEntity, D_802E9BD4, 0x0000003C, 0x00000073, 0x0000000A, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignAreaFlag, 0x00000008, 0x00000043, 0x00000002, AssignScript, D_80241540_AA89C0, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF84061B3, 0x00000001, 0x00000043, 0x00000008, MakeEntity, 0x802EAA54, 0x00000096, 0x00000073, 0x00000000, 0x0000005A, 0x0000003C, 0x80000000, 0x00000012, 0x00000000, 0x00000043, 0x00000008, MakeEntity, 0x802EAA54, 0x00000096, 0x00000096, 0xFFFFFF97, 0x0000005A, 0x0000003C, 0x80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000004, func_80240310_AA7790, 0xFFFFFFA6, 0x00000000, 0x00000000, 0x00000044, 0x00000001, D_80240F44_AA83C4, 0x00000013, 0x00000000, 0x00000043, 0x00000007, MakeItemEntity, 0x0000001A, 0xFFFFFEA2, 0x000000D7, 0xFFFFFFCE, 0x00000000, 0xF84061B2, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000000A, 0x00000002, 0xF84061B3, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_BlueSwitch, 0x0000003C, 0x00000073, 0x0000000A, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignAreaFlag, 0x00000008, 0x00000043, 0x00000002, AssignScript, D_80241540_AA89C0, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF84061B3, 0x00000001, 0x00000043, 0x00000008, MakeEntity, 0x802EAA54, 0x00000096, 0x00000073, 0x00000000, 0x0000005A, 0x0000003C, 0x80000000, 0x00000012, 0x00000000, 0x00000043, 0x00000008, MakeEntity, 0x802EAA54, 0x00000096, 0x00000096, 0xFFFFFF97, 0x0000005A, 0x0000003C, 0x80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000004, func_80240310_AA7790, 0xFFFFFFA6, 0x00000000, 0x00000000, 0x00000044, 0x00000001, D_80240F44_AA83C4, 0x00000013, 0x00000000, 0x00000043, 0x00000007, MakeItemEntity, 0x0000001A, 0xFFFFFEA2, 0x000000D7, 0xFFFFFFCE, 0x00000000, 0xF84061B2, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80240F44_AA83C4 .word 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFD050F81, 0x00000001, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xF84061B3, 0x00000001, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000002, 0xFE363C80, 0x00000073, 0x0000000E, 0x00000002, 0xFE363C80, 0x000000B4, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C80, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000096, 0x00000027, 0x00000002, 0xFE363C83, 0xFFFFFFD8, 0x00000024, 0x00000002, 0xFE363C84, 0x0000005A, 0x00000012, 0x00000000, 0x00000027, 0x00000002, 0xFE363C83, 0x00000028, 0x00000024, 0x00000002, 0xFE363C84, 0x0000010E, 0x00000013, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000002, SetPlayerJumpscale, 0xF24A8280, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0001002B, 0x00000043, 0x00000005, PlayerJump1, 0xFE363C83, 0xFE363C81, 0xFE363C82, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000008, 0x00000001, 0x00000005, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000050, 0x0000000F, 0x00000001, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x00000045, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000006, 0x00000001, 0x00000087, 0x00000073, 0xFFFFFFBA, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000006, 0x00000001, 0x000000B4, 0x00000073, 0xFFFFFFBA, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000006, 0x00000001, 0x00000087, 0x00000073, 0xFFFFFFC9, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000006, 0x00000001, 0x000000B4, 0x00000073, 0xFFFFFFC9, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000006, 0x00000001, 0x00000087, 0x00000073, 0xFFFFFFD8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000006, 0x00000001, 0x000000B4, 0x00000073, 0xFFFFFFD8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, EnableModel, 0x00000045, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000029, 0x7FFFFE00, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000012, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x000001EF, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFFA6, 0x00000000, 0x0000000F, 0x00000001, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000004, func_80240310_AA7790, 0xFE363C80, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000017, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_802403C0_AA7840, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0x00000096, 0x00000096, 0xFFFFFF97, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0x00000096, 0x00000073, 0x00000000, 0x00000011, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_134/AAC3B0.data.s b/ver/us/asm/data/world/area_kpa/kpa_134/AAC3B0.data.s index ae2cc1673d..c5688b12cb 100644 --- a/ver/us/asm/data/world/area_kpa/kpa_134/AAC3B0.data.s +++ b/ver/us/asm/data/world/area_kpa/kpa_134/AAC3B0.data.s @@ -9,4 +9,4 @@ dlabel D_80243598_AAC538 .word 0x0000001A, 0x00000000 dlabel D_802435A0_AAC540 -.word 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00D8, 0x000000A0, 0x00000028, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000024, 0x00000002, 0xF84061B5, 0x00000001, 0x00000043, 0x00000005, kpa_134_GetEntityPosition, 0xFD050F81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, PlaySoundAt, 0x00000269, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C80, 0xFD050F81, 0x00000043, 0x00000001, kpa_134_SetEntityFlags100000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000047, 0x00000005, 0x802408E8, 0x00000100, 0x00000027, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF84061B5, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802BCD68, 0x000002E7, 0x0000000A, 0x00000073, 0x0000010E, 0x80000000, 0x00000024, 0x00000002, 0xFD050F81, 0xFE363C80, 0x0000004E, 0x00000006, D_802435A0_AAC540, 0x00000100, 0x00004000, D_80243598_AAC538, 0x00000000, 0x00000001, 0x00000012, 0x00000000, 0x00000047, 0x00000005, 0x802408E8, 0x00000100, 0x00000027, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF84061B6, 0x00000000, 0x00000043, 0x00000007, MakeEntity, D_802E9BD4, 0xFFFFFF20, 0x00000163, 0xFFFFFFE7, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignAreaFlag, 0x00000009, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000013, 0x00000000, 0x00000043, 0x00000007, MakeEntity, D_802EA0C4, 0xFFFFFF20, 0x0000014A, 0xFFFFFFE7, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80243410_AAC3B0, 0x00000043, 0x00000008, MakeEntity, 0x802EAA54, 0x000001DB, 0x00000000, 0xFFFFFFEC, 0x0000005A, 0x0000003C, 0x80000000, 0x00000043, 0x00000008, MakeEntity, 0x802EA588, 0x000000C3, 0x0000012C, 0xFFFFFFB5, 0x00000000, 0x000000A3, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF84061B7, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00D8, 0x000000A0, 0x00000028, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000024, 0x00000002, 0xF84061B5, 0x00000001, 0x00000043, 0x00000005, kpa_134_GetEntityPosition, 0xFD050F81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, PlaySoundAt, 0x00000269, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C80, 0xFD050F81, 0x00000043, 0x00000001, kpa_134_SetEntityFlags100000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000047, 0x00000005, 0x802408E8, 0x00000100, 0x00000027, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF84061B5, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802BCD68, 0x000002E7, 0x0000000A, 0x00000073, 0x0000010E, 0x80000000, 0x00000024, 0x00000002, 0xFD050F81, 0xFE363C80, 0x0000004E, 0x00000006, D_802435A0_AAC540, 0x00000100, 0x00004000, D_80243598_AAC538, 0x00000000, 0x00000001, 0x00000012, 0x00000000, 0x00000047, 0x00000005, 0x802408E8, 0x00000100, 0x00000027, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF84061B6, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_BlueSwitch, 0xFFFFFF20, 0x00000163, 0xFFFFFFE7, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignAreaFlag, 0x00000009, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000013, 0x00000000, 0x00000043, 0x00000007, MakeEntity, D_802EA0C4, 0xFFFFFF20, 0x0000014A, 0xFFFFFFE7, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80243410_AAC3B0, 0x00000043, 0x00000008, MakeEntity, 0x802EAA54, 0x000001DB, 0x00000000, 0xFFFFFFEC, 0x0000005A, 0x0000003C, 0x80000000, 0x00000043, 0x00000008, MakeEntity, 0x802EA588, 0x000000C3, 0x0000012C, 0xFFFFFFB5, 0x00000000, 0x000000A3, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF84061B7, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_16/A5A3D0.data.s b/ver/us/asm/data/world/area_kpa/kpa_16/A5A3D0.data.s index 8772a093bf..7c7800a1e7 100644 --- a/ver/us/asm/data/world/area_kpa/kpa_16/A5A3D0.data.s +++ b/ver/us/asm/data/world/area_kpa/kpa_16/A5A3D0.data.s @@ -33,4 +33,4 @@ dlabel D_80240E5C_A5AE8C .word 0x00000024, 0x00000002, 0xF5DE0329, 0x00000016, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x0000000A, 0x00000002, 0xF8406195, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000037, 0x7FFFFE00, 0x00000013, 0x00000000, 0x00000043, 0x00000003, MakeNpcs, 0x00000001, 0x802429BC, 0x00000046, 0x00000001, D_802410F0_A5B120, 0x0000000A, 0x00000002, 0xF8406194, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x000000FC, 0x00000000, 0x00000044, 0x00000001, D_80240744_A5A774, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000002F, 0x7FFFFE00, 0x00000012, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x00000082, 0x00000000, 0x00000044, 0x00000001, D_802405D0_A5A600, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000002E, 0x7FFFFE00, 0x00000013, 0x00000000, 0x00000044, 0x00000001, D_802405A4_A5A5D4, 0x00000044, 0x00000001, D_802403F0_A5A420, 0x0000000A, 0x00000002, 0xF8406194, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x0000002E, 0x00000003, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x0000002B, 0x00000003, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x0000002C, 0x00000003, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x0000002D, 0x00000003, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x00000036, 0x00000003, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x0000002F, 0x00000003, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x00000032, 0x00000003, 0x00000056, 0x00000000, 0x00000043, 0x00000002, ResetFromLava, D_80240E1C_A5AE4C, 0x00000057, 0x00000000, 0x00000057, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000036, 0x7FFFFE00, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802410F0_A5B120 -.word 0x0000000A, 0x00000002, 0xF8406194, 0x00000000, 0x00000043, 0x00000007, MakeEntity, D_802E9BD4, 0x000001D6, 0x000000E6, 0xFFFFFF6F, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignAreaFlag, 0x00000007, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 +.word 0x0000000A, 0x00000002, 0xF8406194, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_BlueSwitch, 0x000001D6, 0x000000E6, 0xFFFFFF6F, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignAreaFlag, 0x00000007, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_32/A5E4C0.data.s b/ver/us/asm/data/world/area_kpa/kpa_32/A5E4C0.data.s index a436df390d..8676f2826d 100644 --- a/ver/us/asm/data/world/area_kpa/kpa_32/A5E4C0.data.s +++ b/ver/us/asm/data/world/area_kpa/kpa_32/A5E4C0.data.s @@ -3,4 +3,4 @@ .section .data dlabel D_80240400_A5E4C0 -.word 0x00000043, 0x00000007, MakeEntity, D_802E9A18, 0x00000000, 0x0000000A, 0x00000000, 0x00000000, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000043, 0x00000007, MakeEntity, Entity_SavePoint, 0x00000000, 0x0000000A, 0x00000000, 0x00000000, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_33/A5F480.data.s b/ver/us/asm/data/world/area_kpa/kpa_33/A5F480.data.s index 00c9658714..9439949c22 100644 --- a/ver/us/asm/data/world/area_kpa/kpa_33/A5F480.data.s +++ b/ver/us/asm/data/world/area_kpa/kpa_33/A5F480.data.s @@ -3,4 +3,4 @@ .section .data dlabel D_80240400_A5F480 -.word 0x00000043, 0x00000007, MakeEntity, D_802E9A18, 0x00000000, 0x0000000A, 0x00000000, 0x00000000, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000043, 0x00000007, MakeEntity, Entity_SavePoint, 0x00000000, 0x0000000A, 0x00000000, 0x00000000, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_63/A738E0.data.s b/ver/us/asm/data/world/area_kpa/kpa_63/A738E0.data.s index 5383d99ed7..9837ffa99c 100644 --- a/ver/us/asm/data/world/area_kpa/kpa_63/A738E0.data.s +++ b/ver/us/asm/data/world/area_kpa/kpa_63/A738E0.data.s @@ -3,4 +3,4 @@ .section .data dlabel D_80240330_A738E0 -.word 0x00000043, 0x00000007, MakeEntity, D_802E9A18, 0x00000078, 0x0000003C, 0x0000005A, 0x00000000, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000043, 0x00000007, MakeEntity, Entity_SavePoint, 0x00000078, 0x0000003C, 0x0000005A, 0x00000000, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kzn/kzn_03/C66FC0.data.s b/ver/us/asm/data/world/area_kzn/kzn_03/C66FC0.data.s index 1d39c5743e..8f4c9b3220 100644 --- a/ver/us/asm/data/world/area_kzn/kzn_03/C66FC0.data.s +++ b/ver/us/asm/data/world/area_kzn/kzn_03/C66FC0.data.s @@ -15,4 +15,4 @@ dlabel D_802464F8_C67208 .word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000003, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000001, kzn_03_UnsetCamera0MoveFlag1, 0x00000045, 0x00000002, D_802462B0_C66FC0, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFD050F89, 0x00000000, 0x00000043, 0x00000002, SetPlayerJumpscale, 0xF24A801A, 0x00000043, 0x00000005, PlayerJump, 0xFFFFFE2A, 0x0000029E, 0x00000047, 0x00000012, 0x00000012, 0x00000000, 0x00000043, 0x00000002, SetPlayerJumpscale, 0xF24A7D4D, 0x00000043, 0x00000005, PlayerJump, 0xFFFFFE80, 0x00000366, 0xFFFFFFEA, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, SetPlayerActionState, 0x0000000A, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000001, kzn_03_SetCamera0MoveFlag1, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024663C_C6734C -.word 0x00000024, 0x00000002, 0xF5DE0180, 0x0000001D, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, D_802E9A18, 0x0000016D, 0x00000212, 0x00000087, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeItemEntity, 0x000000EC, 0x0000004B, 0x00000122, 0x000000EB, 0x00000011, 0xF84060B2, 0x00000043, 0x00000007, MakeEntity, D_802EA0C4, 0x000000D7, 0x000002E9, 0xFFFFFF97, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, D_802EA0C4, 0x00000055, 0x00000302, 0xFFFFFF97, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeItemEntity, 0x00000090, 0x00000055, 0x0000031B, 0xFFFFFF97, 0x0000000D, 0xF84060B3, 0x00000043, 0x00000008, MakeEntity, 0x802EA564, 0x00000023, 0x000002DA, 0xFFFFFF97, 0x00000000, 0x00000157, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF84060B4, 0x00000043, 0x00000008, MakeEntity, 0x802EA564, 0xFFFFFFF1, 0x000002DA, 0xFFFFFF97, 0x00000000, 0x00000157, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF84060B5, 0x00000043, 0x00000008, MakeEntity, 0x802EA564, 0xFFFFFFBF, 0x000002DA, 0xFFFFFF97, 0x00000000, 0x00000157, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF84060B6, 0x00000043, 0x00000008, MakeEntity, 0x802EA564, 0xFFFFFF8D, 0x000002DA, 0xFFFFFF97, 0x00000000, 0x00000157, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF84060B7, 0x0000000C, 0x00000002, 0xF5DE0180, 0x0000001D, 0x00000043, 0x00000007, MakeEntity, 0x802EA22C, 0x000001EA, 0x000001D6, 0x000000D2, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_8024663C_C6734C, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x0000000F, 0x00000002, 0xF5DE0180, 0x0000001D, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000032, 0x7FFFFE00, 0x00000057, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000032, 0x7FFFFE00, 0x00000013, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802EAA30, 0x000000A0, 0x0000001E, 0x0000015E, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80246314_C67024, 0x00000043, 0x00000007, MakeEntity, 0x802EAA30, 0x0000014F, 0x00000109, 0x00000168, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80246410_C67120, 0x00000056, 0x00000000, 0x00000043, 0x00000001, func_80242D38_C63A48, 0x00000057, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802EAA30, 0xFFFFFE66, 0x00000285, 0x00000078, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_802464F8_C67208, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 +.word 0x00000024, 0x00000002, 0xF5DE0180, 0x0000001D, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_SavePoint, 0x0000016D, 0x00000212, 0x00000087, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeItemEntity, 0x000000EC, 0x0000004B, 0x00000122, 0x000000EB, 0x00000011, 0xF84060B2, 0x00000043, 0x00000007, MakeEntity, D_802EA0C4, 0x000000D7, 0x000002E9, 0xFFFFFF97, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, D_802EA0C4, 0x00000055, 0x00000302, 0xFFFFFF97, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeItemEntity, 0x00000090, 0x00000055, 0x0000031B, 0xFFFFFF97, 0x0000000D, 0xF84060B3, 0x00000043, 0x00000008, MakeEntity, 0x802EA564, 0x00000023, 0x000002DA, 0xFFFFFF97, 0x00000000, 0x00000157, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF84060B4, 0x00000043, 0x00000008, MakeEntity, 0x802EA564, 0xFFFFFFF1, 0x000002DA, 0xFFFFFF97, 0x00000000, 0x00000157, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF84060B5, 0x00000043, 0x00000008, MakeEntity, 0x802EA564, 0xFFFFFFBF, 0x000002DA, 0xFFFFFF97, 0x00000000, 0x00000157, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF84060B6, 0x00000043, 0x00000008, MakeEntity, 0x802EA564, 0xFFFFFF8D, 0x000002DA, 0xFFFFFF97, 0x00000000, 0x00000157, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF84060B7, 0x0000000C, 0x00000002, 0xF5DE0180, 0x0000001D, 0x00000043, 0x00000007, MakeEntity, 0x802EA22C, 0x000001EA, 0x000001D6, 0x000000D2, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_8024663C_C6734C, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x0000000F, 0x00000002, 0xF5DE0180, 0x0000001D, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000032, 0x7FFFFE00, 0x00000057, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000032, 0x7FFFFE00, 0x00000013, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802EAA30, 0x000000A0, 0x0000001E, 0x0000015E, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80246314_C67024, 0x00000043, 0x00000007, MakeEntity, 0x802EAA30, 0x0000014F, 0x00000109, 0x00000168, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80246410_C67120, 0x00000056, 0x00000000, 0x00000043, 0x00000001, func_80242D38_C63A48, 0x00000057, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802EAA30, 0xFFFFFE66, 0x00000285, 0x00000078, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_802464F8_C67208, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kzn/kzn_18/C8C460.data.s b/ver/us/asm/data/world/area_kzn/kzn_18/C8C460.data.s index 2c76e71b95..69f9600568 100644 --- a/ver/us/asm/data/world/area_kzn/kzn_18/C8C460.data.s +++ b/ver/us/asm/data/world/area_kzn/kzn_18/C8C460.data.s @@ -66,4 +66,4 @@ dlabel D_80241A4C_C8DAEC .word 0x00000001, D_8024166C_C8D70C, 0x00000000, 0x00000001, D_8024185C_C8D8FC, 0x00000000, 0x00000000, 0x00000000, 0x00000000 dlabel D_80241A70_C8DB10 -.word 0x00000043, 0x00000008, MakeEntity, 0x802EAB04, 0x000000FA, 0x000000FA, 0xFFFFFF1F, 0x00000000, 0x00000017, 0x80000000, 0x00000043, 0x00000002, AssignPanelFlag, 0xF84060BB, 0x00000043, 0x00000007, MakeEntity, D_802E9A18, 0xFFFFFE5C, 0x00000055, 0xFFFFFFB0, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA7E0, 0x0000015E, 0x00000136, 0xFFFFFF06, 0x00000000, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000008, MakeEntity, 0x802EAB04, 0x000000FA, 0x000000FA, 0xFFFFFF1F, 0x00000000, 0x00000017, 0x80000000, 0x00000043, 0x00000002, AssignPanelFlag, 0xF84060BB, 0x00000043, 0x00000007, MakeEntity, Entity_SavePoint, 0xFFFFFE5C, 0x00000055, 0xFFFFFFB0, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA7E0, 0x0000015E, 0x00000136, 0xFFFFFF06, 0x00000000, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_mac/mac_01/807C00.data.s b/ver/us/asm/data/world/area_mac/mac_01/807C00.data.s index 814ab6918e..62d66009bc 100644 --- a/ver/us/asm/data/world/area_mac/mac_01/807C00.data.s +++ b/ver/us/asm/data/world/area_mac/mac_01/807C00.data.s @@ -3,7 +3,7 @@ .section .data dlabel D_80247380_807C00 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D0170, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0x00000060, 0x00000043, 0x00000007, MakeEntity, D_802E9A18, 0x00000118, 0x00000050, 0xFFFFFF7E, 0x00000000, 0x80000000, 0x00000013, 0x00000000, 0x00000047, 0x00000005, D_80247380_807C00, 0x00000100, 0x00000033, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D0170, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0x00000060, 0x00000043, 0x00000007, MakeEntity, Entity_SavePoint, 0x00000118, 0x00000050, 0xFFFFFF7E, 0x00000000, 0x80000000, 0x00000013, 0x00000000, 0x00000047, 0x00000005, D_80247380_807C00, 0x00000100, 0x00000033, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80247430_807CB0 .word 0x00000026, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000002F, 0x00000002, 0xFE363C81, 0xF24B2E80, 0x00000043, 0x00000005, TranslateModel, 0x00000050, 0xFE363C81, 0x00000000, 0x00000000, 0x00000026, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000002E, 0x00000002, 0xFE363C81, 0xF24A7E4D, 0x00000043, 0x00000006, RotateModel, 0x00000050, 0xFE363C81, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x004B004C, 0x003F0040, 0x00410042, 0x00430046, 0x00480049, 0x0047004D, 0x0044003D, 0x003E0000 diff --git a/ver/us/asm/data/world/area_mac/mac_05/8564E0.data.s b/ver/us/asm/data/world/area_mac/mac_05/8564E0.data.s index 3fd86124b8..5686eee67d 100644 --- a/ver/us/asm/data/world/area_mac/mac_05/8564E0.data.s +++ b/ver/us/asm/data/world/area_mac/mac_05/8564E0.data.s @@ -6,4 +6,4 @@ dlabel D_80244370_8564E0 .word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D0174, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802443B8_856528 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D016C, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, D_802E9A18, 0xFFFFFF6A, 0x0000003C, 0xFFFFFE89, 0x00000000, 0x80000000, 0x00000043, 0x00000008, MakeEntity, 0x802EAB04, 0xFFFFFFCE, 0x00000000, 0xFFFFFED4, 0x00000000, 0x00000003, 0x80000000, 0x00000043, 0x00000002, AssignPanelFlag, 0xF8405CAC, 0x00000043, 0x00000007, MakeEntity, 0x802EA0E8, 0xFFFFFE16, 0x00000082, 0x000000A0, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405CB2, 0x00000047, 0x00000005, D_80244370_8564E0, 0x00000100, 0x0000000E, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802443B8_856528, 0x00000100, 0x0000002E, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D016C, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_SavePoint, 0xFFFFFF6A, 0x0000003C, 0xFFFFFE89, 0x00000000, 0x80000000, 0x00000043, 0x00000008, MakeEntity, 0x802EAB04, 0xFFFFFFCE, 0x00000000, 0xFFFFFED4, 0x00000000, 0x00000003, 0x80000000, 0x00000043, 0x00000002, AssignPanelFlag, 0xF8405CAC, 0x00000043, 0x00000007, MakeEntity, 0x802EA0E8, 0xFFFFFE16, 0x00000082, 0x000000A0, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405CB2, 0x00000047, 0x00000005, D_80244370_8564E0, 0x00000100, 0x0000000E, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802443B8_856528, 0x00000100, 0x0000002E, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_mac/machi/7E7A30.data.s b/ver/us/asm/data/world/area_mac/machi/7E7A30.data.s index 165c2b948b..51d57dcef8 100644 --- a/ver/us/asm/data/world/area_mac/machi/7E7A30.data.s +++ b/ver/us/asm/data/world/area_mac/machi/7E7A30.data.s @@ -30,4 +30,4 @@ dlabel D_80240CF0_7E8090 .word 0x00000043, 0x00000001, func_80240000_7E73A0, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000046, 0x00000001, D_80240E20_7E81C0, 0x00000047, 0x00000005, D_80240C00_7E7FA0, 0x00000040, 0x00000003, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240C30_7E7FD0, 0x00000040, 0x00000006, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240C60_7E8000, 0x00000040, 0x00000009, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240C90_7E8030, 0x00000040, 0x00000018, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240CC0_7E8060, 0x00000040, 0x00000012, 0x00000001, 0x00000000, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, 0x80242F6C, 0x00000046, 0x00000001, 0x802410D0, 0x00000044, 0x00000001, 0x802435B0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80240E20_7E81C0 -.word 0x00000043, 0x00000007, MakeEntity, D_802E9BF8, 0x00000116, 0x00000000, 0xFFFFFEC2, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, D_802E9C1C, 0x00000044, 0x00000000, 0xFFFFFFA4, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, D_802E9BD4, 0x00000077, 0x00000000, 0xFFFFFF5A, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, D_802E9BB0, 0x000000A9, 0x00000000, 0xFFFFFF5A, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA588, 0x00000000, 0x0000003C, 0xFFFFFEBA, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA0E8, 0x00000028, 0x0000003C, 0xFFFFFEBA, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, D_802EA0C4, 0x00000050, 0x00000064, 0xFFFFFEBA, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, D_802EA0C4, 0x00000078, 0x00000068, 0xFFFFFEBA, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, D_802EA0C4, 0x000000A0, 0x0000006C, 0xFFFFFEBA, 0x00000000, 0x80000000, 0x00000043, 0x00000008, MakeEntity, 0x802EA564, 0x000000C8, 0x0000006E, 0xFFFFFEBA, 0x00000000, 0x0000008A, 0x80000000, 0x00000043, 0x00000008, MakeEntity, 0x802EA564, 0x000000F0, 0x00000064, 0xFFFFFEBA, 0x00000000, 0x0000008A, 0x80000000, 0x00000043, 0x00000008, MakeEntity, 0x802EAE0C, 0xFFFFFF32, 0x00000000, 0xFFFFFE8B, 0x00000000, 0x00000005, 0x80000000, 0x00000043, 0x00000008, MakeEntity, 0x802EAE30, 0xFFFFFF7D, 0x00000000, 0xFFFFFE99, 0x00000000, 0x00000006, 0x80000000, 0x00000043, 0x00000007, MakeItemEntity, 0x0000008A, 0x00000046, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000007, MakeItemEntity, 0x0000008A, 0x0000005E, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000007, MakeItemEntity, 0x0000008A, 0x00000076, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000007, MakeItemEntity, 0x0000008A, 0x0000008E, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000007, MakeItemEntity, 0x0000008A, 0x000000A6, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000043, 0x00000007, MakeEntity, Entity_HugeBlueSwitch, 0x00000116, 0x00000000, 0xFFFFFEC2, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_GreenStompSwitch, 0x00000044, 0x00000000, 0xFFFFFFA4, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_BlueSwitch, 0x00000077, 0x00000000, 0xFFFFFF5A, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_RedSwitch, 0x000000A9, 0x00000000, 0xFFFFFF5A, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA588, 0x00000000, 0x0000003C, 0xFFFFFEBA, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA0E8, 0x00000028, 0x0000003C, 0xFFFFFEBA, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, D_802EA0C4, 0x00000050, 0x00000064, 0xFFFFFEBA, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, D_802EA0C4, 0x00000078, 0x00000068, 0xFFFFFEBA, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, D_802EA0C4, 0x000000A0, 0x0000006C, 0xFFFFFEBA, 0x00000000, 0x80000000, 0x00000043, 0x00000008, MakeEntity, 0x802EA564, 0x000000C8, 0x0000006E, 0xFFFFFEBA, 0x00000000, 0x0000008A, 0x80000000, 0x00000043, 0x00000008, MakeEntity, 0x802EA564, 0x000000F0, 0x00000064, 0xFFFFFEBA, 0x00000000, 0x0000008A, 0x80000000, 0x00000043, 0x00000008, MakeEntity, 0x802EAE0C, 0xFFFFFF32, 0x00000000, 0xFFFFFE8B, 0x00000000, 0x00000005, 0x80000000, 0x00000043, 0x00000008, MakeEntity, 0x802EAE30, 0xFFFFFF7D, 0x00000000, 0xFFFFFE99, 0x00000000, 0x00000006, 0x80000000, 0x00000043, 0x00000007, MakeItemEntity, 0x0000008A, 0x00000046, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000007, MakeItemEntity, 0x0000008A, 0x0000005E, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000007, MakeItemEntity, 0x0000008A, 0x00000076, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000007, MakeItemEntity, 0x0000008A, 0x0000008E, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000007, MakeItemEntity, 0x0000008A, 0x000000A6, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_mim/mim_10/BB5EB0.data.s b/ver/us/asm/data/world/area_mim/mim_10/BB5EB0.data.s index 58b7e76da4..f47bed6c1b 100644 --- a/ver/us/asm/data/world/area_mim/mim_10/BB5EB0.data.s +++ b/ver/us/asm/data/world/area_mim/mim_10/BB5EB0.data.s @@ -3,4 +3,4 @@ .section .data dlabel D_802404D0_BB5EB0 -.word 0x00000043, 0x00000007, MakeEntity, D_802E9A18, 0xFFFFFF51, 0x0000003C, 0xFFFFFFCE, 0x00000000, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000043, 0x00000007, MakeEntity, Entity_SavePoint, 0xFFFFFF51, 0x0000003C, 0xFFFFFFCE, 0x00000000, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_mim/mim_11/BBA180.data.s b/ver/us/asm/data/world/area_mim/mim_11/BBA180.data.s index c15cb56661..58c701d429 100644 --- a/ver/us/asm/data/world/area_mim/mim_11/BBA180.data.s +++ b/ver/us/asm/data/world/area_mim/mim_11/BBA180.data.s @@ -3,4 +3,4 @@ .section .data dlabel D_80243110_BBA180 -.word 0x00000043, 0x00000003, GotoMap, 0x80244300, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF8406314, 0x00000000, 0x0000000A, 0x00000002, 0xF840630F, 0x00000001, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000003, 0x00000024, 0x00000002, 0xF8406311, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x0000000A, MakeEntity, 0x802EAF80, 0xFFFFFEED, 0x00000000, 0xFFFFFF1F, 0x0000010E, 0x00000003, D_80243110_BBA180, 0x00000794, 0x80000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA7E0, 0x00000000, 0x0000003C, 0xFFFFFED4, 0x0000002D, 0x80000000, 0x00000043, 0x00000007, MakeEntity, D_802E9A18, 0x000000DC, 0x0000003C, 0xFFFFFFB0, 0x0000002D, 0x80000000, 0x00000043, 0x00000008, MakeEntity, 0x802EA564, 0xFFFFFEE6, 0x0000003C, 0x0000020A, 0x00000000, 0x0000008B, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405F27, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000043, 0x00000003, GotoMap, 0x80244300, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF8406314, 0x00000000, 0x0000000A, 0x00000002, 0xF840630F, 0x00000001, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000003, 0x00000024, 0x00000002, 0xF8406311, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x0000000A, MakeEntity, 0x802EAF80, 0xFFFFFEED, 0x00000000, 0xFFFFFF1F, 0x0000010E, 0x00000003, D_80243110_BBA180, 0x00000794, 0x80000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA7E0, 0x00000000, 0x0000003C, 0xFFFFFED4, 0x0000002D, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_SavePoint, 0x000000DC, 0x0000003C, 0xFFFFFFB0, 0x0000002D, 0x80000000, 0x00000043, 0x00000008, MakeEntity, 0x802EA564, 0xFFFFFEE6, 0x0000003C, 0x0000020A, 0x00000000, 0x0000008B, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405F27, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_nok/nok_01/9C8920.data.s b/ver/us/asm/data/world/area_nok/nok_01/9C8920.data.s index 291316196b..6ae3613912 100644 --- a/ver/us/asm/data/world/area_nok/nok_01/9C8920.data.s +++ b/ver/us/asm/data/world/area_nok/nok_01/9C8920.data.s @@ -3,4 +3,4 @@ .section .data dlabel D_80243540_9C8920 -.word 0x00000043, 0x00000007, MakeEntity, D_802EA0C4, 0x00000014, 0x0000003C, 0x00000172, 0x00000000, 0x80000000, 0x0000000A, 0x00000002, 0xF8405DB7, 0x00000000, 0x00000043, 0x00000002, AssignScript, 0x8024A758, 0x00000013, 0x00000000, 0x00000043, 0x00000007, MakeEntity, D_802E9A18, 0x000001A9, 0x0000003C, 0x0000007D, 0x00000000, 0x80000000, 0x00000043, 0x00000008, MakeEntity, 0x802EAB04, 0x00000096, 0x00000000, 0x0000015E, 0x00000000, 0x00000007, 0x80000000, 0x00000043, 0x00000002, AssignPanelFlag, 0xF8405DDE, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000043, 0x00000007, MakeEntity, D_802EA0C4, 0x00000014, 0x0000003C, 0x00000172, 0x00000000, 0x80000000, 0x0000000A, 0x00000002, 0xF8405DB7, 0x00000000, 0x00000043, 0x00000002, AssignScript, 0x8024A758, 0x00000013, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_SavePoint, 0x000001A9, 0x0000003C, 0x0000007D, 0x00000000, 0x80000000, 0x00000043, 0x00000008, MakeEntity, 0x802EAB04, 0x00000096, 0x00000000, 0x0000015E, 0x00000000, 0x00000007, 0x80000000, 0x00000043, 0x00000002, AssignPanelFlag, 0xF8405DDE, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_nok/nok_12/9FC970.data.s b/ver/us/asm/data/world/area_nok/nok_12/9FC970.data.s index 060acf2c05..76b022cacd 100644 --- a/ver/us/asm/data/world/area_nok/nok_12/9FC970.data.s +++ b/ver/us/asm/data/world/area_nok/nok_12/9FC970.data.s @@ -27,4 +27,4 @@ dlabel D_80242870_9FD060 .word 0x00000043, 0x00000004, func_80240180_9FA970, 0x00000003, 0x00000000, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFF9D, 0x00000024, 0x00000002, 0xF5DE0180, 0xFFFFFF9D, 0x00000008, 0x00000001, 0x0000000F, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000001, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000005, MakeLerp, 0x0000005F, 0x00000000, 0x0000000C, 0x00000001, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, nok_12_SetEntityPosition, 0xFD050F80, 0xFFFFFE2A, 0xFE363C80, 0xFFFFFF6A, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, PlaySoundAt, 0x00000048, 0x00000000, 0xFFFFFE2A, 0xFE363C80, 0xFFFFFF6A, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000005, 0xF24A7E80, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242A00_9FD1F0 -.word 0x0000000E, 0x00000002, 0xF5DE0180, 0xFFFFFF9D, 0x0000000A, 0x00000002, 0xF5DE0180, 0xFFFFFF9D, 0x00000043, 0x00000007, MakeEntity, D_802E9BD4, 0xFFFFFE2A, 0x00000000, 0xFFFFFF6A, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignAreaFlag, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000007, MakeEntity, D_802E9BD4, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignAreaFlag, 0x00000001, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000008, MakeEntity, 0x802EA564, 0xFFFFFDD0, 0x0000003C, 0xFFFFFF88, 0x00000000, 0x00000090, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405DD5, 0x00000043, 0x00000007, MakeEntity, D_802EA0C4, 0xFFFFFF5B, 0x0000003C, 0xFFFFFF7E, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80242870_9FD060, 0x00000043, 0x00000007, MakeEntity, D_802EA0C4, 0x00000208, 0x0000006E, 0xFFFFFF4C, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, D_802EA0C4, 0x00000253, 0x0000006E, 0xFFFFFF4C, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, D_802EA0C4, 0x000002D0, 0x00000087, 0xFFFFFF4C, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA0E8, 0x00000334, 0x00000087, 0xFFFFFF4C, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405DD8, 0x00000043, 0x00000007, MakeItemEntity, 0x0000015C, 0xFFFFFF24, 0xFFFFFFCE, 0x0000009B, 0x00000011, 0xF8405DC4, 0x00000043, 0x00000007, MakeItemEntity, 0x0000008F, 0x00000188, 0x00000019, 0xFFFFFF6F, 0x00000011, 0xF8405DE7, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 +.word 0x0000000E, 0x00000002, 0xF5DE0180, 0xFFFFFF9D, 0x0000000A, 0x00000002, 0xF5DE0180, 0xFFFFFF9D, 0x00000043, 0x00000007, MakeEntity, Entity_BlueSwitch, 0xFFFFFE2A, 0x00000000, 0xFFFFFF6A, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignAreaFlag, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_BlueSwitch, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignAreaFlag, 0x00000001, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000008, MakeEntity, 0x802EA564, 0xFFFFFDD0, 0x0000003C, 0xFFFFFF88, 0x00000000, 0x00000090, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405DD5, 0x00000043, 0x00000007, MakeEntity, D_802EA0C4, 0xFFFFFF5B, 0x0000003C, 0xFFFFFF7E, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80242870_9FD060, 0x00000043, 0x00000007, MakeEntity, D_802EA0C4, 0x00000208, 0x0000006E, 0xFFFFFF4C, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, D_802EA0C4, 0x00000253, 0x0000006E, 0xFFFFFF4C, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, D_802EA0C4, 0x000002D0, 0x00000087, 0xFFFFFF4C, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA0E8, 0x00000334, 0x00000087, 0xFFFFFF4C, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405DD8, 0x00000043, 0x00000007, MakeItemEntity, 0x0000015C, 0xFFFFFF24, 0xFFFFFFCE, 0x0000009B, 0x00000011, 0xF8405DC4, 0x00000043, 0x00000007, MakeItemEntity, 0x0000008F, 0x00000188, 0x00000019, 0xFFFFFF6F, 0x00000011, 0xF8405DE7, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_nok/nok_14/A052F0.data.s b/ver/us/asm/data/world/area_nok/nok_14/A052F0.data.s index 6a300100c3..bc5bd387b2 100644 --- a/ver/us/asm/data/world/area_nok/nok_14/A052F0.data.s +++ b/ver/us/asm/data/world/area_nok/nok_14/A052F0.data.s @@ -6,4 +6,4 @@ dlabel D_80242AB0_A052F0 .word 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000001, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D0179, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242B54_A05394 -.word 0x0000000A, 0x00000002, 0xF8405DC5, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000005, 0x00000001, 0x00000019, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetNpcPos, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetItemPos, 0xFD050F80, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000006, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000004, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000004, 0xFFFFFEA7, 0x0000004B, 0xFFFFFF8B, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000004, 0xF24A8080, 0x0000000E, 0x00000002, 0xFE363C80, 0xFFFFFEA7, 0x00000043, 0x00000006, NpcJump0, 0x00000004, 0xFFFFFEE8, 0x00000000, 0xFFFFFF90, 0x00000014, 0x00000012, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000004, 0xFFFFFE66, 0x00000000, 0xFFFFFF90, 0x00000014, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, D_802EAFDC, 0xFFFFFF6A, 0x00000000, 0xFFFFFF51, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80242AB0_A052F0, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFA5, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000007, MakeEntity, D_802E9BD4, 0x00000064, 0x00000000, 0xFFFFFF47, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignAreaFlag, 0x00000002, 0x00000013, 0x00000000, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0xFFFFFD71, 0x0000004B, 0xFFFFFFDD, 0x00000011, 0xF8405DC6, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0xFFFFFD80, 0x0000004B, 0xFFFFFFEC, 0x00000011, 0xF8405DC7, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0xFFFFFD80, 0x0000004B, 0xFFFFFFCE, 0x00000011, 0xF8405DC8, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0xFFFFFD62, 0x0000004B, 0xFFFFFFEC, 0x00000011, 0xF8405DC9, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0xFFFFFD62, 0x0000004B, 0xFFFFFFCE, 0x00000011, 0xF8405DCA, 0x00000043, 0x00000007, MakeEntity, D_802EA0C4, 0xFFFFFEA7, 0x0000004D, 0xFFFFFF8B, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80242B54_A05394, 0x00000043, 0x00000007, MakeItemEntity, 0x00000084, 0xFFFFFEA7, 0x00000066, 0xFFFFFF8B, 0x00000011, 0xF8405DC5, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000007, MakeEntity, D_802EA0C4, 0x000000C8, 0x0000003C, 0xFFFFFF60, 0x00000000, 0x80000000, 0x00000043, 0x00000008, MakeEntity, 0x802EA588, 0x000000FA, 0x0000003C, 0xFFFFFF60, 0x00000000, 0x00000080, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405DD7, 0x00000043, 0x00000007, MakeEntity, D_802EA0C4, 0x0000012C, 0x0000003C, 0xFFFFFF60, 0x00000000, 0x80000000, 0x00000043, 0x00000008, MakeEntity, 0x802EAB04, 0xFFFFFD76, 0x0000004B, 0xFFFFFFCE, 0x00000000, 0x00000008, 0x80000000, 0x00000043, 0x00000002, AssignPanelFlag, 0xF8405DE1, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 +.word 0x0000000A, 0x00000002, 0xF8405DC5, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000005, 0x00000001, 0x00000019, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetNpcPos, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetItemPos, 0xFD050F80, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000006, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000004, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000004, 0xFFFFFEA7, 0x0000004B, 0xFFFFFF8B, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000004, 0xF24A8080, 0x0000000E, 0x00000002, 0xFE363C80, 0xFFFFFEA7, 0x00000043, 0x00000006, NpcJump0, 0x00000004, 0xFFFFFEE8, 0x00000000, 0xFFFFFF90, 0x00000014, 0x00000012, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000004, 0xFFFFFE66, 0x00000000, 0xFFFFFF90, 0x00000014, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, D_802EAFDC, 0xFFFFFF6A, 0x00000000, 0xFFFFFF51, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80242AB0_A052F0, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFA5, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_BlueSwitch, 0x00000064, 0x00000000, 0xFFFFFF47, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignAreaFlag, 0x00000002, 0x00000013, 0x00000000, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0xFFFFFD71, 0x0000004B, 0xFFFFFFDD, 0x00000011, 0xF8405DC6, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0xFFFFFD80, 0x0000004B, 0xFFFFFFEC, 0x00000011, 0xF8405DC7, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0xFFFFFD80, 0x0000004B, 0xFFFFFFCE, 0x00000011, 0xF8405DC8, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0xFFFFFD62, 0x0000004B, 0xFFFFFFEC, 0x00000011, 0xF8405DC9, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0xFFFFFD62, 0x0000004B, 0xFFFFFFCE, 0x00000011, 0xF8405DCA, 0x00000043, 0x00000007, MakeEntity, D_802EA0C4, 0xFFFFFEA7, 0x0000004D, 0xFFFFFF8B, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80242B54_A05394, 0x00000043, 0x00000007, MakeItemEntity, 0x00000084, 0xFFFFFEA7, 0x00000066, 0xFFFFFF8B, 0x00000011, 0xF8405DC5, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000007, MakeEntity, D_802EA0C4, 0x000000C8, 0x0000003C, 0xFFFFFF60, 0x00000000, 0x80000000, 0x00000043, 0x00000008, MakeEntity, 0x802EA588, 0x000000FA, 0x0000003C, 0xFFFFFF60, 0x00000000, 0x00000080, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405DD7, 0x00000043, 0x00000007, MakeEntity, D_802EA0C4, 0x0000012C, 0x0000003C, 0xFFFFFF60, 0x00000000, 0x80000000, 0x00000043, 0x00000008, MakeEntity, 0x802EAB04, 0xFFFFFD76, 0x0000004B, 0xFFFFFFCE, 0x00000000, 0x00000008, 0x80000000, 0x00000043, 0x00000002, AssignPanelFlag, 0xF8405DE1, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_obk/obk_03/BC5A00.data.s b/ver/us/asm/data/world/area_obk/obk_03/BC5A00.data.s index d4b6139677..8d2ba33185 100644 --- a/ver/us/asm/data/world/area_obk/obk_03/BC5A00.data.s +++ b/ver/us/asm/data/world/area_obk/obk_03/BC5A00.data.s @@ -15,10 +15,10 @@ dlabel D_80241B9C_BC5E1C .word 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000E, 0x00000002, 0xFE363C80, 0x0000018A, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000F, 0x00000002, 0xFE363C80, 0x000001D6, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000E, 0x00000002, 0xFE363C82, 0xFFFFFF79, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000F, 0x00000002, 0xFE363C82, 0xFFFFFFC2, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0008001F, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000005A, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000002, SetPlayerJumpscale, 0xF24A8280, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0001002B, 0x00000043, 0x00000005, PlayerJump1, 0x00000160, 0xFFFFFF2E, 0xFFFFFFFB, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000008, 0x00000001, 0x00000005, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241CD8_BC5F58 -.word 0x00000043, 0x00000007, MakeEntity, D_802E9BD4, 0x00000168, 0xFFFFFF2E, 0xFFFFFF9C, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignAreaFlag, 0x00000006, 0x00000043, 0x00000002, AssignScript, D_80241DB4_BC6034, 0x00000044, 0x00000001, D_80241A60_BC5CE0, 0x00000024, 0x00000002, 0xFE363C82, 0x00000168, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0xFFFFFF9C, 0x00000024, 0x00000002, 0xFE363C85, 0xFFFFFF2E, 0x00000024, 0x00000002, 0xFE363C86, 0x00000014, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C88, 0x00000005, 0x00000046, 0x00000001, D_80241780_BC5A00, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000007, MakeEntity, Entity_BlueSwitch, 0x00000168, 0xFFFFFF2E, 0xFFFFFF9C, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignAreaFlag, 0x00000006, 0x00000043, 0x00000002, AssignScript, D_80241DB4_BC6034, 0x00000044, 0x00000001, D_80241A60_BC5CE0, 0x00000024, 0x00000002, 0xFE363C82, 0x00000168, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0xFFFFFF9C, 0x00000024, 0x00000002, 0xFE363C85, 0xFFFFFF2E, 0x00000024, 0x00000002, 0xFE363C86, 0x00000014, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C88, 0x00000005, 0x00000046, 0x00000001, D_80241780_BC5A00, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241DB4_BC6034 -.word 0x00000043, 0x00000007, MakeEntity, D_802E9BF8, 0x000001B8, 0xFFFFFF2E, 0xFFFFFF9C, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignAreaFlag, 0x00000007, 0x00000043, 0x00000002, AssignScript, D_80241E90_BC6110, 0x00000044, 0x00000001, D_80241B9C_BC5E1C, 0x00000024, 0x00000002, 0xFE363C82, 0x000001B8, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0xFFFFFF9C, 0x00000024, 0x00000002, 0xFE363C85, 0xFFFFFF2E, 0x00000024, 0x00000002, 0xFE363C86, 0x00000014, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C88, 0x0000001E, 0x00000046, 0x00000001, D_802418F0_BC5B70, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000007, MakeEntity, Entity_HugeBlueSwitch, 0x000001B8, 0xFFFFFF2E, 0xFFFFFF9C, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignAreaFlag, 0x00000007, 0x00000043, 0x00000002, AssignScript, D_80241E90_BC6110, 0x00000044, 0x00000001, D_80241B9C_BC5E1C, 0x00000024, 0x00000002, 0xFE363C82, 0x000001B8, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0xFFFFFF9C, 0x00000024, 0x00000002, 0xFE363C85, 0xFFFFFF2E, 0x00000024, 0x00000002, 0xFE363C86, 0x00000014, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C88, 0x0000001E, 0x00000046, 0x00000001, D_802418F0_BC5B70, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241E90_BC6110 -.word 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFD9, 0x00000044, 0x00000001, 0x80242320, 0x00000024, 0x00000002, 0xF5DE0180, 0xFFFFFFD9, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFD9, 0x00000043, 0x00000007, MakeEntity, D_802E9BD4, 0x0000012C, 0xFFFFFF2E, 0xFFFFFF9C, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignAreaFlag, 0x00000005, 0x00000043, 0x00000002, AssignScript, D_80241CD8_BC5F58, 0x00000013, 0x00000000, 0x00000043, 0x00000008, MakeEntity, 0x802EAED4, 0xFFFFFF7E, 0x00000000, 0xFFFFFFCE, 0x00000000, 0x0000008C, 0x80000000, 0x00000043, 0x00000002, AssignCrateFlag, 0xF8405F45, 0x00000043, 0x00000008, MakeEntity, 0x802EAED4, 0x0000009B, 0x00000000, 0xFFFFFF9C, 0x00000000, 0xFFFFFFFF, 0x80000000, 0x00000043, 0x00000008, MakeEntity, 0x802EAED4, 0xFFFFFF5B, 0x00000000, 0xFFFFFFCE, 0x00000000, 0xFFFFFFFF, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 +.word 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFD9, 0x00000044, 0x00000001, 0x80242320, 0x00000024, 0x00000002, 0xF5DE0180, 0xFFFFFFD9, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFD9, 0x00000043, 0x00000007, MakeEntity, Entity_BlueSwitch, 0x0000012C, 0xFFFFFF2E, 0xFFFFFF9C, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignAreaFlag, 0x00000005, 0x00000043, 0x00000002, AssignScript, D_80241CD8_BC5F58, 0x00000013, 0x00000000, 0x00000043, 0x00000008, MakeEntity, 0x802EAED4, 0xFFFFFF7E, 0x00000000, 0xFFFFFFCE, 0x00000000, 0x0000008C, 0x80000000, 0x00000043, 0x00000002, AssignCrateFlag, 0xF8405F45, 0x00000043, 0x00000008, MakeEntity, 0x802EAED4, 0x0000009B, 0x00000000, 0xFFFFFF9C, 0x00000000, 0xFFFFFFFF, 0x80000000, 0x00000043, 0x00000008, MakeEntity, 0x802EAED4, 0xFFFFFF5B, 0x00000000, 0xFFFFFFCE, 0x00000000, 0xFFFFFFFF, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_omo/omo_03/DA6050.data.s b/ver/us/asm/data/world/area_omo/omo_03/DA6050.data.s index 10d5fd8d9c..2f772a76cf 100644 --- a/ver/us/asm/data/world/area_omo/omo_03/DA6050.data.s +++ b/ver/us/asm/data/world/area_omo/omo_03/DA6050.data.s @@ -18,7 +18,7 @@ dlabel D_802415E0_DA6820 .word 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetCamTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241648_DA6888 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000003, 0x00000008, 0x00000001, 0x00000001, 0x00000045, 0x00000002, D_802415E0_DA6820, 0xFE363C8A, 0x0000000A, 0x00000002, 0xF9718884, 0x00000000, 0x00000043, 0x00000001, omo_03_UnsetCamera0MoveFlag1, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000003, GotoMap, 0x80248180, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000057, 0x00000000, 0x00000043, 0x00000002, SetPlayerJumpscale, 0xF24A7D4D, 0x00000043, 0x00000005, PlayerJump, 0xFFFFFF0B, 0x0000010E, 0x000000FA, 0x00000014, 0x00000012, 0x00000000, 0x00000043, 0x00000002, SetPlayerJumpscale, 0xF24A7E80, 0x00000043, 0x00000005, PlayerJump, 0xFFFFFFA1, 0x00000000, 0x000000FA, 0x00000019, 0x00000024, 0x00000002, 0xF9718884, 0x00000000, 0x00000013, 0x00000000, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000003, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000200, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000064, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000045, 0x00000002, D_802415E0_DA6820, 0xFE363C8A, 0x00000056, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000004, 0x00000016, 0x00000001, 0x00000008, 0x00000016, 0x00000001, 0x00000009, 0x00000016, 0x00000001, 0x00000006, 0x0000001C, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7D4D, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFC, 0xFFFFFF6A, 0x00000019, 0x000000FA, 0x00000025, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFC, 0xFFFFFF92, 0x00000000, 0x000000BE, 0x00000014, 0x00000023, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000200, 0x00000001, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000057, 0x00000000, 0x00000043, 0x00000002, SetPlayerJumpscale, 0xF24A7D4D, 0x00000043, 0x00000005, PlayerJump, 0xFFFFFF6A, 0x00000019, 0x000000FA, 0x00000019, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, D_802E9A18, 0xFFFFFF06, 0x0000003C, 0x00000032, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, 0x802EAA30, 0xFFFFFF6A, 0x00000000, 0x000000FA, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80241648_DA6888, 0x00000043, 0x00000008, MakeEntity, 0x802EAB04, 0x000000CB, 0x00000000, 0x000000C8, 0x00000000, 0x00000019, 0x80000000, 0x00000043, 0x00000002, AssignPanelFlag, 0xF8406026, 0x00000043, 0x00000008, MakeEntity, 0x802EA588, 0x00000190, 0x0000003C, 0xFFFFFFCE, 0x00000000, 0x00000088, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405FDD, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000003, 0x00000008, 0x00000001, 0x00000001, 0x00000045, 0x00000002, D_802415E0_DA6820, 0xFE363C8A, 0x0000000A, 0x00000002, 0xF9718884, 0x00000000, 0x00000043, 0x00000001, omo_03_UnsetCamera0MoveFlag1, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000003, GotoMap, 0x80248180, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000057, 0x00000000, 0x00000043, 0x00000002, SetPlayerJumpscale, 0xF24A7D4D, 0x00000043, 0x00000005, PlayerJump, 0xFFFFFF0B, 0x0000010E, 0x000000FA, 0x00000014, 0x00000012, 0x00000000, 0x00000043, 0x00000002, SetPlayerJumpscale, 0xF24A7E80, 0x00000043, 0x00000005, PlayerJump, 0xFFFFFFA1, 0x00000000, 0x000000FA, 0x00000019, 0x00000024, 0x00000002, 0xF9718884, 0x00000000, 0x00000013, 0x00000000, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000003, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000200, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000064, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000045, 0x00000002, D_802415E0_DA6820, 0xFE363C8A, 0x00000056, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000004, 0x00000016, 0x00000001, 0x00000008, 0x00000016, 0x00000001, 0x00000009, 0x00000016, 0x00000001, 0x00000006, 0x0000001C, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7D4D, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFC, 0xFFFFFF6A, 0x00000019, 0x000000FA, 0x00000025, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFC, 0xFFFFFF92, 0x00000000, 0x000000BE, 0x00000014, 0x00000023, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000200, 0x00000001, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000057, 0x00000000, 0x00000043, 0x00000002, SetPlayerJumpscale, 0xF24A7D4D, 0x00000043, 0x00000005, PlayerJump, 0xFFFFFF6A, 0x00000019, 0x000000FA, 0x00000019, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_SavePoint, 0xFFFFFF06, 0x0000003C, 0x00000032, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, 0x802EAA30, 0xFFFFFF6A, 0x00000000, 0x000000FA, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80241648_DA6888, 0x00000043, 0x00000008, MakeEntity, 0x802EAB04, 0x000000CB, 0x00000000, 0x000000C8, 0x00000000, 0x00000019, 0x80000000, 0x00000043, 0x00000002, AssignPanelFlag, 0xF8406026, 0x00000043, 0x00000008, MakeEntity, 0x802EA588, 0x00000190, 0x0000003C, 0xFFFFFFCE, 0x00000000, 0x00000088, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405FDD, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241AA0_DA6CE0 .word 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_omo/omo_06/DBCFD0.data.s b/ver/us/asm/data/world/area_omo/omo_06/DBCFD0.data.s index 47a5b942ae..881f5f8d57 100644 --- a/ver/us/asm/data/world/area_omo/omo_06/DBCFD0.data.s +++ b/ver/us/asm/data/world/area_omo/omo_06/DBCFD0.data.s @@ -12,4 +12,4 @@ dlabel D_8024572C_DBD03C .word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000046, 0x00000001, D_802456C4_DBCFD4, 0x00000013, 0x00000000, 0x00000014, 0x00000001, 0xFE363C8B, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, AddItem, 0xFE363C8A, 0xFE363C80, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000002, AddKeyItem, 0xFE363C8A, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, AddBadge, 0xFE363C8A, 0xFE363C80, 0x00000023, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024580C_DBD11C -.word 0x00000024, 0x00000002, 0xFE363C8A, 0x00000069, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000001, 0x00000024, 0x00000002, 0xF8405FF2, 0x00000001, 0x00000046, 0x00000001, D_8024572C_DBD03C, 0x00000024, 0x00000002, 0xF8405C8D, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, D_802E9A18, 0xFFFFFF38, 0x0000003C, 0x0000012C, 0x00000000, 0x80000000, 0x00000043, 0x00000008, MakeEntity, 0x802EA588, 0xFFFFFEE8, 0x0000003C, 0xFFFFFEDE, 0x00000000, 0x00000082, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405FF3, 0x00000043, 0x00000008, MakeEntity, 0x802EAE30, 0x00000190, 0x00000000, 0x0000003C, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignFlag, 0xF8405FF2, 0x00000043, 0x00000002, AssignScript, D_8024580C_DBD11C, 0x00000043, 0x00000008, MakeEntity, 0x802EAB04, 0x00000064, 0x00000000, 0x00000190, 0x00000000, 0x00000028, 0x80000000, 0x00000043, 0x00000002, AssignPanelFlag, 0xF8406027, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000024, 0x00000002, 0xFE363C8A, 0x00000069, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000001, 0x00000024, 0x00000002, 0xF8405FF2, 0x00000001, 0x00000046, 0x00000001, D_8024572C_DBD03C, 0x00000024, 0x00000002, 0xF8405C8D, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_SavePoint, 0xFFFFFF38, 0x0000003C, 0x0000012C, 0x00000000, 0x80000000, 0x00000043, 0x00000008, MakeEntity, 0x802EA588, 0xFFFFFEE8, 0x0000003C, 0xFFFFFEDE, 0x00000000, 0x00000082, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405FF3, 0x00000043, 0x00000008, MakeEntity, 0x802EAE30, 0x00000190, 0x00000000, 0x0000003C, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignFlag, 0xF8405FF2, 0x00000043, 0x00000002, AssignScript, D_8024580C_DBD11C, 0x00000043, 0x00000008, MakeEntity, 0x802EAB04, 0x00000064, 0x00000000, 0x00000190, 0x00000000, 0x00000028, 0x80000000, 0x00000043, 0x00000002, AssignPanelFlag, 0xF8406027, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_omo/omo_08/DC8100.data.s b/ver/us/asm/data/world/area_omo/omo_08/DC8100.data.s index b3100bba50..e382e4415e 100644 --- a/ver/us/asm/data/world/area_omo/omo_08/DC8100.data.s +++ b/ver/us/asm/data/world/area_omo/omo_08/DC8100.data.s @@ -84,4 +84,4 @@ dlabel D_802470F4_DCB4C4 .word 0x00000003, 0x00000000, 0x00000001, 0x0000000A, 0x00000002, 0xFAA2B581, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x008C0004, 0x008C0001, 0x00000000, 0x000F0006, 0x00000012, 0x00000000, 0x0000000A, 0x00000002, 0xF9718882, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x008C0004, 0x008C0001, 0x00000000, 0x000F0007, 0x0000000A, 0x00000002, 0xF8405FCD, 0x00000000, 0x00000043, 0x00000002, ShowChoice, 0x001E0040, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000002, 0x00000043, 0x00000001, CloseMessage, 0x00000030, 0x00000001, D_802470E8_DCB4B8, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000005, 0x00000001, 0xFE363C80, 0x00000031, 0x00000001, 0xFE363C81, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E86, 0xFE363C81, 0x00000046, 0x00000001, D_80246918_DCACE8, 0x00000012, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0x00000000, 0x008C0004, 0x008C0001, 0x00000000, 0x000F0008, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, ShowChoice, 0x001E0041, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000003, 0x00000043, 0x00000001, CloseMessage, 0x00000030, 0x00000001, D_802470E8_DCB4B8, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000005, 0x00000001, 0xFE363C80, 0x00000031, 0x00000001, 0xFE363C81, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E86, 0xFE363C81, 0x00000046, 0x00000001, D_80246918_DCACE8, 0x00000012, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0x00000000, 0x008C0004, 0x008C0001, 0x00000000, 0x000F0008, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x008C0006, 0x008C0002, 0x00000000, 0x000F0016, 0x0000001B, 0x00000001, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x008C0004, 0x008C0001, 0x00000000, 0x000F0007, 0x00000043, 0x00000002, ShowChoice, 0x001E003F, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000003, 0x00000043, 0x00000001, CloseMessage, 0x00000030, 0x00000001, D_802470F4_DCB4C4, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000005, 0x00000001, 0xFE363C80, 0x00000031, 0x00000001, 0xFE363C81, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E86, 0xFE363C81, 0x00000046, 0x00000001, D_80246778_DCAB48, 0x00000012, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0x00000000, 0x008C0004, 0x008C0001, 0x00000000, 0x000F0008, 0x00000013, 0x00000000, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80247438_DCB808 -.word 0xF2486D98, 0xF247316B, 0xF24C1E84, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000046, 0x00000001, D_80246558_DCA928, 0x00000043, 0x00000002, GetLoadType, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000024, 0x00000002, 0xFD050F80, 0x00000000, 0x00000024, 0x00000002, 0xFD050F81, D_80247438_DCB808, 0x00000024, 0x00000002, 0xFD050F82, 0x00000000, 0x00000044, 0x00000001, D_80243D30_DC8100, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000001, 0x00000044, 0x00000001, D_80246E30_DCB200, 0x00000016, 0x00000001, 0x00000002, 0x00000044, 0x00000001, D_80246B08_DCAED8, 0x0000001C, 0x00000000, 0x00000024, 0x00000002, 0xFD050F80, 0x00000000, 0x00000024, 0x00000002, 0xFD050F81, D_80247438_DCB808, 0x00000024, 0x00000002, 0xFD050F82, 0x00000000, 0x00000044, 0x00000001, D_80243D30_DC8100, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000001, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, D_802E9A18, 0xFFFFFEA2, 0x0000003C, 0x00000032, 0x00000000, 0x80000000, 0x00000043, 0x00000008, MakeEntity, 0x802EA588, 0x0000015E, 0x0000003C, 0x0000003C, 0x00000000, 0x00000080, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405FF9, 0x00000043, 0x00000008, MakeEntity, 0x802EAB04, 0xFFFFFF38, 0x00000000, 0x000000C8, 0x00000000, 0x00000014, 0x80000000, 0x00000043, 0x00000002, AssignPanelFlag, 0xF8406028, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 +.word 0xF2486D98, 0xF247316B, 0xF24C1E84, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000046, 0x00000001, D_80246558_DCA928, 0x00000043, 0x00000002, GetLoadType, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000024, 0x00000002, 0xFD050F80, 0x00000000, 0x00000024, 0x00000002, 0xFD050F81, D_80247438_DCB808, 0x00000024, 0x00000002, 0xFD050F82, 0x00000000, 0x00000044, 0x00000001, D_80243D30_DC8100, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000001, 0x00000044, 0x00000001, D_80246E30_DCB200, 0x00000016, 0x00000001, 0x00000002, 0x00000044, 0x00000001, D_80246B08_DCAED8, 0x0000001C, 0x00000000, 0x00000024, 0x00000002, 0xFD050F80, 0x00000000, 0x00000024, 0x00000002, 0xFD050F81, D_80247438_DCB808, 0x00000024, 0x00000002, 0xFD050F82, 0x00000000, 0x00000044, 0x00000001, D_80243D30_DC8100, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000001, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_SavePoint, 0xFFFFFEA2, 0x0000003C, 0x00000032, 0x00000000, 0x80000000, 0x00000043, 0x00000008, MakeEntity, 0x802EA588, 0x0000015E, 0x0000003C, 0x0000003C, 0x00000000, 0x00000080, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405FF9, 0x00000043, 0x00000008, MakeEntity, 0x802EAB04, 0xFFFFFF38, 0x00000000, 0x000000C8, 0x00000000, 0x00000014, 0x80000000, 0x00000043, 0x00000002, AssignPanelFlag, 0xF8406028, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_omo/omo_10/DDC720.data.s b/ver/us/asm/data/world/area_omo/omo_10/DDC720.data.s index 23a5e6a9ba..f609697155 100644 --- a/ver/us/asm/data/world/area_omo/omo_10/DDC720.data.s +++ b/ver/us/asm/data/world/area_omo/omo_10/DDC720.data.s @@ -3,4 +3,4 @@ .section .data dlabel D_80244D70_DDC720 -.word 0x00000043, 0x00000008, MakeEntity, 0x802EA588, 0xFFFFFEA2, 0x0000003C, 0x0000003C, 0x00000000, 0x0000008C, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8406018, 0x00000043, 0x00000007, MakeEntity, 0x802EA7E0, 0x000000FA, 0x0000003C, 0x00000037, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, D_802E9A18, 0x00000096, 0x0000003C, 0x00000037, 0x00000000, 0x80000000, 0x00000043, 0x00000008, MakeEntity, 0x802EAB04, 0x00000000, 0x00000000, 0x000000C8, 0x00000000, 0x00000020, 0x80000000, 0x00000043, 0x00000002, AssignPanelFlag, 0xF8406029, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000043, 0x00000008, MakeEntity, 0x802EA588, 0xFFFFFEA2, 0x0000003C, 0x0000003C, 0x00000000, 0x0000008C, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8406018, 0x00000043, 0x00000007, MakeEntity, 0x802EA7E0, 0x000000FA, 0x0000003C, 0x00000037, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_SavePoint, 0x00000096, 0x0000003C, 0x00000037, 0x00000000, 0x80000000, 0x00000043, 0x00000008, MakeEntity, 0x802EAB04, 0x00000000, 0x00000000, 0x000000C8, 0x00000000, 0x00000020, 0x80000000, 0x00000043, 0x00000002, AssignPanelFlag, 0xF8406029, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_osr/osr_02/AB2B00.data.s b/ver/us/asm/data/world/area_osr/osr_02/AB2B00.data.s index 581ac2995d..463168eda1 100644 --- a/ver/us/asm/data/world/area_osr/osr_02/AB2B00.data.s +++ b/ver/us/asm/data/world/area_osr/osr_02/AB2B00.data.s @@ -3,4 +3,4 @@ .section .data dlabel D_80240990_AB2B00 -.word 0x0000000A, 0x00000002, 0xF8405D7D, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0x00000059, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000008, MakeEntity, 0x802EA588, 0x000000B4, 0x0000003C, 0xFFFFFFF1, 0x00000000, 0x0000008E, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF84061EB, 0x00000043, 0x00000007, MakeEntity, D_802E9A18, 0xFFFFFF9C, 0x0000003C, 0xFFFFFFCE, 0x00000000, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 +.word 0x0000000A, 0x00000002, 0xF8405D7D, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0x00000059, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000008, MakeEntity, 0x802EA588, 0x000000B4, 0x0000003C, 0xFFFFFFF1, 0x00000000, 0x0000008E, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF84061EB, 0x00000043, 0x00000007, MakeEntity, Entity_SavePoint, 0xFFFFFF9C, 0x0000003C, 0xFFFFFFCE, 0x00000000, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_pra/pra_03/D543C0.data.s b/ver/us/asm/data/world/area_pra/pra_03/D543C0.data.s index ba75b22c79..9fed07d7a5 100644 --- a/ver/us/asm/data/world/area_pra/pra_03/D543C0.data.s +++ b/ver/us/asm/data/world/area_pra/pra_03/D543C0.data.s @@ -6,4 +6,4 @@ dlabel D_80240710_D543C0 .word 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000002, 0xFE363C81, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C83, 0x00000013, 0x00000000, 0x00000043, 0x00000005, SetCamTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802407A0_D54450 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000006, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x0000000A, 0x00000002, 0xFD050F80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFF51, 0x00000045, 0x00000002, D_80240710_D543C0, 0xFE363C8A, 0x00000043, 0x00000001, func_802400AC_D53D5C, 0x00000043, 0x00000002, SetPlayerJumpscale, 0xF24A8280, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF38, 0x00000024, 0x00000002, 0xFE363C82, 0x0000000F, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000045, 0x00000002, D_80240710_D543C0, 0xFE363C8A, 0x00000043, 0x00000001, func_80240020_D53CD0, 0x00000043, 0x00000002, SetPlayerJumpscale, 0xF24A7D4D, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000023, 0x00000013, 0x00000000, 0x00000043, 0x00000005, PlayerJump, 0xFE363C80, 0xFE363C81, 0xFE363C89, 0xFE363C82, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000001, func_80240138_D53DE8, 0x00000057, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802EAA30, 0x0000007C, 0xFFFFFF38, 0xFFFFFFB5, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_802407A0_D54450, 0x00000043, 0x00000007, MakeEntity, D_802E9A18, 0xFFFFFF38, 0x0000003C, 0xFFFFFFB5, 0x00000000, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000006, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x0000000A, 0x00000002, 0xFD050F80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFF51, 0x00000045, 0x00000002, D_80240710_D543C0, 0xFE363C8A, 0x00000043, 0x00000001, func_802400AC_D53D5C, 0x00000043, 0x00000002, SetPlayerJumpscale, 0xF24A8280, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF38, 0x00000024, 0x00000002, 0xFE363C82, 0x0000000F, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000045, 0x00000002, D_80240710_D543C0, 0xFE363C8A, 0x00000043, 0x00000001, func_80240020_D53CD0, 0x00000043, 0x00000002, SetPlayerJumpscale, 0xF24A7D4D, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000023, 0x00000013, 0x00000000, 0x00000043, 0x00000005, PlayerJump, 0xFE363C80, 0xFE363C81, 0xFE363C89, 0xFE363C82, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000001, func_80240138_D53DE8, 0x00000057, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802EAA30, 0x0000007C, 0xFFFFFF38, 0xFFFFFFB5, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_802407A0_D54450, 0x00000043, 0x00000007, MakeEntity, Entity_SavePoint, 0xFFFFFF38, 0x0000003C, 0xFFFFFFB5, 0x00000000, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_pra/pra_29/D7DE90.data.s b/ver/us/asm/data/world/area_pra/pra_29/D7DE90.data.s index 62165c751c..04ab7c41cb 100644 --- a/ver/us/asm/data/world/area_pra/pra_29/D7DE90.data.s +++ b/ver/us/asm/data/world/area_pra/pra_29/D7DE90.data.s @@ -3,7 +3,7 @@ .section .data dlabel D_80241340_D7DE90 -.word 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000053, 0x00000012, 0x00000000, 0x00000043, 0x00000008, MakeEntity, D_802E9BD4, 0x0000014A, 0x00000000, 0xFFFFFFB3, 0x00000000, 0x00000002, 0x80000000, 0x00000043, 0x00000008, MakeEntity, D_802E9BD4, 0x0000014A, 0x00000000, 0x0000004D, 0x00000000, 0x00000001, 0x80000000, 0x00000043, 0x00000002, AssignAreaFlag, 0x00000002, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C84, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C85, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000053, 0x00000012, 0x00000000, 0x00000043, 0x00000008, MakeEntity, Entity_BlueSwitch, 0x0000014A, 0x00000000, 0xFFFFFFB3, 0x00000000, 0x00000002, 0x80000000, 0x00000043, 0x00000008, MakeEntity, Entity_BlueSwitch, 0x0000014A, 0x00000000, 0x0000004D, 0x00000000, 0x00000001, 0x80000000, 0x00000043, 0x00000002, AssignAreaFlag, 0x00000002, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C84, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C85, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802414E0_D7E030 .word 0x0000003E, 0x00000002, 0x00000010, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, pra_29_ReflectWall, 0x00000016, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000001, pra_29_ReflectWall, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, pra_29_ReflectFloor, 0xFE363C80, 0x00000043, 0x00000002, pra_29_ReflectPartner, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_pra/pra_33/D8B060.data.s b/ver/us/asm/data/world/area_pra/pra_33/D8B060.data.s index addcd2cd4d..2640671a2f 100644 --- a/ver/us/asm/data/world/area_pra/pra_33/D8B060.data.s +++ b/ver/us/asm/data/world/area_pra/pra_33/D8B060.data.s @@ -3,4 +3,4 @@ .section .data dlabel D_80241980_D8B060 -.word 0x0000000A, 0x00000002, 0xF9718883, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF9718883, 0x00000001, 0x0000000A, 0x00000002, 0xFD050F80, 0x00000000, 0x00000024, 0x00000002, 0xFD050F80, 0x00000001, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFD050F80, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x0000001D, 0x0000002E, 0x00000000, 0x00000043, 0x00000001, func_80240F20_D8A600, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x0000001D, 0x7FFFFE00, 0x00000043, 0x00000001, func_80240F58_D8A638, 0x0000000A, 0x00000002, 0xFD050F80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x000000B4, 0x00000043, 0x00000005, MakeLerp, 0x000000B4, 0x00000168, 0x0000000F, 0x00000000, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x000000B4, 0x0000000F, 0x00000000, 0x00000013, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateGroup, 0x00000033, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000001C, 0x00000043, 0x00000001, func_80240F20_D8A600, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000001, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C82, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000043, 0x00000001, func_80241000_D8A6E0, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xF9718883, 0x00000000, 0x00000043, 0x00000001, func_80240F20_D8A600, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000001D, 0x7FFFFE00, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF840616B, 0x00000000, 0x00000024, 0x00000002, 0xF9718883, 0x00000000, 0x00000043, 0x00000007, MakeEntity, D_802E9BB0, 0x00000136, 0x00000000, 0x0000006E, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80241980_D8B060, 0x00000043, 0x00000007, MakeEntity, D_802E9BB0, 0x00000136, 0x00000000, 0xFFFFFF92, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80241980_D8B060, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000001C, 0x00000031, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000001D, 0x00000031, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000001D, 0x7FFFFE00, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 +.word 0x0000000A, 0x00000002, 0xF9718883, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF9718883, 0x00000001, 0x0000000A, 0x00000002, 0xFD050F80, 0x00000000, 0x00000024, 0x00000002, 0xFD050F80, 0x00000001, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFD050F80, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x0000001D, 0x0000002E, 0x00000000, 0x00000043, 0x00000001, func_80240F20_D8A600, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x0000001D, 0x7FFFFE00, 0x00000043, 0x00000001, func_80240F58_D8A638, 0x0000000A, 0x00000002, 0xFD050F80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x000000B4, 0x00000043, 0x00000005, MakeLerp, 0x000000B4, 0x00000168, 0x0000000F, 0x00000000, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x000000B4, 0x0000000F, 0x00000000, 0x00000013, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateGroup, 0x00000033, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000001C, 0x00000043, 0x00000001, func_80240F20_D8A600, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000001, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C82, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000043, 0x00000001, func_80241000_D8A6E0, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xF9718883, 0x00000000, 0x00000043, 0x00000001, func_80240F20_D8A600, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000001D, 0x7FFFFE00, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF840616B, 0x00000000, 0x00000024, 0x00000002, 0xF9718883, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_RedSwitch, 0x00000136, 0x00000000, 0x0000006E, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80241980_D8B060, 0x00000043, 0x00000007, MakeEntity, Entity_RedSwitch, 0x00000136, 0x00000000, 0xFFFFFF92, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80241980_D8B060, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000001C, 0x00000031, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000001D, 0x00000031, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000001D, 0x7FFFFE00, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_pra/pra_40/D9AE80.data.s b/ver/us/asm/data/world/area_pra/pra_40/D9AE80.data.s index c6829c6056..189fbb3c3c 100644 --- a/ver/us/asm/data/world/area_pra/pra_40/D9AE80.data.s +++ b/ver/us/asm/data/world/area_pra/pra_40/D9AE80.data.s @@ -3,4 +3,4 @@ .section .data dlabel D_802414D0_D9AE80 -.word 0x00000043, 0x00000007, MakeEntity, D_802E9A18, 0x000000A5, 0x0000003C, 0xFFFFFFCE, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA7E0, 0x00000055, 0x0000003C, 0xFFFFFFCE, 0x00000000, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000043, 0x00000007, MakeEntity, Entity_SavePoint, 0x000000A5, 0x0000003C, 0xFFFFFFCE, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA7E0, 0x00000055, 0x0000003C, 0xFFFFFFCE, 0x00000000, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_sam/sam_02/D09AD0.data.s b/ver/us/asm/data/world/area_sam/sam_02/D09AD0.data.s index 8fbdb046c3..b6150f330d 100644 --- a/ver/us/asm/data/world/area_sam/sam_02/D09AD0.data.s +++ b/ver/us/asm/data/world/area_sam/sam_02/D09AD0.data.s @@ -231,4 +231,4 @@ dlabel D_8024B30C_D10A3C .word 0x00000008, D_80249130_D0E860, 0xC3660000, 0x00000000, 0x43200000, 0x00002D09, 0x00000000, 0x00000001, 0x00050301, 0x0000005A, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00AF0001, 0x00AF0002, 0x00AF0003, 0x00AF0003, 0x00AF0001, 0x00AF0001, 0x00AF0000, 0x00AF0000, 0x00AF0003, 0x00AF0003, 0x00AF0003, 0x00AF0003, 0x00AF0003, 0x00AF0003, 0x00AF0003, 0x00AF0003, 0x00000000, 0x00000000, 0x00000000, 0x001A0002, 0x00000006, D_8024A38C_D0FABC, 0x00000001, 0x00000002, D_8024AF2C_D1065C, 0x00000001, 0x00000001, D_8024B30C_D10A3C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000006, D_8024A38C_D0FABC, 0x00000001, 0x00000001, D_8024B30C_D10A3C, 0x00000000, 0x00000000, 0x00000000, 0x00000000 dlabel D_8024B550_D10C80 -.word 0x0000000A, 0x00000002, 0xF840611F, 0x00000001, 0x00000043, 0x00000007, MakeItemEntity, 0x0000008E, 0x0000015E, 0x00000000, 0xFFFFFF88, 0x00000011, 0xF8406120, 0x00000043, 0x00000007, MakeItemEntity, 0x0000008A, 0x0000014A, 0x00000000, 0xFFFFFF9C, 0x00000011, 0xF8406121, 0x00000043, 0x00000007, MakeItemEntity, 0x0000008A, 0x0000014A, 0x00000000, 0xFFFFFF74, 0x00000011, 0xF8406122, 0x00000043, 0x00000007, MakeItemEntity, 0x0000008A, 0x00000172, 0x00000000, 0xFFFFFF9C, 0x00000011, 0xF8406123, 0x00000043, 0x00000007, MakeItemEntity, 0x0000008A, 0x00000172, 0x00000000, 0xFFFFFF74, 0x00000011, 0xF8406124, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, D_802E9A18, 0x000000A0, 0x0000003C, 0x000000C8, 0x00000000, 0x80000000, 0x00000044, 0x00000001, D_8024B550_D10C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 +.word 0x0000000A, 0x00000002, 0xF840611F, 0x00000001, 0x00000043, 0x00000007, MakeItemEntity, 0x0000008E, 0x0000015E, 0x00000000, 0xFFFFFF88, 0x00000011, 0xF8406120, 0x00000043, 0x00000007, MakeItemEntity, 0x0000008A, 0x0000014A, 0x00000000, 0xFFFFFF9C, 0x00000011, 0xF8406121, 0x00000043, 0x00000007, MakeItemEntity, 0x0000008A, 0x0000014A, 0x00000000, 0xFFFFFF74, 0x00000011, 0xF8406122, 0x00000043, 0x00000007, MakeItemEntity, 0x0000008A, 0x00000172, 0x00000000, 0xFFFFFF9C, 0x00000011, 0xF8406123, 0x00000043, 0x00000007, MakeItemEntity, 0x0000008A, 0x00000172, 0x00000000, 0xFFFFFF74, 0x00000011, 0xF8406124, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_SavePoint, 0x000000A0, 0x0000003C, 0x000000C8, 0x00000000, 0x80000000, 0x00000044, 0x00000001, D_8024B550_D10C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_sam/sam_06/D2BC50.data.s b/ver/us/asm/data/world/area_sam/sam_06/D2BC50.data.s index ef23b5203f..c3136da44e 100644 --- a/ver/us/asm/data/world/area_sam/sam_06/D2BC50.data.s +++ b/ver/us/asm/data/world/area_sam/sam_06/D2BC50.data.s @@ -3,4 +3,4 @@ .section .data dlabel D_8024BDC0_D2BC50 -.word 0x00000043, 0x00000007, MakeEntity, D_802E9A18, 0xFFFFFF06, 0x00000078, 0x0000008C, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeItemEntity, 0x00000032, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000043, 0x00000007, MakeEntity, Entity_SavePoint, 0xFFFFFF06, 0x00000078, 0x0000008C, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeItemEntity, 0x00000032, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_sam/sam_07/D2E0B0.data.s b/ver/us/asm/data/world/area_sam/sam_07/D2E0B0.data.s index 1f2f19ce7e..b8a975fdd5 100644 --- a/ver/us/asm/data/world/area_sam/sam_07/D2E0B0.data.s +++ b/ver/us/asm/data/world/area_sam/sam_07/D2E0B0.data.s @@ -3,4 +3,4 @@ .section .data dlabel D_80242380_D2E0B0 -.word 0x0000000A, 0x00000002, 0xF840612F, 0x00000000, 0x00000043, 0x00000007, MakeEntity, D_802E9C1C, 0xFFFFFC4F, 0xFFFFFF4D, 0xFFFFFFB5, 0x00000000, 0x80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000002, AssignScript, 0x80242784, 0x00000012, 0x00000000, 0x00000043, 0x00000007, MakeEntity, D_802E9C1C, 0xFFFFFC4F, 0x00000001, 0xFFFFFFB5, 0x00000000, 0x80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000002, AssignScript, 0x80242784, 0x00000013, 0x00000000, 0x00000043, 0x00000007, MakeEntity, D_802EA0C4, 0x0000032A, 0x0000014A, 0xFFFFFF88, 0x0000005A, 0x80000000, 0x00000043, 0x00000008, MakeEntity, 0x802EA588, 0x0000032A, 0x00000168, 0xFFFFFF88, 0x0000005A, 0x0000008E, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8406130, 0x00000043, 0x00000007, MakeEntity, D_802E9A18, 0xFFFFFABA, 0xFFFFFFC4, 0xFFFFFF88, 0x00000000, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 +.word 0x0000000A, 0x00000002, 0xF840612F, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_GreenStompSwitch, 0xFFFFFC4F, 0xFFFFFF4D, 0xFFFFFFB5, 0x00000000, 0x80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000002, AssignScript, 0x80242784, 0x00000012, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_GreenStompSwitch, 0xFFFFFC4F, 0x00000001, 0xFFFFFFB5, 0x00000000, 0x80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000002, AssignScript, 0x80242784, 0x00000013, 0x00000000, 0x00000043, 0x00000007, MakeEntity, D_802EA0C4, 0x0000032A, 0x0000014A, 0xFFFFFF88, 0x0000005A, 0x80000000, 0x00000043, 0x00000008, MakeEntity, 0x802EA588, 0x0000032A, 0x00000168, 0xFFFFFF88, 0x0000005A, 0x0000008E, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8406130, 0x00000043, 0x00000007, MakeEntity, Entity_SavePoint, 0xFFFFFABA, 0xFFFFFFC4, 0xFFFFFF88, 0x00000000, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_sam/sam_08/D314C0.data.s b/ver/us/asm/data/world/area_sam/sam_08/D314C0.data.s index 7c7134a92c..ade4405603 100644 --- a/ver/us/asm/data/world/area_sam/sam_08/D314C0.data.s +++ b/ver/us/asm/data/world/area_sam/sam_08/D314C0.data.s @@ -30,4 +30,4 @@ dlabel D_80241CA8_D31928 .word 0x0000000A, 0x00000002, 0xF8406131, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, sam_08_UnkFunc40, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000001, 0x00200000, 0x00000043, 0x00000001, sam_08_SetOverrideFlags_40, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, sam_08_UnkFunc20, 0xFD050F81, 0xFE363C89, 0x00000043, 0x00000003, FindKeyItem, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, sam_08_UnkFunc38, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, sam_08_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, sam_08_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_802401CC_D2FE4C, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, sam_08_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, sam_08_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, sam_08_SwitchToPartner, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, sam_08_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, sam_08_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80241B44_D317C4, 0x00000043, 0x00000003, sam_08_UnkFunc18, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF8406131, 0x00000001, 0x00000043, 0x00000002, sam_08_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000001, sam_08_UnkFunc19, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, sam_08_UnkFunc17, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242128_D31DA8 -.word 0x00000043, 0x00000007, MakeEntity, 0x802EA910, 0xFFFFFCE0, 0x000000D2, 0xFFFFFF7E, 0x00000000, 0x80000000, 0x00000024, 0x00000002, 0xFD050F81, 0xFE363C80, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8406131, 0x00000043, 0x00000002, AssignScript, D_80241CA8_D31928, 0x00000043, 0x00000007, MakeItemEntity, 0x00000085, 0xFFFFFCFE, 0xFFFFFF10, 0x0000001E, 0x00000013, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0x0000004B, 0x00000043, 0x00000007, MakeEntity, D_802E9BD4, 0xFFFFFC40, 0xFFFFFF88, 0xFFFFFFDB, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignAreaFlag, 0x00000006, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 +.word 0x00000043, 0x00000007, MakeEntity, 0x802EA910, 0xFFFFFCE0, 0x000000D2, 0xFFFFFF7E, 0x00000000, 0x80000000, 0x00000024, 0x00000002, 0xFD050F81, 0xFE363C80, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8406131, 0x00000043, 0x00000002, AssignScript, D_80241CA8_D31928, 0x00000043, 0x00000007, MakeItemEntity, 0x00000085, 0xFFFFFCFE, 0xFFFFFF10, 0x0000001E, 0x00000013, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0x0000004B, 0x00000043, 0x00000007, MakeEntity, Entity_BlueSwitch, 0xFFFFFC40, 0xFFFFFF88, 0xFFFFFFDB, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignAreaFlag, 0x00000006, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_sam/sam_10/D38840.data.s b/ver/us/asm/data/world/area_sam/sam_10/D38840.data.s index 72284727bb..e11c336ab3 100644 --- a/ver/us/asm/data/world/area_sam/sam_10/D38840.data.s +++ b/ver/us/asm/data/world/area_sam/sam_10/D38840.data.s @@ -3,7 +3,7 @@ .section .data dlabel D_80241040_D38840 -.word 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000002, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000004, ShowGotItem, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000008, MakeEntity, 0x802EA5AC, 0x00000307, 0x0000021C, 0xFFFFFFCE, 0x00000000, 0x00000123, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8406137, 0x00000043, 0x00000007, MakeItemEntity, 0x0000015C, 0xFFFFFF60, 0x0000012C, 0xFFFFFF92, 0x00000011, 0xF8406138, 0x0000000C, 0x00000002, 0xF5DE0180, 0x0000004D, 0x00000043, 0x00000007, DropItemEntityB, 0x0000006C, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_802402BC_D37ABC, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000012, 0x00000000, 0x00000043, 0x00000007, DropItemEntityB, 0x0000006C, 0xFFFFFF8B, 0x000000B3, 0xFFFFFFC9, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_802402BC_D37ABC, 0x00000013, 0x00000000, 0x00000043, 0x00000007, MakeEntity, D_802E9A18, 0xFFFFFF06, 0x00000366, 0xFFFFFF2E, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA7E0, 0x00000302, 0x000004B0, 0xFFFFFF1F, 0x00000000, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000002, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000004, ShowGotItem, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000008, MakeEntity, 0x802EA5AC, 0x00000307, 0x0000021C, 0xFFFFFFCE, 0x00000000, 0x00000123, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8406137, 0x00000043, 0x00000007, MakeItemEntity, 0x0000015C, 0xFFFFFF60, 0x0000012C, 0xFFFFFF92, 0x00000011, 0xF8406138, 0x0000000C, 0x00000002, 0xF5DE0180, 0x0000004D, 0x00000043, 0x00000007, DropItemEntityB, 0x0000006C, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_802402BC_D37ABC, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000012, 0x00000000, 0x00000043, 0x00000007, DropItemEntityB, 0x0000006C, 0xFFFFFF8B, 0x000000B3, 0xFFFFFFC9, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_802402BC_D37ABC, 0x00000013, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_SavePoint, 0xFFFFFF06, 0x00000366, 0xFFFFFF2E, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA7E0, 0x00000302, 0x000004B0, 0xFFFFFF1F, 0x00000000, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802411F0_D389F0 .word 0x00000028, 0xFFFFFF38, 0x0000002B, 0xFFFFFF1A, 0x0000002E, 0xFFFFFEFC, 0x00000031, 0xFFFFFEDE, 0x00000034, 0xFFFFFEC0, 0x00000037, 0xFFFFFEA2, 0x0000003A, 0xFFFFFE84, 0x0000003D, 0xFFFFFE66, 0x00000040, 0xFFFFFE48, 0x00000043, 0xFFFFFE2A, 0x00000046, 0xFFFFFDEE, 0x00000049, 0xFFFFFDD0, 0x0000004C, 0xFFFFFDB2, 0x0000004F, 0xFFFFFD94, 0x00000052, 0xFFFFFD76, 0x00000055, 0xFFFFFD58, 0x00000058, 0xFFFFFD3A, 0x0000005B, 0xFFFFFD1C, 0x0000005E, 0xFFFFFCFE, 0x00000061, 0xFFFFFCE0, 0x00000064, 0xFFFFFCA4, 0x00000067, 0xFFFFFC86, 0x0000006A, 0xFFFFFC68, 0x0000006D, 0xFFFFFC4A, 0x00000070, 0xFFFFFC2C, 0x00000073, 0xFFFFFC0E, 0x00000076, 0xFFFFFBF0, 0x00000079, 0xFFFFFBD2, 0x0000007C, 0xFFFFFBB4, 0x0000007F, 0xFFFFFB96 diff --git a/ver/us/asm/data/world/area_sbk/sbk_99/95B190.data.s b/ver/us/asm/data/world/area_sbk/sbk_99/95B190.data.s index e80403ca01..13ed749e86 100644 --- a/ver/us/asm/data/world/area_sbk/sbk_99/95B190.data.s +++ b/ver/us/asm/data/world/area_sbk/sbk_99/95B190.data.s @@ -3,4 +3,4 @@ .section .data dlabel D_802402E0_95B190 -.word 0x00000043, 0x00000007, MakeEntity, D_802E9A18, 0x00000091, 0x0000003C, 0xFFFFFE89, 0x0000002D, 0x80000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA7E0, 0x00000058, 0x0000003C, 0xFFFFFEBC, 0x00000028, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000043, 0x00000007, MakeEntity, Entity_SavePoint, 0x00000091, 0x0000003C, 0xFFFFFE89, 0x0000002D, 0x80000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA7E0, 0x00000058, 0x0000003C, 0xFFFFFEBC, 0x00000028, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_01/86BC00.data.s b/ver/us/asm/data/world/area_tik/tik_01/86BC00.data.s index 5fad50e658..7a94214fa3 100644 --- a/ver/us/asm/data/world/area_tik/tik_01/86BC00.data.s +++ b/ver/us/asm/data/world/area_tik/tik_01/86BC00.data.s @@ -18,7 +18,7 @@ dlabel D_8024290C_86BDBC .word 0x00000043, 0x00000003, GotoMap, 0x80243280, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024293C_86BDEC -.word 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x0000208E, 0x00000024, 0x00000002, 0xF840630D, 0x00000001, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D0A, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA19C, 0xFFFFFF10, 0xFFFFFFF6, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80242874_86BD24, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000000B, 0x7FFFFE00, 0x00000013, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000011, 0x7FFFFE00, 0x0000000A, 0x00000002, 0xF840630D, 0x00000000, 0x00000043, 0x00000007, MakeEntity, D_802E9BD4, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignAreaFlag, 0x00000003, 0x00000024, 0x00000002, 0xFD050F81, 0xFE363C80, 0x00000047, 0x00000005, D_8024293C_86BDEC, 0x00020000, 0xF9718883, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D2D, 0x00000001, 0x00000043, 0x00000005, tik_01_SetEntityPosition, 0xFD050F81, 0x0000007D, 0xFFFFFFF6, 0x00000019, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x0000000A, MakeEntity, 0x802EAF80, 0x00000096, 0xFFFFFFF6, 0xFFFFFFAE, 0x00000000, 0x00000002, D_802428AC_86BD5C, 0x0000078D, 0x80000000, 0x00000043, 0x0000000A, MakeEntity, 0x802EAF80, 0x00000032, 0xFFFFFFF6, 0xFFFFFFAE, 0x00000000, 0x00000003, D_802428DC_86BD8C, 0x0000078D, 0x80000000, 0x00000043, 0x0000000A, MakeEntity, 0x802EAF80, 0xFFFFFFCE, 0xFFFFFFF6, 0xFFFFFFAE, 0x00000000, 0x00000004, D_8024290C_86BDBC, 0x0000078D, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x0000208E, 0x00000024, 0x00000002, 0xF840630D, 0x00000001, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D0A, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA19C, 0xFFFFFF10, 0xFFFFFFF6, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80242874_86BD24, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000000B, 0x7FFFFE00, 0x00000013, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000011, 0x7FFFFE00, 0x0000000A, 0x00000002, 0xF840630D, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_BlueSwitch, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignAreaFlag, 0x00000003, 0x00000024, 0x00000002, 0xFD050F81, 0xFE363C80, 0x00000047, 0x00000005, D_8024293C_86BDEC, 0x00020000, 0xF9718883, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D2D, 0x00000001, 0x00000043, 0x00000005, tik_01_SetEntityPosition, 0xFD050F81, 0x0000007D, 0xFFFFFFF6, 0x00000019, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x0000000A, MakeEntity, 0x802EAF80, 0x00000096, 0xFFFFFFF6, 0xFFFFFFAE, 0x00000000, 0x00000002, D_802428AC_86BD5C, 0x0000078D, 0x80000000, 0x00000043, 0x0000000A, MakeEntity, 0x802EAF80, 0x00000032, 0xFFFFFFF6, 0xFFFFFFAE, 0x00000000, 0x00000003, D_802428DC_86BD8C, 0x0000078D, 0x80000000, 0x00000043, 0x0000000A, MakeEntity, 0x802EAF80, 0xFFFFFFCE, 0xFFFFFFF6, 0xFFFFFFAE, 0x00000000, 0x00000004, D_8024290C_86BDBC, 0x0000078D, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242B50_86C000 .short 0x0000, 0x0000, 0x0018, 0x0018, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0063, 0x0000, 0x0000 diff --git a/ver/us/asm/data/world/area_tik/tik_06/879860.data.s b/ver/us/asm/data/world/area_tik/tik_06/879860.data.s index ef3da9356a..613147fea0 100644 --- a/ver/us/asm/data/world/area_tik/tik_06/879860.data.s +++ b/ver/us/asm/data/world/area_tik/tik_06/879860.data.s @@ -12,4 +12,4 @@ dlabel D_80242AC8_8799A8 .word 0x00000024, 0x00000002, 0xF8405D07, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000014, 0x7FFFFE00, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242B00_8799E0 -.word 0x00000024, 0x00000002, 0xF8405D08, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000000E, 0x7FFFFE00, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, D_802E9A18, 0x00000078, 0x00000032, 0xFFFFFFB5, 0x00000000, 0x80000000, 0x00000043, 0x00000003, EnableModel, 0x00000023, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000008, 0x7FFFFE00, 0x0000000A, 0x00000002, 0xF8405D06, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802BCE84, 0xFFFFFE99, 0xFFFFFFF6, 0xFFFFFFF7, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80242A9C_87997C, 0x00000012, 0x00000000, 0x00000044, 0x00000001, D_80242980_879860, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D07, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA10C, 0x000000BE, 0xFFFFFFF6, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80242AC8_8799A8, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000014, 0x7FFFFE00, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D08, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA19C, 0xFFFFFDE4, 0xFFFFFFF6, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80242B00_8799E0, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000000E, 0x7FFFFE00, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000024, 0x00000002, 0xF8405D08, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000000E, 0x7FFFFE00, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_SavePoint, 0x00000078, 0x00000032, 0xFFFFFFB5, 0x00000000, 0x80000000, 0x00000043, 0x00000003, EnableModel, 0x00000023, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000008, 0x7FFFFE00, 0x0000000A, 0x00000002, 0xF8405D06, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802BCE84, 0xFFFFFE99, 0xFFFFFFF6, 0xFFFFFFF7, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80242A9C_87997C, 0x00000012, 0x00000000, 0x00000044, 0x00000001, D_80242980_879860, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D07, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA10C, 0x000000BE, 0xFFFFFFF6, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80242AC8_8799A8, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000014, 0x7FFFFE00, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D08, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA19C, 0xFFFFFDE4, 0xFFFFFFF6, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80242B00_8799E0, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000000E, 0x7FFFFE00, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_08/881770.data.s b/ver/us/asm/data/world/area_tik/tik_08/881770.data.s index 4f6bb1b8f0..4d5a5ff608 100644 --- a/ver/us/asm/data/world/area_tik/tik_08/881770.data.s +++ b/ver/us/asm/data/world/area_tik/tik_08/881770.data.s @@ -9,4 +9,4 @@ dlabel D_80242A7C_88186C .word 0x00000043, 0x00000003, GotoMap, 0x802433C8, 0x00000003, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242AAC_88189C -.word 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x0000208E, 0x00000024, 0x00000002, 0xF840630E, 0x00000001, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF840630E, 0x00000000, 0x00000043, 0x00000007, MakeEntity, D_802E9BD4, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignAreaFlag, 0x00000004, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000047, 0x00000005, D_80242AAC_88189C, 0x00020000, 0xF9718884, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D2F, 0x00000001, 0x00000043, 0x00000005, tik_08_SetEntityPosition, 0xFD050F80, 0x0000005A, 0xFFFFFFF6, 0x00000064, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x0000000A, MakeEntity, 0x802EAF80, 0x0000005F, 0xFFFFFFF6, 0xFFFFFFA8, 0x00000000, 0x00000004, D_80242A7C_88186C, 0x0000078E, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 +.word 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x0000208E, 0x00000024, 0x00000002, 0xF840630E, 0x00000001, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF840630E, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_BlueSwitch, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignAreaFlag, 0x00000004, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000047, 0x00000005, D_80242AAC_88189C, 0x00020000, 0xF9718884, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D2F, 0x00000001, 0x00000043, 0x00000005, tik_08_SetEntityPosition, 0xFD050F80, 0x0000005A, 0xFFFFFFF6, 0x00000064, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x0000000A, MakeEntity, 0x802EAF80, 0x0000005F, 0xFFFFFFF6, 0xFFFFFFA8, 0x00000000, 0x00000004, D_80242A7C_88186C, 0x0000078E, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_09/8856E0.data.s b/ver/us/asm/data/world/area_tik/tik_09/8856E0.data.s index b5edc2fd13..4a8b0f611a 100644 --- a/ver/us/asm/data/world/area_tik/tik_09/8856E0.data.s +++ b/ver/us/asm/data/world/area_tik/tik_09/8856E0.data.s @@ -9,4 +9,4 @@ dlabel D_8024375C_88591C .word 0x00000043, 0x00000003, GotoMap, 0x80244190, 0x00000003, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024378C_88594C -.word 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x0000208E, 0x00000024, 0x00000002, 0xF840630F, 0x00000001, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF840630F, 0x00000000, 0x00000043, 0x00000007, MakeEntity, D_802E9BD4, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignAreaFlag, 0x00000005, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000047, 0x00000005, D_8024378C_88594C, 0x00020000, 0xF9718885, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D30, 0x00000001, 0x00000043, 0x00000005, tik_09_SetEntityPosition, 0xFD050F80, 0xFFFFFFF6, 0xFFFFFFF6, 0x0000000A, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x0000000A, MakeEntity, 0x802EAF80, 0xFFFFFFE2, 0xFFFFFFF6, 0xFFFFFFD8, 0x00000000, 0x00000002, D_8024375C_88591C, 0x0000078F, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 +.word 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x0000208E, 0x00000024, 0x00000002, 0xF840630F, 0x00000001, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF840630F, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_BlueSwitch, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignAreaFlag, 0x00000005, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000047, 0x00000005, D_8024378C_88594C, 0x00020000, 0xF9718885, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D30, 0x00000001, 0x00000043, 0x00000005, tik_09_SetEntityPosition, 0xFD050F80, 0xFFFFFFF6, 0xFFFFFFF6, 0x0000000A, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x0000000A, MakeEntity, 0x802EAF80, 0xFFFFFFE2, 0xFFFFFFF6, 0xFFFFFFD8, 0x00000000, 0x00000002, D_8024375C_88591C, 0x0000078F, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_trd/trd_00/99AFB0.data.s b/ver/us/asm/data/world/area_trd/trd_00/99AFB0.data.s index 35cbe36b91..884c0cb179 100644 --- a/ver/us/asm/data/world/area_trd/trd_00/99AFB0.data.s +++ b/ver/us/asm/data/world/area_trd/trd_00/99AFB0.data.s @@ -15,4 +15,4 @@ dlabel D_8024148C_99B0FC .word 0x00000024, 0x00000002, 0xFE363C8A, 0x00000104, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000002, 0x00000024, 0x00000002, 0xF8405E01, 0x00000001, 0x00000046, 0x00000001, D_802413AC_99B01C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802414D8_99B148 -.word 0x00000024, 0x00000002, 0xFE363C8A, 0x00000135, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000002, 0x00000024, 0x00000002, 0xF8405E02, 0x00000001, 0x00000046, 0x00000001, D_802413AC_99B01C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000008, MakeEntity, 0x802EAE30, 0x0000032A, 0x00000000, 0xFFFFFFCE, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignFlag, 0xF8405E01, 0x00000043, 0x00000002, AssignScript, D_8024148C_99B0FC, 0x00000043, 0x00000008, MakeEntity, 0x802EAE30, 0xFFFFFD12, 0x000000C8, 0xFFFFFF83, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignFlag, 0xF8405E02, 0x00000043, 0x00000002, AssignScript, D_802414D8_99B148, 0x00000043, 0x00000007, MakeEntity, D_802E9A18, 0xFFFFFC68, 0x0000003C, 0x00000050, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, D_802E9A18, 0x00000145, 0x0000003C, 0x000000DC, 0x00000000, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 +.word 0x00000024, 0x00000002, 0xFE363C8A, 0x00000135, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000002, 0x00000024, 0x00000002, 0xF8405E02, 0x00000001, 0x00000046, 0x00000001, D_802413AC_99B01C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000008, MakeEntity, 0x802EAE30, 0x0000032A, 0x00000000, 0xFFFFFFCE, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignFlag, 0xF8405E01, 0x00000043, 0x00000002, AssignScript, D_8024148C_99B0FC, 0x00000043, 0x00000008, MakeEntity, 0x802EAE30, 0xFFFFFD12, 0x000000C8, 0xFFFFFF83, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignFlag, 0xF8405E02, 0x00000043, 0x00000002, AssignScript, D_802414D8_99B148, 0x00000043, 0x00000007, MakeEntity, Entity_SavePoint, 0xFFFFFC68, 0x0000003C, 0x00000050, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_SavePoint, 0x00000145, 0x0000003C, 0x000000DC, 0x00000000, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_trd/trd_01/99F960.data.s b/ver/us/asm/data/world/area_trd/trd_01/99F960.data.s index 725b9ace16..382a92ca4b 100644 --- a/ver/us/asm/data/world/area_trd/trd_01/99F960.data.s +++ b/ver/us/asm/data/world/area_trd/trd_01/99F960.data.s @@ -6,4 +6,4 @@ dlabel D_80242FD0_99F960 .word 0x00000003, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF8405E05, 0x00000001, 0x00000043, 0x00000004, AwaitPlayerApproach, 0x00000140, 0x00000000, 0x00000028, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x000000DC, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x0000012C, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24FF280, 0x00000043, 0x00000004, GetCamPosA, 0x00000000, 0xFE363C80, 0xFE363C81, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xF2497A80, 0xFE363C81, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8680, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000004, AwaitPlayerLeave, 0x00000140, 0x00000000, 0x0000003C, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x0000004F, 0x00000001, 0x00000001, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00D8, 0x000000A0, 0x00000028, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000050, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000050, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, FindKeyItem, 0x00000010, 0xFE363C80, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C80, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000024, 0x00000002, 0xF8405E0A, 0x00000001, 0x00000043, 0x00000005, trd_01_GetEntityPosition, 0xFD050F80, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, PlaySoundAt, 0x00000269, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C80, 0xFD050F80, 0x00000043, 0x00000001, trd_01_SetEntityFlags100000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000050, 0x00000001, 0x00000001, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024328C_99FC1C -.word 0x00000047, 0x00000005, D_802419F8_99E388, 0x00000100, 0x00000010, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF8405E0A, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802BCD68, 0x0000013B, 0x00000008, 0x00000000, 0xFFFFFFB0, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_8024328C_99FC1C, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000013, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFB0, 0x00000043, 0x00000007, MakeEntity, D_802E9BD4, 0x00000000, 0x000000DC, 0x000000FF, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignAreaFlag, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000007, MakeItemEntity, 0x00000109, 0xFFFFFEF4, 0x00000290, 0xFFFFFFD8, 0x00000011, 0xF8405DFE, 0x0000000A, 0x00000002, 0xF8405E19, 0x00000001, 0x0000000A, 0x00000002, 0xF8405E05, 0x00000000, 0x00000043, 0x00000007, MakeItemEntity, 0x00000010, 0x000000FE, 0x00000000, 0x0000001E, 0x00000000, 0xF8405E05, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000047, 0x00000005, D_802419F8_99E388, 0x00000100, 0x00000010, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF8405E0A, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802BCD68, 0x0000013B, 0x00000008, 0x00000000, 0xFFFFFFB0, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_8024328C_99FC1C, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000013, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFB0, 0x00000043, 0x00000007, MakeEntity, Entity_BlueSwitch, 0x00000000, 0x000000DC, 0x000000FF, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignAreaFlag, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000007, MakeItemEntity, 0x00000109, 0xFFFFFEF4, 0x00000290, 0xFFFFFFD8, 0x00000011, 0xF8405DFE, 0x0000000A, 0x00000002, 0xF8405E19, 0x00000001, 0x0000000A, 0x00000002, 0xF8405E05, 0x00000000, 0x00000043, 0x00000007, MakeItemEntity, 0x00000010, 0x000000FE, 0x00000000, 0x0000001E, 0x00000000, 0xF8405E05, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_trd/trd_02/9A3870.data.s b/ver/us/asm/data/world/area_trd/trd_02/9A3870.data.s index 6d267f2111..86d4b1a540 100644 --- a/ver/us/asm/data/world/area_trd/trd_02/9A3870.data.s +++ b/ver/us/asm/data/world/area_trd/trd_02/9A3870.data.s @@ -6,4 +6,4 @@ dlabel D_80242890_9A3870 .word 0x0000004D, 0x00000001, 0x00000000, 0x0000004F, 0x00000001, 0x00000001, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00D8, 0x000000A0, 0x00000028, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000050, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000050, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000024, 0x00000002, 0xF8405E0B, 0x00000001, 0x00000043, 0x00000005, trd_02_GetEntityPosition, 0xFD050F80, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, PlaySoundAt, 0x00000269, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C80, 0xFD050F80, 0x00000043, 0x00000001, trd_02_SetEntityFlags100000, 0x00000050, 0x00000001, 0x00000001, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802429E4_9A39C4 -.word 0x00000047, 0x00000005, D_80241C68_9A2C48, 0x00000100, 0x00000011, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF8405E0B, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802BCD68, 0xFFFFFEF7, 0x000000C3, 0xFFFFFFC9, 0x00000050, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_802429E4_9A39C4, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000013, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFAF, 0x00000043, 0x00000007, MakeEntity, D_802E9BD4, 0x0000000A, 0x000000BB, 0x00000064, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignAreaFlag, 0x00000002, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000047, 0x00000005, D_80241C68_9A2C48, 0x00000100, 0x00000011, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF8405E0B, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802BCD68, 0xFFFFFEF7, 0x000000C3, 0xFFFFFFC9, 0x00000050, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_802429E4_9A39C4, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000013, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFAF, 0x00000043, 0x00000007, MakeEntity, Entity_BlueSwitch, 0x0000000A, 0x000000BB, 0x00000064, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignAreaFlag, 0x00000002, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_trd/trd_03/9A5FF0.data.s b/ver/us/asm/data/world/area_trd/trd_03/9A5FF0.data.s index 43c4378a31..a0ca748450 100644 --- a/ver/us/asm/data/world/area_trd/trd_03/9A5FF0.data.s +++ b/ver/us/asm/data/world/area_trd/trd_03/9A5FF0.data.s @@ -3,4 +3,4 @@ .section .data dlabel D_802419A0_9A5FF0 -.word 0x00000024, 0x00000002, 0xFD050F80, 0x00000000, 0x00000043, 0x00000007, MakeEntity, D_802E9BB0, 0xFFFFFEC5, 0x00000078, 0xFFFFFF9C, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, 0x80243174, 0x00000043, 0x00000007, MakeEntity, D_802E9BB0, 0x000000D2, 0x00000078, 0xFFFFFF9C, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, 0x8024374C, 0x00000043, 0x00000007, MakeItemEntity, 0x00000010, 0xFFFFFDBC, 0x00000000, 0xFFFFFFC4, 0x00000000, 0xF8405E06, 0x00000043, 0x00000007, MakeItemEntity, 0x00000010, 0x000001D6, 0x00000000, 0xFFFFFFC4, 0x00000000, 0xF8405E07, 0x00000043, 0x00000007, MakeItemEntity, 0x000000E4, 0xFFFFFFCE, 0x00000000, 0xFFFFFFC4, 0x00000011, 0xF8405DFF, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000024, 0x00000002, 0xFD050F80, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_RedSwitch, 0xFFFFFEC5, 0x00000078, 0xFFFFFF9C, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, 0x80243174, 0x00000043, 0x00000007, MakeEntity, Entity_RedSwitch, 0x000000D2, 0x00000078, 0xFFFFFF9C, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, 0x8024374C, 0x00000043, 0x00000007, MakeItemEntity, 0x00000010, 0xFFFFFDBC, 0x00000000, 0xFFFFFFC4, 0x00000000, 0xF8405E06, 0x00000043, 0x00000007, MakeItemEntity, 0x00000010, 0x000001D6, 0x00000000, 0xFFFFFFC4, 0x00000000, 0xF8405E07, 0x00000043, 0x00000007, MakeItemEntity, 0x000000E4, 0xFFFFFFCE, 0x00000000, 0xFFFFFFC4, 0x00000011, 0xF8405DFF, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_trd/trd_04/9ABD70.data.s b/ver/us/asm/data/world/area_trd/trd_04/9ABD70.data.s index fb2e7c8992..6f07c31e75 100644 --- a/ver/us/asm/data/world/area_trd/trd_04/9ABD70.data.s +++ b/ver/us/asm/data/world/area_trd/trd_04/9ABD70.data.s @@ -51,4 +51,4 @@ dlabel D_8024516C_9AD55C .word 0x00000047, 0x00000005, D_80243B64_9ABF54, 0x00000100, 0x00000016, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFFFFFF44, 0x00000000, 0xFFFFFFD5, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFF44, 0x00000000, 0xFFFFFFD5, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF2527280, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000006, PlaySoundAt, 0x00000301, 0x00000000, 0xFFFFFF4C, 0x000000AF, 0xFFFFFFDD, 0x00000043, 0x00000005, MakeLerp, 0x000000AF, 0x00000000, 0x00000014, 0x00000001, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, trd_04_SetEntityPosition, 0xFD050F82, 0xFFFFFF4C, 0xFE363C80, 0xFFFFFFDD, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000006, PlaySoundAt, 0x00000048, 0x00000000, 0xFFFFFF4C, 0x00000000, 0xFFFFFFDD, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000005, 0xF24A7E80, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0x00000000, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF250BA80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024540C_9AD7FC -.word 0x0000000A, 0x00000002, 0xF8405E0D, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802BCD68, 0x00000109, 0x00000008, 0x0000005A, 0xFFFFFFB0, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80245140_9AD530, 0x00000024, 0x00000002, 0xFD050F81, 0xFE363C80, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405E0C, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802BCD68, 0xFFFFFEF7, 0x000000C3, 0xFFFFFFC9, 0x00000050, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_8024516C_9AD55C, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000013, 0x00000000, 0x0000000E, 0x00000002, 0xF5DE0180, 0xFFFFFFA9, 0x00000043, 0x00000007, MakeEntity, D_802E9BD4, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignAreaFlag, 0x00000004, 0x00000024, 0x00000002, 0xFD050F82, 0xFE363C80, 0x0000000A, 0x00000002, 0xF5DE0180, 0xFFFFFFA9, 0x00000043, 0x00000005, trd_04_SetEntityPosition, 0xFD050F82, 0xFFFFFF4C, 0x00000000, 0xFFFFFFDD, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 +.word 0x0000000A, 0x00000002, 0xF8405E0D, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802BCD68, 0x00000109, 0x00000008, 0x0000005A, 0xFFFFFFB0, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80245140_9AD530, 0x00000024, 0x00000002, 0xFD050F81, 0xFE363C80, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405E0C, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802BCD68, 0xFFFFFEF7, 0x000000C3, 0xFFFFFFC9, 0x00000050, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_8024516C_9AD55C, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000013, 0x00000000, 0x0000000E, 0x00000002, 0xF5DE0180, 0xFFFFFFA9, 0x00000043, 0x00000007, MakeEntity, Entity_BlueSwitch, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignAreaFlag, 0x00000004, 0x00000024, 0x00000002, 0xFD050F82, 0xFE363C80, 0x0000000A, 0x00000002, 0xF5DE0180, 0xFFFFFFA9, 0x00000043, 0x00000005, trd_04_SetEntityPosition, 0xFD050F82, 0xFFFFFF4C, 0x00000000, 0xFFFFFFDD, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_trd/trd_09/9BDD80.data.s b/ver/us/asm/data/world/area_trd/trd_09/9BDD80.data.s index 9e3722779a..315f9b4549 100644 --- a/ver/us/asm/data/world/area_trd/trd_09/9BDD80.data.s +++ b/ver/us/asm/data/world/area_trd/trd_09/9BDD80.data.s @@ -3,4 +3,4 @@ .section .data dlabel D_80240720_9BDD80 -.word 0x00000024, 0x00000002, 0xF8405E16, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF8405E16, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802BCF24, 0xFFFFFE2A, 0xFFFFFFB5, 0x0000008B, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80240720_9BDD80, 0x00000013, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA7E0, 0x00000578, 0xFFFFFFF1, 0x00000087, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, D_802E9A18, 0x000005D2, 0xFFFFFFF1, 0x00000087, 0x00000000, 0x80000000, 0x00000043, 0x00000008, MakeEntity, 0x802EA564, 0xFFFFFDE4, 0xFFFFFFF1, 0x00000087, 0x00000000, 0x000000A3, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405E00, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 +.word 0x00000024, 0x00000002, 0xF8405E16, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF8405E16, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802BCF24, 0xFFFFFE2A, 0xFFFFFFB5, 0x0000008B, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80240720_9BDD80, 0x00000013, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA7E0, 0x00000578, 0xFFFFFFF1, 0x00000087, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_SavePoint, 0x000005D2, 0xFFFFFFF1, 0x00000087, 0x00000000, 0x80000000, 0x00000043, 0x00000008, MakeEntity, 0x802EA564, 0xFFFFFDE4, 0xFFFFFFF1, 0x00000087, 0x00000000, 0x000000A3, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405E00, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_tst/tst_03/B1B240.data.s b/ver/us/asm/data/world/area_tst/tst_03/B1B240.data.s index 0c42c805ee..745c4227f8 100644 --- a/ver/us/asm/data/world/area_tst/tst_03/B1B240.data.s +++ b/ver/us/asm/data/world/area_tst/tst_03/B1B240.data.s @@ -3,4 +3,4 @@ .section .data dlabel D_802402C0_B1B240 -.word 0x00000043, 0x00000007, MakeEntity, 0x802EA5AC, 0x00000237, 0x0000003C, 0x00000064, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA5D0, 0x0000026F, 0x0000003C, 0x00000064, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, D_802EA07C, 0x0000012C, 0x0000003C, 0xFFFFFFCE, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, D_802EA0C4, 0x00000168, 0x00000050, 0xFFFFFFCE, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA0E8, 0x000001A4, 0x00000050, 0xFFFFFFCE, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA564, 0x000001E0, 0x00000050, 0xFFFFFFCE, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA5F4, 0x0000021C, 0x00000050, 0xFFFFFFCE, 0x00000000, 0x80000000, 0x00000043, 0x00000008, MakeEntity, 0x802EA588, 0x00000258, 0x0000003C, 0xFFFFFFCE, 0x00000000, 0x0000008A, 0x80000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA910, 0x0000012C, 0x0000003C, 0x000000A0, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA7E0, 0x000001A4, 0x0000003C, 0x000000A0, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, D_802E9A18, 0x000001E0, 0x0000003C, 0x000000A0, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA2E0, 0x00000284, 0x0000003C, 0x00000076, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA178, 0x000001CC, 0x00000000, 0x00000032, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA178, 0x000001CC, 0x00000019, 0x00000032, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA208, 0x000001EA, 0x00000000, 0x00000032, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA298, 0x00000208, 0x00000000, 0x00000032, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA2E0, 0x00000284, 0x0000003C, 0x00000076, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, 0x802BCE84, 0x000001A0, 0x00000000, 0x000000E8, 0x00000000, 0x80000000, 0x00000043, 0x00000009, MakeEntity, 0x802EAED4, 0x00000150, 0x00000000, 0x000000E8, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x80000000, 0x00000043, 0x00000009, MakeEntity, 0x802EAED4, 0x0000010E, 0x00000000, 0x000000E8, 0x00000000, 0x0000008A, 0x00000000, 0x80000000, 0x00000043, 0x00000009, MakeEntity, 0x802EAED4, 0x0000010E, 0x0000001E, 0x000000E8, 0x00000000, 0x0000008A, 0x00000000, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000007, MakeEntity, 0x802EA5AC, 0x00000237, 0x0000003C, 0x00000064, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA5D0, 0x0000026F, 0x0000003C, 0x00000064, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, D_802EA07C, 0x0000012C, 0x0000003C, 0xFFFFFFCE, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, D_802EA0C4, 0x00000168, 0x00000050, 0xFFFFFFCE, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA0E8, 0x000001A4, 0x00000050, 0xFFFFFFCE, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA564, 0x000001E0, 0x00000050, 0xFFFFFFCE, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA5F4, 0x0000021C, 0x00000050, 0xFFFFFFCE, 0x00000000, 0x80000000, 0x00000043, 0x00000008, MakeEntity, 0x802EA588, 0x00000258, 0x0000003C, 0xFFFFFFCE, 0x00000000, 0x0000008A, 0x80000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA910, 0x0000012C, 0x0000003C, 0x000000A0, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA7E0, 0x000001A4, 0x0000003C, 0x000000A0, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_SavePoint, 0x000001E0, 0x0000003C, 0x000000A0, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA2E0, 0x00000284, 0x0000003C, 0x00000076, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA178, 0x000001CC, 0x00000000, 0x00000032, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA178, 0x000001CC, 0x00000019, 0x00000032, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA208, 0x000001EA, 0x00000000, 0x00000032, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA298, 0x00000208, 0x00000000, 0x00000032, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA2E0, 0x00000284, 0x0000003C, 0x00000076, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, 0x802BCE84, 0x000001A0, 0x00000000, 0x000000E8, 0x00000000, 0x80000000, 0x00000043, 0x00000009, MakeEntity, 0x802EAED4, 0x00000150, 0x00000000, 0x000000E8, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x80000000, 0x00000043, 0x00000009, MakeEntity, 0x802EAED4, 0x0000010E, 0x00000000, 0x000000E8, 0x00000000, 0x0000008A, 0x00000000, 0x80000000, 0x00000043, 0x00000009, MakeEntity, 0x802EAED4, 0x0000010E, 0x0000001E, 0x000000E8, 0x00000000, 0x0000008A, 0x00000000, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_tst/tst_04/B1C1E0.data.s b/ver/us/asm/data/world/area_tst/tst_04/B1C1E0.data.s index c53803bf91..dd844abd9e 100644 --- a/ver/us/asm/data/world/area_tst/tst_04/B1C1E0.data.s +++ b/ver/us/asm/data/world/area_tst/tst_04/B1C1E0.data.s @@ -3,4 +3,4 @@ .section .data dlabel D_80240C70_B1C1E0 -.word 0x00000043, 0x00000007, MakeEntity, D_802E9BB0, 0x00000000, 0x00000000, 0x0000012C, 0x00000000, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000043, 0x00000007, MakeEntity, Entity_RedSwitch, 0x00000000, 0x00000000, 0x0000012C, 0x00000000, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/nonmatchings/16c8e0/btl_draw_enemy_health_bars.s b/ver/us/asm/nonmatchings/16c8e0/btl_draw_enemy_health_bars.s index 6497d2a034..28e9d649be 100644 --- a/ver/us/asm/nonmatchings/16c8e0/btl_draw_enemy_health_bars.s +++ b/ver/us/asm/nonmatchings/16c8e0/btl_draw_enemy_health_bars.s @@ -129,8 +129,8 @@ glabel btl_draw_enemy_health_bars /* 16EA54 80240174 24420010 */ addiu $v0, $v0, 0x10 /* 16EA58 80240178 0C051277 */ jal set_hud_element_render_depth /* 16EA5C 8024017C AFA20024 */ sw $v0, 0x24($sp) -/* 16EA60 80240180 3C058029 */ lui $a1, %hi(D_80291F80) -/* 16EA64 80240184 24A51F80 */ addiu $a1, $a1, %lo(D_80291F80) +/* 16EA60 80240180 3C058029 */ lui $a1, %hi(HudScript_HPBar) +/* 16EA64 80240184 24A51F80 */ addiu $a1, $a1, %lo(HudScript_HPBar) /* 16EA68 80240188 0C0511FF */ jal set_hud_element_anim /* 16EA6C 8024018C 0200202D */ daddu $a0, $s0, $zero /* 16EA70 80240190 8FA50020 */ lw $a1, 0x20($sp) @@ -156,8 +156,8 @@ glabel btl_draw_enemy_health_bars /* 16EAC0 802401E0 2405000A */ addiu $a1, $zero, 0xa /* 16EAC4 802401E4 0C051277 */ jal set_hud_element_render_depth /* 16EAC8 802401E8 0200202D */ daddu $a0, $s0, $zero -/* 16EACC 802401EC 3C088028 */ lui $t0, %hi(D_802809FC) -/* 16EAD0 802401F0 250809FC */ addiu $t0, $t0, %lo(D_802809FC) +/* 16EACC 802401EC 3C088028 */ lui $t0, %hi(bHPDigitHudScripts) +/* 16EAD0 802401F0 250809FC */ addiu $t0, $t0, %lo(bHPDigitHudScripts) /* 16EAD4 802401F4 02481021 */ addu $v0, $s2, $t0 /* 16EAD8 802401F8 8C450000 */ lw $a1, ($v0) /* 16EADC 802401FC 0C0511FF */ jal set_hud_element_anim @@ -190,8 +190,8 @@ glabel btl_draw_enemy_health_bars /* 16EB44 80240264 0C051277 */ jal set_hud_element_render_depth /* 16EB48 80240268 0200202D */ daddu $a0, $s0, $zero /* 16EB4C 8024026C 00141080 */ sll $v0, $s4, 2 -/* 16EB50 80240270 3C088028 */ lui $t0, %hi(D_802809FC) -/* 16EB54 80240274 250809FC */ addiu $t0, $t0, %lo(D_802809FC) +/* 16EB50 80240270 3C088028 */ lui $t0, %hi(bHPDigitHudScripts) +/* 16EB54 80240274 250809FC */ addiu $t0, $t0, %lo(bHPDigitHudScripts) /* 16EB58 80240278 00481021 */ addu $v0, $v0, $t0 /* 16EB5C 8024027C 8C450000 */ lw $a1, ($v0) /* 16EB60 80240280 0C0511FF */ jal set_hud_element_anim diff --git a/ver/us/asm/nonmatchings/16c8e0/btl_update_starpoints_display.s b/ver/us/asm/nonmatchings/16c8e0/btl_update_starpoints_display.s index 8e5baa5f32..d1b86a8d22 100644 --- a/ver/us/asm/nonmatchings/16c8e0/btl_update_starpoints_display.s +++ b/ver/us/asm/nonmatchings/16c8e0/btl_update_starpoints_display.s @@ -225,10 +225,10 @@ glabel btl_update_starpoints_display /* 16EFD4 802406F4 00042603 */ sra $a0, $a0, 0x18 /* 16EFD8 802406F8 1AC00039 */ blez $s6, .L802407E0 /* 16EFDC 802406FC AFA40050 */ sw $a0, 0x50($sp) -/* 16EFE0 80240700 3C1E8008 */ lui $fp, %hi(D_80080FF0) -/* 16EFE4 80240704 27DE0FF0 */ addiu $fp, $fp, %lo(D_80080FF0) -/* 16EFE8 80240708 3C178010 */ lui $s7, %hi(D_80104BEC) -/* 16EFEC 8024070C 26F74BEC */ addiu $s7, $s7, %lo(D_80104BEC) +/* 16EFE0 80240700 3C1E8008 */ lui $fp, %hi(HudScript_Item_StarPoint) +/* 16EFE4 80240704 27DE0FF0 */ addiu $fp, $fp, %lo(HudScript_Item_StarPoint) +/* 16EFE8 80240708 3C178010 */ lui $s7, %hi(HudScript_StatusSPShine) +/* 16EFEC 8024070C 26F74BEC */ addiu $s7, $s7, %lo(HudScript_StatusSPShine) /* 16EFF0 80240710 3C14802A */ lui $s4, %hi(D_8029EFE8) /* 16EFF4 80240714 2694EFE8 */ addiu $s4, $s4, %lo(D_8029EFE8) /* 16EFF8 80240718 3C13802A */ lui $s3, %hi(D_8029EFC0) @@ -359,8 +359,8 @@ glabel btl_update_starpoints_display .L802408F0: /* 16F1D0 802408F0 19800024 */ blez $t4, .L80240984 /* 16F1D4 802408F4 0000882D */ daddu $s1, $zero, $zero -/* 16F1D8 802408F8 3C148008 */ lui $s4, %hi(D_800810C8) -/* 16F1DC 802408FC 269410C8 */ addiu $s4, $s4, %lo(D_800810C8) +/* 16F1D8 802408F8 3C148008 */ lui $s4, %hi(HudScript_Item_SmallStarPoint) +/* 16F1DC 802408FC 269410C8 */ addiu $s4, $s4, %lo(HudScript_Item_SmallStarPoint) /* 16F1E0 80240900 3C014120 */ lui $at, 0x4120 /* 16F1E4 80240904 4481A000 */ mtc1 $at, $f20 /* 16F1E8 80240908 3C13802A */ lui $s3, %hi(D_8029F010) diff --git a/ver/us/asm/nonmatchings/16c8e0/initialize_battle.s b/ver/us/asm/nonmatchings/16c8e0/initialize_battle.s index d8fd0a46d0..1d5d50b33e 100644 --- a/ver/us/asm/nonmatchings/16c8e0/initialize_battle.s +++ b/ver/us/asm/nonmatchings/16c8e0/initialize_battle.s @@ -97,8 +97,8 @@ glabel initialize_battle /* 16CB68 8023E288 00000000 */ nop /* 16CB6C 8023E28C 0C051FB1 */ jal set_windows_visible /* 16CB70 8023E290 24040001 */ addiu $a0, $zero, 1 -/* 16CB74 8023E294 3C048029 */ lui $a0, %hi(D_80291F80) -/* 16CB78 8023E298 24841F80 */ addiu $a0, $a0, %lo(D_80291F80) +/* 16CB74 8023E294 3C048029 */ lui $a0, %hi(HudScript_HPBar) +/* 16CB78 8023E298 24841F80 */ addiu $a0, $a0, %lo(HudScript_HPBar) /* 16CB7C 8023E29C 0C050529 */ jal create_hud_element /* 16CB80 8023E2A0 00000000 */ nop /* 16CB84 8023E2A4 3C01802A */ lui $at, %hi(D_8029EFBC) @@ -109,8 +109,8 @@ glabel initialize_battle /* 16CB98 8023E2B8 3C12802A */ lui $s2, %hi(D_8029EFC0) /* 16CB9C 8023E2BC 2652EFC0 */ addiu $s2, $s2, %lo(D_8029EFC0) .L8023E2C0: -/* 16CBA0 8023E2C0 3C048008 */ lui $a0, %hi(D_80080FF0) -/* 16CBA4 8023E2C4 24840FF0 */ addiu $a0, $a0, %lo(D_80080FF0) +/* 16CBA0 8023E2C0 3C048008 */ lui $a0, %hi(HudScript_Item_StarPoint) +/* 16CBA4 8023E2C4 24840FF0 */ addiu $a0, $a0, %lo(HudScript_Item_StarPoint) /* 16CBA8 8023E2C8 0C050529 */ jal create_hud_element /* 16CBAC 8023E2CC 26310001 */ addiu $s1, $s1, 1 /* 16CBB0 8023E2D0 AE420000 */ sw $v0, ($s2) @@ -128,8 +128,8 @@ glabel initialize_battle /* 16CBE0 8023E300 3C12802A */ lui $s2, %hi(D_8029EFE8) /* 16CBE4 8023E304 2652EFE8 */ addiu $s2, $s2, %lo(D_8029EFE8) .L8023E308: -/* 16CBE8 8023E308 3C048010 */ lui $a0, %hi(D_80104BEC) -/* 16CBEC 8023E30C 24844BEC */ addiu $a0, $a0, %lo(D_80104BEC) +/* 16CBE8 8023E308 3C048010 */ lui $a0, %hi(HudScript_StatusSPShine) +/* 16CBEC 8023E30C 24844BEC */ addiu $a0, $a0, %lo(HudScript_StatusSPShine) /* 16CBF0 8023E310 0C050529 */ jal create_hud_element /* 16CBF4 8023E314 26310001 */ addiu $s1, $s1, 1 /* 16CBF8 8023E318 AE420000 */ sw $v0, ($s2) @@ -147,8 +147,8 @@ glabel initialize_battle /* 16CC28 8023E348 3C12802A */ lui $s2, %hi(D_8029F010) /* 16CC2C 8023E34C 2652F010 */ addiu $s2, $s2, %lo(D_8029F010) .L8023E350: -/* 16CC30 8023E350 3C048008 */ lui $a0, %hi(D_800810C8) -/* 16CC34 8023E354 248410C8 */ addiu $a0, $a0, %lo(D_800810C8) +/* 16CC30 8023E350 3C048008 */ lui $a0, %hi(HudScript_Item_SmallStarPoint) +/* 16CC34 8023E354 248410C8 */ addiu $a0, $a0, %lo(HudScript_Item_SmallStarPoint) /* 16CC38 8023E358 0C050529 */ jal create_hud_element /* 16CC3C 8023E35C 26310001 */ addiu $s1, $s1, 1 /* 16CC40 8023E360 AE420000 */ sw $v0, ($s2) diff --git a/ver/us/asm/nonmatchings/17D6A0/func_8024FB3C.s b/ver/us/asm/nonmatchings/17D6A0/func_8024FB3C.s index 5b996c20b2..cc6b633dda 100644 --- a/ver/us/asm/nonmatchings/17D6A0/func_8024FB3C.s +++ b/ver/us/asm/nonmatchings/17D6A0/func_8024FB3C.s @@ -110,13 +110,13 @@ glabel func_8024FB3C /* 17E540 8024FC60 00400008 */ jr $v0 /* 17E544 8024FC64 00000000 */ nop .L8024FC68_17E548: -/* 17E548 8024FC68 3C048011 */ lui $a0, %hi(D_80108E1C) -/* 17E54C 8024FC6C 24848E1C */ addiu $a0, $a0, %lo(D_80108E1C) +/* 17E548 8024FC68 3C048011 */ lui $a0, %hi(HudScript_StickNeutral) +/* 17E54C 8024FC6C 24848E1C */ addiu $a0, $a0, %lo(HudScript_StickNeutral) /* 17E550 8024FC70 08094060 */ j .L80250180 /* 17E554 8024FC74 00000000 */ nop .L8024FC78_17E558: -/* 17E558 8024FC78 3C048011 */ lui $a0, %hi(D_80108E1C) -/* 17E55C 8024FC7C 24848E1C */ addiu $a0, $a0, %lo(D_80108E1C) +/* 17E558 8024FC78 3C048011 */ lui $a0, %hi(HudScript_StickNeutral) +/* 17E55C 8024FC7C 24848E1C */ addiu $a0, $a0, %lo(HudScript_StickNeutral) /* 17E560 8024FC80 0C050529 */ jal create_hud_element /* 17E564 8024FC84 00000000 */ nop /* 17E568 8024FC88 00022400 */ sll $a0, $v0, 0x10 @@ -130,8 +130,8 @@ glabel func_8024FB3C /* 17E588 8024FCA8 86040000 */ lh $a0, ($s0) /* 17E58C 8024FCAC 0C051261 */ jal set_hud_element_render_pos /* 17E590 8024FCB0 00A0302D */ daddu $a2, $a1, $zero -/* 17E594 8024FCB4 3C048029 */ lui $a0, %hi(D_80292788) -/* 17E598 8024FCB8 24842788 */ addiu $a0, $a0, %lo(D_80292788) +/* 17E594 8024FCB4 3C048029 */ lui $a0, %hi(HudScript_TimingReady) +/* 17E598 8024FCB8 24842788 */ addiu $a0, $a0, %lo(HudScript_TimingReady) /* 17E59C 8024FCBC 0C050529 */ jal create_hud_element /* 17E5A0 8024FCC0 00000000 */ nop /* 17E5A4 8024FCC4 00022400 */ sll $a0, $v0, 0x10 @@ -141,8 +141,8 @@ glabel func_8024FB3C /* 17E5B4 8024FCD4 080941E3 */ j .L8025078C /* 17E5B8 8024FCD8 24050080 */ addiu $a1, $zero, 0x80 .L8024FCDC_17E5BC: -/* 17E5BC 8024FCDC 3C048011 */ lui $a0, %hi(D_80108E1C) -/* 17E5C0 8024FCE0 24848E1C */ addiu $a0, $a0, %lo(D_80108E1C) +/* 17E5BC 8024FCDC 3C048011 */ lui $a0, %hi(HudScript_StickNeutral) +/* 17E5C0 8024FCE0 24848E1C */ addiu $a0, $a0, %lo(HudScript_StickNeutral) /* 17E5C4 8024FCE4 0C050529 */ jal create_hud_element /* 17E5C8 8024FCE8 00000000 */ nop /* 17E5CC 8024FCEC 00022400 */ sll $a0, $v0, 0x10 @@ -156,8 +156,8 @@ glabel func_8024FB3C /* 17E5EC 8024FD0C 86040000 */ lh $a0, ($s0) /* 17E5F0 8024FD10 0C051261 */ jal set_hud_element_render_pos /* 17E5F4 8024FD14 00A0302D */ daddu $a2, $a1, $zero -/* 17E5F8 8024FD18 3C048029 */ lui $a0, %hi(D_802936D4) -/* 17E5FC 8024FD1C 248436D4 */ addiu $a0, $a0, %lo(D_802936D4) +/* 17E5F8 8024FD18 3C048029 */ lui $a0, %hi(HudScript_AimTarget) +/* 17E5FC 8024FD1C 248436D4 */ addiu $a0, $a0, %lo(HudScript_AimTarget) /* 17E600 8024FD20 0C050529 */ jal create_hud_element /* 17E604 8024FD24 00000000 */ nop /* 17E608 8024FD28 00022400 */ sll $a0, $v0, 0x10 @@ -167,8 +167,8 @@ glabel func_8024FB3C /* 17E618 8024FD38 08094044 */ j .L80250110 /* 17E61C 8024FD3C 34058080 */ ori $a1, $zero, 0x8080 .L8024FD40_17E620: -/* 17E620 8024FD40 3C048029 */ lui $a0, %hi(D_8029259C) -/* 17E624 8024FD44 2484259C */ addiu $a0, $a0, %lo(D_8029259C) +/* 17E620 8024FD40 3C048029 */ lui $a0, %hi(HudScript_CUpButton) +/* 17E624 8024FD44 2484259C */ addiu $a0, $a0, %lo(HudScript_CUpButton) /* 17E628 8024FD48 0C050529 */ jal create_hud_element /* 17E62C 8024FD4C 00000000 */ nop /* 17E630 8024FD50 00022400 */ sll $a0, $v0, 0x10 @@ -182,8 +182,8 @@ glabel func_8024FB3C /* 17E650 8024FD70 86040000 */ lh $a0, ($s0) /* 17E654 8024FD74 0C051261 */ jal set_hud_element_render_pos /* 17E658 8024FD78 00A0302D */ daddu $a2, $a1, $zero -/* 17E65C 8024FD7C 3C048029 */ lui $a0, %hi(D_80292630) -/* 17E660 8024FD80 24842630 */ addiu $a0, $a0, %lo(D_80292630) +/* 17E65C 8024FD7C 3C048029 */ lui $a0, %hi(HudScript_CDownButton) +/* 17E660 8024FD80 24842630 */ addiu $a0, $a0, %lo(HudScript_CDownButton) /* 17E664 8024FD84 0C050529 */ jal create_hud_element /* 17E668 8024FD88 00000000 */ nop /* 17E66C 8024FD8C 00022400 */ sll $a0, $v0, 0x10 @@ -197,8 +197,8 @@ glabel func_8024FB3C /* 17E68C 8024FDAC 86040000 */ lh $a0, ($s0) /* 17E690 8024FDB0 0C051261 */ jal set_hud_element_render_pos /* 17E694 8024FDB4 00A0302D */ daddu $a2, $a1, $zero -/* 17E698 8024FDB8 3C048029 */ lui $a0, %hi(D_80292438) -/* 17E69C 8024FDBC 24842438 */ addiu $a0, $a0, %lo(D_80292438) +/* 17E698 8024FDB8 3C048029 */ lui $a0, %hi(HudScript_CLeftButton) +/* 17E69C 8024FDBC 24842438 */ addiu $a0, $a0, %lo(HudScript_CLeftButton) /* 17E6A0 8024FDC0 0C050529 */ jal create_hud_element /* 17E6A4 8024FDC4 00000000 */ nop /* 17E6A8 8024FDC8 00022400 */ sll $a0, $v0, 0x10 @@ -212,8 +212,8 @@ glabel func_8024FB3C /* 17E6C8 8024FDE8 86040000 */ lh $a0, ($s0) /* 17E6CC 8024FDEC 0C051261 */ jal set_hud_element_render_pos /* 17E6D0 8024FDF0 00A0302D */ daddu $a2, $a1, $zero -/* 17E6D4 8024FDF4 3C048029 */ lui $a0, %hi(D_802924CC) -/* 17E6D8 8024FDF8 248424CC */ addiu $a0, $a0, %lo(D_802924CC) +/* 17E6D4 8024FDF4 3C048029 */ lui $a0, %hi(HudScript_CRightButton) +/* 17E6D8 8024FDF8 248424CC */ addiu $a0, $a0, %lo(HudScript_CRightButton) /* 17E6DC 8024FDFC 0C050529 */ jal create_hud_element /* 17E6E0 8024FE00 00000000 */ nop /* 17E6E4 8024FE04 00022400 */ sll $a0, $v0, 0x10 @@ -223,13 +223,13 @@ glabel func_8024FB3C /* 17E6F4 8024FE14 080941E3 */ j .L8025078C /* 17E6F8 8024FE18 24050080 */ addiu $a1, $zero, 0x80 .L8024FE1C_17E6FC: -/* 17E6FC 8024FE1C 3C048011 */ lui $a0, %hi(D_80108E1C) -/* 17E700 8024FE20 24848E1C */ addiu $a0, $a0, %lo(D_80108E1C) +/* 17E6FC 8024FE1C 3C048011 */ lui $a0, %hi(HudScript_StickNeutral) +/* 17E700 8024FE20 24848E1C */ addiu $a0, $a0, %lo(HudScript_StickNeutral) /* 17E704 8024FE24 08094060 */ j .L80250180 /* 17E708 8024FE28 00000000 */ nop .L8024FE2C_17E70C: -/* 17E70C 8024FE2C 3C048011 */ lui $a0, %hi(D_80108B28) -/* 17E710 8024FE30 24848B28 */ addiu $a0, $a0, %lo(D_80108B28) +/* 17E70C 8024FE2C 3C048011 */ lui $a0, %hi(HudScript_AButton) +/* 17E710 8024FE30 24848B28 */ addiu $a0, $a0, %lo(HudScript_AButton) /* 17E714 8024FE34 0C050529 */ jal create_hud_element /* 17E718 8024FE38 00000000 */ nop /* 17E71C 8024FE3C 00022400 */ sll $a0, $v0, 0x10 @@ -243,8 +243,8 @@ glabel func_8024FB3C /* 17E73C 8024FE5C 86040000 */ lh $a0, ($s0) /* 17E740 8024FE60 0C051261 */ jal set_hud_element_render_pos /* 17E744 8024FE64 00A0302D */ daddu $a2, $a1, $zero -/* 17E748 8024FE68 3C048029 */ lui $a0, %hi(D_8029231C) -/* 17E74C 8024FE6C 2484231C */ addiu $a0, $a0, %lo(D_8029231C) +/* 17E748 8024FE68 3C048029 */ lui $a0, %hi(HudScript_BButton) +/* 17E74C 8024FE6C 2484231C */ addiu $a0, $a0, %lo(HudScript_BButton) /* 17E750 8024FE70 0C050529 */ jal create_hud_element /* 17E754 8024FE74 00000000 */ nop /* 17E758 8024FE78 00022400 */ sll $a0, $v0, 0x10 @@ -258,8 +258,8 @@ glabel func_8024FB3C /* 17E778 8024FE98 86040000 */ lh $a0, ($s0) /* 17E77C 8024FE9C 0C051261 */ jal set_hud_element_render_pos /* 17E780 8024FEA0 00A0302D */ daddu $a2, $a1, $zero -/* 17E784 8024FEA4 3C048029 */ lui $a0, %hi(D_80292630) -/* 17E788 8024FEA8 24842630 */ addiu $a0, $a0, %lo(D_80292630) +/* 17E784 8024FEA4 3C048029 */ lui $a0, %hi(HudScript_CDownButton) +/* 17E788 8024FEA8 24842630 */ addiu $a0, $a0, %lo(HudScript_CDownButton) /* 17E78C 8024FEAC 0C050529 */ jal create_hud_element /* 17E790 8024FEB0 00000000 */ nop /* 17E794 8024FEB4 00022400 */ sll $a0, $v0, 0x10 @@ -269,13 +269,13 @@ glabel func_8024FB3C /* 17E7A4 8024FEC4 080941E3 */ j .L8025078C /* 17E7A8 8024FEC8 34058080 */ ori $a1, $zero, 0x8080 .L8024FECC_17E7AC: -/* 17E7AC 8024FECC 3C048011 */ lui $a0, %hi(D_80108E1C) -/* 17E7B0 8024FED0 24848E1C */ addiu $a0, $a0, %lo(D_80108E1C) +/* 17E7AC 8024FECC 3C048011 */ lui $a0, %hi(HudScript_StickNeutral) +/* 17E7B0 8024FED0 24848E1C */ addiu $a0, $a0, %lo(HudScript_StickNeutral) /* 17E7B4 8024FED4 08094060 */ j .L80250180 /* 17E7B8 8024FED8 00000000 */ nop .L8024FEDC_17E7BC: -/* 17E7BC 8024FEDC 3C048029 */ lui $a0, %hi(D_80292788) -/* 17E7C0 8024FEE0 24842788 */ addiu $a0, $a0, %lo(D_80292788) +/* 17E7BC 8024FEDC 3C048029 */ lui $a0, %hi(HudScript_TimingReady) +/* 17E7C0 8024FEE0 24842788 */ addiu $a0, $a0, %lo(HudScript_TimingReady) /* 17E7C4 8024FEE4 0C050529 */ jal create_hud_element /* 17E7C8 8024FEE8 00000000 */ nop /* 17E7CC 8024FEEC 00022400 */ sll $a0, $v0, 0x10 @@ -289,8 +289,8 @@ glabel func_8024FB3C /* 17E7EC 8024FF0C 86040000 */ lh $a0, ($s0) /* 17E7F0 8024FF10 0C051261 */ jal set_hud_element_render_pos /* 17E7F4 8024FF14 00A0302D */ daddu $a2, $a1, $zero -/* 17E7F8 8024FF18 3C048011 */ lui $a0, %hi(D_80108B28) -/* 17E7FC 8024FF1C 24848B28 */ addiu $a0, $a0, %lo(D_80108B28) +/* 17E7F8 8024FF18 3C048011 */ lui $a0, %hi(HudScript_AButton) +/* 17E7FC 8024FF1C 24848B28 */ addiu $a0, $a0, %lo(HudScript_AButton) /* 17E800 8024FF20 0C050529 */ jal create_hud_element /* 17E804 8024FF24 00000000 */ nop /* 17E808 8024FF28 00022400 */ sll $a0, $v0, 0x10 @@ -300,8 +300,8 @@ glabel func_8024FB3C /* 17E818 8024FF38 080941E3 */ j .L8025078C /* 17E81C 8024FF3C 34058080 */ ori $a1, $zero, 0x8080 .L8024FF40_17E820: -/* 17E820 8024FF40 3C048011 */ lui $a0, %hi(D_80108B28) -/* 17E824 8024FF44 24848B28 */ addiu $a0, $a0, %lo(D_80108B28) +/* 17E820 8024FF40 3C048011 */ lui $a0, %hi(HudScript_AButton) +/* 17E824 8024FF44 24848B28 */ addiu $a0, $a0, %lo(HudScript_AButton) /* 17E828 8024FF48 0C050529 */ jal create_hud_element /* 17E82C 8024FF4C 00000000 */ nop /* 17E830 8024FF50 00022400 */ sll $a0, $v0, 0x10 @@ -315,8 +315,8 @@ glabel func_8024FB3C /* 17E850 8024FF70 86040000 */ lh $a0, ($s0) /* 17E854 8024FF74 0C051261 */ jal set_hud_element_render_pos /* 17E858 8024FF78 00A0302D */ daddu $a2, $a1, $zero -/* 17E85C 8024FF7C 3C048029 */ lui $a0, %hi(D_8029231C) -/* 17E860 8024FF80 2484231C */ addiu $a0, $a0, %lo(D_8029231C) +/* 17E85C 8024FF7C 3C048029 */ lui $a0, %hi(HudScript_BButton) +/* 17E860 8024FF80 2484231C */ addiu $a0, $a0, %lo(HudScript_BButton) /* 17E864 8024FF84 0C050529 */ jal create_hud_element /* 17E868 8024FF88 00000000 */ nop /* 17E86C 8024FF8C 86040000 */ lh $a0, ($s0) @@ -325,8 +325,8 @@ glabel func_8024FB3C /* 17E878 8024FF98 080941E4 */ j .L80250790 /* 17E87C 8024FF9C 34058080 */ ori $a1, $zero, 0x8080 .L8024FFA0_17E880: -/* 17E880 8024FFA0 3C048011 */ lui $a0, %hi(D_80108B28) -/* 17E884 8024FFA4 24848B28 */ addiu $a0, $a0, %lo(D_80108B28) +/* 17E880 8024FFA0 3C048011 */ lui $a0, %hi(HudScript_AButton) +/* 17E884 8024FFA4 24848B28 */ addiu $a0, $a0, %lo(HudScript_AButton) /* 17E888 8024FFA8 0C050529 */ jal create_hud_element /* 17E88C 8024FFAC 00000000 */ nop /* 17E890 8024FFB0 00022400 */ sll $a0, $v0, 0x10 @@ -340,8 +340,8 @@ glabel func_8024FB3C /* 17E8B0 8024FFD0 86040000 */ lh $a0, ($s0) /* 17E8B4 8024FFD4 0C051261 */ jal set_hud_element_render_pos /* 17E8B8 8024FFD8 00A0302D */ daddu $a2, $a1, $zero -/* 17E8BC 8024FFDC 3C048029 */ lui $a0, %hi(D_8029231C) -/* 17E8C0 8024FFE0 2484231C */ addiu $a0, $a0, %lo(D_8029231C) +/* 17E8BC 8024FFDC 3C048029 */ lui $a0, %hi(HudScript_BButton) +/* 17E8C0 8024FFE0 2484231C */ addiu $a0, $a0, %lo(HudScript_BButton) /* 17E8C4 8024FFE4 0C050529 */ jal create_hud_element /* 17E8C8 8024FFE8 00000000 */ nop /* 17E8CC 8024FFEC 00022400 */ sll $a0, $v0, 0x10 @@ -351,8 +351,8 @@ glabel func_8024FB3C /* 17E8DC 8024FFFC 080941E3 */ j .L8025078C /* 17E8E0 80250000 34058080 */ ori $a1, $zero, 0x8080 .L80250004_17E8E4: -/* 17E8E4 80250004 3C048029 */ lui $a0, %hi(D_80292788) -/* 17E8E8 80250008 24842788 */ addiu $a0, $a0, %lo(D_80292788) +/* 17E8E4 80250004 3C048029 */ lui $a0, %hi(HudScript_TimingReady) +/* 17E8E8 80250008 24842788 */ addiu $a0, $a0, %lo(HudScript_TimingReady) /* 17E8EC 8025000C 0C050529 */ jal create_hud_element /* 17E8F0 80250010 00000000 */ nop /* 17E8F4 80250014 00022400 */ sll $a0, $v0, 0x10 @@ -366,8 +366,8 @@ glabel func_8024FB3C /* 17E914 80250034 86040000 */ lh $a0, ($s0) /* 17E918 80250038 0C051261 */ jal set_hud_element_render_pos /* 17E91C 8025003C 00A0302D */ daddu $a2, $a1, $zero -/* 17E920 80250040 3C048011 */ lui $a0, %hi(D_80108B54) -/* 17E924 80250044 24848B54 */ addiu $a0, $a0, %lo(D_80108B54) +/* 17E920 80250040 3C048011 */ lui $a0, %hi(HudScript_AButtonDown) +/* 17E924 80250044 24848B54 */ addiu $a0, $a0, %lo(HudScript_AButtonDown) /* 17E928 80250048 0C050529 */ jal create_hud_element /* 17E92C 8025004C 00000000 */ nop /* 17E930 80250050 00022400 */ sll $a0, $v0, 0x10 @@ -377,8 +377,8 @@ glabel func_8024FB3C /* 17E940 80250060 080941E3 */ j .L8025078C /* 17E944 80250064 34058080 */ ori $a1, $zero, 0x8080 .L80250068_17E948: -/* 17E948 80250068 3C048011 */ lui $a0, %hi(D_80108E1C) -/* 17E94C 8025006C 24848E1C */ addiu $a0, $a0, %lo(D_80108E1C) +/* 17E948 80250068 3C048011 */ lui $a0, %hi(HudScript_StickNeutral) +/* 17E94C 8025006C 24848E1C */ addiu $a0, $a0, %lo(HudScript_StickNeutral) /* 17E950 80250070 0C050529 */ jal create_hud_element /* 17E954 80250074 00000000 */ nop /* 17E958 80250078 00022400 */ sll $a0, $v0, 0x10 @@ -392,8 +392,8 @@ glabel func_8024FB3C /* 17E978 80250098 86040000 */ lh $a0, ($s0) /* 17E97C 8025009C 0C051261 */ jal set_hud_element_render_pos /* 17E980 802500A0 00A0302D */ daddu $a2, $a1, $zero -/* 17E984 802500A4 3C048029 */ lui $a0, %hi(D_802936D4) -/* 17E988 802500A8 248436D4 */ addiu $a0, $a0, %lo(D_802936D4) +/* 17E984 802500A4 3C048029 */ lui $a0, %hi(HudScript_AimTarget) +/* 17E988 802500A8 248436D4 */ addiu $a0, $a0, %lo(HudScript_AimTarget) /* 17E98C 802500AC 0C050529 */ jal create_hud_element /* 17E990 802500B0 00000000 */ nop /* 17E994 802500B4 00022400 */ sll $a0, $v0, 0x10 @@ -410,8 +410,8 @@ glabel func_8024FB3C /* 17E9C0 802500E0 86040000 */ lh $a0, ($s0) /* 17E9C4 802500E4 0C0513F6 */ jal create_hud_element_transform_B /* 17E9C8 802500E8 00000000 */ nop -/* 17E9CC 802500EC 3C048029 */ lui $a0, %hi(D_8029369C) -/* 17E9D0 802500F0 2484369C */ addiu $a0, $a0, %lo(D_8029369C) +/* 17E9CC 802500EC 3C048029 */ lui $a0, %hi(HudScript_AimReticle) +/* 17E9D0 802500F0 2484369C */ addiu $a0, $a0, %lo(HudScript_AimReticle) /* 17E9D4 802500F4 0C050529 */ jal create_hud_element /* 17E9D8 802500F8 00000000 */ nop /* 17E9DC 802500FC 00022400 */ sll $a0, $v0, 0x10 @@ -432,8 +432,8 @@ glabel func_8024FB3C /* 17EA14 80250134 080941EB */ j .L802507AC /* 17EA18 80250138 24020001 */ addiu $v0, $zero, 1 .L8025013C_17EA1C: -/* 17EA1C 8025013C 3C048011 */ lui $a0, %hi(D_80108B28) -/* 17EA20 80250140 24848B28 */ addiu $a0, $a0, %lo(D_80108B28) +/* 17EA1C 8025013C 3C048011 */ lui $a0, %hi(HudScript_AButton) +/* 17EA20 80250140 24848B28 */ addiu $a0, $a0, %lo(HudScript_AButton) /* 17EA24 80250144 0C050529 */ jal create_hud_element /* 17EA28 80250148 00000000 */ nop /* 17EA2C 8025014C 00022400 */ sll $a0, $v0, 0x10 @@ -448,8 +448,8 @@ glabel func_8024FB3C /* 17EA50 80250170 0C051261 */ jal set_hud_element_render_pos /* 17EA54 80250174 00A0302D */ daddu $a2, $a1, $zero .L80250178_17EA58: -/* 17EA58 80250178 3C048011 */ lui $a0, %hi(D_80108B28) -/* 17EA5C 8025017C 24848B28 */ addiu $a0, $a0, %lo(D_80108B28) +/* 17EA58 80250178 3C048011 */ lui $a0, %hi(HudScript_AButton) +/* 17EA5C 8025017C 24848B28 */ addiu $a0, $a0, %lo(HudScript_AButton) .L80250180: /* 17EA60 80250180 0C050529 */ jal create_hud_element /* 17EA64 80250184 00000000 */ nop @@ -497,152 +497,152 @@ glabel func_8024FB3C .L80250224_17EB04: /* 17EB04 80250224 3C04802A */ lui $a0, %hi(D_8029F642) /* 17EB08 80250228 8484F642 */ lh $a0, %lo(D_8029F642)($a0) -/* 17EB0C 8025022C 3C058011 */ lui $a1, %hi(D_80108B80) -/* 17EB10 80250230 24A58B80 */ addiu $a1, $a1, %lo(D_80108B80) +/* 17EB0C 8025022C 3C058011 */ lui $a1, %hi(HudScript_MashAButton) +/* 17EB10 80250230 24A58B80 */ addiu $a1, $a1, %lo(HudScript_MashAButton) /* 17EB14 80250234 0809412D */ j .L802504B4 /* 17EB18 80250238 00000000 */ nop .L8025023C_17EB1C: /* 17EB1C 8025023C 3C04802A */ lui $a0, %hi(D_8029F642) /* 17EB20 80250240 8484F642 */ lh $a0, %lo(D_8029F642)($a0) -/* 17EB24 80250244 3C058011 */ lui $a1, %hi(D_80108F30) -/* 17EB28 80250248 24A58F30 */ addiu $a1, $a1, %lo(D_80108F30) +/* 17EB24 80250244 3C058011 */ lui $a1, %hi(HudScript_StickMashLeft) +/* 17EB28 80250248 24A58F30 */ addiu $a1, $a1, %lo(HudScript_StickMashLeft) /* 17EB2C 8025024C 0809412D */ j .L802504B4 /* 17EB30 80250250 00000000 */ nop .L80250254_17EB34: /* 17EB34 80250254 3C04802A */ lui $a0, %hi(D_8029F642) /* 17EB38 80250258 8484F642 */ lh $a0, %lo(D_8029F642)($a0) -/* 17EB3C 8025025C 3C058011 */ lui $a1, %hi(D_80108F90) -/* 17EB40 80250260 24A58F90 */ addiu $a1, $a1, %lo(D_80108F90) +/* 17EB3C 8025025C 3C058011 */ lui $a1, %hi(HudScript_StickTapLeft) +/* 17EB40 80250260 24A58F90 */ addiu $a1, $a1, %lo(HudScript_StickTapLeft) /* 17EB44 80250264 0C0511FF */ jal set_hud_element_anim /* 17EB48 80250268 00000000 */ nop /* 17EB4C 8025026C 3C04802A */ lui $a0, %hi(D_8029F644) /* 17EB50 80250270 8484F644 */ lh $a0, %lo(D_8029F644)($a0) -/* 17EB54 80250274 3C058029 */ lui $a1, %hi(D_802927B4) -/* 17EB58 80250278 24A527B4 */ addiu $a1, $a1, %lo(D_802927B4) +/* 17EB54 80250274 3C058029 */ lui $a1, %hi(HudScript_TimingBlink) +/* 17EB58 80250278 24A527B4 */ addiu $a1, $a1, %lo(HudScript_TimingBlink) /* 17EB5C 8025027C 0809412D */ j .L802504B4 /* 17EB60 80250280 00000000 */ nop .L80250284_17EB64: /* 17EB64 80250284 3C04802A */ lui $a0, %hi(D_8029F642) /* 17EB68 80250288 8484F642 */ lh $a0, %lo(D_8029F642)($a0) -/* 17EB6C 8025028C 3C058011 */ lui $a1, %hi(D_80108F90) -/* 17EB70 80250290 24A58F90 */ addiu $a1, $a1, %lo(D_80108F90) +/* 17EB6C 8025028C 3C058011 */ lui $a1, %hi(HudScript_StickTapLeft) +/* 17EB70 80250290 24A58F90 */ addiu $a1, $a1, %lo(HudScript_StickTapLeft) /* 17EB74 80250294 0C0511FF */ jal set_hud_element_anim /* 17EB78 80250298 00000000 */ nop /* 17EB7C 8025029C 3C04802A */ lui $a0, %hi(D_8029F644) /* 17EB80 802502A0 8484F644 */ lh $a0, %lo(D_8029F644)($a0) -/* 17EB84 802502A4 3C058029 */ lui $a1, %hi(D_802936D4) -/* 17EB88 802502A8 24A536D4 */ addiu $a1, $a1, %lo(D_802936D4) +/* 17EB84 802502A4 3C058029 */ lui $a1, %hi(HudScript_AimTarget) +/* 17EB88 802502A8 24A536D4 */ addiu $a1, $a1, %lo(HudScript_AimTarget) /* 17EB8C 802502AC 0809412D */ j .L802504B4 /* 17EB90 802502B0 00000000 */ nop .L802502B4_17EB94: /* 17EB94 802502B4 3C04802A */ lui $a0, %hi(D_8029F642) /* 17EB98 802502B8 8484F642 */ lh $a0, %lo(D_8029F642)($a0) -/* 17EB9C 802502BC 3C058029 */ lui $a1, %hi(D_802925F4) -/* 17EBA0 802502C0 24A525F4 */ addiu $a1, $a1, %lo(D_802925F4) +/* 17EB9C 802502BC 3C058029 */ lui $a1, %hi(HudScript_MashCUpButton) +/* 17EBA0 802502C0 24A525F4 */ addiu $a1, $a1, %lo(HudScript_MashCUpButton) /* 17EBA4 802502C4 0C0511FF */ jal set_hud_element_anim /* 17EBA8 802502C8 00000000 */ nop /* 17EBAC 802502CC 3C04802A */ lui $a0, %hi(D_8029F644) /* 17EBB0 802502D0 8484F644 */ lh $a0, %lo(D_8029F644)($a0) -/* 17EBB4 802502D4 3C058029 */ lui $a1, %hi(D_80292688) -/* 17EBB8 802502D8 24A52688 */ addiu $a1, $a1, %lo(D_80292688) +/* 17EBB4 802502D4 3C058029 */ lui $a1, %hi(HudScript_MashCDownButton1) +/* 17EBB8 802502D8 24A52688 */ addiu $a1, $a1, %lo(HudScript_MashCDownButton1) /* 17EBBC 802502DC 0C0511FF */ jal set_hud_element_anim /* 17EBC0 802502E0 00000000 */ nop /* 17EBC4 802502E4 3C04802A */ lui $a0, %hi(D_8029F646) /* 17EBC8 802502E8 8484F646 */ lh $a0, %lo(D_8029F646)($a0) -/* 17EBCC 802502EC 3C058029 */ lui $a1, %hi(D_80292490) -/* 17EBD0 802502F0 24A52490 */ addiu $a1, $a1, %lo(D_80292490) +/* 17EBCC 802502EC 3C058029 */ lui $a1, %hi(HudScript_MashCLeftButton) +/* 17EBD0 802502F0 24A52490 */ addiu $a1, $a1, %lo(HudScript_MashCLeftButton) /* 17EBD4 802502F4 0C0511FF */ jal set_hud_element_anim /* 17EBD8 802502F8 00000000 */ nop /* 17EBDC 802502FC 3C04802A */ lui $a0, %hi(D_8029F648) /* 17EBE0 80250300 8484F648 */ lh $a0, %lo(D_8029F648)($a0) -/* 17EBE4 80250304 3C058029 */ lui $a1, %hi(D_80292524) -/* 17EBE8 80250308 24A52524 */ addiu $a1, $a1, %lo(D_80292524) +/* 17EBE4 80250304 3C058029 */ lui $a1, %hi(HudScript_MashCRightButton1) +/* 17EBE8 80250308 24A52524 */ addiu $a1, $a1, %lo(HudScript_MashCRightButton1) /* 17EBEC 8025030C 0809412D */ j .L802504B4 /* 17EBF0 80250310 00000000 */ nop .L80250314_17EBF4: /* 17EBF4 80250314 3C04802A */ lui $a0, %hi(D_8029F642) /* 17EBF8 80250318 8484F642 */ lh $a0, %lo(D_8029F642)($a0) -/* 17EBFC 8025031C 3C058011 */ lui $a1, %hi(D_80108E80) -/* 17EC00 80250320 24A58E80 */ addiu $a1, $a1, %lo(D_80108E80) +/* 17EBFC 8025031C 3C058011 */ lui $a1, %hi(HudScript_StickBackAndForth) +/* 17EC00 80250320 24A58E80 */ addiu $a1, $a1, %lo(HudScript_StickBackAndForth) /* 17EC04 80250324 0809412D */ j .L802504B4 /* 17EC08 80250328 00000000 */ nop .L8025032C_17EC0C: /* 17EC0C 8025032C 3C04802A */ lui $a0, %hi(D_8029F642) /* 17EC10 80250330 8484F642 */ lh $a0, %lo(D_8029F642)($a0) -/* 17EC14 80250334 3C058011 */ lui $a1, %hi(D_80108BBC) -/* 17EC18 80250338 24A58BBC */ addiu $a1, $a1, %lo(D_80108BBC) +/* 17EC14 80250334 3C058011 */ lui $a1, %hi(HudScript_PressAButton) +/* 17EC18 80250338 24A58BBC */ addiu $a1, $a1, %lo(HudScript_PressAButton) /* 17EC1C 8025033C 0C0511FF */ jal set_hud_element_anim /* 17EC20 80250340 00000000 */ nop /* 17EC24 80250344 3C04802A */ lui $a0, %hi(D_8029F644) /* 17EC28 80250348 8484F644 */ lh $a0, %lo(D_8029F644)($a0) -/* 17EC2C 8025034C 3C058029 */ lui $a1, %hi(D_802923B0) -/* 17EC30 80250350 24A523B0 */ addiu $a1, $a1, %lo(D_802923B0) +/* 17EC2C 8025034C 3C058029 */ lui $a1, %hi(HudScript_PressBButton) +/* 17EC30 80250350 24A523B0 */ addiu $a1, $a1, %lo(HudScript_PressBButton) /* 17EC34 80250354 0C0511FF */ jal set_hud_element_anim /* 17EC38 80250358 00000000 */ nop /* 17EC3C 8025035C 3C04802A */ lui $a0, %hi(D_8029F646) /* 17EC40 80250360 8484F646 */ lh $a0, %lo(D_8029F646)($a0) -/* 17EC44 80250364 3C058029 */ lui $a1, %hi(D_802926C4) -/* 17EC48 80250368 24A526C4 */ addiu $a1, $a1, %lo(D_802926C4) +/* 17EC44 80250364 3C058029 */ lui $a1, %hi(HudScript_PressCDownButton) +/* 17EC48 80250368 24A526C4 */ addiu $a1, $a1, %lo(HudScript_PressCDownButton) /* 17EC4C 8025036C 0809412D */ j .L802504B4 /* 17EC50 80250370 00000000 */ nop .L80250374_17EC54: /* 17EC54 80250374 3C04802A */ lui $a0, %hi(D_8029F642) /* 17EC58 80250378 8484F642 */ lh $a0, %lo(D_8029F642)($a0) -/* 17EC5C 8025037C 3C058011 */ lui $a1, %hi(D_80108D6C) -/* 17EC60 80250380 24A58D6C */ addiu $a1, $a1, %lo(D_80108D6C) +/* 17EC5C 8025037C 3C058011 */ lui $a1, %hi(HudScript_RotateStickCW) +/* 17EC60 80250380 24A58D6C */ addiu $a1, $a1, %lo(HudScript_RotateStickCW) /* 17EC64 80250384 0809412D */ j .L802504B4 /* 17EC68 80250388 00000000 */ nop .L8025038C_17EC6C: /* 17EC6C 8025038C 3C04802A */ lui $a0, %hi(D_8029F642) /* 17EC70 80250390 8484F642 */ lh $a0, %lo(D_8029F642)($a0) -/* 17EC74 80250394 3C058029 */ lui $a1, %hi(D_802927B4) -/* 17EC78 80250398 24A527B4 */ addiu $a1, $a1, %lo(D_802927B4) +/* 17EC74 80250394 3C058029 */ lui $a1, %hi(HudScript_TimingBlink) +/* 17EC78 80250398 24A527B4 */ addiu $a1, $a1, %lo(HudScript_TimingBlink) /* 17EC7C 8025039C 0C0511FF */ jal set_hud_element_anim /* 17EC80 802503A0 00000000 */ nop /* 17EC84 802503A4 3C04802A */ lui $a0, %hi(D_8029F644) /* 17EC88 802503A8 8484F644 */ lh $a0, %lo(D_8029F644)($a0) -/* 17EC8C 802503AC 3C058011 */ lui $a1, %hi(D_80108B80) -/* 17EC90 802503B0 24A58B80 */ addiu $a1, $a1, %lo(D_80108B80) +/* 17EC8C 802503AC 3C058011 */ lui $a1, %hi(HudScript_MashAButton) +/* 17EC90 802503B0 24A58B80 */ addiu $a1, $a1, %lo(HudScript_MashAButton) /* 17EC94 802503B4 0809412D */ j .L802504B4 /* 17EC98 802503B8 00000000 */ nop .L802503BC_17EC9C: /* 17EC9C 802503BC 3C04802A */ lui $a0, %hi(D_8029F642) /* 17ECA0 802503C0 8484F642 */ lh $a0, %lo(D_8029F642)($a0) -/* 17ECA4 802503C4 3C058011 */ lui $a1, %hi(D_80108B80) -/* 17ECA8 802503C8 24A58B80 */ addiu $a1, $a1, %lo(D_80108B80) +/* 17ECA4 802503C4 3C058011 */ lui $a1, %hi(HudScript_MashAButton) +/* 17ECA8 802503C8 24A58B80 */ addiu $a1, $a1, %lo(HudScript_MashAButton) /* 17ECAC 802503CC 0C0511FF */ jal set_hud_element_anim /* 17ECB0 802503D0 00000000 */ nop /* 17ECB4 802503D4 3C04802A */ lui $a0, %hi(D_8029F644) /* 17ECB8 802503D8 8484F644 */ lh $a0, %lo(D_8029F644)($a0) -/* 17ECBC 802503DC 3C058029 */ lui $a1, %hi(D_802923FC) -/* 17ECC0 802503E0 24A523FC */ addiu $a1, $a1, %lo(D_802923FC) +/* 17ECBC 802503DC 3C058029 */ lui $a1, %hi(HudScript_MashBButton2) +/* 17ECC0 802503E0 24A523FC */ addiu $a1, $a1, %lo(HudScript_MashBButton2) /* 17ECC4 802503E4 0809412D */ j .L802504B4 /* 17ECC8 802503E8 00000000 */ nop .L802503EC_17ECCC: /* 17ECCC 802503EC 3C04802A */ lui $a0, %hi(D_8029F642) /* 17ECD0 802503F0 8484F642 */ lh $a0, %lo(D_8029F642)($a0) -/* 17ECD4 802503F4 3C058011 */ lui $a1, %hi(D_80108B80) -/* 17ECD8 802503F8 24A58B80 */ addiu $a1, $a1, %lo(D_80108B80) +/* 17ECD4 802503F4 3C058011 */ lui $a1, %hi(HudScript_MashAButton) +/* 17ECD8 802503F8 24A58B80 */ addiu $a1, $a1, %lo(HudScript_MashAButton) /* 17ECDC 802503FC 0C0511FF */ jal set_hud_element_anim /* 17ECE0 80250400 00000000 */ nop /* 17ECE4 80250404 3C04802A */ lui $a0, %hi(D_8029F644) /* 17ECE8 80250408 8484F644 */ lh $a0, %lo(D_8029F644)($a0) -/* 17ECEC 8025040C 3C058029 */ lui $a1, %hi(D_80292374) -/* 17ECF0 80250410 24A52374 */ addiu $a1, $a1, %lo(D_80292374) +/* 17ECEC 8025040C 3C058029 */ lui $a1, %hi(HudScript_MashBButton1) +/* 17ECF0 80250410 24A52374 */ addiu $a1, $a1, %lo(HudScript_MashBButton1) /* 17ECF4 80250414 0809412D */ j .L802504B4 /* 17ECF8 80250418 00000000 */ nop .L8025041C_17ECFC: /* 17ECFC 8025041C 3C04802A */ lui $a0, %hi(D_8029F642) /* 17ED00 80250420 8484F642 */ lh $a0, %lo(D_8029F642)($a0) -/* 17ED04 80250424 3C058011 */ lui $a1, %hi(D_80108B80) -/* 17ED08 80250428 24A58B80 */ addiu $a1, $a1, %lo(D_80108B80) +/* 17ED04 80250424 3C058011 */ lui $a1, %hi(HudScript_MashAButton) +/* 17ED08 80250428 24A58B80 */ addiu $a1, $a1, %lo(HudScript_MashAButton) /* 17ED0C 8025042C 0809412D */ j .L802504B4 /* 17ED10 80250430 00000000 */ nop .L80250434_17ED14: /* 17ED14 80250434 3C04802A */ lui $a0, %hi(D_8029F642) /* 17ED18 80250438 8484F642 */ lh $a0, %lo(D_8029F642)($a0) -/* 17ED1C 8025043C 3C058029 */ lui $a1, %hi(D_802927B4) -/* 17ED20 80250440 24A527B4 */ addiu $a1, $a1, %lo(D_802927B4) +/* 17ED1C 8025043C 3C058029 */ lui $a1, %hi(HudScript_TimingBlink) +/* 17ED20 80250440 24A527B4 */ addiu $a1, $a1, %lo(HudScript_TimingBlink) /* 17ED24 80250444 0C0511FF */ jal set_hud_element_anim /* 17ED28 80250448 00000000 */ nop /* 17ED2C 8025044C 3C04802A */ lui $a0, %hi(D_8029F644) @@ -652,30 +652,30 @@ glabel func_8024FB3C .L8025045C_17ED3C: /* 17ED3C 8025045C 3C04802A */ lui $a0, %hi(D_8029F642) /* 17ED40 80250460 8484F642 */ lh $a0, %lo(D_8029F642)($a0) -/* 17ED44 80250464 3C058011 */ lui $a1, %hi(D_801091E4) -/* 17ED48 80250468 24A591E4 */ addiu $a1, $a1, %lo(D_801091E4) +/* 17ED44 80250464 3C058011 */ lui $a1, %hi(HudScript_StickTapRight) +/* 17ED48 80250468 24A591E4 */ addiu $a1, $a1, %lo(HudScript_StickTapRight) /* 17ED4C 8025046C 0809412D */ j .L802504B4 /* 17ED50 80250470 00000000 */ nop .L80250474_17ED54: /* 17ED54 80250474 3C04802A */ lui $a0, %hi(D_8029F642) /* 17ED58 80250478 8484F642 */ lh $a0, %lo(D_8029F642)($a0) -/* 17ED5C 8025047C 3C058011 */ lui $a1, %hi(D_80108B80) -/* 17ED60 80250480 24A58B80 */ addiu $a1, $a1, %lo(D_80108B80) +/* 17ED5C 8025047C 3C058011 */ lui $a1, %hi(HudScript_MashAButton) +/* 17ED60 80250480 24A58B80 */ addiu $a1, $a1, %lo(HudScript_MashAButton) /* 17ED64 80250484 0809412D */ j .L802504B4 /* 17ED68 80250488 00000000 */ nop .L8025048C_17ED6C: /* 17ED6C 8025048C 3C04802A */ lui $a0, %hi(D_8029F642) /* 17ED70 80250490 8484F642 */ lh $a0, %lo(D_8029F642)($a0) -/* 17ED74 80250494 3C058011 */ lui $a1, %hi(D_80108BBC) -/* 17ED78 80250498 24A58BBC */ addiu $a1, $a1, %lo(D_80108BBC) +/* 17ED74 80250494 3C058011 */ lui $a1, %hi(HudScript_PressAButton) +/* 17ED78 80250498 24A58BBC */ addiu $a1, $a1, %lo(HudScript_PressAButton) /* 17ED7C 8025049C 0C0511FF */ jal set_hud_element_anim /* 17ED80 802504A0 00000000 */ nop .L802504A4_17ED84: /* 17ED84 802504A4 3C04802A */ lui $a0, %hi(D_8029F642) /* 17ED88 802504A8 8484F642 */ lh $a0, %lo(D_8029F642)($a0) .L802504AC: -/* 17ED8C 802504AC 3C058011 */ lui $a1, %hi(D_80108BBC) -/* 17ED90 802504B0 24A58BBC */ addiu $a1, $a1, %lo(D_80108BBC) +/* 17ED8C 802504AC 3C058011 */ lui $a1, %hi(HudScript_PressAButton) +/* 17ED90 802504B0 24A58BBC */ addiu $a1, $a1, %lo(HudScript_PressAButton) .L802504B4: /* 17ED94 802504B4 0C0511FF */ jal set_hud_element_anim /* 17ED98 802504B8 00000000 */ nop @@ -845,38 +845,38 @@ glabel func_8024FB3C /* 17EFE0 80250700 00400008 */ jr $v0 /* 17EFE4 80250704 00000000 */ nop .L80250708_17EFE8: -/* 17EFE8 80250708 3C048008 */ lui $a0, %hi(D_800806A0) -/* 17EFEC 8025070C 248406A0 */ addiu $a0, $a0, %lo(D_800806A0) +/* 17EFE8 80250708 3C048008 */ lui $a0, %hi(HudScript_Item_Hammer1) +/* 17EFEC 8025070C 248406A0 */ addiu $a0, $a0, %lo(HudScript_Item_Hammer1) /* 17EFF0 80250710 080941DC */ j .L80250770 /* 17EFF4 80250714 00000000 */ nop .L80250718_17EFF8: -/* 17EFF8 80250718 3C048008 */ lui $a0, %hi(D_800806D0) -/* 17EFFC 8025071C 248406D0 */ addiu $a0, $a0, %lo(D_800806D0) +/* 17EFF8 80250718 3C048008 */ lui $a0, %hi(HudScript_Item_Hammer2) +/* 17EFFC 8025071C 248406D0 */ addiu $a0, $a0, %lo(HudScript_Item_Hammer2) /* 17F000 80250720 080941DC */ j .L80250770 /* 17F004 80250724 00000000 */ nop .L80250728_17F008: -/* 17F008 80250728 3C048008 */ lui $a0, %hi(D_80080700) -/* 17F00C 8025072C 24840700 */ addiu $a0, $a0, %lo(D_80080700) +/* 17F008 80250728 3C048008 */ lui $a0, %hi(HudScript_Item_Hammer3) +/* 17F00C 8025072C 24840700 */ addiu $a0, $a0, %lo(HudScript_Item_Hammer3) /* 17F010 80250730 080941DC */ j .L80250770 /* 17F014 80250734 00000000 */ nop .L80250738_17F018: -/* 17F018 80250738 3C048008 */ lui $a0, %hi(D_80080730) -/* 17F01C 8025073C 24840730 */ addiu $a0, $a0, %lo(D_80080730) +/* 17F018 80250738 3C048008 */ lui $a0, %hi(HudScript_Item_Boots1) +/* 17F01C 8025073C 24840730 */ addiu $a0, $a0, %lo(HudScript_Item_Boots1) /* 17F020 80250740 080941DC */ j .L80250770 /* 17F024 80250744 00000000 */ nop .L80250748_17F028: -/* 17F028 80250748 3C048008 */ lui $a0, %hi(D_80080760) -/* 17F02C 8025074C 24840760 */ addiu $a0, $a0, %lo(D_80080760) +/* 17F028 80250748 3C048008 */ lui $a0, %hi(HudScript_Item_Boots2) +/* 17F02C 8025074C 24840760 */ addiu $a0, $a0, %lo(HudScript_Item_Boots2) /* 17F030 80250750 080941DC */ j .L80250770 /* 17F034 80250754 00000000 */ nop .L80250758_17F038: -/* 17F038 80250758 3C048008 */ lui $a0, %hi(D_80080790) -/* 17F03C 8025075C 24840790 */ addiu $a0, $a0, %lo(D_80080790) +/* 17F038 80250758 3C048008 */ lui $a0, %hi(HudScript_Item_Boots3) +/* 17F03C 8025075C 24840790 */ addiu $a0, $a0, %lo(HudScript_Item_Boots3) /* 17F040 80250760 080941DC */ j .L80250770 /* 17F044 80250764 00000000 */ nop .L80250768_17F048: -/* 17F048 80250768 3C048008 */ lui $a0, %hi(D_800807C0) -/* 17F04C 8025076C 248407C0 */ addiu $a0, $a0, %lo(D_800807C0) +/* 17F048 80250768 3C048008 */ lui $a0, %hi(HudScript_Item_Items) +/* 17F04C 8025076C 248407C0 */ addiu $a0, $a0, %lo(HudScript_Item_Items) .L80250770: /* 17F050 80250770 0C050529 */ jal create_hud_element /* 17F054 80250774 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/18C790/btl_state_update_celebration.s b/ver/us/asm/nonmatchings/18C790/btl_state_update_celebration.s index 688913a7e3..bf562aca90 100644 --- a/ver/us/asm/nonmatchings/18C790/btl_state_update_celebration.s +++ b/ver/us/asm/nonmatchings/18C790/btl_state_update_celebration.s @@ -835,9 +835,9 @@ glabel btl_state_update_celebration /* 18D6D8 8025EDF8 3C14802A */ lui $s4, %hi(D_8029FAA8) /* 18D6DC 8025EDFC 8E94FAA8 */ lw $s4, %lo(D_8029FAA8)($s4) /* 18D6E0 8025EE00 000210C0 */ sll $v0, $v0, 3 -/* 18D6E4 8025EE04 3C058009 */ lui $a1, %hi(D_8008A680) +/* 18D6E4 8025EE04 3C058009 */ lui $a1, %hi(gItemHudScripts) /* 18D6E8 8025EE08 00A22821 */ addu $a1, $a1, $v0 -/* 18D6EC 8025EE0C 8CA5A680 */ lw $a1, %lo(D_8008A680)($a1) +/* 18D6EC 8025EE0C 8CA5A680 */ lw $a1, %lo(gItemHudScripts)($a1) /* 18D6F0 8025EE10 0C0511FF */ jal set_hud_element_anim /* 18D6F4 8025EE14 0280202D */ daddu $a0, $s4, $zero /* 18D6F8 8025EE18 0280202D */ daddu $a0, $s4, $zero @@ -1081,9 +1081,9 @@ glabel btl_state_update_celebration /* 18DA98 8025F1B8 3C14802A */ lui $s4, %hi(D_8029FAC4) /* 18DA9C 8025F1BC 8E94FAC4 */ lw $s4, %lo(D_8029FAC4)($s4) /* 18DAA0 8025F1C0 000210C0 */ sll $v0, $v0, 3 -/* 18DAA4 8025F1C4 3C058009 */ lui $a1, %hi(D_8008A680) +/* 18DAA4 8025F1C4 3C058009 */ lui $a1, %hi(gItemHudScripts) /* 18DAA8 8025F1C8 00A22821 */ addu $a1, $a1, $v0 -/* 18DAAC 8025F1CC 8CA5A680 */ lw $a1, %lo(D_8008A680)($a1) +/* 18DAAC 8025F1CC 8CA5A680 */ lw $a1, %lo(gItemHudScripts)($a1) /* 18DAB0 8025F1D0 0C0511FF */ jal set_hud_element_anim /* 18DAB4 8025F1D4 0280202D */ daddu $a0, $s4, $zero /* 18DAB8 8025F1D8 0280202D */ daddu $a0, $s4, $zero @@ -1292,8 +1292,8 @@ glabel btl_state_update_celebration /* 18DDD4 8025F4F4 3C01802A */ lui $at, %hi(D_8029FB68) /* 18DDD8 8025F4F8 AC22FB68 */ sw $v0, %lo(D_8029FB68)($at) .L8025F4FC: -/* 18DDDC 8025F4FC 3C048029 */ lui $a0, %hi(D_80292C28) -/* 18DDE0 8025F500 24842C28 */ addiu $a0, $a0, %lo(D_80292C28) +/* 18DDDC 8025F4FC 3C048029 */ lui $a0, %hi(HudScript_ProjectorBeam) +/* 18DDE0 8025F500 24842C28 */ addiu $a0, $a0, %lo(HudScript_ProjectorBeam) /* 18DDE4 8025F504 0C050529 */ jal create_hud_element /* 18DDE8 8025F508 00000000 */ nop /* 18DDEC 8025F50C 0040A02D */ daddu $s4, $v0, $zero diff --git a/ver/us/asm/nonmatchings/415D90/btl_state_draw_select_target.s b/ver/us/asm/nonmatchings/415D90/btl_state_draw_select_target.s index fcba4fb9e4..c0b82e4ab6 100644 --- a/ver/us/asm/nonmatchings/415D90/btl_state_draw_select_target.s +++ b/ver/us/asm/nonmatchings/415D90/btl_state_draw_select_target.s @@ -74,8 +74,8 @@ glabel btl_state_draw_select_target /* 41FB74 802AADE4 24130002 */ addiu $s3, $zero, 2 /* 41FB78 802AADE8 0C05122C */ jal get_hud_element_anim /* 41FB7C 802AADEC 0200202D */ daddu $a0, $s0, $zero -/* 41FB80 802AADF0 3C058008 */ lui $a1, %hi(D_80080208) -/* 41FB84 802AADF4 24A50208 */ addiu $a1, $a1, %lo(D_80080208) +/* 41FB80 802AADF0 3C058008 */ lui $a1, %hi(HudScript_HandPointLeftLoop) +/* 41FB84 802AADF4 24A50208 */ addiu $a1, $a1, %lo(HudScript_HandPointLeftLoop) /* 41FB88 802AADF8 080AAB86 */ j .L802AAE18 /* 41FB8C 802AADFC 00000000 */ nop .L802AAE00: @@ -83,8 +83,8 @@ glabel btl_state_draw_select_target /* 41FB94 802AAE04 2413FFF5 */ addiu $s3, $zero, -0xb /* 41FB98 802AAE08 0C05122C */ jal get_hud_element_anim /* 41FB9C 802AAE0C 0200202D */ daddu $a0, $s0, $zero -/* 41FBA0 802AAE10 3C058008 */ lui $a1, %hi(D_8007FF20) -/* 41FBA4 802AAE14 24A5FF20 */ addiu $a1, $a1, %lo(D_8007FF20) +/* 41FBA0 802AAE10 3C058008 */ lui $a1, %hi(HudScript_HandPointDownLoop) +/* 41FBA4 802AAE14 24A5FF20 */ addiu $a1, $a1, %lo(HudScript_HandPointDownLoop) .L802AAE18: /* 41FBA8 802AAE18 50450004 */ beql $v0, $a1, .L802AAE2C /* 41FBAC 802AAE1C 24040001 */ addiu $a0, $zero, 1 @@ -117,8 +117,8 @@ glabel btl_state_draw_select_target .L802AAE84: /* 41FC14 802AAE84 1920004B */ blez $t1, .L802AAFB4 /* 41FC18 802AAE88 0000902D */ daddu $s2, $zero, $zero -/* 41FC1C 802AAE8C 3C1E8008 */ lui $fp, %hi(D_8007FF20) -/* 41FC20 802AAE90 27DEFF20 */ addiu $fp, $fp, %lo(D_8007FF20) +/* 41FC1C 802AAE8C 3C1E8008 */ lui $fp, %hi(HudScript_HandPointDownLoop) +/* 41FC20 802AAE90 27DEFF20 */ addiu $fp, $fp, %lo(HudScript_HandPointDownLoop) /* 41FC24 802AAE94 3C15802B */ lui $s5, %hi(D_802ACC70) /* 41FC28 802AAE98 26B5CC70 */ addiu $s5, $s5, %lo(D_802ACC70) .L802AAE9C: @@ -151,8 +151,8 @@ glabel btl_state_draw_select_target /* 41FC94 802AAF04 24130002 */ addiu $s3, $zero, 2 /* 41FC98 802AAF08 0C05122C */ jal get_hud_element_anim /* 41FC9C 802AAF0C 0200202D */ daddu $a0, $s0, $zero -/* 41FCA0 802AAF10 3C098008 */ lui $t1, %hi(D_80080208) -/* 41FCA4 802AAF14 25290208 */ addiu $t1, $t1, %lo(D_80080208) +/* 41FCA0 802AAF10 3C098008 */ lui $t1, %hi(HudScript_HandPointLeftLoop) +/* 41FCA4 802AAF14 25290208 */ addiu $t1, $t1, %lo(HudScript_HandPointLeftLoop) /* 41FCA8 802AAF18 1049000C */ beq $v0, $t1, .L802AAF4C /* 41FCAC 802AAF1C 0120282D */ daddu $a1, $t1, $zero /* 41FCB0 802AAF20 080AABD1 */ j .L802AAF44 diff --git a/ver/us/asm/nonmatchings/415D90/btl_state_update_partner_menu.s b/ver/us/asm/nonmatchings/415D90/btl_state_update_partner_menu.s index 45ba04595b..5e407dd227 100644 --- a/ver/us/asm/nonmatchings/415D90/btl_state_update_partner_menu.s +++ b/ver/us/asm/nonmatchings/415D90/btl_state_update_partner_menu.s @@ -240,17 +240,17 @@ glabel btl_state_update_partner_menu /* 41D2C4 802A8534 2673D0D0 */ addiu $s3, $s3, %lo(battle_menu_isEnabled) /* 41D2C8 802A8538 3C15802B */ lui $s5, %hi(battle_menu_isMessageDisabled) /* 41D2CC 802A853C 26B5D0E8 */ addiu $s5, $s5, %lo(battle_menu_isMessageDisabled) -/* 41D2D0 802A8540 3C03802B */ lui $v1, %hi(D_802AB478) -/* 41D2D4 802A8544 2463B478 */ addiu $v1, $v1, %lo(D_802AB478) -/* 41D2D8 802A8548 3C12802B */ lui $s2, %hi(main_battle_menu_iconScripts) -/* 41D2DC 802A854C 2652D078 */ addiu $s2, $s2, %lo(main_battle_menu_iconScripts) +/* 41D2D0 802A8540 3C03802B */ lui $v1, %hi(battle_menu_StrategiesHudScript) +/* 41D2D4 802A8544 2463B478 */ addiu $v1, $v1, %lo(battle_menu_StrategiesHudScript) +/* 41D2D8 802A8548 3C12802B */ lui $s2, %hi(main_battle_menu_JumpHudScripts) +/* 41D2DC 802A854C 2652D078 */ addiu $s2, $s2, %lo(main_battle_menu_JumpHudScripts) /* 41D2E0 802A8550 3C01802B */ lui $at, %hi(battle_menu_submenuIDs) /* 41D2E4 802A8554 AC24D0B8 */ sw $a0, %lo(battle_menu_submenuIDs)($at) /* 41D2E8 802A8558 AE710000 */ sw $s1, ($s3) /* 41D2EC 802A855C AEA00000 */ sw $zero, ($s5) /* 41D2F0 802A8560 8C620000 */ lw $v0, ($v1) -/* 41D2F4 802A8564 3C16802B */ lui $s6, %hi(battle_menu_centeredMessages) -/* 41D2F8 802A8568 26D6B4C0 */ addiu $s6, $s6, %lo(battle_menu_centeredMessages) +/* 41D2F4 802A8564 3C16802B */ lui $s6, %hi(battle_menu_centeredMessagesA) +/* 41D2F8 802A8568 26D6B4C0 */ addiu $s6, $s6, %lo(battle_menu_centeredMessagesA) /* 41D2FC 802A856C AE420000 */ sw $v0, ($s2) /* 41D300 802A8570 8EC2001C */ lw $v0, 0x1c($s6) /* 41D304 802A8574 3C1E802B */ lui $fp, %hi(battle_menu_messageIDs) @@ -274,9 +274,9 @@ glabel btl_state_update_partner_menu /* 41D344 802A85B4 00031080 */ sll $v0, $v1, 2 /* 41D348 802A85B8 00431021 */ addu $v0, $v0, $v1 /* 41D34C 802A85BC 000210C0 */ sll $v0, $v0, 3 -/* 41D350 802A85C0 3C03802B */ lui $v1, %hi(D_802AB590) +/* 41D350 802A85C0 3C03802B */ lui $v1, %hi(battle_menu_PartnerMoveHudScripts) /* 41D354 802A85C4 00621821 */ addu $v1, $v1, $v0 -/* 41D358 802A85C8 8C63B590 */ lw $v1, %lo(D_802AB590)($v1) +/* 41D358 802A85C8 8C63B590 */ lw $v1, %lo(battle_menu_PartnerMoveHudScripts)($v1) /* 41D35C 802A85CC 8EC20018 */ lw $v0, 0x18($s6) /* 41D360 802A85D0 24050006 */ addiu $a1, $zero, 6 /* 41D364 802A85D4 3C01802B */ lui $at, %hi(D_802AD0BC) @@ -285,9 +285,9 @@ glabel btl_state_update_partner_menu /* 41D370 802A85E0 AFC20004 */ sw $v0, 4($fp) /* 41D374 802A85E4 AE430004 */ sw $v1, 4($s2) /* 41D378 802A85E8 82820080 */ lb $v0, 0x80($s4) -/* 41D37C 802A85EC 3C04802B */ lui $a0, %hi(D_802AB590) +/* 41D37C 802A85EC 3C04802B */ lui $a0, %hi(battle_menu_PartnerMoveHudScripts) /* 41D380 802A85F0 1C40000B */ bgtz $v0, .L802A8620 -/* 41D384 802A85F4 2484B590 */ addiu $a0, $a0, %lo(D_802AB590) +/* 41D384 802A85F4 2484B590 */ addiu $a0, $a0, %lo(battle_menu_PartnerMoveHudScripts) /* 41D388 802A85F8 82E30012 */ lb $v1, 0x12($s7) /* 41D38C 802A85FC 00031080 */ sll $v0, $v1, 2 /* 41D390 802A8600 00431021 */ addu $v0, $v0, $v1 @@ -325,8 +325,8 @@ glabel btl_state_update_partner_menu /* 41D404 802A8674 24040035 */ addiu $a0, $zero, 0x35 /* 41D408 802A8678 10400018 */ beqz $v0, .L802A86DC /* 41D40C 802A867C 2407000B */ addiu $a3, $zero, 0xb -/* 41D410 802A8680 3C06802B */ lui $a2, %hi(D_802AB390) -/* 41D414 802A8684 24C6B390 */ addiu $a2, $a2, %lo(D_802AB390) +/* 41D410 802A8680 3C06802B */ lui $a2, %hi(battle_menu_StarPowerHudScripts) +/* 41D414 802A8684 24C6B390 */ addiu $a2, $a2, %lo(battle_menu_StarPowerHudScripts) /* 41D418 802A8688 8CC40000 */ lw $a0, ($a2) /* 41D41C 802A868C 8EC5002C */ lw $a1, 0x2c($s6) /* 41D420 802A8690 96830070 */ lhu $v1, 0x70($s4) @@ -573,8 +573,8 @@ glabel btl_state_update_partner_menu /* 41D780 802A89F0 9282020E */ lbu $v0, 0x20e($s4) /* 41D784 802A89F4 1040007A */ beqz $v0, .L802A8BE0 /* 41D788 802A89F8 0000882D */ daddu $s1, $zero, $zero -/* 41D78C 802A89FC 3C1E802B */ lui $fp, %hi(D_802AB590) -/* 41D790 802A8A00 27DEB590 */ addiu $fp, $fp, %lo(D_802AB590) +/* 41D78C 802A89FC 3C1E802B */ lui $fp, %hi(battle_menu_PartnerMoveHudScripts) +/* 41D790 802A8A00 27DEB590 */ addiu $fp, $fp, %lo(battle_menu_PartnerMoveHudScripts) /* 41D794 802A8A04 2416000C */ addiu $s6, $zero, 0xc /* 41D798 802A8A08 24150008 */ addiu $s5, $zero, 8 .L802A8A0C: @@ -823,8 +823,8 @@ glabel btl_state_update_partner_menu /* 41DB20 802A8D90 0200882D */ daddu $s1, $s0, $zero /* 41DB24 802A8D94 3C098008 */ lui $t1, %hi(gItemTable) /* 41DB28 802A8D98 252978E0 */ addiu $t1, $t1, %lo(gItemTable) -/* 41DB2C 802A8D9C 3C088009 */ lui $t0, %hi(D_8008A680) -/* 41DB30 802A8DA0 2508A680 */ addiu $t0, $t0, %lo(D_8008A680) +/* 41DB2C 802A8D9C 3C088009 */ lui $t0, %hi(gItemHudScripts) +/* 41DB30 802A8DA0 2508A680 */ addiu $t0, $t0, %lo(gItemHudScripts) /* 41DB34 802A8DA4 24070001 */ addiu $a3, $zero, 1 /* 41DB38 802A8DA8 02E0302D */ daddu $a2, $s7, $zero /* 41DB3C 802A8DAC 0240282D */ daddu $a1, $s2, $zero @@ -958,13 +958,13 @@ glabel btl_state_update_partner_menu .L802A8F84_41DD14: /* 41DD14 802A8F84 0000802D */ daddu $s0, $zero, $zero /* 41DD18 802A8F88 24110001 */ addiu $s1, $zero, 1 -/* 41DD1C 802A8F8C 3C0C8009 */ lui $t4, %hi(D_8008EF20) -/* 41DD20 802A8F90 258CEF20 */ addiu $t4, $t4, %lo(D_8008EF20) -/* 41DD24 802A8F94 3C0B802B */ lui $t3, %hi(D_802AB3F8) -/* 41DD28 802A8F98 256BB3F8 */ addiu $t3, $t3, %lo(D_802AB3F8) +/* 41DD1C 802A8F8C 3C0C8009 */ lui $t4, %hi(gPartnerPopupProperties) +/* 41DD20 802A8F90 258CEF20 */ addiu $t4, $t4, %lo(gPartnerPopupProperties) +/* 41DD24 802A8F94 3C0B802B */ lui $t3, %hi(battle_menu_PartnerHudScripts) +/* 41DD28 802A8F98 256BB3F8 */ addiu $t3, $t3, %lo(battle_menu_PartnerHudScripts) /* 41DD2C 802A8F9C 0220502D */ daddu $t2, $s1, $zero -/* 41DD30 802A8FA0 3C09802B */ lui $t1, %hi(D_802AB438) -/* 41DD34 802A8FA4 2529B438 */ addiu $t1, $t1, %lo(D_802AB438) +/* 41DD30 802A8FA0 3C09802B */ lui $t1, %hi(battle_menu_DisabledPartnerHudScripts) +/* 41DD34 802A8FA4 2529B438 */ addiu $t1, $t1, %lo(battle_menu_DisabledPartnerHudScripts) /* 41DD38 802A8FA8 3C088009 */ lui $t0, %hi(D_8008EEC4) /* 41DD3C 802A8FAC 2508EEC4 */ addiu $t0, $t0, %lo(D_8008EEC4) /* 41DD40 802A8FB0 0240202D */ daddu $a0, $s2, $zero @@ -1129,8 +1129,8 @@ glabel btl_state_update_partner_menu /* 41DF88 802A91F8 A28201F6 */ sb $v0, 0x1f6($s4) /* 41DF8C 802A91FC 3C128009 */ lui $s2, %hi(gMoveTable) /* 41DF90 802A9200 2652F060 */ addiu $s2, $s2, %lo(gMoveTable) -/* 41DF94 802A9204 3C0F802B */ lui $t7, %hi(D_802AB398) -/* 41DF98 802A9208 25EFB398 */ addiu $t7, $t7, %lo(D_802AB398) +/* 41DF94 802A9204 3C0F802B */ lui $t7, %hi(battle_menu_StarPowerMovesHudScripts) +/* 41DF98 802A9208 25EFB398 */ addiu $t7, $t7, %lo(battle_menu_StarPowerMovesHudScripts) /* 41DF9C 802A920C 3C10802B */ lui $s0, %hi(battle_menu_moveOptionSortPriorities) /* 41DFA0 802A9210 2610D5D0 */ addiu $s0, $s0, %lo(battle_menu_moveOptionSortPriorities) /* 41DFA4 802A9214 3C0E802B */ lui $t6, %hi(battle_menu_moveOptionDisplayCostReductionColors) @@ -1327,8 +1327,8 @@ glabel btl_state_update_partner_menu /* 41E270 802A94E0 3C05001D */ lui $a1, 0x1d /* 41E274 802A94E4 34A500A1 */ ori $a1, $a1, 0xa1 /* 41E278 802A94E8 24020005 */ addiu $v0, $zero, 5 -/* 41E27C 802A94EC 3C04802B */ lui $a0, %hi(D_802AB4A4) -/* 41E280 802A94F0 8C84B4A4 */ lw $a0, %lo(D_802AB4A4)($a0) +/* 41E27C 802A94EC 3C04802B */ lui $a0, %hi(battle_menu_leftJustfiedMessagesB) +/* 41E280 802A94F0 8C84B4A4 */ lw $a0, %lo(battle_menu_leftJustfiedMessagesB)($a0) /* 41E284 802A94F4 82E30012 */ lb $v1, 0x12($s7) /* 41E288 802A94F8 3C06802B */ lui $a2, %hi(D_802AD690) /* 41E28C 802A94FC 24C6D690 */ addiu $a2, $a2, %lo(D_802AD690) @@ -1337,9 +1337,9 @@ glabel btl_state_update_partner_menu /* 41E298 802A9508 00031880 */ sll $v1, $v1, 2 /* 41E29C 802A950C 3C01802B */ lui $at, %hi(D_802AD658) /* 41E2A0 802A9510 AC24D658 */ sw $a0, %lo(D_802AD658)($at) -/* 41E2A4 802A9514 3C01802B */ lui $at, %hi(D_802AB3F8) +/* 41E2A4 802A9514 3C01802B */ lui $at, %hi(battle_menu_PartnerHudScripts) /* 41E2A8 802A9518 00230821 */ addu $at, $at, $v1 -/* 41E2AC 802A951C 8C23B3F8 */ lw $v1, %lo(D_802AB3F8)($at) +/* 41E2AC 802A951C 8C23B3F8 */ lw $v1, %lo(battle_menu_PartnerHudScripts)($at) /* 41E2B0 802A9520 24020001 */ addiu $v0, $zero, 1 /* 41E2B4 802A9524 ACC20000 */ sw $v0, ($a2) /* 41E2B8 802A9528 3C01802B */ lui $at, %hi(D_802AD6C0) @@ -1351,9 +1351,9 @@ glabel btl_state_update_partner_menu /* 41E2D0 802A9540 AC830000 */ sw $v1, ($a0) /* 41E2D4 802A9544 82E20012 */ lb $v0, 0x12($s7) /* 41E2D8 802A9548 00021080 */ sll $v0, $v0, 2 -/* 41E2DC 802A954C 3C01802B */ lui $at, %hi(D_802AB438) +/* 41E2DC 802A954C 3C01802B */ lui $at, %hi(battle_menu_DisabledPartnerHudScripts) /* 41E2E0 802A9550 00220821 */ addu $at, $at, $v0 -/* 41E2E4 802A9554 8C22B438 */ lw $v0, %lo(D_802AB438)($at) +/* 41E2E4 802A9554 8C22B438 */ lw $v0, %lo(battle_menu_DisabledPartnerHudScripts)($at) /* 41E2E8 802A9558 ACC00000 */ sw $zero, ($a2) /* 41E2EC 802A955C 3C01802B */ lui $at, %hi(D_802AD6A8) /* 41E2F0 802A9560 AC20D6A8 */ sw $zero, %lo(D_802AD6A8)($at) @@ -1363,8 +1363,8 @@ glabel btl_state_update_partner_menu .L802A956C: /* 41E2FC 802A956C 3C05001D */ lui $a1, 0x1d /* 41E300 802A9570 00101880 */ sll $v1, $s0, 2 -/* 41E304 802A9574 3C04802B */ lui $a0, %hi(D_802AB480) -/* 41E308 802A9578 8C84B480 */ lw $a0, %lo(D_802AB480)($a0) +/* 41E304 802A9574 3C04802B */ lui $a0, %hi(battle_menu_DoNothingHudScripts) +/* 41E308 802A9578 8C84B480 */ lw $a0, %lo(battle_menu_DoNothingHudScripts)($a0) /* 41E30C 802A957C 24020009 */ addiu $v0, $zero, 9 /* 41E310 802A9580 3C01802B */ lui $at, %hi(D_802AD678) /* 41E314 802A9584 00230821 */ addu $at, $at, $v1 @@ -1376,8 +1376,8 @@ glabel btl_state_update_partner_menu /* 41E32C 802A959C 3C01802B */ lui $at, %hi(D_802AD640) /* 41E330 802A95A0 00230821 */ addu $at, $at, $v1 /* 41E334 802A95A4 AC24D640 */ sw $a0, %lo(D_802AD640)($at) -/* 41E338 802A95A8 3C02802B */ lui $v0, %hi(D_802AB4B4) -/* 41E33C 802A95AC 8C42B4B4 */ lw $v0, %lo(D_802AB4B4)($v0) +/* 41E338 802A95A8 3C02802B */ lui $v0, %hi(battle_menu_leftJustfiedMessagesC) +/* 41E33C 802A95AC 8C42B4B4 */ lw $v0, %lo(battle_menu_leftJustfiedMessagesC)($v0) /* 41E340 802A95B0 34A500A2 */ ori $a1, $a1, 0xa2 /* 41E344 802A95B4 3C01802B */ lui $at, %hi(D_802AD6C0) /* 41E348 802A95B8 00230821 */ addu $at, $at, $v1 @@ -1529,13 +1529,13 @@ glabel btl_state_update_partner_menu .L802A97D0_41E560: /* 41E560 802A97D0 0000802D */ daddu $s0, $zero, $zero /* 41E564 802A97D4 24110001 */ addiu $s1, $zero, 1 -/* 41E568 802A97D8 3C0C8009 */ lui $t4, %hi(D_8008EF20) -/* 41E56C 802A97DC 258CEF20 */ addiu $t4, $t4, %lo(D_8008EF20) -/* 41E570 802A97E0 3C0B802B */ lui $t3, %hi(D_802AB3F8) -/* 41E574 802A97E4 256BB3F8 */ addiu $t3, $t3, %lo(D_802AB3F8) +/* 41E568 802A97D8 3C0C8009 */ lui $t4, %hi(gPartnerPopupProperties) +/* 41E56C 802A97DC 258CEF20 */ addiu $t4, $t4, %lo(gPartnerPopupProperties) +/* 41E570 802A97E0 3C0B802B */ lui $t3, %hi(battle_menu_PartnerHudScripts) +/* 41E574 802A97E4 256BB3F8 */ addiu $t3, $t3, %lo(battle_menu_PartnerHudScripts) /* 41E578 802A97E8 0220502D */ daddu $t2, $s1, $zero -/* 41E57C 802A97EC 3C09802B */ lui $t1, %hi(D_802AB438) -/* 41E580 802A97F0 2529B438 */ addiu $t1, $t1, %lo(D_802AB438) +/* 41E57C 802A97EC 3C09802B */ lui $t1, %hi(battle_menu_DisabledPartnerHudScripts) +/* 41E580 802A97F0 2529B438 */ addiu $t1, $t1, %lo(battle_menu_DisabledPartnerHudScripts) /* 41E584 802A97F4 3C088009 */ lui $t0, %hi(D_8008EEC4) /* 41E588 802A97F8 2508EEC4 */ addiu $t0, $t0, %lo(D_8008EEC4) /* 41E58C 802A97FC 0240202D */ daddu $a0, $s2, $zero diff --git a/ver/us/asm/nonmatchings/415D90/btl_state_update_peach_menu.s b/ver/us/asm/nonmatchings/415D90/btl_state_update_peach_menu.s index b918da01cf..a78f8bf582 100644 --- a/ver/us/asm/nonmatchings/415D90/btl_state_update_peach_menu.s +++ b/ver/us/asm/nonmatchings/415D90/btl_state_update_peach_menu.s @@ -197,10 +197,10 @@ glabel btl_state_update_peach_menu /* 41EB9C 802A9E0C 24020001 */ addiu $v0, $zero, 1 /* 41EBA0 802A9E10 3C08802B */ lui $t0, %hi(battle_menu_isMessageDisabled) /* 41EBA4 802A9E14 2508D0E8 */ addiu $t0, $t0, %lo(battle_menu_isMessageDisabled) -/* 41EBA8 802A9E18 3C06802B */ lui $a2, %hi(D_802AB720) -/* 41EBAC 802A9E1C 24C6B720 */ addiu $a2, $a2, %lo(D_802AB720) -/* 41EBB0 802A9E20 3C05802B */ lui $a1, %hi(main_battle_menu_iconScripts) -/* 41EBB4 802A9E24 24A5D078 */ addiu $a1, $a1, %lo(main_battle_menu_iconScripts) +/* 41EBA8 802A9E18 3C06802B */ lui $a2, %hi(battle_menu_PeachStarPowerHudScripts) +/* 41EBAC 802A9E1C 24C6B720 */ addiu $a2, $a2, %lo(battle_menu_PeachStarPowerHudScripts) +/* 41EBB0 802A9E20 3C05802B */ lui $a1, %hi(main_battle_menu_JumpHudScripts) +/* 41EBB4 802A9E24 24A5D078 */ addiu $a1, $a1, %lo(main_battle_menu_JumpHudScripts) /* 41EBB8 802A9E28 ACE20000 */ sw $v0, ($a3) /* 41EBBC 802A9E2C AD000000 */ sw $zero, ($t0) /* 41EBC0 802A9E30 8CC30000 */ lw $v1, ($a2) diff --git a/ver/us/asm/nonmatchings/415D90/btl_state_update_player_menu.s b/ver/us/asm/nonmatchings/415D90/btl_state_update_player_menu.s index 4c0abfe021..5921915a46 100644 --- a/ver/us/asm/nonmatchings/415D90/btl_state_update_player_menu.s +++ b/ver/us/asm/nonmatchings/415D90/btl_state_update_player_menu.s @@ -232,18 +232,18 @@ glabel btl_state_update_player_menu /* 41AA68 802A5CD8 241E0002 */ addiu $fp, $zero, 2 /* 41AA6C 802A5CDC A2C0004C */ sb $zero, 0x4c($s6) .L802A5CE0: -/* 41AA70 802A5CE0 3C03802B */ lui $v1, %hi(D_802AB478) -/* 41AA74 802A5CE4 8C63B478 */ lw $v1, %lo(D_802AB478)($v1) +/* 41AA70 802A5CE0 3C03802B */ lui $v1, %hi(battle_menu_StrategiesHudScript) +/* 41AA74 802A5CE4 8C63B478 */ lw $v1, %lo(battle_menu_StrategiesHudScript)($v1) /* 41AA78 802A5CE8 24020007 */ addiu $v0, $zero, 7 /* 41AA7C 802A5CEC 3C01802B */ lui $at, %hi(battle_menu_submenuIDs) /* 41AA80 802A5CF0 AC22D0B8 */ sw $v0, %lo(battle_menu_submenuIDs)($at) /* 41AA84 802A5CF4 24020001 */ addiu $v0, $zero, 1 /* 41AA88 802A5CF8 3C01802B */ lui $at, %hi(battle_menu_isEnabled) /* 41AA8C 802A5CFC AC22D0D0 */ sw $v0, %lo(battle_menu_isEnabled)($at) -/* 41AA90 802A5D00 3C02802B */ lui $v0, %hi(D_802AB4DC) -/* 41AA94 802A5D04 8C42B4DC */ lw $v0, %lo(D_802AB4DC)($v0) -/* 41AA98 802A5D08 3C01802B */ lui $at, %hi(main_battle_menu_iconScripts) -/* 41AA9C 802A5D0C AC23D078 */ sw $v1, %lo(main_battle_menu_iconScripts)($at) +/* 41AA90 802A5D00 3C02802B */ lui $v0, %hi(battle_menu_centeredMessagesC) +/* 41AA94 802A5D04 8C42B4DC */ lw $v0, %lo(battle_menu_centeredMessagesC)($v0) +/* 41AA98 802A5D08 3C01802B */ lui $at, %hi(main_battle_menu_JumpHudScripts) +/* 41AA9C 802A5D0C AC23D078 */ sw $v1, %lo(main_battle_menu_JumpHudScripts)($at) /* 41AAA0 802A5D10 82C30083 */ lb $v1, 0x83($s6) /* 41AAA4 802A5D14 3C04802B */ lui $a0, %hi(battle_menu_messageIDs) /* 41AAA8 802A5D18 2484D090 */ addiu $a0, $a0, %lo(battle_menu_messageIDs) @@ -268,14 +268,14 @@ glabel btl_state_update_player_menu /* 41AAEC 802A5D5C 30420080 */ andi $v0, $v0, 0x80 /* 41AAF0 802A5D60 1440000B */ bnez $v0, .L802A5D90 /* 41AAF4 802A5D64 00000000 */ nop -/* 41AAF8 802A5D68 3C02802B */ lui $v0, %hi(D_802AB47C) -/* 41AAFC 802A5D6C 8C42B47C */ lw $v0, %lo(D_802AB47C)($v0) +/* 41AAF8 802A5D68 3C02802B */ lui $v0, %hi(battle_menu_DisabledStrategiesHudScript) +/* 41AAFC 802A5D6C 8C42B47C */ lw $v0, %lo(battle_menu_DisabledStrategiesHudScript)($v0) /* 41AB00 802A5D70 3C01802B */ lui $at, %hi(battle_menu_isEnabled) /* 41AB04 802A5D74 00230821 */ addu $at, $at, $v1 /* 41AB08 802A5D78 AC20D0D0 */ sw $zero, %lo(battle_menu_isEnabled)($at) -/* 41AB0C 802A5D7C 3C01802B */ lui $at, %hi(main_battle_menu_iconScripts) +/* 41AB0C 802A5D7C 3C01802B */ lui $at, %hi(main_battle_menu_JumpHudScripts) /* 41AB10 802A5D80 00230821 */ addu $at, $at, $v1 -/* 41AB14 802A5D84 AC22D078 */ sw $v0, %lo(main_battle_menu_iconScripts)($at) +/* 41AB14 802A5D84 AC22D078 */ sw $v0, %lo(main_battle_menu_JumpHudScripts)($at) /* 41AB18 802A5D88 24020048 */ addiu $v0, $zero, 0x48 /* 41AB1C 802A5D8C AC820000 */ sw $v0, ($a0) .L802A5D90: @@ -287,11 +287,11 @@ glabel btl_state_update_player_menu /* 41AB30 802A5DA0 82C2007D */ lb $v0, 0x7d($s6) /* 41AB34 802A5DA4 04400034 */ bltz $v0, .L802A5E78 /* 41AB38 802A5DA8 26940001 */ addiu $s4, $s4, 1 -/* 41AB3C 802A5DAC 3C03802B */ lui $v1, %hi(main_battle_menu_iconScripts) -/* 41AB40 802A5DB0 2463D078 */ addiu $v1, $v1, %lo(main_battle_menu_iconScripts) +/* 41AB3C 802A5DAC 3C03802B */ lui $v1, %hi(main_battle_menu_JumpHudScripts) +/* 41AB40 802A5DB0 2463D078 */ addiu $v1, $v1, %lo(main_battle_menu_JumpHudScripts) /* 41AB44 802A5DB4 00142080 */ sll $a0, $s4, 2 -/* 41AB48 802A5DB8 3C07802B */ lui $a3, %hi(D_802AB388) -/* 41AB4C 802A5DBC 24E7B388 */ addiu $a3, $a3, %lo(D_802AB388) +/* 41AB48 802A5DB8 3C07802B */ lui $a3, %hi(battle_menu_ItemHudScripts) +/* 41AB4C 802A5DBC 24E7B388 */ addiu $a3, $a3, %lo(battle_menu_ItemHudScripts) /* 41AB50 802A5DC0 00833021 */ addu $a2, $a0, $v1 /* 41AB54 802A5DC4 8CE20000 */ lw $v0, ($a3) /* 41AB58 802A5DC8 24090002 */ addiu $t1, $zero, 2 @@ -304,8 +304,8 @@ glabel btl_state_update_player_menu /* 41AB74 802A5DE4 00240821 */ addu $at, $at, $a0 /* 41AB78 802A5DE8 AC29D0B8 */ sw $t1, %lo(battle_menu_submenuIDs)($at) /* 41AB7C 802A5DEC ACA20000 */ sw $v0, ($a1) -/* 41AB80 802A5DF0 3C02802B */ lui $v0, %hi(D_802AB4C8) -/* 41AB84 802A5DF4 8C42B4C8 */ lw $v0, %lo(D_802AB4C8)($v0) +/* 41AB80 802A5DF0 3C02802B */ lui $v0, %hi(battle_menu_centeredMessagesB) +/* 41AB84 802A5DF4 8C42B4C8 */ lw $v0, %lo(battle_menu_centeredMessagesB)($v0) /* 41AB88 802A5DF8 3C01802B */ lui $at, %hi(battle_menu_messageIDs) /* 41AB8C 802A5DFC 00240821 */ addu $at, $at, $a0 /* 41AB90 802A5E00 AC22D090 */ sw $v0, %lo(battle_menu_messageIDs)($at) @@ -343,24 +343,24 @@ glabel btl_state_update_player_menu .L802A5E74: /* 41AC04 802A5E74 26940001 */ addiu $s4, $s4, 1 .L802A5E78: -/* 41AC08 802A5E78 3C0C802B */ lui $t4, %hi(main_battle_menu_iconScripts) -/* 41AC0C 802A5E7C 258CD078 */ addiu $t4, $t4, %lo(main_battle_menu_iconScripts) +/* 41AC08 802A5E78 3C0C802B */ lui $t4, %hi(main_battle_menu_JumpHudScripts) +/* 41AC0C 802A5E7C 258CD078 */ addiu $t4, $t4, %lo(main_battle_menu_JumpHudScripts) /* 41AC10 802A5E80 00141880 */ sll $v1, $s4, 2 /* 41AC14 802A5E84 006C3021 */ addu $a2, $v1, $t4 /* 41AC18 802A5E88 3C0B802B */ lui $t3, %hi(battle_menu_isEnabled) /* 41AC1C 802A5E8C 256BD0D0 */ addiu $t3, $t3, %lo(battle_menu_isEnabled) /* 41AC20 802A5E90 006B2821 */ addu $a1, $v1, $t3 /* 41AC24 802A5E94 24090001 */ addiu $t1, $zero, 1 -/* 41AC28 802A5E98 3C0A802B */ lui $t2, %hi(battle_menu_centeredMessages) -/* 41AC2C 802A5E9C 254AB4C0 */ addiu $t2, $t2, %lo(battle_menu_centeredMessages) +/* 41AC28 802A5E98 3C0A802B */ lui $t2, %hi(battle_menu_centeredMessagesA) +/* 41AC2C 802A5E9C 254AB4C0 */ addiu $t2, $t2, %lo(battle_menu_centeredMessagesA) /* 41AC30 802A5EA0 82A20000 */ lb $v0, ($s5) /* 41AC34 802A5EA4 24420001 */ addiu $v0, $v0, 1 /* 41AC38 802A5EA8 000210C0 */ sll $v0, $v0, 3 -/* 41AC3C 802A5EAC 3C01802B */ lui $at, %hi(battle_menu_iconScripts) +/* 41AC3C 802A5EAC 3C01802B */ lui $at, %hi(battle_menu_JumpHudScripts) /* 41AC40 802A5EB0 00220821 */ addu $at, $at, $v0 -/* 41AC44 802A5EB4 8C22B348 */ lw $v0, %lo(battle_menu_iconScripts)($at) -/* 41AC48 802A5EB8 3C04802B */ lui $a0, %hi(battle_menu_iconScripts) -/* 41AC4C 802A5EBC 2484B348 */ addiu $a0, $a0, %lo(battle_menu_iconScripts) +/* 41AC44 802A5EB4 8C22B348 */ lw $v0, %lo(battle_menu_JumpHudScripts)($at) +/* 41AC48 802A5EB8 3C04802B */ lui $a0, %hi(battle_menu_JumpHudScripts) +/* 41AC4C 802A5EBC 2484B348 */ addiu $a0, $a0, %lo(battle_menu_JumpHudScripts) /* 41AC50 802A5EC0 ACC20000 */ sw $v0, ($a2) /* 41AC54 802A5EC4 3C01802B */ lui $at, %hi(battle_menu_submenuIDs) /* 41AC58 802A5EC8 00230821 */ addu $at, $at, $v1 @@ -419,9 +419,9 @@ glabel btl_state_update_player_menu /* 41AD1C 802A5F8C 24420001 */ addiu $v0, $v0, 1 /* 41AD20 802A5F90 000210C0 */ sll $v0, $v0, 3 /* 41AD24 802A5F94 008C3021 */ addu $a2, $a0, $t4 -/* 41AD28 802A5F98 3C01802B */ lui $at, %hi(D_802AB368) +/* 41AD28 802A5F98 3C01802B */ lui $at, %hi(battle_menu_HammerHudScripts) /* 41AD2C 802A5F9C 00220821 */ addu $at, $at, $v0 -/* 41AD30 802A5FA0 8C22B368 */ lw $v0, %lo(D_802AB368)($at) +/* 41AD30 802A5FA0 8C22B368 */ lw $v0, %lo(battle_menu_HammerHudScripts)($at) /* 41AD34 802A5FA4 008B2821 */ addu $a1, $a0, $t3 /* 41AD38 802A5FA8 ACC20000 */ sw $v0, ($a2) /* 41AD3C 802A5FAC 00871021 */ addu $v0, $a0, $a3 @@ -431,9 +431,9 @@ glabel btl_state_update_player_menu /* 41AD4C 802A5FBC 00881021 */ addu $v0, $a0, $t0 /* 41AD50 802A5FC0 AC430000 */ sw $v1, ($v0) /* 41AD54 802A5FC4 82C2007F */ lb $v0, 0x7f($s6) -/* 41AD58 802A5FC8 3C03802B */ lui $v1, %hi(D_802AB368) +/* 41AD58 802A5FC8 3C03802B */ lui $v1, %hi(battle_menu_HammerHudScripts) /* 41AD5C 802A5FCC 1C400008 */ bgtz $v0, .L802A5FF0 -/* 41AD60 802A5FD0 2463B368 */ addiu $v1, $v1, %lo(D_802AB368) +/* 41AD60 802A5FD0 2463B368 */ addiu $v1, $v1, %lo(battle_menu_HammerHudScripts) /* 41AD64 802A5FD4 8C620000 */ lw $v0, ($v1) /* 41AD68 802A5FD8 ACC20000 */ sw $v0, ($a2) /* 41AD6C 802A5FDC 24020044 */ addiu $v0, $zero, 0x44 @@ -474,10 +474,10 @@ glabel btl_state_update_player_menu /* 41ADE4 802A6054 82A2028E */ lb $v0, 0x28e($s5) /* 41ADE8 802A6058 10400027 */ beqz $v0, .L802A60F8 /* 41ADEC 802A605C 00141880 */ sll $v1, $s4, 2 -/* 41ADF0 802A6060 3C04802B */ lui $a0, %hi(main_battle_menu_iconScripts) -/* 41ADF4 802A6064 2484D078 */ addiu $a0, $a0, %lo(main_battle_menu_iconScripts) -/* 41ADF8 802A6068 3C06802B */ lui $a2, %hi(D_802AB390) -/* 41ADFC 802A606C 24C6B390 */ addiu $a2, $a2, %lo(D_802AB390) +/* 41ADF0 802A6060 3C04802B */ lui $a0, %hi(main_battle_menu_JumpHudScripts) +/* 41ADF4 802A6064 2484D078 */ addiu $a0, $a0, %lo(main_battle_menu_JumpHudScripts) +/* 41ADF8 802A6068 3C06802B */ lui $a2, %hi(battle_menu_StarPowerHudScripts) +/* 41ADFC 802A606C 24C6B390 */ addiu $a2, $a2, %lo(battle_menu_StarPowerHudScripts) /* 41AE00 802A6070 00642821 */ addu $a1, $v1, $a0 /* 41AE04 802A6074 8CC20000 */ lw $v0, ($a2) /* 41AE08 802A6078 24070008 */ addiu $a3, $zero, 8 @@ -490,8 +490,8 @@ glabel btl_state_update_player_menu /* 41AE24 802A6094 00230821 */ addu $at, $at, $v1 /* 41AE28 802A6098 AC27D0B8 */ sw $a3, %lo(battle_menu_submenuIDs)($at) /* 41AE2C 802A609C AC820000 */ sw $v0, ($a0) -/* 41AE30 802A60A0 3C02802B */ lui $v0, %hi(D_802AB4E0) -/* 41AE34 802A60A4 8C42B4E0 */ lw $v0, %lo(D_802AB4E0)($v0) +/* 41AE30 802A60A0 3C02802B */ lui $v0, %hi(battle_menu_centeredMessagesD) +/* 41AE34 802A60A4 8C42B4E0 */ lw $v0, %lo(battle_menu_centeredMessagesD)($v0) /* 41AE38 802A60A8 3C01802B */ lui $at, %hi(battle_menu_messageIDs) /* 41AE3C 802A60AC 00230821 */ addu $at, $at, $v1 /* 41AE40 802A60B0 AC22D090 */ sw $v0, %lo(battle_menu_messageIDs)($at) @@ -1005,8 +1005,8 @@ glabel btl_state_update_player_menu /* 41B564 802A67D4 00021140 */ sll $v0, $v0, 5 /* 41B568 802A67D8 004E8021 */ addu $s0, $v0, $t6 /* 41B56C 802A67DC 86020004 */ lh $v0, 4($s0) -/* 41B570 802A67E0 3C0E8009 */ lui $t6, %hi(D_8008A680) -/* 41B574 802A67E4 25CEA680 */ addiu $t6, $t6, %lo(D_8008A680) +/* 41B570 802A67E0 3C0E8009 */ lui $t6, %hi(gItemHudScripts) +/* 41B574 802A67E4 25CEA680 */ addiu $t6, $t6, %lo(gItemHudScripts) /* 41B578 802A67E8 A0800000 */ sb $zero, ($a0) /* 41B57C 802A67EC 828301F6 */ lb $v1, 0x1f6($s4) /* 41B580 802A67F0 000210C0 */ sll $v0, $v0, 3 @@ -1434,8 +1434,8 @@ glabel btl_state_update_player_menu /* 41BB78 802A6DE8 3C0E8008 */ lui $t6, %hi(gItemTable) /* 41BB7C 802A6DEC 25CE78E0 */ addiu $t6, $t6, %lo(gItemTable) /* 41BB80 802A6DF0 004E8021 */ addu $s0, $v0, $t6 -/* 41BB84 802A6DF4 3C0E8009 */ lui $t6, %hi(D_8008A680) -/* 41BB88 802A6DF8 25CEA680 */ addiu $t6, $t6, %lo(D_8008A680) +/* 41BB84 802A6DF4 3C0E8009 */ lui $t6, %hi(gItemHudScripts) +/* 41BB88 802A6DF8 25CEA680 */ addiu $t6, $t6, %lo(gItemHudScripts) /* 41BB8C 802A6DFC 86020004 */ lh $v0, 4($s0) /* 41BB90 802A6E00 96030018 */ lhu $v1, 0x18($s0) /* 41BB94 802A6E04 000210C0 */ sll $v0, $v0, 3 @@ -1630,8 +1630,8 @@ glabel btl_state_update_player_menu /* 41BE48 802A70B8 3C0E8008 */ lui $t6, %hi(gItemTable) /* 41BE4C 802A70BC 25CE78E0 */ addiu $t6, $t6, %lo(gItemTable) /* 41BE50 802A70C0 004E8021 */ addu $s0, $v0, $t6 -/* 41BE54 802A70C4 3C0E8009 */ lui $t6, %hi(D_8008A680) -/* 41BE58 802A70C8 25CEA680 */ addiu $t6, $t6, %lo(D_8008A680) +/* 41BE54 802A70C4 3C0E8009 */ lui $t6, %hi(gItemHudScripts) +/* 41BE58 802A70C8 25CEA680 */ addiu $t6, $t6, %lo(gItemHudScripts) /* 41BE5C 802A70CC 86020004 */ lh $v0, 4($s0) /* 41BE60 802A70D0 96030018 */ lhu $v1, 0x18($s0) /* 41BE64 802A70D4 000210C0 */ sll $v0, $v0, 3 @@ -1789,8 +1789,8 @@ glabel btl_state_update_player_menu /* 41C094 802A7304 24070048 */ addiu $a3, $zero, 0x48 /* 41C098 802A7308 240AFFFE */ addiu $t2, $zero, -2 /* 41C09C 802A730C 24090001 */ addiu $t1, $zero, 1 -/* 41C0A0 802A7310 3C08802B */ lui $t0, %hi(D_802AB398) -/* 41C0A4 802A7314 2508B398 */ addiu $t0, $t0, %lo(D_802AB398) +/* 41C0A0 802A7310 3C08802B */ lui $t0, %hi(battle_menu_StarPowerMovesHudScripts) +/* 41C0A4 802A7314 2508B398 */ addiu $t0, $t0, %lo(battle_menu_StarPowerMovesHudScripts) /* 41C0A8 802A7318 3C06802B */ lui $a2, %hi(battle_menu_moveOptionIconScripts) /* 41C0AC 802A731C 24C6D260 */ addiu $a2, $a2, %lo(battle_menu_moveOptionIconScripts) .L802A7320: @@ -2037,8 +2037,8 @@ glabel btl_state_update_player_menu /* 41C428 802A7698 3C0E8008 */ lui $t6, %hi(gItemTable) /* 41C42C 802A769C 25CE78E0 */ addiu $t6, $t6, %lo(gItemTable) /* 41C430 802A76A0 004E8021 */ addu $s0, $v0, $t6 -/* 41C434 802A76A4 3C0E8009 */ lui $t6, %hi(D_8008A680) -/* 41C438 802A76A8 25CEA680 */ addiu $t6, $t6, %lo(D_8008A680) +/* 41C434 802A76A4 3C0E8009 */ lui $t6, %hi(gItemHudScripts) +/* 41C438 802A76A8 25CEA680 */ addiu $t6, $t6, %lo(gItemHudScripts) /* 41C43C 802A76AC 86020004 */ lh $v0, 4($s0) /* 41C440 802A76B0 96030018 */ lhu $v1, 0x18($s0) /* 41C444 802A76B4 000210C0 */ sll $v0, $v0, 3 @@ -2295,8 +2295,8 @@ glabel btl_state_update_player_menu /* 41C7C4 802A7A34 3C05001D */ lui $a1, 0x1d /* 41C7C8 802A7A38 34A500A1 */ ori $a1, $a1, 0xa1 /* 41C7CC 802A7A3C 24020005 */ addiu $v0, $zero, 5 -/* 41C7D0 802A7A40 3C04802B */ lui $a0, %hi(D_802AB4A4) -/* 41C7D4 802A7A44 8C84B4A4 */ lw $a0, %lo(D_802AB4A4)($a0) +/* 41C7D0 802A7A40 3C04802B */ lui $a0, %hi(battle_menu_leftJustfiedMessagesB) +/* 41C7D4 802A7A44 8C84B4A4 */ lw $a0, %lo(battle_menu_leftJustfiedMessagesB)($a0) /* 41C7D8 802A7A48 82A30012 */ lb $v1, 0x12($s5) /* 41C7DC 802A7A4C 3C06802B */ lui $a2, %hi(D_802AD690) /* 41C7E0 802A7A50 24C6D690 */ addiu $a2, $a2, %lo(D_802AD690) @@ -2305,9 +2305,9 @@ glabel btl_state_update_player_menu /* 41C7EC 802A7A5C 00031880 */ sll $v1, $v1, 2 /* 41C7F0 802A7A60 3C01802B */ lui $at, %hi(D_802AD658) /* 41C7F4 802A7A64 AC24D658 */ sw $a0, %lo(D_802AD658)($at) -/* 41C7F8 802A7A68 3C01802B */ lui $at, %hi(D_802AB3F8) +/* 41C7F8 802A7A68 3C01802B */ lui $at, %hi(battle_menu_PartnerHudScripts) /* 41C7FC 802A7A6C 00230821 */ addu $at, $at, $v1 -/* 41C800 802A7A70 8C23B3F8 */ lw $v1, %lo(D_802AB3F8)($at) +/* 41C800 802A7A70 8C23B3F8 */ lw $v1, %lo(battle_menu_PartnerHudScripts)($at) /* 41C804 802A7A74 24020001 */ addiu $v0, $zero, 1 /* 41C808 802A7A78 ACC20000 */ sw $v0, ($a2) /* 41C80C 802A7A7C 3C01802B */ lui $at, %hi(D_802AD6C0) @@ -2319,9 +2319,9 @@ glabel btl_state_update_player_menu /* 41C824 802A7A94 AC830000 */ sw $v1, ($a0) /* 41C828 802A7A98 82A20012 */ lb $v0, 0x12($s5) /* 41C82C 802A7A9C 00021080 */ sll $v0, $v0, 2 -/* 41C830 802A7AA0 3C01802B */ lui $at, %hi(D_802AB438) +/* 41C830 802A7AA0 3C01802B */ lui $at, %hi(battle_menu_DisabledPartnerHudScripts) /* 41C834 802A7AA4 00220821 */ addu $at, $at, $v0 -/* 41C838 802A7AA8 8C22B438 */ lw $v0, %lo(D_802AB438)($at) +/* 41C838 802A7AA8 8C22B438 */ lw $v0, %lo(battle_menu_DisabledPartnerHudScripts)($at) /* 41C83C 802A7AAC ACC00000 */ sw $zero, ($a2) /* 41C840 802A7AB0 3C01802B */ lui $at, %hi(D_802AD6A8) /* 41C844 802A7AB4 AC20D6A8 */ sw $zero, %lo(D_802AD6A8)($at) @@ -2335,8 +2335,8 @@ glabel btl_state_update_player_menu /* 41C85C 802A7ACC 26940001 */ addiu $s4, $s4, 1 /* 41C860 802A7AD0 24020009 */ addiu $v0, $zero, 9 /* 41C864 802A7AD4 24080001 */ addiu $t0, $zero, 1 -/* 41C868 802A7AD8 3C04802B */ lui $a0, %hi(D_802AB480) -/* 41C86C 802A7ADC 8C84B480 */ lw $a0, %lo(D_802AB480)($a0) +/* 41C868 802A7AD8 3C04802B */ lui $a0, %hi(battle_menu_DoNothingHudScripts) +/* 41C86C 802A7ADC 8C84B480 */ lw $a0, %lo(battle_menu_DoNothingHudScripts)($a0) /* 41C870 802A7AE0 3C06001D */ lui $a2, 0x1d /* 41C874 802A7AE4 3C01802B */ lui $at, %hi(D_802AD678) /* 41C878 802A7AE8 00230821 */ addu $at, $at, $v1 @@ -2347,11 +2347,11 @@ glabel btl_state_update_player_menu /* 41C88C 802A7AFC 3C01802B */ lui $at, %hi(D_802AD640) /* 41C890 802A7B00 00230821 */ addu $at, $at, $v1 /* 41C894 802A7B04 AC24D640 */ sw $a0, %lo(D_802AD640)($at) -/* 41C898 802A7B08 3C04802B */ lui $a0, %hi(battle_menu_leftJustfiedMessages) -/* 41C89C 802A7B0C 2484B490 */ addiu $a0, $a0, %lo(battle_menu_leftJustfiedMessages) +/* 41C898 802A7B08 3C04802B */ lui $a0, %hi(battle_menu_leftJustfiedMessagesA) +/* 41C89C 802A7B0C 2484B490 */ addiu $a0, $a0, %lo(battle_menu_leftJustfiedMessagesA) /* 41C8A0 802A7B10 8C820024 */ lw $v0, 0x24($a0) -/* 41C8A4 802A7B14 3C09802B */ lui $t1, %hi(D_802AB488) -/* 41C8A8 802A7B18 2529B488 */ addiu $t1, $t1, %lo(D_802AB488) +/* 41C8A4 802A7B14 3C09802B */ lui $t1, %hi(battle_menu_FleeHudScripts) +/* 41C8A8 802A7B18 2529B488 */ addiu $t1, $t1, %lo(battle_menu_FleeHudScripts) /* 41C8AC 802A7B1C 3C01802B */ lui $at, %hi(D_802AD6C0) /* 41C8B0 802A7B20 00230821 */ addu $at, $at, $v1 /* 41C8B4 802A7B24 AC25D6C0 */ sw $a1, %lo(D_802AD6C0)($at) @@ -2572,13 +2572,13 @@ glabel btl_state_update_player_menu .L802A7E3C_41CBCC: /* 41CBCC 802A7E3C 0000A02D */ daddu $s4, $zero, $zero /* 41CBD0 802A7E40 24130001 */ addiu $s3, $zero, 1 -/* 41CBD4 802A7E44 3C0C8009 */ lui $t4, %hi(D_8008EF20) -/* 41CBD8 802A7E48 258CEF20 */ addiu $t4, $t4, %lo(D_8008EF20) -/* 41CBDC 802A7E4C 3C0B802B */ lui $t3, %hi(D_802AB3F8) -/* 41CBE0 802A7E50 256BB3F8 */ addiu $t3, $t3, %lo(D_802AB3F8) +/* 41CBD4 802A7E44 3C0C8009 */ lui $t4, %hi(gPartnerPopupProperties) +/* 41CBD8 802A7E48 258CEF20 */ addiu $t4, $t4, %lo(gPartnerPopupProperties) +/* 41CBDC 802A7E4C 3C0B802B */ lui $t3, %hi(battle_menu_PartnerHudScripts) +/* 41CBE0 802A7E50 256BB3F8 */ addiu $t3, $t3, %lo(battle_menu_PartnerHudScripts) /* 41CBE4 802A7E54 0260502D */ daddu $t2, $s3, $zero -/* 41CBE8 802A7E58 3C09802B */ lui $t1, %hi(D_802AB438) -/* 41CBEC 802A7E5C 2529B438 */ addiu $t1, $t1, %lo(D_802AB438) +/* 41CBE8 802A7E58 3C09802B */ lui $t1, %hi(battle_menu_DisabledPartnerHudScripts) +/* 41CBEC 802A7E5C 2529B438 */ addiu $t1, $t1, %lo(battle_menu_DisabledPartnerHudScripts) /* 41CBF0 802A7E60 3C088009 */ lui $t0, %hi(D_8008EEC4) /* 41CBF4 802A7E64 2508EEC4 */ addiu $t0, $t0, %lo(D_8008EEC4) /* 41CBF8 802A7E68 3C04802B */ lui $a0, %hi(D_802ACCD0) diff --git a/ver/us/asm/nonmatchings/415D90/btl_state_update_select_target.s b/ver/us/asm/nonmatchings/415D90/btl_state_update_select_target.s index 70fb27deb7..8611c26f85 100644 --- a/ver/us/asm/nonmatchings/415D90/btl_state_update_select_target.s +++ b/ver/us/asm/nonmatchings/415D90/btl_state_update_select_target.s @@ -156,8 +156,8 @@ glabel btl_state_update_select_target /* 41F644 802AA8B4 3C12802B */ lui $s2, %hi(D_802ACC70) /* 41F648 802AA8B8 2652CC70 */ addiu $s2, $s2, %lo(D_802ACC70) .L802AA8BC: -/* 41F64C 802AA8BC 3C048008 */ lui $a0, %hi(D_8007FF20) -/* 41F650 802AA8C0 2484FF20 */ addiu $a0, $a0, %lo(D_8007FF20) +/* 41F64C 802AA8BC 3C048008 */ lui $a0, %hi(HudScript_HandPointDownLoop) +/* 41F650 802AA8C0 2484FF20 */ addiu $a0, $a0, %lo(HudScript_HandPointDownLoop) /* 41F654 802AA8C4 0C050529 */ jal create_hud_element /* 41F658 802AA8C8 26100001 */ addiu $s0, $s0, 1 /* 41F65C 802AA8CC 0040882D */ daddu $s1, $v0, $zero @@ -266,13 +266,13 @@ glabel btl_state_update_select_target /* 41F7D0 802AAA40 30420800 */ andi $v0, $v0, 0x800 /* 41F7D4 802AAA44 10400005 */ beqz $v0, .L802AAA5C /* 41F7D8 802AAA48 0220202D */ daddu $a0, $s1, $zero -/* 41F7DC 802AAA4C 3C058008 */ lui $a1, %hi(D_80080208) -/* 41F7E0 802AAA50 24A50208 */ addiu $a1, $a1, %lo(D_80080208) +/* 41F7DC 802AAA4C 3C058008 */ lui $a1, %hi(HudScript_HandPointLeftLoop) +/* 41F7E0 802AAA50 24A50208 */ addiu $a1, $a1, %lo(HudScript_HandPointLeftLoop) /* 41F7E4 802AAA54 080AAA99 */ j .L802AAA64 /* 41F7E8 802AAA58 00000000 */ nop .L802AAA5C: -/* 41F7EC 802AAA5C 3C058008 */ lui $a1, %hi(D_8007FF20) -/* 41F7F0 802AAA60 24A5FF20 */ addiu $a1, $a1, %lo(D_8007FF20) +/* 41F7EC 802AAA5C 3C058008 */ lui $a1, %hi(HudScript_HandPointDownLoop) +/* 41F7F0 802AAA60 24A5FF20 */ addiu $a1, $a1, %lo(HudScript_HandPointDownLoop) .L802AAA64: /* 41F7F4 802AAA64 0C0511FF */ jal set_hud_element_anim /* 41F7F8 802AAA68 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/415D90/btl_state_update_twink_menu.s b/ver/us/asm/nonmatchings/415D90/btl_state_update_twink_menu.s index 6cb8d3e264..15ef0ec3c8 100644 --- a/ver/us/asm/nonmatchings/415D90/btl_state_update_twink_menu.s +++ b/ver/us/asm/nonmatchings/415D90/btl_state_update_twink_menu.s @@ -233,10 +233,10 @@ glabel btl_state_update_twink_menu /* 41F184 802AA3F4 24020001 */ addiu $v0, $zero, 1 /* 41F188 802AA3F8 3C08802B */ lui $t0, %hi(battle_menu_isMessageDisabled) /* 41F18C 802AA3FC 2508D0E8 */ addiu $t0, $t0, %lo(battle_menu_isMessageDisabled) -/* 41F190 802AA400 3C06802B */ lui $a2, %hi(D_802AB72C) -/* 41F194 802AA404 24C6B72C */ addiu $a2, $a2, %lo(D_802AB72C) -/* 41F198 802AA408 3C05802B */ lui $a1, %hi(main_battle_menu_iconScripts) -/* 41F19C 802AA40C 24A5D078 */ addiu $a1, $a1, %lo(main_battle_menu_iconScripts) +/* 41F190 802AA400 3C06802B */ lui $a2, %hi(battle_menu_TwinkStarPowerHudScripts) +/* 41F194 802AA404 24C6B72C */ addiu $a2, $a2, %lo(battle_menu_TwinkStarPowerHudScripts) +/* 41F198 802AA408 3C05802B */ lui $a1, %hi(main_battle_menu_JumpHudScripts) +/* 41F19C 802AA40C 24A5D078 */ addiu $a1, $a1, %lo(main_battle_menu_JumpHudScripts) /* 41F1A0 802AA410 ACE20000 */ sw $v0, ($a3) /* 41F1A4 802AA414 AD000000 */ sw $zero, ($t0) /* 41F1A8 802AA418 8CC30000 */ lw $v1, ($a2) diff --git a/ver/us/asm/nonmatchings/415D90/func_802A11B0.s b/ver/us/asm/nonmatchings/415D90/func_802A11B0.s index b2c1ce7798..4b46d27826 100644 --- a/ver/us/asm/nonmatchings/415D90/func_802A11B0.s +++ b/ver/us/asm/nonmatchings/415D90/func_802A11B0.s @@ -94,8 +94,8 @@ glabel func_802A11B0 /* 416094 802A1304 2694D028 */ addiu $s4, $s4, %lo(D_802AD028) /* 416098 802A1308 3C12802B */ lui $s2, %hi(D_802AD010) /* 41609C 802A130C 2652D010 */ addiu $s2, $s2, %lo(D_802AD010) -/* 4160A0 802A1310 3C10802B */ lui $s0, %hi(main_battle_menu_iconScripts) -/* 4160A4 802A1314 2610D078 */ addiu $s0, $s0, %lo(main_battle_menu_iconScripts) +/* 4160A0 802A1310 3C10802B */ lui $s0, %hi(main_battle_menu_JumpHudScripts) +/* 4160A4 802A1314 2610D078 */ addiu $s0, $s0, %lo(main_battle_menu_JumpHudScripts) .L802A1318: /* 4160A8 802A1318 8E040000 */ lw $a0, ($s0) /* 4160AC 802A131C 26100004 */ addiu $s0, $s0, 4 @@ -119,8 +119,8 @@ glabel func_802A11B0 /* 4160F4 802A1364 3C053F40 */ lui $a1, 0x3f40 /* 4160F8 802A1368 0C051308 */ jal set_hud_element_scale /* 4160FC 802A136C 26520004 */ addiu $s2, $s2, 4 -/* 416100 802A1370 3C048029 */ lui $a0, %hi(D_80292C00) -/* 416104 802A1374 24842C00 */ addiu $a0, $a0, %lo(D_80292C00) +/* 416100 802A1370 3C048029 */ lui $a0, %hi(HudScript_ProjectorSpot) +/* 416104 802A1374 24842C00 */ addiu $a0, $a0, %lo(HudScript_ProjectorSpot) /* 416108 802A1378 0C050529 */ jal create_hud_element /* 41610C 802A137C 00000000 */ nop /* 416110 802A1380 0040882D */ daddu $s1, $v0, $zero @@ -145,8 +145,8 @@ glabel func_802A11B0 /* 41615C 802A13CC 1440FFD2 */ bnez $v0, .L802A1318 /* 416160 802A13D0 26940004 */ addiu $s4, $s4, 4 .L802A13D4: -/* 416164 802A13D4 3C048029 */ lui $a0, %hi(D_80292C00) -/* 416168 802A13D8 24842C00 */ addiu $a0, $a0, %lo(D_80292C00) +/* 416164 802A13D4 3C048029 */ lui $a0, %hi(HudScript_ProjectorSpot) +/* 416168 802A13D8 24842C00 */ addiu $a0, $a0, %lo(HudScript_ProjectorSpot) /* 41616C 802A13DC 0C050529 */ jal create_hud_element /* 416170 802A13E0 00000000 */ nop /* 416174 802A13E4 0040882D */ daddu $s1, $v0, $zero @@ -166,8 +166,8 @@ glabel func_802A11B0 /* 4161AC 802A141C 0220202D */ daddu $a0, $s1, $zero /* 4161B0 802A1420 0C051280 */ jal set_hud_element_flags /* 4161B4 802A1424 24050002 */ addiu $a1, $zero, 2 -/* 4161B8 802A1428 3C108029 */ lui $s0, %hi(D_80292BD8) -/* 4161BC 802A142C 26102BD8 */ addiu $s0, $s0, %lo(D_80292BD8) +/* 4161B8 802A1428 3C108029 */ lui $s0, %hi(HudScript_ProjectorReel) +/* 4161BC 802A142C 26102BD8 */ addiu $s0, $s0, %lo(HudScript_ProjectorReel) /* 4161C0 802A1430 0C050529 */ jal create_hud_element /* 4161C4 802A1434 0200202D */ daddu $a0, $s0, $zero /* 4161C8 802A1438 0040882D */ daddu $s1, $v0, $zero @@ -232,8 +232,8 @@ glabel func_802A11B0 /* 4162B4 802A1524 0220202D */ daddu $a0, $s1, $zero /* 4162B8 802A1528 0C0513AC */ jal set_hud_element_alpha /* 4162BC 802A152C 240500F0 */ addiu $a1, $zero, 0xf0 -/* 4162C0 802A1530 3C048029 */ lui $a0, %hi(D_80292C28) -/* 4162C4 802A1534 24842C28 */ addiu $a0, $a0, %lo(D_80292C28) +/* 4162C0 802A1530 3C048029 */ lui $a0, %hi(HudScript_ProjectorBeam) +/* 4162C4 802A1534 24842C28 */ addiu $a0, $a0, %lo(HudScript_ProjectorBeam) /* 4162C8 802A1538 0C050529 */ jal create_hud_element /* 4162CC 802A153C 00000000 */ nop /* 4162D0 802A1540 0040882D */ daddu $s1, $v0, $zero @@ -303,8 +303,8 @@ glabel func_802A11B0 /* 4163D0 802A1640 0220202D */ daddu $a0, $s1, $zero /* 4163D4 802A1644 0C0513AC */ jal set_hud_element_alpha /* 4163D8 802A1648 240500E6 */ addiu $a1, $zero, 0xe6 -/* 4163DC 802A164C 3C048029 */ lui $a0, %hi(D_80292C50) -/* 4163E0 802A1650 24842C50 */ addiu $a0, $a0, %lo(D_80292C50) +/* 4163DC 802A164C 3C048029 */ lui $a0, %hi(HudScript_SwapZ) +/* 4163E0 802A1650 24842C50 */ addiu $a0, $a0, %lo(HudScript_SwapZ) /* 4163E4 802A1654 0C050529 */ jal create_hud_element /* 4163E8 802A1658 00000000 */ nop /* 4163EC 802A165C 0040882D */ daddu $s1, $v0, $zero @@ -323,8 +323,8 @@ glabel func_802A11B0 /* 416420 802A1690 2405005E */ addiu $a1, $zero, 0x5e /* 416424 802A1694 0C051261 */ jal set_hud_element_render_pos /* 416428 802A1698 240600D1 */ addiu $a2, $zero, 0xd1 -/* 41642C 802A169C 3C048029 */ lui $a0, %hi(D_80292C7C) -/* 416430 802A16A0 24842C7C */ addiu $a0, $a0, %lo(D_80292C7C) +/* 41642C 802A169C 3C048029 */ lui $a0, %hi(HudScript_SwapArrowLeft) +/* 416430 802A16A0 24842C7C */ addiu $a0, $a0, %lo(HudScript_SwapArrowLeft) /* 416434 802A16A4 0C050529 */ jal create_hud_element /* 416438 802A16A8 00000000 */ nop /* 41643C 802A16AC 0040882D */ daddu $s1, $v0, $zero @@ -343,8 +343,8 @@ glabel func_802A11B0 /* 416470 802A16E0 24050051 */ addiu $a1, $zero, 0x51 /* 416474 802A16E4 0C051261 */ jal set_hud_element_render_pos /* 416478 802A16E8 240600D2 */ addiu $a2, $zero, 0xd2 -/* 41647C 802A16EC 3C048029 */ lui $a0, %hi(D_80292CB8) -/* 416480 802A16F0 24842CB8 */ addiu $a0, $a0, %lo(D_80292CB8) +/* 41647C 802A16EC 3C048029 */ lui $a0, %hi(HudScript_SwapArrowRight) +/* 416480 802A16F0 24842CB8 */ addiu $a0, $a0, %lo(HudScript_SwapArrowRight) /* 416484 802A16F4 0C050529 */ jal create_hud_element /* 416488 802A16F8 00000000 */ nop /* 41648C 802A16FC 0040882D */ daddu $s1, $v0, $zero diff --git a/ver/us/asm/nonmatchings/415D90/func_802A2C84.s b/ver/us/asm/nonmatchings/415D90/func_802A2C84.s index 981bc53726..aa8a65139c 100644 --- a/ver/us/asm/nonmatchings/415D90/func_802A2C84.s +++ b/ver/us/asm/nonmatchings/415D90/func_802A2C84.s @@ -181,8 +181,8 @@ glabel func_802A2C84 /* 417C90 802A2F00 1440FFEC */ bnez $v0, .L802A2EB4 /* 417C94 802A2F04 26730004 */ addiu $s3, $s3, 4 .L802A2F08: -/* 417C98 802A2F08 3C048010 */ lui $a0, %hi(D_80104A28) -/* 417C9C 802A2F0C 24844A28 */ addiu $a0, $a0, %lo(D_80104A28) +/* 417C98 802A2F08 3C048010 */ lui $a0, %hi(HudScript_AnimatedHandPointer) +/* 417C9C 802A2F0C 24844A28 */ addiu $a0, $a0, %lo(HudScript_AnimatedHandPointer) /* 417CA0 802A2F10 0C050529 */ jal create_hud_element /* 417CA4 802A2F14 00000000 */ nop /* 417CA8 802A2F18 0040902D */ daddu $s2, $v0, $zero @@ -200,8 +200,8 @@ glabel func_802A2C84 /* 417CD8 802A2F48 86060000 */ lh $a2, ($s0) /* 417CDC 802A2F4C 0C051261 */ jal set_hud_element_render_pos /* 417CE0 802A2F50 0240202D */ daddu $a0, $s2, $zero -/* 417CE4 802A2F54 3C048010 */ lui $a0, %hi(D_801077E4) -/* 417CE8 802A2F58 248477E4 */ addiu $a0, $a0, %lo(D_801077E4) +/* 417CE4 802A2F54 3C048010 */ lui $a0, %hi(HudScript_GreenArrowUp) +/* 417CE8 802A2F58 248477E4 */ addiu $a0, $a0, %lo(HudScript_GreenArrowUp) /* 417CEC 802A2F5C 0C050529 */ jal create_hud_element /* 417CF0 802A2F60 00000000 */ nop /* 417CF4 802A2F64 0040902D */ daddu $s2, $v0, $zero @@ -217,8 +217,8 @@ glabel func_802A2C84 /* 417D1C 802A2F8C 24A50027 */ addiu $a1, $a1, 0x27 /* 417D20 802A2F90 0C051261 */ jal set_hud_element_render_pos /* 417D24 802A2F94 24C6FFF9 */ addiu $a2, $a2, -7 -/* 417D28 802A2F98 3C048010 */ lui $a0, %hi(D_80107798) -/* 417D2C 802A2F9C 24847798 */ addiu $a0, $a0, %lo(D_80107798) +/* 417D28 802A2F98 3C048010 */ lui $a0, %hi(HudScript_GreenArrowDown) +/* 417D2C 802A2F9C 24847798 */ addiu $a0, $a0, %lo(HudScript_GreenArrowDown) /* 417D30 802A2FA0 0C050529 */ jal create_hud_element /* 417D34 802A2FA4 00000000 */ nop /* 417D38 802A2FA8 0040902D */ daddu $s2, $v0, $zero @@ -238,8 +238,8 @@ glabel func_802A2C84 /* 417D70 802A2FE0 8C42D4A0 */ lw $v0, %lo(battle_menu_hasSpiritsMenu)($v0) /* 417D74 802A2FE4 1440000A */ bnez $v0, .L802A3010 /* 417D78 802A2FE8 00000000 */ nop -/* 417D7C 802A2FEC 3C048011 */ lui $a0, %hi(D_80108538) -/* 417D80 802A2FF0 24848538 */ addiu $a0, $a0, %lo(D_80108538) +/* 417D7C 802A2FEC 3C048011 */ lui $a0, %hi(HudScript_StatusFlower) +/* 417D80 802A2FF0 24848538 */ addiu $a0, $a0, %lo(HudScript_StatusFlower) /* 417D84 802A2FF4 0C050529 */ jal create_hud_element /* 417D88 802A2FF8 00000000 */ nop /* 417D8C 802A2FFC 0040902D */ daddu $s2, $v0, $zero @@ -248,8 +248,8 @@ glabel func_802A2C84 /* 417D98 802A3008 080A8C0F */ j .L802A303C /* 417D9C 802A300C 0240202D */ daddu $a0, $s2, $zero .L802A3010: -/* 417DA0 802A3010 3C048011 */ lui $a0, %hi(D_80108974) -/* 417DA4 802A3014 24848974 */ addiu $a0, $a0, %lo(D_80108974) +/* 417DA0 802A3010 3C048011 */ lui $a0, %hi(HudScript_MenuStarPower) +/* 417DA4 802A3014 24848974 */ addiu $a0, $a0, %lo(HudScript_MenuStarPower) /* 417DA8 802A3018 0C050529 */ jal create_hud_element /* 417DAC 802A301C 00000000 */ nop /* 417DB0 802A3020 0040902D */ daddu $s2, $v0, $zero @@ -293,18 +293,18 @@ glabel func_802A2C84 /* 417E40 802A30B0 080A8C36 */ j .L802A30D8 /* 417E44 802A30B4 00000000 */ nop .L802A30B8: -/* 417E48 802A30B8 3C048010 */ lui $a0, %hi(D_80107638) -/* 417E4C 802A30BC 24847638 */ addiu $a0, $a0, %lo(D_80107638) +/* 417E48 802A30B8 3C048010 */ lui $a0, %hi(HudScript_FPCost) +/* 417E4C 802A30BC 24847638 */ addiu $a0, $a0, %lo(HudScript_FPCost) /* 417E50 802A30C0 080A8C47 */ j .L802A311C /* 417E54 802A30C4 00000000 */ nop .L802A30C8: -/* 417E58 802A30C8 3C048010 */ lui $a0, %hi(D_80107664) -/* 417E5C 802A30CC 24847664 */ addiu $a0, $a0, %lo(D_80107664) +/* 417E58 802A30C8 3C048010 */ lui $a0, %hi(HudScript_FPCostReduced) +/* 417E5C 802A30CC 24847664 */ addiu $a0, $a0, %lo(HudScript_FPCostReduced) /* 417E60 802A30D0 080A8C47 */ j .L802A311C /* 417E64 802A30D4 00000000 */ nop .L802A30D8: -/* 417E68 802A30D8 3C048010 */ lui $a0, %hi(D_80107690) -/* 417E6C 802A30DC 24847690 */ addiu $a0, $a0, %lo(D_80107690) +/* 417E68 802A30D8 3C048010 */ lui $a0, %hi(HudScript_FPCostReducedTwice) +/* 417E6C 802A30DC 24847690 */ addiu $a0, $a0, %lo(HudScript_FPCostReducedTwice) /* 417E70 802A30E0 080A8C4F */ j .L802A313C /* 417E74 802A30E4 00000000 */ nop .L802A30E8: @@ -316,13 +316,13 @@ glabel func_802A2C84 /* 417E8C 802A30FC 080A8C4D */ j .L802A3134 /* 417E90 802A3100 00000000 */ nop .L802A3104: -/* 417E94 802A3104 3C048010 */ lui $a0, %hi(D_801076E8) -/* 417E98 802A3108 248476E8 */ addiu $a0, $a0, %lo(D_801076E8) +/* 417E94 802A3104 3C048010 */ lui $a0, %hi(HudScript_POWCost) +/* 417E98 802A3108 248476E8 */ addiu $a0, $a0, %lo(HudScript_POWCost) /* 417E9C 802A310C 080A8C47 */ j .L802A311C /* 417EA0 802A3110 00000000 */ nop .L802A3114: -/* 417EA4 802A3114 3C048010 */ lui $a0, %hi(D_80107714) -/* 417EA8 802A3118 24847714 */ addiu $a0, $a0, %lo(D_80107714) +/* 417EA4 802A3114 3C048010 */ lui $a0, %hi(HudScript_POWCostReduced) +/* 417EA8 802A3118 24847714 */ addiu $a0, $a0, %lo(HudScript_POWCostReduced) .L802A311C: /* 417EAC 802A311C 0C050529 */ jal create_hud_element /* 417EB0 802A3120 00000000 */ nop @@ -331,8 +331,8 @@ glabel func_802A2C84 /* 417EBC 802A312C 080A8C53 */ j .L802A314C /* 417EC0 802A3130 AC520000 */ sw $s2, ($v0) .L802A3134: -/* 417EC4 802A3134 3C048010 */ lui $a0, %hi(D_80107740) -/* 417EC8 802A3138 24847740 */ addiu $a0, $a0, %lo(D_80107740) +/* 417EC4 802A3134 3C048010 */ lui $a0, %hi(HudScript_POWCostReducedTwice) +/* 417EC8 802A3138 24847740 */ addiu $a0, $a0, %lo(HudScript_POWCostReducedTwice) .L802A313C: /* 417ECC 802A313C 0C050529 */ jal create_hud_element /* 417ED0 802A3140 00000000 */ nop @@ -797,8 +797,8 @@ glabel func_802A2C84 .L802A3808: /* 418598 802A3808 3C04802B */ lui $a0, %hi(battle_menu_moveCursorIcon) /* 41859C 802A380C 8C84D118 */ lw $a0, %lo(battle_menu_moveCursorIcon)($a0) -/* 4185A0 802A3810 3C058010 */ lui $a1, %hi(D_80104A00) -/* 4185A4 802A3814 24A54A00 */ addiu $a1, $a1, %lo(D_80104A00) +/* 4185A0 802A3810 3C058010 */ lui $a1, %hi(HudScript_HandPointer) +/* 4185A4 802A3814 24A54A00 */ addiu $a1, $a1, %lo(HudScript_HandPointer) /* 4185A8 802A3818 0C0511FF */ jal set_hud_element_anim /* 4185AC 802A381C 00000000 */ nop /* 4185B0 802A3820 24040001 */ addiu $a0, $zero, 1 diff --git a/ver/us/asm/nonmatchings/415D90/func_802A3C98.s b/ver/us/asm/nonmatchings/415D90/func_802A3C98.s index 6d18590e52..ecff0a3939 100644 --- a/ver/us/asm/nonmatchings/415D90/func_802A3C98.s +++ b/ver/us/asm/nonmatchings/415D90/func_802A3C98.s @@ -295,8 +295,8 @@ glabel func_802A3C98 /* 418E54 802A40C4 8C420000 */ lw $v0, ($v0) /* 418E58 802A40C8 5C400006 */ bgtzl $v0, .L802A40E4 /* 418E5C 802A40CC 0200202D */ daddu $a0, $s0, $zero -/* 418E60 802A40D0 3C058010 */ lui $a1, %hi(D_801076BC) -/* 418E64 802A40D4 24A576BC */ addiu $a1, $a1, %lo(D_801076BC) +/* 418E60 802A40D0 3C058010 */ lui $a1, %hi(HudScript_NotEnoughFP) +/* 418E64 802A40D4 24A576BC */ addiu $a1, $a1, %lo(HudScript_NotEnoughFP) /* 418E68 802A40D8 0C0511FF */ jal set_hud_element_anim /* 418E6C 802A40DC 0200202D */ daddu $a0, $s0, $zero /* 418E70 802A40E0 0200202D */ daddu $a0, $s0, $zero @@ -320,8 +320,8 @@ glabel func_802A3C98 /* 418EB0 802A4120 8C420000 */ lw $v0, ($v0) /* 418EB4 802A4124 5C400006 */ bgtzl $v0, .L802A4140 /* 418EB8 802A4128 0200202D */ daddu $a0, $s0, $zero -/* 418EBC 802A412C 3C058010 */ lui $a1, %hi(D_8010776C) -/* 418EC0 802A4130 24A5776C */ addiu $a1, $a1, %lo(D_8010776C) +/* 418EBC 802A412C 3C058010 */ lui $a1, %hi(HudScript_NotEnoughPOW) +/* 418EC0 802A4130 24A5776C */ addiu $a1, $a1, %lo(HudScript_NotEnoughPOW) /* 418EC4 802A4134 0C0511FF */ jal set_hud_element_anim /* 418EC8 802A4138 0200202D */ daddu $a0, $s0, $zero /* 418ECC 802A413C 0200202D */ daddu $a0, $s0, $zero diff --git a/ver/us/asm/nonmatchings/415D90/func_802A4A54.s b/ver/us/asm/nonmatchings/415D90/func_802A4A54.s index c175c0c6e7..9e7a27b3f3 100644 --- a/ver/us/asm/nonmatchings/415D90/func_802A4A54.s +++ b/ver/us/asm/nonmatchings/415D90/func_802A4A54.s @@ -83,8 +83,8 @@ glabel func_802A4A54 /* 4198F8 802A4B68 1440FFEF */ bnez $v0, .L802A4B28 /* 4198FC 802A4B6C 26730004 */ addiu $s3, $s3, 4 .L802A4B70: -/* 419900 802A4B70 3C048010 */ lui $a0, %hi(D_80104A28) -/* 419904 802A4B74 24844A28 */ addiu $a0, $a0, %lo(D_80104A28) +/* 419900 802A4B70 3C048010 */ lui $a0, %hi(HudScript_AnimatedHandPointer) +/* 419904 802A4B74 24844A28 */ addiu $a0, $a0, %lo(HudScript_AnimatedHandPointer) /* 419908 802A4B78 0C050529 */ jal create_hud_element /* 41990C 802A4B7C 00000000 */ nop /* 419910 802A4B80 0040902D */ daddu $s2, $v0, $zero @@ -102,8 +102,8 @@ glabel func_802A4A54 /* 419940 802A4BB0 86260000 */ lh $a2, ($s1) /* 419944 802A4BB4 0C051261 */ jal set_hud_element_render_pos /* 419948 802A4BB8 0240202D */ daddu $a0, $s2, $zero -/* 41994C 802A4BBC 3C048010 */ lui $a0, %hi(D_801077E4) -/* 419950 802A4BC0 248477E4 */ addiu $a0, $a0, %lo(D_801077E4) +/* 41994C 802A4BBC 3C048010 */ lui $a0, %hi(HudScript_GreenArrowUp) +/* 419950 802A4BC0 248477E4 */ addiu $a0, $a0, %lo(HudScript_GreenArrowUp) /* 419954 802A4BC4 0C050529 */ jal create_hud_element /* 419958 802A4BC8 00000000 */ nop /* 41995C 802A4BCC 0040902D */ daddu $s2, $v0, $zero @@ -119,8 +119,8 @@ glabel func_802A4A54 /* 419984 802A4BF4 24A50027 */ addiu $a1, $a1, 0x27 /* 419988 802A4BF8 0C051261 */ jal set_hud_element_render_pos /* 41998C 802A4BFC 24C6FFF9 */ addiu $a2, $a2, -7 -/* 419990 802A4C00 3C048010 */ lui $a0, %hi(D_80107798) -/* 419994 802A4C04 24847798 */ addiu $a0, $a0, %lo(D_80107798) +/* 419990 802A4C00 3C048010 */ lui $a0, %hi(HudScript_GreenArrowDown) +/* 419994 802A4C04 24847798 */ addiu $a0, $a0, %lo(HudScript_GreenArrowDown) /* 419998 802A4C08 0C050529 */ jal create_hud_element /* 41999C 802A4C0C 00000000 */ nop /* 4199A0 802A4C10 0040902D */ daddu $s2, $v0, $zero @@ -394,8 +394,8 @@ glabel func_802A4A54 /* 419D90 802A5000 0C0513BF */ jal set_hud_element_tint /* 419D94 802A5004 00A0382D */ daddu $a3, $a1, $zero /* 419D98 802A5008 8E040000 */ lw $a0, ($s0) -/* 419D9C 802A500C 3C058010 */ lui $a1, %hi(D_80104A00) -/* 419DA0 802A5010 24A54A00 */ addiu $a1, $a1, %lo(D_80104A00) +/* 419D9C 802A500C 3C058010 */ lui $a1, %hi(HudScript_HandPointer) +/* 419DA0 802A5010 24A54A00 */ addiu $a1, $a1, %lo(HudScript_HandPointer) /* 419DA4 802A5014 0C0511FF */ jal set_hud_element_anim /* 419DA8 802A5018 00000000 */ nop /* 419DAC 802A501C 24040006 */ addiu $a0, $zero, 6 diff --git a/ver/us/asm/nonmatchings/7fd10_len_b40/setup_item_popup.s b/ver/us/asm/nonmatchings/7fd10_len_b40/setup_item_popup.s index f49408ba5b..ef3d9bd6ad 100644 --- a/ver/us/asm/nonmatchings/7fd10_len_b40/setup_item_popup.s +++ b/ver/us/asm/nonmatchings/7fd10_len_b40/setup_item_popup.s @@ -6,8 +6,8 @@ glabel setup_item_popup /* 800F8 800E6C48 0100302D */ daddu $a2, $t0, $zero /* 800FC 800E6C4C 3C0B8008 */ lui $t3, %hi(gItemTable) /* 80100 800E6C50 256B78E0 */ addiu $t3, $t3, %lo(gItemTable) -/* 80104 800E6C54 3C0A8009 */ lui $t2, %hi(D_8008A680) -/* 80108 800E6C58 254AA680 */ addiu $t2, $t2, %lo(D_8008A680) +/* 80104 800E6C54 3C0A8009 */ lui $t2, %hi(gItemHudScripts) +/* 80108 800E6C58 254AA680 */ addiu $t2, $t2, %lo(gItemHudScripts) /* 8010C 800E6C5C 24090001 */ addiu $t1, $zero, 1 /* 80110 800E6C60 3C078011 */ lui $a3, %hi(gPlayerData) /* 80114 800E6C64 24E7F290 */ addiu $a3, $a3, %lo(gPlayerData) diff --git a/ver/us/asm/nonmatchings/7fd10_len_b40/setup_partner_popup.s b/ver/us/asm/nonmatchings/7fd10_len_b40/setup_partner_popup.s index a666fb349f..0f7c8b0da4 100644 --- a/ver/us/asm/nonmatchings/7fd10_len_b40/setup_partner_popup.s +++ b/ver/us/asm/nonmatchings/7fd10_len_b40/setup_partner_popup.s @@ -7,13 +7,13 @@ glabel setup_partner_popup /* 80030 800E6B80 0000502D */ daddu $t2, $zero, $zero /* 80034 800E6B84 24090001 */ addiu $t1, $zero, 1 /* 80038 800E6B88 24180005 */ addiu $t8, $zero, 5 -/* 8003C 800E6B8C 3C0F8009 */ lui $t7, %hi(D_8008EF20) -/* 80040 800E6B90 25EFEF20 */ addiu $t7, $t7, %lo(D_8008EF20) -/* 80044 800E6B94 3C0E800F */ lui $t6, %hi(D_800F7F00) -/* 80048 800E6B98 25CE7F00 */ addiu $t6, $t6, %lo(D_800F7F00) +/* 8003C 800E6B8C 3C0F8009 */ lui $t7, %hi(gPartnerPopupProperties) +/* 80040 800E6B90 25EFEF20 */ addiu $t7, $t7, %lo(gPartnerPopupProperties) +/* 80044 800E6B94 3C0E800F */ lui $t6, %hi(wPartnerHudScripts) +/* 80048 800E6B98 25CE7F00 */ addiu $t6, $t6, %lo(wPartnerHudScripts) /* 8004C 800E6B9C 0120682D */ daddu $t5, $t1, $zero -/* 80050 800E6BA0 3C0C800F */ lui $t4, %hi(D_800F7F40) -/* 80054 800E6BA4 258C7F40 */ addiu $t4, $t4, %lo(D_800F7F40) +/* 80050 800E6BA0 3C0C800F */ lui $t4, %hi(wDisabledPartnerHudScripts) +/* 80054 800E6BA4 258C7F40 */ addiu $t4, $t4, %lo(wDisabledPartnerHudScripts) /* 80058 800E6BA8 3C088009 */ lui $t0, %hi(D_8008EEC4) /* 8005C 800E6BAC 2508EEC4 */ addiu $t0, $t0, %lo(D_8008EEC4) .L800E6BB0: diff --git a/ver/us/asm/nonmatchings/80850_len_3060/status_menu_draw_number.s b/ver/us/asm/nonmatchings/80850_len_3060/status_menu_draw_number.s index 5a5eb027f3..2d7d5335e1 100644 --- a/ver/us/asm/nonmatchings/80850_len_3060/status_menu_draw_number.s +++ b/ver/us/asm/nonmatchings/80850_len_3060/status_menu_draw_number.s @@ -5,8 +5,8 @@ glabel status_menu_draw_number /* 81154 800E7CA4 27BDFFC0 */ addiu $sp, $sp, -0x40 /* 81158 800E7CA8 AFB1001C */ sw $s1, 0x1c($sp) /* 8115C 800E7CAC 00A0882D */ daddu $s1, $a1, $zero -/* 81160 800E7CB0 3C05800F */ lui $a1, %hi(D_800F7FA8) -/* 81164 800E7CB4 8CA57FA8 */ lw $a1, %lo(D_800F7FA8)($a1) +/* 81160 800E7CB0 3C05800F */ lui $a1, %hi(TimesHudScript) +/* 81164 800E7CB4 8CA57FA8 */ lw $a1, %lo(TimesHudScript)($a1) /* 81168 800E7CB8 AFB40028 */ sw $s4, 0x28($sp) /* 8116C 800E7CBC 0080A02D */ daddu $s4, $a0, $zero /* 81170 800E7CC0 AFB00018 */ sw $s0, 0x18($sp) @@ -63,8 +63,8 @@ glabel status_menu_draw_number /* 81234 800E7D84 0260902D */ daddu $s2, $s3, $zero /* 81238 800E7D88 27B60010 */ addiu $s6, $sp, 0x10 /* 8123C 800E7D8C 26B0FFFF */ addiu $s0, $s5, -1 -/* 81240 800E7D90 3C17800F */ lui $s7, %hi(D_800F7F80) -/* 81244 800E7D94 26F77F80 */ addiu $s7, $s7, %lo(D_800F7F80) +/* 81240 800E7D90 3C17800F */ lui $s7, %hi(DigitHudScripts) +/* 81244 800E7D94 26F77F80 */ addiu $s7, $s7, %lo(DigitHudScripts) .L800E7D98: /* 81248 800E7D98 02D21021 */ addu $v0, $s6, $s2 /* 8124C 800E7D9C 80420000 */ lb $v0, ($v0) diff --git a/ver/us/asm/nonmatchings/80850_len_3060/status_menu_draw_stat.s b/ver/us/asm/nonmatchings/80850_len_3060/status_menu_draw_stat.s index 45f07fc65f..72c90f34cc 100644 --- a/ver/us/asm/nonmatchings/80850_len_3060/status_menu_draw_stat.s +++ b/ver/us/asm/nonmatchings/80850_len_3060/status_menu_draw_stat.s @@ -17,8 +17,8 @@ glabel status_menu_draw_stat /* 81314 800E7E64 0000902D */ daddu $s2, $zero, $zero /* 81318 800E7E68 AFB50034 */ sw $s5, 0x34($sp) /* 8131C 800E7E6C 8FB50058 */ lw $s5, 0x58($sp) -/* 81320 800E7E70 3C05800F */ lui $a1, %hi(D_800F7FAC) -/* 81324 800E7E74 8CA57FAC */ lw $a1, %lo(D_800F7FAC)($a1) +/* 81320 800E7E70 3C05800F */ lui $a1, %hi(SlashHudScript) +/* 81324 800E7E74 8CA57FAC */ lw $a1, %lo(SlashHudScript)($a1) /* 81328 800E7E78 26080008 */ addiu $t0, $s0, 8 /* 8132C 800E7E7C AFA80018 */ sw $t0, 0x18($sp) /* 81330 800E7E80 26280008 */ addiu $t0, $s1, 8 @@ -76,8 +76,8 @@ glabel status_menu_draw_stat /* 813F8 800E7F48 24110001 */ addiu $s1, $zero, 1 .L800E7F4C: /* 813FC 800E7F4C 00021080 */ sll $v0, $v0, 2 -/* 81400 800E7F50 3C08800F */ lui $t0, %hi(D_800F7F80) -/* 81404 800E7F54 25087F80 */ addiu $t0, $t0, %lo(D_800F7F80) +/* 81400 800E7F50 3C08800F */ lui $t0, %hi(DigitHudScripts) +/* 81404 800E7F54 25087F80 */ addiu $t0, $t0, %lo(DigitHudScripts) /* 81408 800E7F58 00481021 */ addu $v0, $v0, $t0 /* 8140C 800E7F5C 8C450000 */ lw $a1, ($v0) /* 81410 800E7F60 0C0511FF */ jal set_hud_element_anim @@ -128,8 +128,8 @@ glabel status_menu_draw_stat /* 814B4 800E8004 2510001A */ addiu $s0, $t0, 0x1a /* 814B8 800E8008 27B70010 */ addiu $s7, $sp, 0x10 /* 814BC 800E800C 26D5FFFF */ addiu $s5, $s6, -1 -/* 814C0 800E8010 3C1E800F */ lui $fp, %hi(D_800F7F80) -/* 814C4 800E8014 27DE7F80 */ addiu $fp, $fp, %lo(D_800F7F80) +/* 814C0 800E8010 3C1E800F */ lui $fp, %hi(DigitHudScripts) +/* 814C4 800E8014 27DE7F80 */ addiu $fp, $fp, %lo(DigitHudScripts) .L800E8018: /* 814C8 800E8018 02F21021 */ addu $v0, $s7, $s2 /* 814CC 800E801C 80420000 */ lb $v0, ($v0) diff --git a/ver/us/asm/nonmatchings/80850_len_3060/update_status_menu.s b/ver/us/asm/nonmatchings/80850_len_3060/update_status_menu.s index f388f594d6..9695e97f6e 100644 --- a/ver/us/asm/nonmatchings/80850_len_3060/update_status_menu.s +++ b/ver/us/asm/nonmatchings/80850_len_3060/update_status_menu.s @@ -872,8 +872,8 @@ glabel update_status_menu .L800E8D3C: /* 821EC 800E8D3C 0240202D */ daddu $a0, $s2, $zero /* 821F0 800E8D40 8FA90050 */ lw $t1, 0x50($sp) -/* 821F4 800E8D44 3C02800F */ lui $v0, %hi(D_800F7FB0) -/* 821F8 800E8D48 24427FB0 */ addiu $v0, $v0, %lo(D_800F7FB0) +/* 821F4 800E8D44 3C02800F */ lui $v0, %hi(SPIncrementHudScripts) +/* 821F8 800E8D48 24427FB0 */ addiu $v0, $v0, %lo(SPIncrementHudScripts) /* 821FC 800E8D4C 00094880 */ sll $t1, $t1, 2 /* 82200 800E8D50 01229821 */ addu $s3, $t1, $v0 /* 82204 800E8D54 AFA90058 */ sw $t1, 0x58($sp) @@ -1033,9 +1033,9 @@ glabel update_status_menu /* 82450 800E8FA0 0240202D */ daddu $a0, $s2, $zero /* 82454 800E8FA4 8FA90058 */ lw $t1, 0x58($sp) /* 82458 800E8FA8 0000882D */ daddu $s1, $zero, $zero -/* 8245C 800E8FAC 3C05800F */ lui $a1, %hi(D_800F7FCC) +/* 8245C 800E8FAC 3C05800F */ lui $a1, %hi(SPStarHudScripts) /* 82460 800E8FB0 00A92821 */ addu $a1, $a1, $t1 -/* 82464 800E8FB4 8CA57FCC */ lw $a1, %lo(D_800F7FCC)($a1) +/* 82464 800E8FB4 8CA57FCC */ lw $a1, %lo(SPStarHudScripts)($a1) /* 82468 800E8FB8 8FA90050 */ lw $t1, 0x50($sp) /* 8246C 800E8FBC 26D60014 */ addiu $s6, $s6, 0x14 /* 82470 800E8FC0 25290001 */ addiu $t1, $t1, 1 @@ -1079,8 +1079,8 @@ glabel update_status_menu /* 82500 800E9050 16200012 */ bnez $s1, .L800E909C /* 82504 800E9054 24020001 */ addiu $v0, $zero, 1 /* 82508 800E9058 26100001 */ addiu $s0, $s0, 1 -/* 8250C 800E905C 3C058011 */ lui $a1, %hi(D_801083B0) -/* 82510 800E9060 24A583B0 */ addiu $a1, $a1, %lo(D_801083B0) +/* 8250C 800E905C 3C058011 */ lui $a1, %hi(HudScript_StatusSPEmptyIncrement) +/* 82510 800E9060 24A583B0 */ addiu $a1, $a1, %lo(HudScript_StatusSPEmptyIncrement) /* 82514 800E9064 0C0511FF */ jal set_hud_element_anim /* 82518 800E9068 0240202D */ daddu $a0, $s2, $zero /* 8251C 800E906C 0240202D */ daddu $a0, $s2, $zero @@ -1099,8 +1099,8 @@ glabel update_status_menu /* 8254C 800E909C 56220011 */ bnel $s1, $v0, .L800E90E4 /* 82550 800E90A0 24020002 */ addiu $v0, $zero, 2 /* 82554 800E90A4 02028021 */ addu $s0, $s0, $v0 -/* 82558 800E90A8 3C058011 */ lui $a1, %hi(D_801083B0) -/* 8255C 800E90AC 24A583B0 */ addiu $a1, $a1, %lo(D_801083B0) +/* 82558 800E90A8 3C058011 */ lui $a1, %hi(HudScript_StatusSPEmptyIncrement) +/* 8255C 800E90AC 24A583B0 */ addiu $a1, $a1, %lo(HudScript_StatusSPEmptyIncrement) /* 82560 800E90B0 0C0511FF */ jal set_hud_element_anim /* 82564 800E90B4 0240202D */ daddu $a0, $s2, $zero /* 82568 800E90B8 0240202D */ daddu $a0, $s2, $zero @@ -1118,8 +1118,8 @@ glabel update_status_menu /* 82594 800E90E4 16220011 */ bne $s1, $v0, .L800E912C /* 82598 800E90E8 24020003 */ addiu $v0, $zero, 3 /* 8259C 800E90EC 26100001 */ addiu $s0, $s0, 1 -/* 825A0 800E90F0 3C058011 */ lui $a1, %hi(D_801083B0) -/* 825A4 800E90F4 24A583B0 */ addiu $a1, $a1, %lo(D_801083B0) +/* 825A0 800E90F0 3C058011 */ lui $a1, %hi(HudScript_StatusSPEmptyIncrement) +/* 825A4 800E90F4 24A583B0 */ addiu $a1, $a1, %lo(HudScript_StatusSPEmptyIncrement) /* 825A8 800E90F8 0C0511FF */ jal set_hud_element_anim /* 825AC 800E90FC 0240202D */ daddu $a0, $s2, $zero /* 825B0 800E9100 0240202D */ daddu $a0, $s2, $zero @@ -1137,8 +1137,8 @@ glabel update_status_menu /* 825DC 800E912C 16220011 */ bne $s1, $v0, .L800E9174 /* 825E0 800E9130 24020004 */ addiu $v0, $zero, 4 /* 825E4 800E9134 26100001 */ addiu $s0, $s0, 1 -/* 825E8 800E9138 3C058011 */ lui $a1, %hi(D_801083B0) -/* 825EC 800E913C 24A583B0 */ addiu $a1, $a1, %lo(D_801083B0) +/* 825E8 800E9138 3C058011 */ lui $a1, %hi(HudScript_StatusSPEmptyIncrement) +/* 825EC 800E913C 24A583B0 */ addiu $a1, $a1, %lo(HudScript_StatusSPEmptyIncrement) /* 825F0 800E9140 0C0511FF */ jal set_hud_element_anim /* 825F4 800E9144 0240202D */ daddu $a0, $s2, $zero /* 825F8 800E9148 0240202D */ daddu $a0, $s2, $zero @@ -1156,8 +1156,8 @@ glabel update_status_menu /* 82624 800E9174 16220011 */ bne $s1, $v0, .L800E91BC /* 82628 800E9178 24020005 */ addiu $v0, $zero, 5 /* 8262C 800E917C 26100001 */ addiu $s0, $s0, 1 -/* 82630 800E9180 3C058011 */ lui $a1, %hi(D_801083B0) -/* 82634 800E9184 24A583B0 */ addiu $a1, $a1, %lo(D_801083B0) +/* 82630 800E9180 3C058011 */ lui $a1, %hi(HudScript_StatusSPEmptyIncrement) +/* 82634 800E9184 24A583B0 */ addiu $a1, $a1, %lo(HudScript_StatusSPEmptyIncrement) /* 82638 800E9188 0C0511FF */ jal set_hud_element_anim /* 8263C 800E918C 0240202D */ daddu $a0, $s2, $zero /* 82640 800E9190 0240202D */ daddu $a0, $s2, $zero @@ -1175,8 +1175,8 @@ glabel update_status_menu /* 8266C 800E91BC 16220011 */ bne $s1, $v0, .L800E9204 /* 82670 800E91C0 24020006 */ addiu $v0, $zero, 6 /* 82674 800E91C4 26100001 */ addiu $s0, $s0, 1 -/* 82678 800E91C8 3C058011 */ lui $a1, %hi(D_801083B0) -/* 8267C 800E91CC 24A583B0 */ addiu $a1, $a1, %lo(D_801083B0) +/* 82678 800E91C8 3C058011 */ lui $a1, %hi(HudScript_StatusSPEmptyIncrement) +/* 8267C 800E91CC 24A583B0 */ addiu $a1, $a1, %lo(HudScript_StatusSPEmptyIncrement) /* 82680 800E91D0 0C0511FF */ jal set_hud_element_anim /* 82684 800E91D4 0240202D */ daddu $a0, $s2, $zero /* 82688 800E91D8 0240202D */ daddu $a0, $s2, $zero @@ -1194,8 +1194,8 @@ glabel update_status_menu /* 826B4 800E9204 16220011 */ bne $s1, $v0, .L800E924C /* 826B8 800E9208 24020007 */ addiu $v0, $zero, 7 /* 826BC 800E920C 26100001 */ addiu $s0, $s0, 1 -/* 826C0 800E9210 3C058011 */ lui $a1, %hi(D_801083B0) -/* 826C4 800E9214 24A583B0 */ addiu $a1, $a1, %lo(D_801083B0) +/* 826C0 800E9210 3C058011 */ lui $a1, %hi(HudScript_StatusSPEmptyIncrement) +/* 826C4 800E9214 24A583B0 */ addiu $a1, $a1, %lo(HudScript_StatusSPEmptyIncrement) /* 826C8 800E9218 0C0511FF */ jal set_hud_element_anim /* 826CC 800E921C 0240202D */ daddu $a0, $s2, $zero /* 826D0 800E9220 0240202D */ daddu $a0, $s2, $zero @@ -1213,8 +1213,8 @@ glabel update_status_menu /* 826FC 800E924C 1622000F */ bne $s1, $v0, .L800E928C /* 82700 800E9250 0000882D */ daddu $s1, $zero, $zero /* 82704 800E9254 26100001 */ addiu $s0, $s0, 1 -/* 82708 800E9258 3C058011 */ lui $a1, %hi(D_801084F0) -/* 8270C 800E925C 24A584F0 */ addiu $a1, $a1, %lo(D_801084F0) +/* 82708 800E9258 3C058011 */ lui $a1, %hi(HudScript_StatusStarEmpty) +/* 8270C 800E925C 24A584F0 */ addiu $a1, $a1, %lo(HudScript_StatusStarEmpty) /* 82710 800E9260 0C0511FF */ jal set_hud_element_anim /* 82714 800E9264 0240202D */ daddu $a0, $s2, $zero /* 82718 800E9268 0240202D */ daddu $a0, $s2, $zero diff --git a/ver/us/asm/nonmatchings/8a860_len_3f30/func_800F16CC.s b/ver/us/asm/nonmatchings/8a860_len_3f30/func_800F16CC.s index b425ae34fa..ab4c25dfe5 100644 --- a/ver/us/asm/nonmatchings/8a860_len_3f30/func_800F16CC.s +++ b/ver/us/asm/nonmatchings/8a860_len_3f30/func_800F16CC.s @@ -226,8 +226,8 @@ glabel func_800F16CC .L800F19C8: /* 8AE78 800F19C8 3C048011 */ lui $a0, %hi(D_8010D66C) /* 8AE7C 800F19CC 8C84D66C */ lw $a0, %lo(D_8010D66C)($a0) -/* 8AE80 800F19D0 3C058010 */ lui $a1, %hi(D_80104A28) -/* 8AE84 800F19D4 24A54A28 */ addiu $a1, $a1, %lo(D_80104A28) +/* 8AE80 800F19D0 3C058010 */ lui $a1, %hi(HudScript_AnimatedHandPointer) +/* 8AE84 800F19D4 24A54A28 */ addiu $a1, $a1, %lo(HudScript_AnimatedHandPointer) /* 8AE88 800F19D8 0C0511FF */ jal set_hud_element_anim /* 8AE8C 800F19DC 00000000 */ nop /* 8AE90 800F19E0 8FBF001C */ lw $ra, 0x1c($sp) diff --git a/ver/us/asm/nonmatchings/C50A0/item_entity_load.s b/ver/us/asm/nonmatchings/C50A0/item_entity_load.s index 686c277355..ea1054ce06 100644 --- a/ver/us/asm/nonmatchings/C50A0/item_entity_load.s +++ b/ver/us/asm/nonmatchings/C50A0/item_entity_load.s @@ -26,9 +26,9 @@ glabel item_entity_load /* C7860 80131160 87C20018 */ lh $v0, 0x18($fp) /* C7864 80131164 36B50FFF */ ori $s5, $s5, 0xfff /* C7868 80131168 00021080 */ sll $v0, $v0, 2 -/* C786C 8013116C 3C108009 */ lui $s0, %hi(D_8008DDD4) +/* C786C 8013116C 3C108009 */ lui $s0, %hi(gItemEntityScripts) /* C7870 80131170 02028021 */ addu $s0, $s0, $v0 -/* C7874 80131174 8E10DDD4 */ lw $s0, %lo(D_8008DDD4)($s0) +/* C7874 80131174 8E10DDD4 */ lw $s0, %lo(gItemEntityScripts)($s0) /* C7878 80131178 3C16001D */ lui $s6, 0x1d /* C787C 8013117C 26D6C310 */ addiu $s6, $s6, -0x3cf0 /* C7880 80131180 AFD00024 */ sw $s0, 0x24($fp) diff --git a/ver/us/asm/nonmatchings/C50A0/make_item_entity.s b/ver/us/asm/nonmatchings/C50A0/make_item_entity.s index 768ee891d4..99ae0768f3 100644 --- a/ver/us/asm/nonmatchings/C50A0/make_item_entity.s +++ b/ver/us/asm/nonmatchings/C50A0/make_item_entity.s @@ -467,8 +467,8 @@ glabel make_item_entity /* C812C 80131A2C 24020157 */ addiu $v0, $zero, 0x157 /* C8130 80131A30 14620009 */ bne $v1, $v0, .L80131A58 /* C8134 80131A34 2402015C */ addiu $v0, $zero, 0x15c -/* C8138 80131A38 3C058010 */ lui $a1, %hi(D_80104AC0) -/* C813C 80131A3C 24A54AC0 */ addiu $a1, $a1, %lo(D_80104AC0) +/* C8138 80131A38 3C058010 */ lui $a1, %hi(SparkleScript_Coin) +/* C813C 80131A3C 24A54AC0 */ addiu $a1, $a1, %lo(SparkleScript_Coin) /* C8140 80131A40 0C04C27C */ jal sparkle_script_init /* C8144 80131A44 0200202D */ daddu $a0, $s0, $zero /* C8148 80131A48 0C04C2B3 */ jal sparkle_script_update diff --git a/ver/us/asm/nonmatchings/C50A0/init_got_item.s b/ver/us/asm/nonmatchings/C50A0/make_item_entity_at_player.s similarity index 98% rename from ver/us/asm/nonmatchings/C50A0/init_got_item.s rename to ver/us/asm/nonmatchings/C50A0/make_item_entity_at_player.s index df4b911e0a..3c124c9812 100644 --- a/ver/us/asm/nonmatchings/C50A0/init_got_item.s +++ b/ver/us/asm/nonmatchings/C50A0/make_item_entity_at_player.s @@ -1,7 +1,7 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -glabel init_got_item +glabel make_item_entity_at_player /* C8200 80131B00 27BDFFB8 */ addiu $sp, $sp, -0x48 /* C8204 80131B04 AFB00028 */ sw $s0, 0x28($sp) /* C8208 80131B08 0080802D */ daddu $s0, $a0, $zero @@ -176,8 +176,8 @@ glabel init_got_item /* C8488 80131D88 24020157 */ addiu $v0, $zero, 0x157 /* C848C 80131D8C 14620008 */ bne $v1, $v0, .L80131DB0 /* C8490 80131D90 02A0102D */ daddu $v0, $s5, $zero -/* C8494 80131D94 3C058010 */ lui $a1, %hi(D_80104AC0) -/* C8498 80131D98 24A54AC0 */ addiu $a1, $a1, %lo(D_80104AC0) +/* C8494 80131D94 3C058010 */ lui $a1, %hi(SparkleScript_Coin) +/* C8498 80131D98 24A54AC0 */ addiu $a1, $a1, %lo(SparkleScript_Coin) /* C849C 80131D9C 0C04C27C */ jal sparkle_script_init /* C84A0 80131DA0 0220202D */ daddu $a0, $s1, $zero /* C84A4 80131DA4 0C04C2B3 */ jal sparkle_script_update diff --git a/ver/us/asm/nonmatchings/C50A0/update_item_entities.s b/ver/us/asm/nonmatchings/C50A0/update_item_entities.s index 95afe6398b..f31c01d8d8 100644 --- a/ver/us/asm/nonmatchings/C50A0/update_item_entities.s +++ b/ver/us/asm/nonmatchings/C50A0/update_item_entities.s @@ -42,8 +42,8 @@ glabel update_item_entities /* C8654 80131F54 2842005B */ slti $v0, $v0, 0x5b /* C8658 80131F58 14400012 */ bnez $v0, .L80131FA4 /* C865C 80131F5C 00000000 */ nop -/* C8660 80131F60 3C058010 */ lui $a1, %hi(D_80104AC0) -/* C8664 80131F64 24A54AC0 */ addiu $a1, $a1, %lo(D_80104AC0) +/* C8660 80131F60 3C058010 */ lui $a1, %hi(SparkleScript_Coin) +/* C8664 80131F64 24A54AC0 */ addiu $a1, $a1, %lo(SparkleScript_Coin) /* C8668 80131F68 0C04C27C */ jal sparkle_script_init /* C866C 80131F6C 0220202D */ daddu $a0, $s1, $zero /* C8670 80131F70 0C00A67F */ jal rand_int diff --git a/ver/us/asm/nonmatchings/C50A0/update_item_entity_temp.s b/ver/us/asm/nonmatchings/C50A0/update_item_entity_temp.s index 62cf58f61e..25010e92c8 100644 --- a/ver/us/asm/nonmatchings/C50A0/update_item_entity_temp.s +++ b/ver/us/asm/nonmatchings/C50A0/update_item_entity_temp.s @@ -140,9 +140,9 @@ glabel update_item_entity_temp /* CBFB4 801358B4 00220821 */ addu $at, $at, $v0 /* CBFB8 801358B8 842278E4 */ lh $v0, %lo(gItemTable+0x4)($at) /* CBFBC 801358BC 000210C0 */ sll $v0, $v0, 3 -/* CBFC0 801358C0 3C048009 */ lui $a0, %hi(D_8008A680) +/* CBFC0 801358C0 3C048009 */ lui $a0, %hi(gItemHudScripts) /* CBFC4 801358C4 00822021 */ addu $a0, $a0, $v0 -/* CBFC8 801358C8 8C84A680 */ lw $a0, %lo(D_8008A680)($a0) +/* CBFC8 801358C8 8C84A680 */ lw $a0, %lo(gItemHudScripts)($a0) /* CBFCC 801358CC 0C050529 */ jal create_hud_element /* CBFD0 801358D0 00000000 */ nop /* CBFD4 801358D4 0040202D */ daddu $a0, $v0, $zero @@ -656,12 +656,12 @@ glabel update_item_entity_temp /* CC714 80136014 00021140 */ sll $v0, $v0, 5 /* CC718 80136018 00482821 */ addu $a1, $v0, $t0 /* CC71C 8013601C 84A20004 */ lh $v0, 4($a1) -/* CC720 80136020 3C0A8009 */ lui $t2, %hi(D_8008A680) -/* CC724 80136024 254AA680 */ addiu $t2, $t2, %lo(D_8008A680) +/* CC720 80136020 3C0A8009 */ lui $t2, %hi(gItemHudScripts) +/* CC724 80136024 254AA680 */ addiu $t2, $t2, %lo(gItemHudScripts) /* CC728 80136028 000210C0 */ sll $v0, $v0, 3 -/* CC72C 8013602C 3C018009 */ lui $at, %hi(D_8008A680) +/* CC72C 8013602C 3C018009 */ lui $at, %hi(gItemHudScripts) /* CC730 80136030 00220821 */ addu $at, $at, $v0 -/* CC734 80136034 8C22A680 */ lw $v0, %lo(D_8008A680)($at) +/* CC734 80136034 8C22A680 */ lw $v0, %lo(gItemHudScripts)($at) /* CC738 80136038 00E0482D */ daddu $t1, $a3, $zero /* CC73C 8013603C AE020000 */ sw $v0, ($s0) /* CC740 80136040 86230018 */ lh $v1, 0x18($s1) diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/07/func_802A9228_425D78.s b/ver/us/asm/nonmatchings/battle/action_cmd/07/func_802A9228_425D78.s index b58f4ca388..748938aec2 100644 --- a/ver/us/asm/nonmatchings/battle/action_cmd/07/func_802A9228_425D78.s +++ b/ver/us/asm/nonmatchings/battle/action_cmd/07/func_802A9228_425D78.s @@ -96,8 +96,8 @@ dlabel L802A935C_425EAC /* 425EC8 802A9378 A622004E */ sh $v0, 0x4e($s1) .L802A937C: /* 425ECC 802A937C 8E240004 */ lw $a0, 4($s1) -/* 425ED0 802A9380 3C058011 */ lui $a1, %hi(D_80108B80) -/* 425ED4 802A9384 24A58B80 */ addiu $a1, $a1, %lo(D_80108B80) +/* 425ED0 802A9380 3C058011 */ lui $a1, %hi(HudScript_MashAButton) +/* 425ED4 802A9384 24A58B80 */ addiu $a1, $a1, %lo(HudScript_MashAButton) /* 425ED8 802A9388 0C0511FF */ jal set_hud_element_anim /* 425EDC 802A938C 00000000 */ nop /* 425EE0 802A9390 A2000081 */ sb $zero, 0x81($s0) diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/0A/func_802A928C_42763C.s b/ver/us/asm/nonmatchings/battle/action_cmd/0A/func_802A928C_42763C.s index 9f7efe7689..faf3762986 100644 --- a/ver/us/asm/nonmatchings/battle/action_cmd/0A/func_802A928C_42763C.s +++ b/ver/us/asm/nonmatchings/battle/action_cmd/0A/func_802A928C_42763C.s @@ -87,8 +87,8 @@ glabel func_802A928C_42763C /* 427754 802A93A4 A622004E */ sh $v0, 0x4e($s1) .L802A93A8: /* 427758 802A93A8 8E240004 */ lw $a0, 4($s1) -/* 42775C 802A93AC 3C058011 */ lui $a1, %hi(D_80108B80) -/* 427760 802A93B0 24A58B80 */ addiu $a1, $a1, %lo(D_80108B80) +/* 42775C 802A93AC 3C058011 */ lui $a1, %hi(HudScript_MashAButton) +/* 427760 802A93B0 24A58B80 */ addiu $a1, $a1, %lo(HudScript_MashAButton) /* 427764 802A93B4 0C0511FF */ jal set_hud_element_anim /* 427768 802A93B8 00000000 */ nop /* 42776C 802A93BC 96230052 */ lhu $v1, 0x52($s1) diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/air_lift/func_802A9278_428CE8.s b/ver/us/asm/nonmatchings/battle/action_cmd/air_lift/func_802A9278_428CE8.s index 19abe77755..456f1dc570 100644 --- a/ver/us/asm/nonmatchings/battle/action_cmd/air_lift/func_802A9278_428CE8.s +++ b/ver/us/asm/nonmatchings/battle/action_cmd/air_lift/func_802A9278_428CE8.s @@ -88,8 +88,8 @@ dlabel L802A938C_428DFC /* 428E18 802A93A8 A622004E */ sh $v0, 0x4e($s1) .L802A93AC: /* 428E1C 802A93AC 8E240004 */ lw $a0, 4($s1) -/* 428E20 802A93B0 3C058011 */ lui $a1, %hi(D_80108B80) -/* 428E24 802A93B4 24A58B80 */ addiu $a1, $a1, %lo(D_80108B80) +/* 428E20 802A93B0 3C058011 */ lui $a1, %hi(HudScript_MashAButton) +/* 428E24 802A93B4 24A58B80 */ addiu $a1, $a1, %lo(HudScript_MashAButton) /* 428E28 802A93B8 0C0511FF */ jal set_hud_element_anim /* 428E2C 802A93BC 00000000 */ nop /* 428E30 802A93C0 3C048000 */ lui $a0, 0x8000 diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/air_raid/func_802A9294_4295B4.s b/ver/us/asm/nonmatchings/battle/action_cmd/air_raid/func_802A9294_4295B4.s index cf7832875c..c0035479a3 100644 --- a/ver/us/asm/nonmatchings/battle/action_cmd/air_raid/func_802A9294_4295B4.s +++ b/ver/us/asm/nonmatchings/battle/action_cmd/air_raid/func_802A9294_4295B4.s @@ -90,8 +90,8 @@ dlabel L802A93B0_4296D0 /* 4296EC 802A93CC A622004E */ sh $v0, 0x4e($s1) .L802A93D0: /* 4296F0 802A93D0 8E240004 */ lw $a0, 4($s1) -/* 4296F4 802A93D4 3C058011 */ lui $a1, %hi(D_80108F30) -/* 4296F8 802A93D8 24A58F30 */ addiu $a1, $a1, %lo(D_80108F30) +/* 4296F4 802A93D4 3C058011 */ lui $a1, %hi(HudScript_StickMashLeft) +/* 4296F8 802A93D8 24A58F30 */ addiu $a1, $a1, %lo(HudScript_StickMashLeft) /* 4296FC 802A93DC 0C0511FF */ jal set_hud_element_anim /* 429700 802A93E0 00000000 */ nop /* 429704 802A93E4 3C048000 */ lui $a0, 0x8000 diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/body_slam/func_802A92D4_4285B4.s b/ver/us/asm/nonmatchings/battle/action_cmd/body_slam/func_802A92D4_4285B4.s index ae104700b5..085900cac6 100644 --- a/ver/us/asm/nonmatchings/battle/action_cmd/body_slam/func_802A92D4_4285B4.s +++ b/ver/us/asm/nonmatchings/battle/action_cmd/body_slam/func_802A92D4_4285B4.s @@ -112,8 +112,8 @@ dlabel L802A9444_428724 /* 428740 802A9460 A622004E */ sh $v0, 0x4e($s1) .L802A9464: /* 428744 802A9464 8E240004 */ lw $a0, 4($s1) -/* 428748 802A9468 3C058011 */ lui $a1, %hi(D_80108B54) -/* 42874C 802A946C 24A58B54 */ addiu $a1, $a1, %lo(D_80108B54) +/* 428748 802A9468 3C058011 */ lui $a1, %hi(HudScript_AButtonDown) +/* 42874C 802A946C 24A58B54 */ addiu $a1, $a1, %lo(HudScript_AButtonDown) /* 428750 802A9470 0C0511FF */ jal set_hud_element_anim /* 428754 802A9474 00000000 */ nop /* 428758 802A9478 3C048000 */ lui $a0, 0x8000 @@ -146,15 +146,15 @@ dlabel L802A94A8_428788 /* 4287BC 802A94DC 28422710 */ slti $v0, $v0, 0x2710 /* 4287C0 802A94E0 14400014 */ bnez $v0, .L802A9534 /* 4287C4 802A94E4 3C0451EB */ lui $a0, 0x51eb -/* 4287C8 802A94E8 3C058029 */ lui $a1, %hi(D_80292788) -/* 4287CC 802A94EC 24A52788 */ addiu $a1, $a1, %lo(D_80292788) +/* 4287C8 802A94E8 3C058029 */ lui $a1, %hi(HudScript_TimingReady) +/* 4287CC 802A94EC 24A52788 */ addiu $a1, $a1, %lo(HudScript_TimingReady) /* 4287D0 802A94F0 8E24000C */ lw $a0, 0xc($s1) /* 4287D4 802A94F4 24022710 */ addiu $v0, $zero, 0x2710 /* 4287D8 802A94F8 0C0511FF */ jal set_hud_element_anim /* 4287DC 802A94FC A6220044 */ sh $v0, 0x44($s1) /* 4287E0 802A9500 8E240004 */ lw $a0, 4($s1) -/* 4287E4 802A9504 3C058011 */ lui $a1, %hi(D_80108B28) -/* 4287E8 802A9508 24A58B28 */ addiu $a1, $a1, %lo(D_80108B28) +/* 4287E4 802A9504 3C058011 */ lui $a1, %hi(HudScript_AButton) +/* 4287E8 802A9508 24A58B28 */ addiu $a1, $a1, %lo(HudScript_AButton) /* 4287EC 802A950C 0C0511FF */ jal set_hud_element_anim /* 4287F0 802A9510 00000000 */ nop /* 4287F4 802A9514 86220068 */ lh $v0, 0x68($s1) diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/break_free/func_802A92DC_4236CC.s b/ver/us/asm/nonmatchings/battle/action_cmd/break_free/func_802A92DC_4236CC.s index 517ca9e662..315be05f53 100644 --- a/ver/us/asm/nonmatchings/battle/action_cmd/break_free/func_802A92DC_4236CC.s +++ b/ver/us/asm/nonmatchings/battle/action_cmd/break_free/func_802A92DC_4236CC.s @@ -112,8 +112,8 @@ dlabel L802A944C_42383C /* 423858 802A9468 A622004E */ sh $v0, 0x4e($s1) .L802A946C: /* 42385C 802A946C 8E240004 */ lw $a0, 4($s1) -/* 423860 802A9470 3C058011 */ lui $a1, %hi(D_80108B80) -/* 423864 802A9474 24A58B80 */ addiu $a1, $a1, %lo(D_80108B80) +/* 423860 802A9470 3C058011 */ lui $a1, %hi(HudScript_MashAButton) +/* 423864 802A9474 24A58B80 */ addiu $a1, $a1, %lo(HudScript_MashAButton) /* 423868 802A9478 0C0511FF */ jal set_hud_element_anim /* 42386C 802A947C 00000000 */ nop /* 423870 802A9480 96230052 */ lhu $v1, 0x52($s1) diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/dizzy_shell/func_802A928C_4263FC.s b/ver/us/asm/nonmatchings/battle/action_cmd/dizzy_shell/func_802A928C_4263FC.s index dcda7d50b3..ba6e46ac7c 100644 --- a/ver/us/asm/nonmatchings/battle/action_cmd/dizzy_shell/func_802A928C_4263FC.s +++ b/ver/us/asm/nonmatchings/battle/action_cmd/dizzy_shell/func_802A928C_4263FC.s @@ -81,8 +81,8 @@ dlabel L802A9388_4264F8 /* 426514 802A93A4 A622004E */ sh $v0, 0x4e($s1) .L802A93A8: /* 426518 802A93A8 8E240004 */ lw $a0, 4($s1) -/* 42651C 802A93AC 3C058011 */ lui $a1, %hi(D_80108B80) -/* 426520 802A93B0 24A58B80 */ addiu $a1, $a1, %lo(D_80108B80) +/* 42651C 802A93AC 3C058011 */ lui $a1, %hi(HudScript_MashAButton) +/* 426520 802A93B0 24A58B80 */ addiu $a1, $a1, %lo(HudScript_MashAButton) /* 426524 802A93B4 0C0511FF */ jal set_hud_element_anim /* 426528 802A93B8 00000000 */ nop /* 42652C 802A93BC 3C048000 */ lui $a0, 0x8000 diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/fire_shell/func_802A9294_426C64.s b/ver/us/asm/nonmatchings/battle/action_cmd/fire_shell/func_802A9294_426C64.s index ffdb8ad6aa..9f90d59e61 100644 --- a/ver/us/asm/nonmatchings/battle/action_cmd/fire_shell/func_802A9294_426C64.s +++ b/ver/us/asm/nonmatchings/battle/action_cmd/fire_shell/func_802A9294_426C64.s @@ -83,8 +83,8 @@ dlabel L802A9398_426D68 /* 426D84 802A93B4 A622004E */ sh $v0, 0x4e($s1) .L802A93B8: /* 426D88 802A93B8 8E240004 */ lw $a0, 4($s1) -/* 426D8C 802A93BC 3C058011 */ lui $a1, %hi(D_80108F30) -/* 426D90 802A93C0 24A58F30 */ addiu $a1, $a1, %lo(D_80108F30) +/* 426D8C 802A93BC 3C058011 */ lui $a1, %hi(HudScript_StickMashLeft) +/* 426D90 802A93C0 24A58F30 */ addiu $a1, $a1, %lo(HudScript_StickMashLeft) /* 426D94 802A93C4 0C0511FF */ jal set_hud_element_anim /* 426D98 802A93C8 00000000 */ nop /* 426D9C 802A93CC 3C048000 */ lui $a0, 0x8000 diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/hammer/func_802A936C_42236C.s b/ver/us/asm/nonmatchings/battle/action_cmd/hammer/func_802A936C_42236C.s index 57d27d0d67..e8ee4bcbe3 100644 --- a/ver/us/asm/nonmatchings/battle/action_cmd/hammer/func_802A936C_42236C.s +++ b/ver/us/asm/nonmatchings/battle/action_cmd/hammer/func_802A936C_42236C.s @@ -229,8 +229,8 @@ dlabel L802A9644_422644 /* 4226B0 802A96B0 4502000B */ bc1fl .L802A96E0 /* 4226B4 802A96B4 4614A580 */ add.s $f22, $f20, $f20 /* 4226B8 802A96B8 8E240014 */ lw $a0, 0x14($s1) -/* 4226BC 802A96BC 3C058029 */ lui $a1, %hi(D_802928CC) -/* 4226C0 802A96C0 24A528CC */ addiu $a1, $a1, %lo(D_802928CC) +/* 4226BC 802A96BC 3C058029 */ lui $a1, %hi(HudScript_TimingCharge3) +/* 4226C0 802A96C0 24A528CC */ addiu $a1, $a1, %lo(HudScript_TimingCharge3) /* 4226C4 802A96C4 0C0511FF */ jal set_hud_element_anim /* 4226C8 802A96C8 00000000 */ nop /* 4226CC 802A96CC 86220054 */ lh $v0, 0x54($s1) @@ -244,8 +244,8 @@ dlabel L802A9644_422644 /* 4226E8 802A96E8 4500000E */ bc1f .L802A9724 /* 4226EC 802A96EC 00000000 */ nop /* 4226F0 802A96F0 8E240010 */ lw $a0, 0x10($s1) -/* 4226F4 802A96F4 3C058029 */ lui $a1, %hi(D_80292874) -/* 4226F8 802A96F8 24A52874 */ addiu $a1, $a1, %lo(D_80292874) +/* 4226F4 802A96F4 3C058029 */ lui $a1, %hi(HudScript_TimingCharge2) +/* 4226F8 802A96F8 24A52874 */ addiu $a1, $a1, %lo(HudScript_TimingCharge2) /* 4226FC 802A96FC 0C0511FF */ jal set_hud_element_anim /* 422700 802A9700 00000000 */ nop /* 422704 802A9704 86220054 */ lh $v0, 0x54($s1) @@ -267,8 +267,8 @@ dlabel L802A9644_422644 /* 422740 802A9740 45000016 */ bc1f .L802A979C /* 422744 802A9744 00101027 */ nor $v0, $zero, $s0 /* 422748 802A9748 8E24000C */ lw $a0, 0xc($s1) -/* 42274C 802A974C 3C058029 */ lui $a1, %hi(D_8029281C) -/* 422750 802A9750 24A5281C */ addiu $a1, $a1, %lo(D_8029281C) +/* 42274C 802A974C 3C058029 */ lui $a1, %hi(HudScript_TimingCharge1) +/* 422750 802A9750 24A5281C */ addiu $a1, $a1, %lo(HudScript_TimingCharge1) /* 422754 802A9754 0C0511FF */ jal set_hud_element_anim /* 422758 802A9758 00000000 */ nop /* 42275C 802A975C 86220054 */ lh $v0, 0x54($s1) @@ -296,14 +296,14 @@ dlabel L802A9644_422644 /* 4227A4 802A97A4 00431021 */ addu $v0, $v0, $v1 /* 4227A8 802A97A8 14820019 */ bne $a0, $v0, .L802A9810 /* 4227AC 802A97AC 24020003 */ addiu $v0, $zero, 3 -/* 4227B0 802A97B0 3C058029 */ lui $a1, %hi(D_80292788) -/* 4227B4 802A97B4 24A52788 */ addiu $a1, $a1, %lo(D_80292788) +/* 4227B0 802A97B0 3C058029 */ lui $a1, %hi(HudScript_TimingReady) +/* 4227B4 802A97B4 24A52788 */ addiu $a1, $a1, %lo(HudScript_TimingReady) /* 4227B8 802A97B8 8E240008 */ lw $a0, 8($s1) /* 4227BC 802A97BC 0C0511FF */ jal set_hud_element_anim /* 4227C0 802A97C0 A2420084 */ sb $v0, 0x84($s2) /* 4227C4 802A97C4 8E240018 */ lw $a0, 0x18($s1) -/* 4227C8 802A97C8 3C058011 */ lui $a1, %hi(D_80108FF0) -/* 4227CC 802A97CC 24A58FF0 */ addiu $a1, $a1, %lo(D_80108FF0) +/* 4227C8 802A97C8 3C058011 */ lui $a1, %hi(HudScript_StickTapNeutral) +/* 4227CC 802A97CC 24A58FF0 */ addiu $a1, $a1, %lo(HudScript_StickTapNeutral) /* 4227D0 802A97D0 0C0511FF */ jal set_hud_element_anim /* 4227D4 802A97D4 00000000 */ nop /* 4227D8 802A97D8 82220062 */ lb $v0, 0x62($s1) diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/hurricane/func_802A92A0_42F980.s b/ver/us/asm/nonmatchings/battle/action_cmd/hurricane/func_802A92A0_42F980.s index e6ae6294ad..0c4056d21c 100644 --- a/ver/us/asm/nonmatchings/battle/action_cmd/hurricane/func_802A92A0_42F980.s +++ b/ver/us/asm/nonmatchings/battle/action_cmd/hurricane/func_802A92A0_42F980.s @@ -104,13 +104,13 @@ dlabel L802A93F0_42FAD0 /* 42FAEC 802A940C A622004E */ sh $v0, 0x4e($s1) .L802A9410: /* 42FAF0 802A9410 8E240004 */ lw $a0, 4($s1) -/* 42FAF4 802A9414 3C058011 */ lui $a1, %hi(D_80108B80) -/* 42FAF8 802A9418 24A58B80 */ addiu $a1, $a1, %lo(D_80108B80) +/* 42FAF4 802A9414 3C058011 */ lui $a1, %hi(HudScript_MashAButton) +/* 42FAF8 802A9418 24A58B80 */ addiu $a1, $a1, %lo(HudScript_MashAButton) /* 42FAFC 802A941C 0C0511FF */ jal set_hud_element_anim /* 42FB00 802A9420 00000000 */ nop /* 42FB04 802A9424 8E24000C */ lw $a0, 0xc($s1) -/* 42FB08 802A9428 3C058029 */ lui $a1, %hi(D_80292374) -/* 42FB0C 802A942C 24A52374 */ addiu $a1, $a1, %lo(D_80292374) +/* 42FB08 802A9428 3C058029 */ lui $a1, %hi(HudScript_MashBButton1) +/* 42FB0C 802A942C 24A52374 */ addiu $a1, $a1, %lo(HudScript_MashBButton1) /* 42FB10 802A9430 0C0511FF */ jal set_hud_element_anim /* 42FB14 802A9434 00000000 */ nop /* 42FB18 802A9438 96230052 */ lhu $v1, 0x52($s1) diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/power_shock/func_802A9310_42D220.s b/ver/us/asm/nonmatchings/battle/action_cmd/power_shock/func_802A9310_42D220.s index 1e93d0d259..b7be60f2f9 100644 --- a/ver/us/asm/nonmatchings/battle/action_cmd/power_shock/func_802A9310_42D220.s +++ b/ver/us/asm/nonmatchings/battle/action_cmd/power_shock/func_802A9310_42D220.s @@ -126,8 +126,8 @@ glabel func_802A9310_42D220 /* 42D3C8 802A94B8 A622004E */ sh $v0, 0x4e($s1) .L802A94BC: /* 42D3CC 802A94BC 8E240004 */ lw $a0, 4($s1) -/* 42D3D0 802A94C0 3C058011 */ lui $a1, %hi(D_80108B80) -/* 42D3D4 802A94C4 24A58B80 */ addiu $a1, $a1, %lo(D_80108B80) +/* 42D3D0 802A94C0 3C058011 */ lui $a1, %hi(HudScript_MashAButton) +/* 42D3D4 802A94C4 24A58B80 */ addiu $a1, $a1, %lo(HudScript_MashAButton) /* 42D3D8 802A94C8 0C0511FF */ jal set_hud_element_anim /* 42D3DC 802A94CC 00000000 */ nop /* 42D3E0 802A94D0 3C048000 */ lui $a0, 0x8000 diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/spiny_surge/func_802A9254_42F074.s b/ver/us/asm/nonmatchings/battle/action_cmd/spiny_surge/func_802A9254_42F074.s index 0c7bb232fc..ec26749922 100644 --- a/ver/us/asm/nonmatchings/battle/action_cmd/spiny_surge/func_802A9254_42F074.s +++ b/ver/us/asm/nonmatchings/battle/action_cmd/spiny_surge/func_802A9254_42F074.s @@ -88,8 +88,8 @@ dlabel L802A9368_42F188 /* 42F1A4 802A9384 A622004E */ sh $v0, 0x4e($s1) .L802A9388: /* 42F1A8 802A9388 8E240004 */ lw $a0, 4($s1) -/* 42F1AC 802A938C 3C058011 */ lui $a1, %hi(D_80108F30) -/* 42F1B0 802A9390 24A58F30 */ addiu $a1, $a1, %lo(D_80108F30) +/* 42F1AC 802A938C 3C058011 */ lui $a1, %hi(HudScript_StickMashLeft) +/* 42F1B0 802A9390 24A58F30 */ addiu $a1, $a1, %lo(HudScript_StickMashLeft) /* 42F1B4 802A9394 0C0511FF */ jal set_hud_element_anim /* 42F1B8 802A9398 00000000 */ nop /* 42F1BC 802A939C 3C048000 */ lui $a0, 0x8000 diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/spook/func_802A9298_4302B8.s b/ver/us/asm/nonmatchings/battle/action_cmd/spook/func_802A9298_4302B8.s index b400ed96c0..1edc229aec 100644 --- a/ver/us/asm/nonmatchings/battle/action_cmd/spook/func_802A9298_4302B8.s +++ b/ver/us/asm/nonmatchings/battle/action_cmd/spook/func_802A9298_4302B8.s @@ -81,8 +81,8 @@ dlabel L802A9394_4303B4 /* 4303D0 802A93B0 A622004E */ sh $v0, 0x4e($s1) .L802A93B4: /* 4303D4 802A93B4 8E240004 */ lw $a0, 4($s1) -/* 4303D8 802A93B8 3C058011 */ lui $a1, %hi(D_80108F30) -/* 4303DC 802A93BC 24A58F30 */ addiu $a1, $a1, %lo(D_80108F30) +/* 4303D8 802A93B8 3C058011 */ lui $a1, %hi(HudScript_StickMashLeft) +/* 4303DC 802A93BC 24A58F30 */ addiu $a1, $a1, %lo(HudScript_StickMashLeft) /* 4303E0 802A93C0 0C0511FF */ jal set_hud_element_anim /* 4303E4 802A93C4 00000000 */ nop /* 4303E8 802A93C8 3C048000 */ lui $a0, 0x8000 diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/squirt/func_802A9208_429F28.s b/ver/us/asm/nonmatchings/battle/action_cmd/squirt/func_802A9208_429F28.s index d87877d029..71bba02798 100644 --- a/ver/us/asm/nonmatchings/battle/action_cmd/squirt/func_802A9208_429F28.s +++ b/ver/us/asm/nonmatchings/battle/action_cmd/squirt/func_802A9208_429F28.s @@ -82,8 +82,8 @@ dlabel L802A9308_42A028 /* 42A044 802A9324 A622004E */ sh $v0, 0x4e($s1) .L802A9328: /* 42A048 802A9328 8E240004 */ lw $a0, 4($s1) -/* 42A04C 802A932C 3C058011 */ lui $a1, %hi(D_80108B54) -/* 42A050 802A9330 24A58B54 */ addiu $a1, $a1, %lo(D_80108B54) +/* 42A04C 802A932C 3C058011 */ lui $a1, %hi(HudScript_AButtonDown) +/* 42A050 802A9330 24A58B54 */ addiu $a1, $a1, %lo(HudScript_AButtonDown) /* 42A054 802A9334 0C0511FF */ jal set_hud_element_anim /* 42A058 802A9338 00000000 */ nop /* 42A05C 802A933C 3C048000 */ lui $a0, 0x8000 @@ -215,15 +215,15 @@ dlabel L802A936C_42A08C /* 42A238 802A9518 8E300004 */ lw $s0, 4($s1) /* 42A23C 802A951C 0C05122C */ jal get_hud_element_anim /* 42A240 802A9520 0200202D */ daddu $a0, $s0, $zero -/* 42A244 802A9524 3C058011 */ lui $a1, %hi(D_80108B54) -/* 42A248 802A9528 24A58B54 */ addiu $a1, $a1, %lo(D_80108B54) +/* 42A244 802A9524 3C058011 */ lui $a1, %hi(HudScript_AButtonDown) +/* 42A248 802A9528 24A58B54 */ addiu $a1, $a1, %lo(HudScript_AButtonDown) /* 42A24C 802A952C 080AA551 */ j .L802A9544 /* 42A250 802A9530 00000000 */ nop .L802A9534: /* 42A254 802A9534 0C05122C */ jal get_hud_element_anim /* 42A258 802A9538 0200202D */ daddu $a0, $s0, $zero -/* 42A25C 802A953C 3C058011 */ lui $a1, %hi(D_80108BBC) -/* 42A260 802A9540 24A58BBC */ addiu $a1, $a1, %lo(D_80108BBC) +/* 42A25C 802A953C 3C058011 */ lui $a1, %hi(HudScript_PressAButton) +/* 42A260 802A9540 24A58BBC */ addiu $a1, $a1, %lo(HudScript_PressAButton) .L802A9544: /* 42A264 802A9544 10450003 */ beq $v0, $a1, .L802A9554 /* 42A268 802A9548 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/water_block/func_802A9000_42A4F0.s b/ver/us/asm/nonmatchings/battle/action_cmd/water_block/func_802A9000_42A4F0.s index 81d0339a99..ea82461202 100644 --- a/ver/us/asm/nonmatchings/battle/action_cmd/water_block/func_802A9000_42A4F0.s +++ b/ver/us/asm/nonmatchings/battle/action_cmd/water_block/func_802A9000_42A4F0.s @@ -36,8 +36,8 @@ glabel func_802A9000_42A4F0 /* 42A568 802A9078 8E050000 */ lw $a1, ($s0) /* 42A56C 802A907C 0C0B1EAF */ jal evt_get_variable /* 42A570 802A9080 0220202D */ daddu $a0, $s1, $zero -/* 42A574 802A9084 3C048011 */ lui $a0, %hi(D_80108B28) -/* 42A578 802A9088 24848B28 */ addiu $a0, $a0, %lo(D_80108B28) +/* 42A574 802A9084 3C048011 */ lui $a0, %hi(HudScript_AButton) +/* 42A578 802A9088 24848B28 */ addiu $a0, $a0, %lo(HudScript_AButton) /* 42A57C 802A908C A6420064 */ sh $v0, 0x64($s2) /* 42A580 802A9090 24020001 */ addiu $v0, $zero, 1 /* 42A584 802A9094 A2620084 */ sb $v0, 0x84($s3) @@ -60,8 +60,8 @@ glabel func_802A9000_42A4F0 /* 42A5C8 802A90D8 0220202D */ daddu $a0, $s1, $zero /* 42A5CC 802A90DC 0C051277 */ jal set_hud_element_render_depth /* 42A5D0 802A90E0 0000282D */ daddu $a1, $zero, $zero -/* 42A5D4 802A90E4 3C048029 */ lui $a0, %hi(D_80292AFC) -/* 42A5D8 802A90E8 24842AFC */ addiu $a0, $a0, %lo(D_80292AFC) +/* 42A5D4 802A90E4 3C048029 */ lui $a0, %hi(HudScript_TimingBar3Chances) +/* 42A5D8 802A90E8 24842AFC */ addiu $a0, $a0, %lo(HudScript_TimingBar3Chances) /* 42A5DC 802A90EC 0C050529 */ jal create_hud_element /* 42A5E0 802A90F0 00000000 */ nop /* 42A5E4 802A90F4 0040882D */ daddu $s1, $v0, $zero @@ -77,8 +77,8 @@ glabel func_802A9000_42A4F0 /* 42A60C 802A911C 0220202D */ daddu $a0, $s1, $zero /* 42A610 802A9120 0C051280 */ jal set_hud_element_flags /* 42A614 802A9124 24050082 */ addiu $a1, $zero, 0x82 -/* 42A618 802A9128 3C108029 */ lui $s0, %hi(D_8029275C) -/* 42A61C 802A912C 2610275C */ addiu $s0, $s0, %lo(D_8029275C) +/* 42A618 802A9128 3C108029 */ lui $s0, %hi(HudScript_TimingWait) +/* 42A61C 802A912C 2610275C */ addiu $s0, $s0, %lo(HudScript_TimingWait) /* 42A620 802A9130 0C050529 */ jal create_hud_element /* 42A624 802A9134 0200202D */ daddu $a0, $s0, $zero /* 42A628 802A9138 0040882D */ daddu $s1, $v0, $zero @@ -124,8 +124,8 @@ glabel func_802A9000_42A4F0 /* 42A6C8 802A91D8 0220202D */ daddu $a0, $s1, $zero /* 42A6CC 802A91DC 0C051280 */ jal set_hud_element_flags /* 42A6D0 802A91E0 24050082 */ addiu $a1, $zero, 0x82 -/* 42A6D4 802A91E4 3C108029 */ lui $s0, %hi(D_80292B54) -/* 42A6D8 802A91E8 26102B54 */ addiu $s0, $s0, %lo(D_80292B54) +/* 42A6D4 802A91E4 3C108029 */ lui $s0, %hi(HudScript_TimingOK) +/* 42A6D8 802A91E8 26102B54 */ addiu $s0, $s0, %lo(HudScript_TimingOK) /* 42A6DC 802A91EC 0C050529 */ jal create_hud_element /* 42A6E0 802A91F0 0200202D */ daddu $a0, $s0, $zero /* 42A6E4 802A91F4 0040882D */ daddu $s1, $v0, $zero @@ -176,8 +176,8 @@ glabel func_802A9000_42A4F0 /* 42A798 802A92A8 0040202D */ daddu $a0, $v0, $zero /* 42A79C 802A92AC 0C051261 */ jal set_hud_element_render_pos /* 42A7A0 802A92B0 AE44002C */ sw $a0, 0x2c($s2) -/* 42A7A4 802A92B4 3C048029 */ lui $a0, %hi(D_802928A0) -/* 42A7A8 802A92B8 248428A0 */ addiu $a0, $a0, %lo(D_802928A0) +/* 42A7A4 802A92B4 3C048029 */ lui $a0, %hi(HudScript_TimingCharge4c) +/* 42A7A8 802A92B8 248428A0 */ addiu $a0, $a0, %lo(HudScript_TimingCharge4c) /* 42A7AC 802A92BC 0C050529 */ jal create_hud_element /* 42A7B0 802A92C0 00000000 */ nop /* 42A7B4 802A92C4 86450056 */ lh $a1, 0x56($s2) @@ -185,8 +185,8 @@ glabel func_802A9000_42A4F0 /* 42A7BC 802A92CC 0040202D */ daddu $a0, $v0, $zero /* 42A7C0 802A92D0 0C051261 */ jal set_hud_element_render_pos /* 42A7C4 802A92D4 AE440030 */ sw $a0, 0x30($s2) -/* 42A7C8 802A92D8 3C048029 */ lui $a0, %hi(D_80292848) -/* 42A7CC 802A92DC 24842848 */ addiu $a0, $a0, %lo(D_80292848) +/* 42A7C8 802A92D8 3C048029 */ lui $a0, %hi(HudScript_TimingCharge4b) +/* 42A7CC 802A92DC 24842848 */ addiu $a0, $a0, %lo(HudScript_TimingCharge4b) /* 42A7D0 802A92E0 0C050529 */ jal create_hud_element /* 42A7D4 802A92E4 00000000 */ nop /* 42A7D8 802A92E8 0040882D */ daddu $s1, $v0, $zero diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/water_block/func_802A948C_42A97C.s b/ver/us/asm/nonmatchings/battle/action_cmd/water_block/func_802A948C_42A97C.s index e2fb7e8afd..e967547bad 100644 --- a/ver/us/asm/nonmatchings/battle/action_cmd/water_block/func_802A948C_42A97C.s +++ b/ver/us/asm/nonmatchings/battle/action_cmd/water_block/func_802A948C_42A97C.s @@ -246,8 +246,8 @@ dlabel L802A97E4_42ACD4 /* 42ACE4 802A97F4 1462000A */ bne $v1, $v0, .L802A9820 /* 42ACE8 802A97F8 24020016 */ addiu $v0, $zero, 0x16 /* 42ACEC 802A97FC 8E240030 */ lw $a0, 0x30($s1) -/* 42ACF0 802A9800 3C058029 */ lui $a1, %hi(D_802928CC) -/* 42ACF4 802A9804 24A528CC */ addiu $a1, $a1, %lo(D_802928CC) +/* 42ACF0 802A9800 3C058029 */ lui $a1, %hi(HudScript_TimingCharge3) +/* 42ACF4 802A9804 24A528CC */ addiu $a1, $a1, %lo(HudScript_TimingCharge3) /* 42ACF8 802A9808 0C0511FF */ jal set_hud_element_anim /* 42ACFC 802A980C 00000000 */ nop /* 42AD00 802A9810 0C05272D */ jal sfx_play_sound @@ -258,8 +258,8 @@ dlabel L802A97E4_42ACD4 /* 42AD10 802A9820 14620008 */ bne $v1, $v0, .L802A9844 /* 42AD14 802A9824 00000000 */ nop /* 42AD18 802A9828 8E240034 */ lw $a0, 0x34($s1) -/* 42AD1C 802A982C 3C058029 */ lui $a1, %hi(D_80292874) -/* 42AD20 802A9830 24A52874 */ addiu $a1, $a1, %lo(D_80292874) +/* 42AD1C 802A982C 3C058029 */ lui $a1, %hi(HudScript_TimingCharge2) +/* 42AD20 802A9830 24A52874 */ addiu $a1, $a1, %lo(HudScript_TimingCharge2) /* 42AD24 802A9834 0C0511FF */ jal set_hud_element_anim /* 42AD28 802A9838 00000000 */ nop /* 42AD2C 802A983C 0C05272D */ jal sfx_play_sound @@ -270,13 +270,13 @@ dlabel L802A97E4_42ACD4 /* 42AD3C 802A984C 1462000D */ bne $v1, $v0, .L802A9884 /* 42AD40 802A9850 00000000 */ nop /* 42AD44 802A9854 8E24000C */ lw $a0, 0xc($s1) -/* 42AD48 802A9858 3C058029 */ lui $a1, %hi(D_80292788) -/* 42AD4C 802A985C 24A52788 */ addiu $a1, $a1, %lo(D_80292788) +/* 42AD48 802A9858 3C058029 */ lui $a1, %hi(HudScript_TimingReady) +/* 42AD4C 802A985C 24A52788 */ addiu $a1, $a1, %lo(HudScript_TimingReady) /* 42AD50 802A9860 0C0511FF */ jal set_hud_element_anim /* 42AD54 802A9864 00000000 */ nop /* 42AD58 802A9868 8E240004 */ lw $a0, 4($s1) -/* 42AD5C 802A986C 3C058011 */ lui $a1, %hi(D_80108B54) -/* 42AD60 802A9870 24A58B54 */ addiu $a1, $a1, %lo(D_80108B54) +/* 42AD5C 802A986C 3C058011 */ lui $a1, %hi(HudScript_AButtonDown) +/* 42AD60 802A9870 24A58B54 */ addiu $a1, $a1, %lo(HudScript_AButtonDown) /* 42AD64 802A9874 0C0511FF */ jal set_hud_element_anim /* 42AD68 802A9878 00000000 */ nop /* 42AD6C 802A987C 0C05272D */ jal sfx_play_sound @@ -378,13 +378,13 @@ dlabel L802A98A8_42AD98 /* 42AEBC 802A99CC 8E30001C */ lw $s0, 0x1c($s1) /* 42AEC0 802A99D0 10400005 */ beqz $v0, .L802A99E8 /* 42AEC4 802A99D4 0200202D */ daddu $a0, $s0, $zero -/* 42AEC8 802A99D8 3C058029 */ lui $a1, %hi(D_80292B54) -/* 42AECC 802A99DC 24A52B54 */ addiu $a1, $a1, %lo(D_80292B54) +/* 42AEC8 802A99D8 3C058029 */ lui $a1, %hi(HudScript_TimingOK) +/* 42AECC 802A99DC 24A52B54 */ addiu $a1, $a1, %lo(HudScript_TimingOK) /* 42AED0 802A99E0 080AA67C */ j .L802A99F0 /* 42AED4 802A99E4 00000000 */ nop .L802A99E8: -/* 42AED8 802A99E8 3C058029 */ lui $a1, %hi(D_80292B80) -/* 42AEDC 802A99EC 24A52B80 */ addiu $a1, $a1, %lo(D_80292B80) +/* 42AED8 802A99E8 3C058029 */ lui $a1, %hi(HudScript_TimingMiss) +/* 42AEDC 802A99EC 24A52B80 */ addiu $a1, $a1, %lo(HudScript_TimingMiss) .L802A99F0: /* 42AEE0 802A99F0 0C0511FF */ jal set_hud_element_anim /* 42AEE4 802A99F4 00000000 */ nop @@ -406,13 +406,13 @@ dlabel L802A98A8_42AD98 /* 42AF20 802A9A30 8E30001C */ lw $s0, 0x1c($s1) /* 42AF24 802A9A34 10400005 */ beqz $v0, .L802A9A4C /* 42AF28 802A9A38 0200202D */ daddu $a0, $s0, $zero -/* 42AF2C 802A9A3C 3C058029 */ lui $a1, %hi(D_80292B54) -/* 42AF30 802A9A40 24A52B54 */ addiu $a1, $a1, %lo(D_80292B54) +/* 42AF2C 802A9A3C 3C058029 */ lui $a1, %hi(HudScript_TimingOK) +/* 42AF30 802A9A40 24A52B54 */ addiu $a1, $a1, %lo(HudScript_TimingOK) /* 42AF34 802A9A44 080AA695 */ j .L802A9A54 /* 42AF38 802A9A48 00000000 */ nop .L802A9A4C: -/* 42AF3C 802A9A4C 3C058029 */ lui $a1, %hi(D_80292B80) -/* 42AF40 802A9A50 24A52B80 */ addiu $a1, $a1, %lo(D_80292B80) +/* 42AF3C 802A9A4C 3C058029 */ lui $a1, %hi(HudScript_TimingMiss) +/* 42AF40 802A9A50 24A52B80 */ addiu $a1, $a1, %lo(HudScript_TimingMiss) .L802A9A54: /* 42AF44 802A9A54 0C0511FF */ jal set_hud_element_anim /* 42AF48 802A9A58 00000000 */ nop @@ -426,8 +426,8 @@ dlabel L802A98A8_42AD98 /* 42AF68 802A9A78 0C05128B */ jal clear_hud_element_flags /* 42AF6C 802A9A7C 24050002 */ addiu $a1, $zero, 2 /* 42AF70 802A9A80 8E240004 */ lw $a0, 4($s1) -/* 42AF74 802A9A84 3C058011 */ lui $a1, %hi(D_80108B28) -/* 42AF78 802A9A88 24A58B28 */ addiu $a1, $a1, %lo(D_80108B28) +/* 42AF74 802A9A84 3C058011 */ lui $a1, %hi(HudScript_AButton) +/* 42AF78 802A9A88 24A58B28 */ addiu $a1, $a1, %lo(HudScript_AButton) /* 42AF7C 802A9A8C 0C0511FF */ jal set_hud_element_anim /* 42AF80 802A9A90 00000000 */ nop .L802A9A94: @@ -439,13 +439,13 @@ dlabel L802A98A8_42AD98 /* 42AF98 802A9AA8 1462000D */ bne $v1, $v0, .L802A9AE0 /* 42AF9C 802A9AAC 00000000 */ nop /* 42AFA0 802A9AB0 8E240010 */ lw $a0, 0x10($s1) -/* 42AFA4 802A9AB4 3C058029 */ lui $a1, %hi(D_80292788) -/* 42AFA8 802A9AB8 24A52788 */ addiu $a1, $a1, %lo(D_80292788) +/* 42AFA4 802A9AB4 3C058029 */ lui $a1, %hi(HudScript_TimingReady) +/* 42AFA8 802A9AB8 24A52788 */ addiu $a1, $a1, %lo(HudScript_TimingReady) /* 42AFAC 802A9ABC 0C0511FF */ jal set_hud_element_anim /* 42AFB0 802A9AC0 00000000 */ nop /* 42AFB4 802A9AC4 8E240004 */ lw $a0, 4($s1) -/* 42AFB8 802A9AC8 3C058011 */ lui $a1, %hi(D_80108B54) -/* 42AFBC 802A9ACC 24A58B54 */ addiu $a1, $a1, %lo(D_80108B54) +/* 42AFB8 802A9AC8 3C058011 */ lui $a1, %hi(HudScript_AButtonDown) +/* 42AFBC 802A9ACC 24A58B54 */ addiu $a1, $a1, %lo(HudScript_AButtonDown) /* 42AFC0 802A9AD0 0C0511FF */ jal set_hud_element_anim /* 42AFC4 802A9AD4 00000000 */ nop /* 42AFC8 802A9AD8 0C05272D */ jal sfx_play_sound @@ -551,13 +551,13 @@ dlabel L802A9B04_42AFF4 /* 42B124 802A9C34 8E300020 */ lw $s0, 0x20($s1) /* 42B128 802A9C38 10400005 */ beqz $v0, .L802A9C50 /* 42B12C 802A9C3C 0200202D */ daddu $a0, $s0, $zero -/* 42B130 802A9C40 3C058029 */ lui $a1, %hi(D_80292B54) -/* 42B134 802A9C44 24A52B54 */ addiu $a1, $a1, %lo(D_80292B54) +/* 42B130 802A9C40 3C058029 */ lui $a1, %hi(HudScript_TimingOK) +/* 42B134 802A9C44 24A52B54 */ addiu $a1, $a1, %lo(HudScript_TimingOK) /* 42B138 802A9C48 080AA716 */ j .L802A9C58 /* 42B13C 802A9C4C 00000000 */ nop .L802A9C50: -/* 42B140 802A9C50 3C058029 */ lui $a1, %hi(D_80292B80) -/* 42B144 802A9C54 24A52B80 */ addiu $a1, $a1, %lo(D_80292B80) +/* 42B140 802A9C50 3C058029 */ lui $a1, %hi(HudScript_TimingMiss) +/* 42B144 802A9C54 24A52B80 */ addiu $a1, $a1, %lo(HudScript_TimingMiss) .L802A9C58: /* 42B148 802A9C58 0C0511FF */ jal set_hud_element_anim /* 42B14C 802A9C5C 00000000 */ nop @@ -579,13 +579,13 @@ dlabel L802A9B04_42AFF4 /* 42B188 802A9C98 8E300020 */ lw $s0, 0x20($s1) /* 42B18C 802A9C9C 10400005 */ beqz $v0, .L802A9CB4 /* 42B190 802A9CA0 0200202D */ daddu $a0, $s0, $zero -/* 42B194 802A9CA4 3C058029 */ lui $a1, %hi(D_80292B54) -/* 42B198 802A9CA8 24A52B54 */ addiu $a1, $a1, %lo(D_80292B54) +/* 42B194 802A9CA4 3C058029 */ lui $a1, %hi(HudScript_TimingOK) +/* 42B198 802A9CA8 24A52B54 */ addiu $a1, $a1, %lo(HudScript_TimingOK) /* 42B19C 802A9CAC 080AA72F */ j .L802A9CBC /* 42B1A0 802A9CB0 00000000 */ nop .L802A9CB4: -/* 42B1A4 802A9CB4 3C058029 */ lui $a1, %hi(D_80292B80) -/* 42B1A8 802A9CB8 24A52B80 */ addiu $a1, $a1, %lo(D_80292B80) +/* 42B1A4 802A9CB4 3C058029 */ lui $a1, %hi(HudScript_TimingMiss) +/* 42B1A8 802A9CB8 24A52B80 */ addiu $a1, $a1, %lo(HudScript_TimingMiss) .L802A9CBC: /* 42B1AC 802A9CBC 0C0511FF */ jal set_hud_element_anim /* 42B1B0 802A9CC0 00000000 */ nop @@ -599,8 +599,8 @@ dlabel L802A9B04_42AFF4 /* 42B1D0 802A9CE0 0C05128B */ jal clear_hud_element_flags /* 42B1D4 802A9CE4 24050002 */ addiu $a1, $zero, 2 /* 42B1D8 802A9CE8 8E240004 */ lw $a0, 4($s1) -/* 42B1DC 802A9CEC 3C058011 */ lui $a1, %hi(D_80108B28) -/* 42B1E0 802A9CF0 24A58B28 */ addiu $a1, $a1, %lo(D_80108B28) +/* 42B1DC 802A9CEC 3C058011 */ lui $a1, %hi(HudScript_AButton) +/* 42B1E0 802A9CF0 24A58B28 */ addiu $a1, $a1, %lo(HudScript_AButton) /* 42B1E4 802A9CF4 0C0511FF */ jal set_hud_element_anim /* 42B1E8 802A9CF8 00000000 */ nop .L802A9CFC: @@ -612,13 +612,13 @@ dlabel L802A9B04_42AFF4 /* 42B200 802A9D10 1462000D */ bne $v1, $v0, .L802A9D48 /* 42B204 802A9D14 00000000 */ nop /* 42B208 802A9D18 8E240014 */ lw $a0, 0x14($s1) -/* 42B20C 802A9D1C 3C058029 */ lui $a1, %hi(D_80292788) -/* 42B210 802A9D20 24A52788 */ addiu $a1, $a1, %lo(D_80292788) +/* 42B20C 802A9D1C 3C058029 */ lui $a1, %hi(HudScript_TimingReady) +/* 42B210 802A9D20 24A52788 */ addiu $a1, $a1, %lo(HudScript_TimingReady) /* 42B214 802A9D24 0C0511FF */ jal set_hud_element_anim /* 42B218 802A9D28 00000000 */ nop /* 42B21C 802A9D2C 8E240004 */ lw $a0, 4($s1) -/* 42B220 802A9D30 3C058011 */ lui $a1, %hi(D_80108B54) -/* 42B224 802A9D34 24A58B54 */ addiu $a1, $a1, %lo(D_80108B54) +/* 42B220 802A9D30 3C058011 */ lui $a1, %hi(HudScript_AButtonDown) +/* 42B224 802A9D34 24A58B54 */ addiu $a1, $a1, %lo(HudScript_AButtonDown) /* 42B228 802A9D38 0C0511FF */ jal set_hud_element_anim /* 42B22C 802A9D3C 00000000 */ nop /* 42B230 802A9D40 0C05272D */ jal sfx_play_sound @@ -729,13 +729,13 @@ dlabel L802A9D7C_42B26C /* 42B39C 802A9EAC 8E300024 */ lw $s0, 0x24($s1) /* 42B3A0 802A9EB0 10400005 */ beqz $v0, .L802A9EC8 /* 42B3A4 802A9EB4 0200202D */ daddu $a0, $s0, $zero -/* 42B3A8 802A9EB8 3C058029 */ lui $a1, %hi(D_80292B54) -/* 42B3AC 802A9EBC 24A52B54 */ addiu $a1, $a1, %lo(D_80292B54) +/* 42B3A8 802A9EB8 3C058029 */ lui $a1, %hi(HudScript_TimingOK) +/* 42B3AC 802A9EBC 24A52B54 */ addiu $a1, $a1, %lo(HudScript_TimingOK) /* 42B3B0 802A9EC0 080AA7B4 */ j .L802A9ED0 /* 42B3B4 802A9EC4 00000000 */ nop .L802A9EC8: -/* 42B3B8 802A9EC8 3C058029 */ lui $a1, %hi(D_80292B80) -/* 42B3BC 802A9ECC 24A52B80 */ addiu $a1, $a1, %lo(D_80292B80) +/* 42B3B8 802A9EC8 3C058029 */ lui $a1, %hi(HudScript_TimingMiss) +/* 42B3BC 802A9ECC 24A52B80 */ addiu $a1, $a1, %lo(HudScript_TimingMiss) .L802A9ED0: /* 42B3C0 802A9ED0 0C0511FF */ jal set_hud_element_anim /* 42B3C4 802A9ED4 00000000 */ nop @@ -758,13 +758,13 @@ dlabel L802A9D7C_42B26C /* 42B404 802A9F14 8E300024 */ lw $s0, 0x24($s1) /* 42B408 802A9F18 10400005 */ beqz $v0, .L802A9F30 /* 42B40C 802A9F1C 0200202D */ daddu $a0, $s0, $zero -/* 42B410 802A9F20 3C058029 */ lui $a1, %hi(D_80292B54) -/* 42B414 802A9F24 24A52B54 */ addiu $a1, $a1, %lo(D_80292B54) +/* 42B410 802A9F20 3C058029 */ lui $a1, %hi(HudScript_TimingOK) +/* 42B414 802A9F24 24A52B54 */ addiu $a1, $a1, %lo(HudScript_TimingOK) /* 42B418 802A9F28 080AA7CE */ j .L802A9F38 /* 42B41C 802A9F2C 00000000 */ nop .L802A9F30: -/* 42B420 802A9F30 3C058029 */ lui $a1, %hi(D_80292B80) -/* 42B424 802A9F34 24A52B80 */ addiu $a1, $a1, %lo(D_80292B80) +/* 42B420 802A9F30 3C058029 */ lui $a1, %hi(HudScript_TimingMiss) +/* 42B424 802A9F34 24A52B80 */ addiu $a1, $a1, %lo(HudScript_TimingMiss) .L802A9F38: /* 42B428 802A9F38 0C0511FF */ jal set_hud_element_anim /* 42B42C 802A9F3C 00000000 */ nop @@ -778,8 +778,8 @@ dlabel L802A9D7C_42B26C /* 42B44C 802A9F5C 0C05128B */ jal clear_hud_element_flags /* 42B450 802A9F60 24050002 */ addiu $a1, $zero, 2 /* 42B454 802A9F64 8E240004 */ lw $a0, 4($s1) -/* 42B458 802A9F68 3C058011 */ lui $a1, %hi(D_80108B28) -/* 42B45C 802A9F6C 24A58B28 */ addiu $a1, $a1, %lo(D_80108B28) +/* 42B458 802A9F68 3C058011 */ lui $a1, %hi(HudScript_AButton) +/* 42B45C 802A9F6C 24A58B28 */ addiu $a1, $a1, %lo(HudScript_AButton) /* 42B460 802A9F70 0C0511FF */ jal set_hud_element_anim /* 42B464 802A9F74 00000000 */ nop /* 42B468 802A9F78 24020010 */ addiu $v0, $zero, 0x10 diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/whirlwind/func_802A9000_423C70.s b/ver/us/asm/nonmatchings/battle/action_cmd/whirlwind/func_802A9000_423C70.s index d7371c244d..813e5ca3a2 100644 --- a/ver/us/asm/nonmatchings/battle/action_cmd/whirlwind/func_802A9000_423C70.s +++ b/ver/us/asm/nonmatchings/battle/action_cmd/whirlwind/func_802A9000_423C70.s @@ -46,8 +46,8 @@ glabel func_802A9000_423C70 /* 423D0C 802A909C 24020003 */ addiu $v0, $zero, 3 /* 423D10 802A90A0 A2820084 */ sb $v0, 0x84($s4) .L802A90A4: -/* 423D14 802A90A4 3C048011 */ lui $a0, %hi(D_80108B28) -/* 423D18 802A90A8 24848B28 */ addiu $a0, $a0, %lo(D_80108B28) +/* 423D14 802A90A4 3C048011 */ lui $a0, %hi(HudScript_AButton) +/* 423D18 802A90A8 24848B28 */ addiu $a0, $a0, %lo(HudScript_AButton) /* 423D1C 802A90AC 2402FFD0 */ addiu $v0, $zero, -0x30 /* 423D20 802A90B0 A6220056 */ sh $v0, 0x56($s1) /* 423D24 802A90B4 24020050 */ addiu $v0, $zero, 0x50 @@ -65,8 +65,8 @@ glabel func_802A9000_423C70 /* 423D54 802A90E4 0200202D */ daddu $a0, $s0, $zero /* 423D58 802A90E8 0C051277 */ jal set_hud_element_render_depth /* 423D5C 802A90EC 0000282D */ daddu $a1, $zero, $zero -/* 423D60 802A90F0 3C048011 */ lui $a0, %hi(D_80108AFC) -/* 423D64 802A90F4 24848AFC */ addiu $a0, $a0, %lo(D_80108AFC) +/* 423D60 802A90F0 3C048011 */ lui $a0, %hi(HudScript_BlueMeter) +/* 423D64 802A90F4 24848AFC */ addiu $a0, $a0, %lo(HudScript_BlueMeter) /* 423D68 802A90F8 0C050529 */ jal create_hud_element /* 423D6C 802A90FC 00000000 */ nop /* 423D70 802A9100 0040802D */ daddu $s0, $v0, $zero diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/whirlwind/func_802A92F0_423F60.s b/ver/us/asm/nonmatchings/battle/action_cmd/whirlwind/func_802A92F0_423F60.s index 078e96144e..f9f7ffbdef 100644 --- a/ver/us/asm/nonmatchings/battle/action_cmd/whirlwind/func_802A92F0_423F60.s +++ b/ver/us/asm/nonmatchings/battle/action_cmd/whirlwind/func_802A92F0_423F60.s @@ -113,8 +113,8 @@ dlabel L802A9464_4240D4 /* 4240F0 802A9480 A622004E */ sh $v0, 0x4e($s1) .L802A9484: /* 4240F4 802A9484 8E240004 */ lw $a0, 4($s1) -/* 4240F8 802A9488 3C058011 */ lui $a1, %hi(D_80108B80) -/* 4240FC 802A948C 24A58B80 */ addiu $a1, $a1, %lo(D_80108B80) +/* 4240F8 802A9488 3C058011 */ lui $a1, %hi(HudScript_MashAButton) +/* 4240FC 802A948C 24A58B80 */ addiu $a1, $a1, %lo(HudScript_MashAButton) /* 424100 802A9490 0C0511FF */ jal set_hud_element_anim /* 424104 802A9494 00000000 */ nop /* 424108 802A9498 96230052 */ lhu $v1, 0x52($s1) diff --git a/ver/us/asm/nonmatchings/battle/item/mystery/battle_item_mystery_func_802A13E4_72C994.s b/ver/us/asm/nonmatchings/battle/item/mystery/battle_item_mystery_func_802A13E4_72C994.s index 37b11413ec..b622b86d6f 100644 --- a/ver/us/asm/nonmatchings/battle/item/mystery/battle_item_mystery_func_802A13E4_72C994.s +++ b/ver/us/asm/nonmatchings/battle/item/mystery/battle_item_mystery_func_802A13E4_72C994.s @@ -71,8 +71,8 @@ glabel battle_item_mystery_func_802A13E4_72C994 .L802A14C8: /* 72CA78 802A14C8 0000802D */ daddu $s0, $zero, $zero .L802A14CC: -/* 72CA7C 802A14CC 3C138009 */ lui $s3, %hi(D_8008A680) -/* 72CA80 802A14D0 2673A680 */ addiu $s3, $s3, %lo(D_8008A680) +/* 72CA7C 802A14CC 3C138009 */ lui $s3, %hi(gItemHudScripts) +/* 72CA80 802A14D0 2673A680 */ addiu $s3, $s3, %lo(gItemHudScripts) /* 72CA84 802A14D4 3C128008 */ lui $s2, %hi(gItemTable) /* 72CA88 802A14D8 265278E0 */ addiu $s2, $s2, %lo(gItemTable) /* 72CA8C 802A14DC 3C11802A */ lui $s1, %hi(D_802A25C8) diff --git a/ver/us/asm/nonmatchings/battle/partner/lakilester/func_8023803C_70BD4C.s b/ver/us/asm/nonmatchings/battle/partner/lakilester/func_8023803C_70BD4C.s index fa9dc632b7..40d9b5d060 100644 --- a/ver/us/asm/nonmatchings/battle/partner/lakilester/func_8023803C_70BD4C.s +++ b/ver/us/asm/nonmatchings/battle/partner/lakilester/func_8023803C_70BD4C.s @@ -42,8 +42,8 @@ glabel func_8023803C_70BD4C /* 70BDD8 802380C8 0808E21D */ j .L80238874 /* 70BDDC 802380CC 00000000 */ nop .L802380D0: -/* 70BDE0 802380D0 3C048029 */ lui $a0, %hi(D_8029369C) -/* 70BDE4 802380D4 2484369C */ addiu $a0, $a0, %lo(D_8029369C) +/* 70BDE0 802380D0 3C048029 */ lui $a0, %hi(HudScript_AimReticle) +/* 70BDE4 802380D4 2484369C */ addiu $a0, $a0, %lo(HudScript_AimReticle) /* 70BDE8 802380D8 0C050529 */ jal create_hud_element /* 70BDEC 802380DC 0000902D */ daddu $s2, $zero, $zero /* 70BDF0 802380E0 0040202D */ daddu $a0, $v0, $zero @@ -51,8 +51,8 @@ glabel func_8023803C_70BD4C /* 70BDF8 802380E8 AC24D288 */ sw $a0, %lo(D_8023D288)($at) /* 70BDFC 802380EC 0C051277 */ jal set_hud_element_render_depth /* 70BE00 802380F0 2405000A */ addiu $a1, $zero, 0xa -/* 70BE04 802380F4 3C048029 */ lui $a0, %hi(D_802936D4) -/* 70BE08 802380F8 248436D4 */ addiu $a0, $a0, %lo(D_802936D4) +/* 70BE04 802380F4 3C048029 */ lui $a0, %hi(HudScript_AimTarget) +/* 70BE08 802380F8 248436D4 */ addiu $a0, $a0, %lo(HudScript_AimTarget) /* 70BE0C 802380FC 0C050529 */ jal create_hud_element /* 70BE10 80238100 00000000 */ nop /* 70BE14 80238104 0040202D */ daddu $a0, $v0, $zero @@ -67,8 +67,8 @@ glabel func_8023803C_70BD4C /* 70BE38 80238128 3C138024 */ lui $s3, %hi(D_8023AB80_70E890) /* 70BE3C 8023812C 0C0513CA */ jal create_hud_element_transform_A /* 70BE40 80238130 2673AB80 */ addiu $s3, $s3, %lo(D_8023AB80_70E890) -/* 70BE44 80238134 3C048011 */ lui $a0, %hi(D_80108E1C) -/* 70BE48 80238138 24848E1C */ addiu $a0, $a0, %lo(D_80108E1C) +/* 70BE44 80238134 3C048011 */ lui $a0, %hi(HudScript_StickNeutral) +/* 70BE48 80238138 24848E1C */ addiu $a0, $a0, %lo(HudScript_StickNeutral) /* 70BE4C 8023813C 3C118024 */ lui $s1, %hi(D_8023D2C0) /* 70BE50 80238140 2631D2C0 */ addiu $s1, $s1, %lo(D_8023D2C0) /* 70BE54 80238144 2402FFD0 */ addiu $v0, $zero, -0x30 @@ -231,8 +231,8 @@ glabel func_8023803C_70BD4C /* 70C0B8 802383A8 0808E21D */ j .L80238874 /* 70C0BC 802383AC AC620000 */ sw $v0, ($v1) .L802383B0: -/* 70C0C0 802383B0 3C058011 */ lui $a1, %hi(D_801091E4) -/* 70C0C4 802383B4 24A591E4 */ addiu $a1, $a1, %lo(D_801091E4) +/* 70C0C0 802383B0 3C058011 */ lui $a1, %hi(HudScript_StickTapRight) +/* 70C0C4 802383B4 24A591E4 */ addiu $a1, $a1, %lo(HudScript_StickTapRight) /* 70C0C8 802383B8 3C048024 */ lui $a0, %hi(D_8023D2BC) /* 70C0CC 802383BC 8C84D2BC */ lw $a0, %lo(D_8023D2BC)($a0) /* 70C0D0 802383C0 24020050 */ addiu $v0, $zero, 0x50 diff --git a/ver/us/asm/nonmatchings/battle/partner/parakarry/func_80238000_6FFD80.s b/ver/us/asm/nonmatchings/battle/partner/parakarry/func_80238000_6FFD80.s index 8a0c92d374..c29d550fd8 100644 --- a/ver/us/asm/nonmatchings/battle/partner/parakarry/func_80238000_6FFD80.s +++ b/ver/us/asm/nonmatchings/battle/partner/parakarry/func_80238000_6FFD80.s @@ -43,8 +43,8 @@ glabel func_80238000_6FFD80 /* 6FFE10 80238090 0808E26B */ j .L802389AC /* 6FFE14 80238094 00000000 */ nop .L80238098: -/* 6FFE18 80238098 3C048029 */ lui $a0, %hi(D_80293014) -/* 6FFE1C 8023809C 24843014 */ addiu $a0, $a0, %lo(D_80293014) +/* 6FFE18 80238098 3C048029 */ lui $a0, %hi(HudScript_AimMarkerF) +/* 6FFE1C 8023809C 24843014 */ addiu $a0, $a0, %lo(HudScript_AimMarkerF) /* 6FFE20 802380A0 0C050529 */ jal create_hud_element /* 6FFE24 802380A4 00000000 */ nop /* 6FFE28 802380A8 0040982D */ daddu $s3, $v0, $zero @@ -58,8 +58,8 @@ glabel func_80238000_6FFD80 /* 6FFE48 802380C8 2405FF9C */ addiu $a1, $zero, -0x64 /* 6FFE4C 802380CC 0C051261 */ jal set_hud_element_render_pos /* 6FFE50 802380D0 00A0302D */ daddu $a2, $a1, $zero -/* 6FFE54 802380D4 3C048029 */ lui $a0, %hi(D_80292F7C) -/* 6FFE58 802380D8 24842F7C */ addiu $a0, $a0, %lo(D_80292F7C) +/* 6FFE54 802380D4 3C048029 */ lui $a0, %hi(HudScript_AimMarkerE) +/* 6FFE58 802380D8 24842F7C */ addiu $a0, $a0, %lo(HudScript_AimMarkerE) /* 6FFE5C 802380DC 0C050529 */ jal create_hud_element /* 6FFE60 802380E0 00000000 */ nop /* 6FFE64 802380E4 0040982D */ daddu $s3, $v0, $zero @@ -71,8 +71,8 @@ glabel func_80238000_6FFD80 /* 6FFE7C 802380FC 2405FF9C */ addiu $a1, $zero, -0x64 /* 6FFE80 80238100 0C051261 */ jal set_hud_element_render_pos /* 6FFE84 80238104 00A0302D */ daddu $a2, $a1, $zero -/* 6FFE88 80238108 3C048029 */ lui $a0, %hi(D_80292EE4) -/* 6FFE8C 8023810C 24842EE4 */ addiu $a0, $a0, %lo(D_80292EE4) +/* 6FFE88 80238108 3C048029 */ lui $a0, %hi(HudScript_AimMarkerD) +/* 6FFE8C 8023810C 24842EE4 */ addiu $a0, $a0, %lo(HudScript_AimMarkerD) /* 6FFE90 80238110 0C050529 */ jal create_hud_element /* 6FFE94 80238114 00000000 */ nop /* 6FFE98 80238118 0040982D */ daddu $s3, $v0, $zero @@ -84,8 +84,8 @@ glabel func_80238000_6FFD80 /* 6FFEB0 80238130 2405FF9C */ addiu $a1, $zero, -0x64 /* 6FFEB4 80238134 0C051261 */ jal set_hud_element_render_pos /* 6FFEB8 80238138 00A0302D */ daddu $a2, $a1, $zero -/* 6FFEBC 8023813C 3C048029 */ lui $a0, %hi(D_80292E4C) -/* 6FFEC0 80238140 24842E4C */ addiu $a0, $a0, %lo(D_80292E4C) +/* 6FFEBC 8023813C 3C048029 */ lui $a0, %hi(HudScript_AimMarkerC) +/* 6FFEC0 80238140 24842E4C */ addiu $a0, $a0, %lo(HudScript_AimMarkerC) /* 6FFEC4 80238144 0C050529 */ jal create_hud_element /* 6FFEC8 80238148 00000000 */ nop /* 6FFECC 8023814C 0040982D */ daddu $s3, $v0, $zero @@ -97,8 +97,8 @@ glabel func_80238000_6FFD80 /* 6FFEE4 80238164 2405FF9C */ addiu $a1, $zero, -0x64 /* 6FFEE8 80238168 0C051261 */ jal set_hud_element_render_pos /* 6FFEEC 8023816C 00A0302D */ daddu $a2, $a1, $zero -/* 6FFEF0 80238170 3C048029 */ lui $a0, %hi(D_80292DB4) -/* 6FFEF4 80238174 24842DB4 */ addiu $a0, $a0, %lo(D_80292DB4) +/* 6FFEF0 80238170 3C048029 */ lui $a0, %hi(HudScript_AimMarkerB) +/* 6FFEF4 80238174 24842DB4 */ addiu $a0, $a0, %lo(HudScript_AimMarkerB) /* 6FFEF8 80238178 0C050529 */ jal create_hud_element /* 6FFEFC 8023817C 00000000 */ nop /* 6FFF00 80238180 0040982D */ daddu $s3, $v0, $zero @@ -110,8 +110,8 @@ glabel func_80238000_6FFD80 /* 6FFF18 80238198 2405FF9C */ addiu $a1, $zero, -0x64 /* 6FFF1C 8023819C 0C051261 */ jal set_hud_element_render_pos /* 6FFF20 802381A0 00A0302D */ daddu $a2, $a1, $zero -/* 6FFF24 802381A4 3C048029 */ lui $a0, %hi(D_80292D1C) -/* 6FFF28 802381A8 24842D1C */ addiu $a0, $a0, %lo(D_80292D1C) +/* 6FFF24 802381A4 3C048029 */ lui $a0, %hi(HudScript_AimMarkerA) +/* 6FFF28 802381A8 24842D1C */ addiu $a0, $a0, %lo(HudScript_AimMarkerA) /* 6FFF2C 802381AC 0C050529 */ jal create_hud_element /* 6FFF30 802381B0 00000000 */ nop /* 6FFF34 802381B4 0040982D */ daddu $s3, $v0, $zero @@ -123,8 +123,8 @@ glabel func_80238000_6FFD80 /* 6FFF4C 802381CC 2405FF9C */ addiu $a1, $zero, -0x64 /* 6FFF50 802381D0 0C051261 */ jal set_hud_element_render_pos /* 6FFF54 802381D4 00A0302D */ daddu $a2, $a1, $zero -/* 6FFF58 802381D8 3C048029 */ lui $a0, %hi(D_8029369C) -/* 6FFF5C 802381DC 2484369C */ addiu $a0, $a0, %lo(D_8029369C) +/* 6FFF58 802381D8 3C048029 */ lui $a0, %hi(HudScript_AimReticle) +/* 6FFF5C 802381DC 2484369C */ addiu $a0, $a0, %lo(HudScript_AimReticle) /* 6FFF60 802381E0 0C050529 */ jal create_hud_element /* 6FFF64 802381E4 00000000 */ nop /* 6FFF68 802381E8 0040982D */ daddu $s3, $v0, $zero @@ -136,8 +136,8 @@ glabel func_80238000_6FFD80 /* 6FFF80 80238200 2405FF9C */ addiu $a1, $zero, -0x64 /* 6FFF84 80238204 0C051261 */ jal set_hud_element_render_pos /* 6FFF88 80238208 00A0302D */ daddu $a2, $a1, $zero -/* 6FFF8C 8023820C 3C048029 */ lui $a0, %hi(D_802934D4) -/* 6FFF90 80238210 248434D4 */ addiu $a0, $a0, %lo(D_802934D4) +/* 6FFF8C 8023820C 3C048029 */ lui $a0, %hi(HudScript_AimShimmerF) +/* 6FFF90 80238210 248434D4 */ addiu $a0, $a0, %lo(HudScript_AimShimmerF) /* 6FFF94 80238214 0C050529 */ jal create_hud_element /* 6FFF98 80238218 00000000 */ nop /* 6FFF9C 8023821C 0040982D */ daddu $s3, $v0, $zero @@ -151,8 +151,8 @@ glabel func_80238000_6FFD80 /* 6FFFBC 8023823C 2405FF9C */ addiu $a1, $zero, -0x64 /* 6FFFC0 80238240 0C051261 */ jal set_hud_element_render_pos /* 6FFFC4 80238244 00A0302D */ daddu $a2, $a1, $zero -/* 6FFFC8 80238248 3C048029 */ lui $a0, %hi(D_8029343C) -/* 6FFFCC 8023824C 2484343C */ addiu $a0, $a0, %lo(D_8029343C) +/* 6FFFC8 80238248 3C048029 */ lui $a0, %hi(HudScript_AimShimmerE) +/* 6FFFCC 8023824C 2484343C */ addiu $a0, $a0, %lo(HudScript_AimShimmerE) /* 6FFFD0 80238250 0C050529 */ jal create_hud_element /* 6FFFD4 80238254 00000000 */ nop /* 6FFFD8 80238258 0040982D */ daddu $s3, $v0, $zero @@ -164,8 +164,8 @@ glabel func_80238000_6FFD80 /* 6FFFF0 80238270 2405FF9C */ addiu $a1, $zero, -0x64 /* 6FFFF4 80238274 0C051261 */ jal set_hud_element_render_pos /* 6FFFF8 80238278 00A0302D */ daddu $a2, $a1, $zero -/* 6FFFFC 8023827C 3C048029 */ lui $a0, %hi(D_802933A4) -/* 700000 80238280 248433A4 */ addiu $a0, $a0, %lo(D_802933A4) +/* 6FFFFC 8023827C 3C048029 */ lui $a0, %hi(HudScript_AimShimmerD) +/* 700000 80238280 248433A4 */ addiu $a0, $a0, %lo(HudScript_AimShimmerD) /* 700004 80238284 0C050529 */ jal create_hud_element /* 700008 80238288 00000000 */ nop /* 70000C 8023828C 0040982D */ daddu $s3, $v0, $zero @@ -177,8 +177,8 @@ glabel func_80238000_6FFD80 /* 700024 802382A4 2405FF9C */ addiu $a1, $zero, -0x64 /* 700028 802382A8 0C051261 */ jal set_hud_element_render_pos /* 70002C 802382AC 00A0302D */ daddu $a2, $a1, $zero -/* 700030 802382B0 3C048029 */ lui $a0, %hi(D_8029330C) -/* 700034 802382B4 2484330C */ addiu $a0, $a0, %lo(D_8029330C) +/* 700030 802382B0 3C048029 */ lui $a0, %hi(HudScript_AimShimmerC) +/* 700034 802382B4 2484330C */ addiu $a0, $a0, %lo(HudScript_AimShimmerC) /* 700038 802382B8 0C050529 */ jal create_hud_element /* 70003C 802382BC 00000000 */ nop /* 700040 802382C0 0040982D */ daddu $s3, $v0, $zero @@ -190,8 +190,8 @@ glabel func_80238000_6FFD80 /* 700058 802382D8 2405FF9C */ addiu $a1, $zero, -0x64 /* 70005C 802382DC 0C051261 */ jal set_hud_element_render_pos /* 700060 802382E0 00A0302D */ daddu $a2, $a1, $zero -/* 700064 802382E4 3C048029 */ lui $a0, %hi(D_80293274) -/* 700068 802382E8 24843274 */ addiu $a0, $a0, %lo(D_80293274) +/* 700064 802382E4 3C048029 */ lui $a0, %hi(HudScript_AimShimmerB) +/* 700068 802382E8 24843274 */ addiu $a0, $a0, %lo(HudScript_AimShimmerB) /* 70006C 802382EC 0C050529 */ jal create_hud_element /* 700070 802382F0 00000000 */ nop /* 700074 802382F4 0040982D */ daddu $s3, $v0, $zero @@ -203,8 +203,8 @@ glabel func_80238000_6FFD80 /* 70008C 8023830C 2405FF9C */ addiu $a1, $zero, -0x64 /* 700090 80238310 0C051261 */ jal set_hud_element_render_pos /* 700094 80238314 00A0302D */ daddu $a2, $a1, $zero -/* 700098 80238318 3C048029 */ lui $a0, %hi(D_802931DC) -/* 70009C 8023831C 248431DC */ addiu $a0, $a0, %lo(D_802931DC) +/* 700098 80238318 3C048029 */ lui $a0, %hi(HudScript_AimShimmerA) +/* 70009C 8023831C 248431DC */ addiu $a0, $a0, %lo(HudScript_AimShimmerA) /* 7000A0 80238320 0C050529 */ jal create_hud_element /* 7000A4 80238324 00000000 */ nop /* 7000A8 80238328 0040982D */ daddu $s3, $v0, $zero @@ -216,8 +216,8 @@ glabel func_80238000_6FFD80 /* 7000C0 80238340 2405FF9C */ addiu $a1, $zero, -0x64 /* 7000C4 80238344 0C051261 */ jal set_hud_element_render_pos /* 7000C8 80238348 00A0302D */ daddu $a2, $a1, $zero -/* 7000CC 8023834C 3C048029 */ lui $a0, %hi(D_802936D4) -/* 7000D0 80238350 248436D4 */ addiu $a0, $a0, %lo(D_802936D4) +/* 7000CC 8023834C 3C048029 */ lui $a0, %hi(HudScript_AimTarget) +/* 7000D0 80238350 248436D4 */ addiu $a0, $a0, %lo(HudScript_AimTarget) /* 7000D4 80238354 0C050529 */ jal create_hud_element /* 7000D8 80238358 00000000 */ nop /* 7000DC 8023835C 0040982D */ daddu $s3, $v0, $zero @@ -234,8 +234,8 @@ glabel func_80238000_6FFD80 /* 700108 80238388 2405FF9C */ addiu $a1, $zero, -0x64 /* 70010C 8023838C 0C051261 */ jal set_hud_element_render_pos /* 700110 80238390 00A0302D */ daddu $a2, $a1, $zero -/* 700114 80238394 3C048011 */ lui $a0, %hi(D_80108E48) -/* 700118 80238398 24848E48 */ addiu $a0, $a0, %lo(D_80108E48) +/* 700114 80238394 3C048011 */ lui $a0, %hi(HudScript_StickHoldLeft) +/* 700118 80238398 24848E48 */ addiu $a0, $a0, %lo(HudScript_StickHoldLeft) /* 70011C 8023839C 3C118024 */ lui $s1, %hi(D_8023BDC4) /* 700120 802383A0 2631BDC4 */ addiu $s1, $s1, %lo(D_8023BDC4) /* 700124 802383A4 2402FFD0 */ addiu $v0, $zero, -0x30 @@ -678,13 +678,13 @@ glabel func_80238000_6FFD80 /* 700790 80238A10 00000000 */ nop /* 700794 80238A14 45000005 */ bc1f .L80238A2C /* 700798 80238A18 0260202D */ daddu $a0, $s3, $zero -/* 70079C 80238A1C 3C058011 */ lui $a1, %hi(D_80108E1C) -/* 7007A0 80238A20 24A58E1C */ addiu $a1, $a1, %lo(D_80108E1C) +/* 70079C 80238A1C 3C058011 */ lui $a1, %hi(HudScript_StickNeutral) +/* 7007A0 80238A20 24A58E1C */ addiu $a1, $a1, %lo(HudScript_StickNeutral) /* 7007A4 80238A24 0808E28D */ j .L80238A34 /* 7007A8 80238A28 00000000 */ nop .L80238A2C: -/* 7007AC 80238A2C 3C058011 */ lui $a1, %hi(D_80108E48) -/* 7007B0 80238A30 24A58E48 */ addiu $a1, $a1, %lo(D_80108E48) +/* 7007AC 80238A2C 3C058011 */ lui $a1, %hi(HudScript_StickHoldLeft) +/* 7007B0 80238A30 24A58E48 */ addiu $a1, $a1, %lo(HudScript_StickHoldLeft) .L80238A34: /* 7007B4 80238A34 0C0511FF */ jal set_hud_element_anim /* 7007B8 80238A38 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/evt/fa4c0_len_3bf0/ShowConsumableChoicePopup.s b/ver/us/asm/nonmatchings/evt/fa4c0_len_3bf0/ShowConsumableChoicePopup.s index ceb3bca59b..42abcaf718 100644 --- a/ver/us/asm/nonmatchings/evt/fa4c0_len_3bf0/ShowConsumableChoicePopup.s +++ b/ver/us/asm/nonmatchings/evt/fa4c0_len_3bf0/ShowConsumableChoicePopup.s @@ -37,8 +37,8 @@ glabel ShowConsumableChoicePopup /* FB064 802D66B4 0120402D */ daddu $t0, $t1, $zero /* FB068 802D66B8 3C0C8008 */ lui $t4, %hi(gItemTable) /* FB06C 802D66BC 258C78E0 */ addiu $t4, $t4, %lo(gItemTable) -/* FB070 802D66C0 3C0B8009 */ lui $t3, %hi(D_8008A680) -/* FB074 802D66C4 256BA680 */ addiu $t3, $t3, %lo(D_8008A680) +/* FB070 802D66C0 3C0B8009 */ lui $t3, %hi(gItemHudScripts) +/* FB074 802D66C4 256BA680 */ addiu $t3, $t3, %lo(gItemHudScripts) /* FB078 802D66C8 240A0001 */ addiu $t2, $zero, 1 /* FB07C 802D66CC 0260382D */ daddu $a3, $s3, $zero /* FB080 802D66D0 3C03800A */ lui $v1, %hi(gOverrideFlags) diff --git a/ver/us/asm/nonmatchings/evt/fa4c0_len_3bf0/ShowKeyChoicePopup.s b/ver/us/asm/nonmatchings/evt/fa4c0_len_3bf0/ShowKeyChoicePopup.s index 0df99bbf01..05b3e4192c 100644 --- a/ver/us/asm/nonmatchings/evt/fa4c0_len_3bf0/ShowKeyChoicePopup.s +++ b/ver/us/asm/nonmatchings/evt/fa4c0_len_3bf0/ShowKeyChoicePopup.s @@ -37,8 +37,8 @@ glabel ShowKeyChoicePopup /* FAE48 802D6498 0120402D */ daddu $t0, $t1, $zero /* FAE4C 802D649C 3C0C8008 */ lui $t4, %hi(gItemTable) /* FAE50 802D64A0 258C78E0 */ addiu $t4, $t4, %lo(gItemTable) -/* FAE54 802D64A4 3C0B8009 */ lui $t3, %hi(D_8008A680) -/* FAE58 802D64A8 256BA680 */ addiu $t3, $t3, %lo(D_8008A680) +/* FAE54 802D64A4 3C0B8009 */ lui $t3, %hi(gItemHudScripts) +/* FAE58 802D64A8 256BA680 */ addiu $t3, $t3, %lo(gItemHudScripts) /* FAE5C 802D64AC 240A0001 */ addiu $t2, $zero, 1 /* FAE60 802D64B0 0260382D */ daddu $a3, $s3, $zero /* FAE64 802D64B4 3C03800A */ lui $v1, %hi(gOverrideFlags) diff --git a/ver/us/asm/nonmatchings/msg/msg_copy_to_print_buffer.s b/ver/us/asm/nonmatchings/msg/msg_copy_to_print_buffer.s index 59971afe41..9cc524163d 100644 --- a/ver/us/asm/nonmatchings/msg/msg_copy_to_print_buffer.s +++ b/ver/us/asm/nonmatchings/msg/msg_copy_to_print_buffer.s @@ -672,16 +672,16 @@ glabel msg_copy_to_print_buffer /* BB5BC 80124EBC 00B08025 */ or $s0, $a1, $s0 /* BB5C0 80124EC0 00108400 */ sll $s0, $s0, 0x10 /* BB5C4 80124EC4 00108383 */ sra $s0, $s0, 0xe -/* BB5C8 80124EC8 3C028009 */ lui $v0, %hi(D_8008E3D8) +/* BB5C8 80124EC8 3C028009 */ lui $v0, %hi(gItemIconRasterOffsets) /* BB5CC 80124ECC 00501021 */ addu $v0, $v0, $s0 -/* BB5D0 80124ED0 8C42E3D8 */ lw $v0, %lo(D_8008E3D8)($v0) +/* BB5D0 80124ED0 8C42E3D8 */ lw $v0, %lo(gItemIconRasterOffsets)($v0) /* BB5D4 80124ED4 26250200 */ addiu $a1, $s1, 0x200 /* BB5D8 80124ED8 00512021 */ addu $a0, $v0, $s1 /* BB5DC 80124EDC 0C00A5CF */ jal dma_copy /* BB5E0 80124EE0 00452821 */ addu $a1, $v0, $a1 -/* BB5E4 80124EE4 3C058009 */ lui $a1, %hi(D_8008E94C) +/* BB5E4 80124EE4 3C058009 */ lui $a1, %hi(gItemIconPaletteOffsets) /* BB5E8 80124EE8 00B02821 */ addu $a1, $a1, $s0 -/* BB5EC 80124EEC 8CA5E94C */ lw $a1, %lo(D_8008E94C)($a1) +/* BB5EC 80124EEC 8CA5E94C */ lw $a1, %lo(gItemIconPaletteOffsets)($a1) /* BB5F0 80124EF0 3C068016 */ lui $a2, %hi(D_8015C7E0) /* BB5F4 80124EF4 24C6C7E0 */ addiu $a2, $a2, %lo(D_8015C7E0) /* BB5F8 80124EF8 00B12021 */ addu $a0, $a1, $s1 diff --git a/ver/us/asm/nonmatchings/msg/msg_draw_frame.s b/ver/us/asm/nonmatchings/msg/msg_draw_frame.s index c27640bc01..c8d7588c70 100644 --- a/ver/us/asm/nonmatchings/msg/msg_draw_frame.s +++ b/ver/us/asm/nonmatchings/msg/msg_draw_frame.s @@ -684,8 +684,8 @@ glabel msg_draw_frame /* C4C24 8012E524 0000102D */ daddu $v0, $zero, $zero .L8012E528: /* C4C28 8012E528 0000702D */ daddu $t6, $zero, $zero -/* C4C2C 8012E52C 3C058009 */ lui $a1, %hi(D_8008FEE0) -/* C4C30 8012E530 24A5FEE0 */ addiu $a1, $a1, %lo(D_8008FEE0) +/* C4C2C 8012E52C 3C058009 */ lui $a1, %hi(gMessageBoxFrameParts) +/* C4C30 8012E530 24A5FEE0 */ addiu $a1, $a1, %lo(gMessageBoxFrameParts) /* C4C34 8012E534 03A0202D */ daddu $a0, $sp, $zero /* C4C38 8012E538 00021980 */ sll $v1, $v0, 6 .L8012E53C: diff --git a/ver/us/asm/nonmatchings/pause/138CC0/pause_badges_draw_contents.s b/ver/us/asm/nonmatchings/pause/138CC0/pause_badges_draw_contents.s index 376be49f9d..3f152f09ac 100644 --- a/ver/us/asm/nonmatchings/pause/138CC0/pause_badges_draw_contents.s +++ b/ver/us/asm/nonmatchings/pause/138CC0/pause_badges_draw_contents.s @@ -520,8 +520,8 @@ glabel pause_badges_draw_contents /* 13AFD8 80247C98 256B78E0 */ addiu $t3, $t3, %lo(gItemTable) /* 13AFDC 80247C9C 004B1021 */ addu $v0, $v0, $t3 /* 13AFE0 80247CA0 84420004 */ lh $v0, 4($v0) -/* 13AFE4 80247CA4 3C0A8009 */ lui $t2, %hi(D_8008A680) -/* 13AFE8 80247CA8 254AA680 */ addiu $t2, $t2, %lo(D_8008A680) +/* 13AFE4 80247CA4 3C0A8009 */ lui $t2, %hi(gItemHudScripts) +/* 13AFE8 80247CA8 254AA680 */ addiu $t2, $t2, %lo(gItemHudScripts) /* 13AFEC 80247CAC 000210C0 */ sll $v0, $v0, 3 /* 13AFF0 80247CB0 004A1021 */ addu $v0, $v0, $t2 /* 13AFF4 80247CB4 8C420000 */ lw $v0, ($v0) @@ -538,8 +538,8 @@ glabel pause_badges_draw_contents /* 13B01C 80247CDC 256B78E0 */ addiu $t3, $t3, %lo(gItemTable) /* 13B020 80247CE0 004B1021 */ addu $v0, $v0, $t3 /* 13B024 80247CE4 84420004 */ lh $v0, 4($v0) -/* 13B028 80247CE8 3C0A8009 */ lui $t2, %hi(D_8008A680) -/* 13B02C 80247CEC 254AA680 */ addiu $t2, $t2, %lo(D_8008A680) +/* 13B028 80247CE8 3C0A8009 */ lui $t2, %hi(gItemHudScripts) +/* 13B02C 80247CEC 254AA680 */ addiu $t2, $t2, %lo(gItemHudScripts) /* 13B030 80247CF0 000210C0 */ sll $v0, $v0, 3 /* 13B034 80247CF4 004A1021 */ addu $v0, $v0, $t2 /* 13B038 80247CF8 08091F4B */ j .L80247D2C @@ -552,8 +552,8 @@ glabel pause_badges_draw_contents /* 13B04C 80247D0C 256B78E0 */ addiu $t3, $t3, %lo(gItemTable) /* 13B050 80247D10 004B1021 */ addu $v0, $v0, $t3 /* 13B054 80247D14 84420004 */ lh $v0, 4($v0) -/* 13B058 80247D18 3C0A8009 */ lui $t2, %hi(D_8008A680) -/* 13B05C 80247D1C 254AA680 */ addiu $t2, $t2, %lo(D_8008A680) +/* 13B058 80247D18 3C0A8009 */ lui $t2, %hi(gItemHudScripts) +/* 13B05C 80247D1C 254AA680 */ addiu $t2, $t2, %lo(gItemHudScripts) /* 13B060 80247D20 000210C0 */ sll $v0, $v0, 3 /* 13B064 80247D24 004A1021 */ addu $v0, $v0, $t2 /* 13B068 80247D28 8C450000 */ lw $a1, ($v0) diff --git a/ver/us/asm/nonmatchings/pause/138CC0/pause_stats_draw_contents.s b/ver/us/asm/nonmatchings/pause/138CC0/pause_stats_draw_contents.s index d0f5fb24e6..cc625073e0 100644 --- a/ver/us/asm/nonmatchings/pause/138CC0/pause_stats_draw_contents.s +++ b/ver/us/asm/nonmatchings/pause/138CC0/pause_stats_draw_contents.s @@ -899,8 +899,8 @@ glabel pause_stats_draw_contents /* 139A48 80246708 1640001A */ bnez $s2, .L80246774 /* 139A4C 8024670C 24020001 */ addiu $v0, $zero, 1 /* 139A50 80246710 26730001 */ addiu $s3, $s3, 1 -/* 139A54 80246714 3C058011 */ lui $a1, %hi(D_801083B0) -/* 139A58 80246718 24A583B0 */ addiu $a1, $a1, %lo(D_801083B0) +/* 139A54 80246714 3C058011 */ lui $a1, %hi(HudScript_StatusSPEmptyIncrement) +/* 139A58 80246718 24A583B0 */ addiu $a1, $a1, %lo(HudScript_StatusSPEmptyIncrement) /* 139A5C 8024671C 0C0511FF */ jal set_hud_element_anim /* 139A60 80246720 0220202D */ daddu $a0, $s1, $zero /* 139A64 80246724 0220202D */ daddu $a0, $s1, $zero @@ -929,8 +929,8 @@ glabel pause_stats_draw_contents /* 139AB4 80246774 56420019 */ bnel $s2, $v0, .L802467DC /* 139AB8 80246778 24020002 */ addiu $v0, $zero, 2 /* 139ABC 8024677C 02629821 */ addu $s3, $s3, $v0 -/* 139AC0 80246780 3C058011 */ lui $a1, %hi(D_801083B0) -/* 139AC4 80246784 24A583B0 */ addiu $a1, $a1, %lo(D_801083B0) +/* 139AC0 80246780 3C058011 */ lui $a1, %hi(HudScript_StatusSPEmptyIncrement) +/* 139AC4 80246784 24A583B0 */ addiu $a1, $a1, %lo(HudScript_StatusSPEmptyIncrement) /* 139AC8 80246788 0C0511FF */ jal set_hud_element_anim /* 139ACC 8024678C 0220202D */ daddu $a0, $s1, $zero /* 139AD0 80246790 0220202D */ daddu $a0, $s1, $zero @@ -958,8 +958,8 @@ glabel pause_stats_draw_contents /* 139B1C 802467DC 16420019 */ bne $s2, $v0, .L80246844 /* 139B20 802467E0 24020003 */ addiu $v0, $zero, 3 /* 139B24 802467E4 26730001 */ addiu $s3, $s3, 1 -/* 139B28 802467E8 3C058011 */ lui $a1, %hi(D_801083B0) -/* 139B2C 802467EC 24A583B0 */ addiu $a1, $a1, %lo(D_801083B0) +/* 139B28 802467E8 3C058011 */ lui $a1, %hi(HudScript_StatusSPEmptyIncrement) +/* 139B2C 802467EC 24A583B0 */ addiu $a1, $a1, %lo(HudScript_StatusSPEmptyIncrement) /* 139B30 802467F0 0C0511FF */ jal set_hud_element_anim /* 139B34 802467F4 0220202D */ daddu $a0, $s1, $zero /* 139B38 802467F8 0220202D */ daddu $a0, $s1, $zero @@ -987,8 +987,8 @@ glabel pause_stats_draw_contents /* 139B84 80246844 16420019 */ bne $s2, $v0, .L802468AC /* 139B88 80246848 24020004 */ addiu $v0, $zero, 4 /* 139B8C 8024684C 26730001 */ addiu $s3, $s3, 1 -/* 139B90 80246850 3C058011 */ lui $a1, %hi(D_801083B0) -/* 139B94 80246854 24A583B0 */ addiu $a1, $a1, %lo(D_801083B0) +/* 139B90 80246850 3C058011 */ lui $a1, %hi(HudScript_StatusSPEmptyIncrement) +/* 139B94 80246854 24A583B0 */ addiu $a1, $a1, %lo(HudScript_StatusSPEmptyIncrement) /* 139B98 80246858 0C0511FF */ jal set_hud_element_anim /* 139B9C 8024685C 0220202D */ daddu $a0, $s1, $zero /* 139BA0 80246860 0220202D */ daddu $a0, $s1, $zero @@ -1016,8 +1016,8 @@ glabel pause_stats_draw_contents /* 139BEC 802468AC 16420019 */ bne $s2, $v0, .L80246914 /* 139BF0 802468B0 24020005 */ addiu $v0, $zero, 5 /* 139BF4 802468B4 26730001 */ addiu $s3, $s3, 1 -/* 139BF8 802468B8 3C058011 */ lui $a1, %hi(D_801083B0) -/* 139BFC 802468BC 24A583B0 */ addiu $a1, $a1, %lo(D_801083B0) +/* 139BF8 802468B8 3C058011 */ lui $a1, %hi(HudScript_StatusSPEmptyIncrement) +/* 139BFC 802468BC 24A583B0 */ addiu $a1, $a1, %lo(HudScript_StatusSPEmptyIncrement) /* 139C00 802468C0 0C0511FF */ jal set_hud_element_anim /* 139C04 802468C4 0220202D */ daddu $a0, $s1, $zero /* 139C08 802468C8 0220202D */ daddu $a0, $s1, $zero @@ -1045,8 +1045,8 @@ glabel pause_stats_draw_contents /* 139C54 80246914 16420019 */ bne $s2, $v0, .L8024697C /* 139C58 80246918 24020006 */ addiu $v0, $zero, 6 /* 139C5C 8024691C 26730001 */ addiu $s3, $s3, 1 -/* 139C60 80246920 3C058011 */ lui $a1, %hi(D_801083B0) -/* 139C64 80246924 24A583B0 */ addiu $a1, $a1, %lo(D_801083B0) +/* 139C60 80246920 3C058011 */ lui $a1, %hi(HudScript_StatusSPEmptyIncrement) +/* 139C64 80246924 24A583B0 */ addiu $a1, $a1, %lo(HudScript_StatusSPEmptyIncrement) /* 139C68 80246928 0C0511FF */ jal set_hud_element_anim /* 139C6C 8024692C 0220202D */ daddu $a0, $s1, $zero /* 139C70 80246930 0220202D */ daddu $a0, $s1, $zero @@ -1074,8 +1074,8 @@ glabel pause_stats_draw_contents /* 139CBC 8024697C 16420019 */ bne $s2, $v0, .L802469E4 /* 139CC0 80246980 24020007 */ addiu $v0, $zero, 7 /* 139CC4 80246984 26730001 */ addiu $s3, $s3, 1 -/* 139CC8 80246988 3C058011 */ lui $a1, %hi(D_801083B0) -/* 139CCC 8024698C 24A583B0 */ addiu $a1, $a1, %lo(D_801083B0) +/* 139CC8 80246988 3C058011 */ lui $a1, %hi(HudScript_StatusSPEmptyIncrement) +/* 139CCC 8024698C 24A583B0 */ addiu $a1, $a1, %lo(HudScript_StatusSPEmptyIncrement) /* 139CD0 80246990 0C0511FF */ jal set_hud_element_anim /* 139CD4 80246994 0220202D */ daddu $a0, $s1, $zero /* 139CD8 80246998 0220202D */ daddu $a0, $s1, $zero @@ -1103,8 +1103,8 @@ glabel pause_stats_draw_contents /* 139D24 802469E4 56420016 */ bnel $s2, $v0, .L80246A40 /* 139D28 802469E8 0000902D */ daddu $s2, $zero, $zero /* 139D2C 802469EC 26730001 */ addiu $s3, $s3, 1 -/* 139D30 802469F0 3C058011 */ lui $a1, %hi(D_801084F0) -/* 139D34 802469F4 24A584F0 */ addiu $a1, $a1, %lo(D_801084F0) +/* 139D30 802469F0 3C058011 */ lui $a1, %hi(HudScript_StatusStarEmpty) +/* 139D34 802469F4 24A584F0 */ addiu $a1, $a1, %lo(HudScript_StatusStarEmpty) /* 139D38 802469F8 0C0511FF */ jal set_hud_element_anim /* 139D3C 802469FC 0220202D */ daddu $a0, $s1, $zero /* 139D40 80246A00 0220202D */ daddu $a0, $s1, $zero diff --git a/ver/us/asm/nonmatchings/pause/13E120/pause_partners_draw_title.s b/ver/us/asm/nonmatchings/pause/13E120/pause_partners_draw_title.s index 056c574a06..7baca30732 100644 --- a/ver/us/asm/nonmatchings/pause/13E120/pause_partners_draw_title.s +++ b/ver/us/asm/nonmatchings/pause/13E120/pause_partners_draw_title.s @@ -23,9 +23,9 @@ glabel pause_partners_draw_title /* 13EF34 8024BBF4 00220821 */ addu $at, $at, $v0 /* 13EF38 8024BBF8 8C22F6B0 */ lw $v0, %lo(D_8024F6B0)($at) /* 13EF3C 8024BBFC 00021100 */ sll $v0, $v0, 4 -/* 13EF40 8024BC00 3C118009 */ lui $s1, %hi(D_8008EF20) +/* 13EF40 8024BC00 3C118009 */ lui $s1, %hi(gPartnerPopupProperties) /* 13EF44 8024BC04 02228821 */ addu $s1, $s1, $v0 -/* 13EF48 8024BC08 8E31EF20 */ lw $s1, %lo(D_8008EF20)($s1) +/* 13EF48 8024BC08 8E31EF20 */ lw $s1, %lo(gPartnerPopupProperties)($s1) /* 13EF4C 8024BC0C 0C039D59 */ jal get_player_data /* 13EF50 8024BC10 00E0A02D */ daddu $s4, $a3, $zero /* 13EF54 8024BC14 8E030000 */ lw $v1, ($s0) diff --git a/ver/us/asm/nonmatchings/pause/pause_items/pause_items_draw_contents.s b/ver/us/asm/nonmatchings/pause/pause_items/pause_items_draw_contents.s index 08bbd34966..469f95b6df 100644 --- a/ver/us/asm/nonmatchings/pause/pause_items/pause_items_draw_contents.s +++ b/ver/us/asm/nonmatchings/pause/pause_items/pause_items_draw_contents.s @@ -343,8 +343,8 @@ glabel pause_items_draw_contents /* 13D1B8 80249E78 254A78E0 */ addiu $t2, $t2, %lo(gItemTable) /* 13D1BC 80249E7C 004A1021 */ addu $v0, $v0, $t2 /* 13D1C0 80249E80 84420004 */ lh $v0, 4($v0) -/* 13D1C4 80249E84 3C0B8009 */ lui $t3, %hi(D_8008A680) -/* 13D1C8 80249E88 256BA680 */ addiu $t3, $t3, %lo(D_8008A680) +/* 13D1C4 80249E84 3C0B8009 */ lui $t3, %hi(gItemHudScripts) +/* 13D1C8 80249E88 256BA680 */ addiu $t3, $t3, %lo(gItemHudScripts) /* 13D1CC 80249E8C 000210C0 */ sll $v0, $v0, 3 /* 13D1D0 80249E90 004B1021 */ addu $v0, $v0, $t3 /* 13D1D4 80249E94 8C420000 */ lw $v0, ($v0) @@ -357,8 +357,8 @@ glabel pause_items_draw_contents /* 13D1EC 80249EAC 254A78E0 */ addiu $t2, $t2, %lo(gItemTable) /* 13D1F0 80249EB0 004A1021 */ addu $v0, $v0, $t2 /* 13D1F4 80249EB4 84420004 */ lh $v0, 4($v0) -/* 13D1F8 80249EB8 3C0B8009 */ lui $t3, %hi(D_8008A680) -/* 13D1FC 80249EBC 256BA680 */ addiu $t3, $t3, %lo(D_8008A680) +/* 13D1F8 80249EB8 3C0B8009 */ lui $t3, %hi(gItemHudScripts) +/* 13D1FC 80249EBC 256BA680 */ addiu $t3, $t3, %lo(gItemHudScripts) /* 13D200 80249EC0 000210C0 */ sll $v0, $v0, 3 /* 13D204 80249EC4 004B1021 */ addu $v0, $v0, $t3 /* 13D208 80249EC8 8C450000 */ lw $a1, ($v0) diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/dgb_04_func_8024259C_C38ACC.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/dgb_04_func_8024259C_C38ACC.s index f1b1f3c3ea..342d2796f0 100644 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/dgb_04_func_8024259C_C38ACC.s +++ b/ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/dgb_04_func_8024259C_C38ACC.s @@ -42,8 +42,8 @@ glabel dgb_04_func_8024259C_C38ACC /* C38B5C 8024262C 5040002E */ beql $v0, $zero, .L802426E8 /* C38B60 80242630 26520001 */ addiu $s2, $s2, 1 /* C38B64 80242634 00101100 */ sll $v0, $s0, 4 -/* C38B68 80242638 3C068009 */ lui $a2, %hi(D_8008EF20) -/* C38B6C 8024263C 24C6EF20 */ addiu $a2, $a2, %lo(D_8008EF20) +/* C38B68 80242638 3C068009 */ lui $a2, %hi(gPartnerPopupProperties) +/* C38B6C 8024263C 24C6EF20 */ addiu $a2, $a2, %lo(gPartnerPopupProperties) /* C38B70 80242640 00461021 */ addu $v0, $v0, $a2 /* C38B74 80242644 0200202D */ daddu $a0, $s0, $zero /* C38B78 80242648 AE300108 */ sw $s0, 0x108($s1) @@ -54,8 +54,8 @@ glabel dgb_04_func_8024259C_C38ACC /* C38B8C 8024265C 0040202D */ daddu $a0, $v0, $zero /* C38B90 80242660 04800011 */ bltz $a0, .L802426A8 /* C38B94 80242664 00101080 */ sll $v0, $s0, 2 -/* C38B98 80242668 3C06800F */ lui $a2, %hi(D_800F7F00) -/* C38B9C 8024266C 24C67F00 */ addiu $a2, $a2, %lo(D_800F7F00) +/* C38B98 80242668 3C06800F */ lui $a2, %hi(wPartnerHudScripts) +/* C38B9C 8024266C 24C67F00 */ addiu $a2, $a2, %lo(wPartnerHudScripts) /* C38BA0 80242670 00461021 */ addu $v0, $v0, $a2 /* C38BA4 80242674 8C430000 */ lw $v1, ($v0) /* C38BA8 80242678 24020001 */ addiu $v0, $zero, 1 @@ -71,8 +71,8 @@ glabel dgb_04_func_8024259C_C38ACC /* C38BD0 802426A0 080909B3 */ j .L802426CC /* C38BD4 802426A4 AE220294 */ sw $v0, 0x294($s1) .L802426A8: -/* C38BD8 802426A8 3C06800F */ lui $a2, %hi(D_800F7F40) -/* C38BDC 802426AC 24C67F40 */ addiu $a2, $a2, %lo(D_800F7F40) +/* C38BD8 802426A8 3C06800F */ lui $a2, %hi(wDisabledPartnerHudScripts) +/* C38BDC 802426AC 24C67F40 */ addiu $a2, $a2, %lo(wDisabledPartnerHudScripts) /* C38BE0 802426B0 00461021 */ addu $v0, $v0, $a2 /* C38BE4 802426B4 8C420000 */ lw $v0, ($v0) /* C38BE8 802426B8 AE20018C */ sw $zero, 0x18c($s1) @@ -130,9 +130,9 @@ glabel dgb_04_func_8024259C_C38ACC /* C38CA0 80242770 02621021 */ addu $v0, $s3, $v0 /* C38CA4 80242774 8C420108 */ lw $v0, 0x108($v0) /* C38CA8 80242778 00021100 */ sll $v0, $v0, 4 -/* C38CAC 8024277C 3C038009 */ lui $v1, %hi(D_8008EF20) +/* C38CAC 8024277C 3C038009 */ lui $v1, %hi(gPartnerPopupProperties) /* C38CB0 80242780 00621821 */ addu $v1, $v1, $v0 -/* C38CB4 80242784 8C63EF20 */ lw $v1, %lo(D_8008EF20)($v1) +/* C38CB4 80242784 8C63EF20 */ lw $v1, %lo(gPartnerPopupProperties)($v1) /* C38CB8 80242788 8EA20074 */ lw $v0, 0x74($s5) /* C38CBC 8024278C 2442FFFF */ addiu $v0, $v0, -1 /* C38CC0 80242790 00021080 */ sll $v0, $v0, 2 diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_08/CAED40/flo_08_func_802401CC_CAEF0C.s b/ver/us/asm/nonmatchings/world/area_flo/flo_08/CAED40/flo_08_func_802401CC_CAEF0C.s index addf698e60..3a5fc4d0e9 100644 --- a/ver/us/asm/nonmatchings/world/area_flo/flo_08/CAED40/flo_08_func_802401CC_CAEF0C.s +++ b/ver/us/asm/nonmatchings/world/area_flo/flo_08/CAED40/flo_08_func_802401CC_CAEF0C.s @@ -42,8 +42,8 @@ glabel flo_08_func_802401CC_CAEF0C /* CAEF9C 8024025C 5040002E */ beql $v0, $zero, .L80240318 /* CAEFA0 80240260 26520001 */ addiu $s2, $s2, 1 /* CAEFA4 80240264 00101100 */ sll $v0, $s0, 4 -/* CAEFA8 80240268 3C068009 */ lui $a2, %hi(D_8008EF20) -/* CAEFAC 8024026C 24C6EF20 */ addiu $a2, $a2, %lo(D_8008EF20) +/* CAEFA8 80240268 3C068009 */ lui $a2, %hi(gPartnerPopupProperties) +/* CAEFAC 8024026C 24C6EF20 */ addiu $a2, $a2, %lo(gPartnerPopupProperties) /* CAEFB0 80240270 00461021 */ addu $v0, $v0, $a2 /* CAEFB4 80240274 0200202D */ daddu $a0, $s0, $zero /* CAEFB8 80240278 AE300108 */ sw $s0, 0x108($s1) @@ -54,8 +54,8 @@ glabel flo_08_func_802401CC_CAEF0C /* CAEFCC 8024028C 0040202D */ daddu $a0, $v0, $zero /* CAEFD0 80240290 04800011 */ bltz $a0, .L802402D8 /* CAEFD4 80240294 00101080 */ sll $v0, $s0, 2 -/* CAEFD8 80240298 3C06800F */ lui $a2, %hi(D_800F7F00) -/* CAEFDC 8024029C 24C67F00 */ addiu $a2, $a2, %lo(D_800F7F00) +/* CAEFD8 80240298 3C06800F */ lui $a2, %hi(wPartnerHudScripts) +/* CAEFDC 8024029C 24C67F00 */ addiu $a2, $a2, %lo(wPartnerHudScripts) /* CAEFE0 802402A0 00461021 */ addu $v0, $v0, $a2 /* CAEFE4 802402A4 8C430000 */ lw $v1, ($v0) /* CAEFE8 802402A8 24020001 */ addiu $v0, $zero, 1 @@ -71,8 +71,8 @@ glabel flo_08_func_802401CC_CAEF0C /* CAF010 802402D0 080900BF */ j .L802402FC /* CAF014 802402D4 AE220294 */ sw $v0, 0x294($s1) .L802402D8: -/* CAF018 802402D8 3C06800F */ lui $a2, %hi(D_800F7F40) -/* CAF01C 802402DC 24C67F40 */ addiu $a2, $a2, %lo(D_800F7F40) +/* CAF018 802402D8 3C06800F */ lui $a2, %hi(wDisabledPartnerHudScripts) +/* CAF01C 802402DC 24C67F40 */ addiu $a2, $a2, %lo(wDisabledPartnerHudScripts) /* CAF020 802402E0 00461021 */ addu $v0, $v0, $a2 /* CAF024 802402E4 8C420000 */ lw $v0, ($v0) /* CAF028 802402E8 AE20018C */ sw $zero, 0x18c($s1) @@ -130,9 +130,9 @@ glabel flo_08_func_802401CC_CAEF0C /* CAF0E0 802403A0 02621021 */ addu $v0, $s3, $v0 /* CAF0E4 802403A4 8C420108 */ lw $v0, 0x108($v0) /* CAF0E8 802403A8 00021100 */ sll $v0, $v0, 4 -/* CAF0EC 802403AC 3C038009 */ lui $v1, %hi(D_8008EF20) +/* CAF0EC 802403AC 3C038009 */ lui $v1, %hi(gPartnerPopupProperties) /* CAF0F0 802403B0 00621821 */ addu $v1, $v1, $v0 -/* CAF0F4 802403B4 8C63EF20 */ lw $v1, %lo(D_8008EF20)($v1) +/* CAF0F4 802403B4 8C63EF20 */ lw $v1, %lo(gPartnerPopupProperties)($v1) /* CAF0F8 802403B8 8EA20074 */ lw $v0, 0x74($s5) /* CAF0FC 802403BC 2442FFFF */ addiu $v0, $v0, -1 /* CAF100 802403C0 00021080 */ sll $v0, $v0, 2 diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_16/CD1F10/flo_16_func_802402AC_CD20DC.s b/ver/us/asm/nonmatchings/world/area_flo/flo_16/CD1F10/flo_16_func_802402AC_CD20DC.s index 8f059e7652..dc11c541f2 100644 --- a/ver/us/asm/nonmatchings/world/area_flo/flo_16/CD1F10/flo_16_func_802402AC_CD20DC.s +++ b/ver/us/asm/nonmatchings/world/area_flo/flo_16/CD1F10/flo_16_func_802402AC_CD20DC.s @@ -42,8 +42,8 @@ glabel func_802402AC_CD20DC /* CD216C 8024033C 5040002E */ beql $v0, $zero, .L802403F8 /* CD2170 80240340 26520001 */ addiu $s2, $s2, 1 /* CD2174 80240344 00101100 */ sll $v0, $s0, 4 -/* CD2178 80240348 3C068009 */ lui $a2, %hi(D_8008EF20) -/* CD217C 8024034C 24C6EF20 */ addiu $a2, $a2, %lo(D_8008EF20) +/* CD2178 80240348 3C068009 */ lui $a2, %hi(gPartnerPopupProperties) +/* CD217C 8024034C 24C6EF20 */ addiu $a2, $a2, %lo(gPartnerPopupProperties) /* CD2180 80240350 00461021 */ addu $v0, $v0, $a2 /* CD2184 80240354 0200202D */ daddu $a0, $s0, $zero /* CD2188 80240358 AE300108 */ sw $s0, 0x108($s1) @@ -54,8 +54,8 @@ glabel func_802402AC_CD20DC /* CD219C 8024036C 0040202D */ daddu $a0, $v0, $zero /* CD21A0 80240370 04800011 */ bltz $a0, .L802403B8 /* CD21A4 80240374 00101080 */ sll $v0, $s0, 2 -/* CD21A8 80240378 3C06800F */ lui $a2, %hi(D_800F7F00) -/* CD21AC 8024037C 24C67F00 */ addiu $a2, $a2, %lo(D_800F7F00) +/* CD21A8 80240378 3C06800F */ lui $a2, %hi(wPartnerHudScripts) +/* CD21AC 8024037C 24C67F00 */ addiu $a2, $a2, %lo(wPartnerHudScripts) /* CD21B0 80240380 00461021 */ addu $v0, $v0, $a2 /* CD21B4 80240384 8C430000 */ lw $v1, ($v0) /* CD21B8 80240388 24020001 */ addiu $v0, $zero, 1 @@ -71,8 +71,8 @@ glabel func_802402AC_CD20DC /* CD21E0 802403B0 080900F7 */ j .L802403DC /* CD21E4 802403B4 AE220294 */ sw $v0, 0x294($s1) .L802403B8: -/* CD21E8 802403B8 3C06800F */ lui $a2, %hi(D_800F7F40) -/* CD21EC 802403BC 24C67F40 */ addiu $a2, $a2, %lo(D_800F7F40) +/* CD21E8 802403B8 3C06800F */ lui $a2, %hi(wDisabledPartnerHudScripts) +/* CD21EC 802403BC 24C67F40 */ addiu $a2, $a2, %lo(wDisabledPartnerHudScripts) /* CD21F0 802403C0 00461021 */ addu $v0, $v0, $a2 /* CD21F4 802403C4 8C420000 */ lw $v0, ($v0) /* CD21F8 802403C8 AE20018C */ sw $zero, 0x18c($s1) @@ -130,9 +130,9 @@ glabel func_802402AC_CD20DC /* CD22B0 80240480 02621021 */ addu $v0, $s3, $v0 /* CD22B4 80240484 8C420108 */ lw $v0, 0x108($v0) /* CD22B8 80240488 00021100 */ sll $v0, $v0, 4 -/* CD22BC 8024048C 3C038009 */ lui $v1, %hi(D_8008EF20) +/* CD22BC 8024048C 3C038009 */ lui $v1, %hi(gPartnerPopupProperties) /* CD22C0 80240490 00621821 */ addu $v1, $v1, $v0 -/* CD22C4 80240494 8C63EF20 */ lw $v1, %lo(D_8008EF20)($v1) +/* CD22C4 80240494 8C63EF20 */ lw $v1, %lo(gPartnerPopupProperties)($v1) /* CD22C8 80240498 8EA20074 */ lw $v0, 0x74($s5) /* CD22CC 8024049C 2442FFFF */ addiu $v0, $v0, -1 /* CD22D0 802404A0 00021080 */ sll $v0, $v0, 2 diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_80240AD0_A39FB0.s b/ver/us/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_80240AD0_A39FB0.s index 200939c312..da59a676b0 100644 --- a/ver/us/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_80240AD0_A39FB0.s +++ b/ver/us/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_80240AD0_A39FB0.s @@ -25,8 +25,8 @@ glabel func_80240AD0_A39FB0 /* A3A000 80240B20 0280902D */ daddu $s2, $s4, $zero /* A3A004 80240B24 3C17F840 */ lui $s7, 0xf840 /* A3A008 80240B28 36F7626B */ ori $s7, $s7, 0x626b -/* A3A00C 80240B2C 3C1E8009 */ lui $fp, %hi(D_8008A680) -/* A3A010 80240B30 27DEA680 */ addiu $fp, $fp, %lo(D_8008A680) +/* A3A00C 80240B2C 3C1E8009 */ lui $fp, %hi(gItemHudScripts) +/* A3A010 80240B30 27DEA680 */ addiu $fp, $fp, %lo(gItemHudScripts) /* A3A014 80240B34 3C118024 */ lui $s1, %hi(D_802435EC_A3CACC) /* A3A018 80240B38 263135EC */ addiu $s1, $s1, %lo(D_802435EC_A3CACC) /* A3A01C 80240B3C 02A0802D */ daddu $s0, $s5, $zero diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_06/A3B4B0/func_8024228C_A3B76C.s b/ver/us/asm/nonmatchings/world/area_hos/hos_06/A3B4B0/func_8024228C_A3B76C.s index 9dbd8ea5f1..c93e05048f 100644 --- a/ver/us/asm/nonmatchings/world/area_hos/hos_06/A3B4B0/func_8024228C_A3B76C.s +++ b/ver/us/asm/nonmatchings/world/area_hos/hos_06/A3B4B0/func_8024228C_A3B76C.s @@ -41,8 +41,8 @@ glabel func_8024228C_A3B76C /* A3B7F4 80242314 AEA20318 */ sw $v0, 0x318($s5) /* A3B7F8 80242318 0000B02D */ daddu $s6, $zero, $zero /* A3B7FC 8024231C 02C0902D */ daddu $s2, $s6, $zero -/* A3B800 80242320 3C1E8009 */ lui $fp, %hi(D_8008A680) -/* A3B804 80242324 27DEA680 */ addiu $fp, $fp, %lo(D_8008A680) +/* A3B800 80242320 3C1E8009 */ lui $fp, %hi(gItemHudScripts) +/* A3B804 80242324 27DEA680 */ addiu $fp, $fp, %lo(gItemHudScripts) /* A3B808 80242328 24170001 */ addiu $s7, $zero, 1 /* A3B80C 8024232C 3C148024 */ lui $s4, %hi(D_80245EEC_A3F3CC) /* A3B810 80242330 26945EEC */ addiu $s4, $s4, %lo(D_80245EEC_A3F3CC) diff --git a/ver/us/asm/nonmatchings/world/area_isk/isk_10/988B60/func_802401CC_988D2C.s b/ver/us/asm/nonmatchings/world/area_isk/isk_10/988B60/func_802401CC_988D2C.s index 8fed2b3cf2..52fc07b3ef 100644 --- a/ver/us/asm/nonmatchings/world/area_isk/isk_10/988B60/func_802401CC_988D2C.s +++ b/ver/us/asm/nonmatchings/world/area_isk/isk_10/988B60/func_802401CC_988D2C.s @@ -42,8 +42,8 @@ glabel func_802401CC_988D2C /* 988DBC 8024025C 5040002E */ beql $v0, $zero, .L80240318 /* 988DC0 80240260 26520001 */ addiu $s2, $s2, 1 /* 988DC4 80240264 00101100 */ sll $v0, $s0, 4 -/* 988DC8 80240268 3C068009 */ lui $a2, %hi(D_8008EF20) -/* 988DCC 8024026C 24C6EF20 */ addiu $a2, $a2, %lo(D_8008EF20) +/* 988DC8 80240268 3C068009 */ lui $a2, %hi(gPartnerPopupProperties) +/* 988DCC 8024026C 24C6EF20 */ addiu $a2, $a2, %lo(gPartnerPopupProperties) /* 988DD0 80240270 00461021 */ addu $v0, $v0, $a2 /* 988DD4 80240274 0200202D */ daddu $a0, $s0, $zero /* 988DD8 80240278 AE300108 */ sw $s0, 0x108($s1) @@ -54,8 +54,8 @@ glabel func_802401CC_988D2C /* 988DEC 8024028C 0040202D */ daddu $a0, $v0, $zero /* 988DF0 80240290 04800011 */ bltz $a0, .L802402D8 /* 988DF4 80240294 00101080 */ sll $v0, $s0, 2 -/* 988DF8 80240298 3C06800F */ lui $a2, %hi(D_800F7F00) -/* 988DFC 8024029C 24C67F00 */ addiu $a2, $a2, %lo(D_800F7F00) +/* 988DF8 80240298 3C06800F */ lui $a2, %hi(wPartnerHudScripts) +/* 988DFC 8024029C 24C67F00 */ addiu $a2, $a2, %lo(wPartnerHudScripts) /* 988E00 802402A0 00461021 */ addu $v0, $v0, $a2 /* 988E04 802402A4 8C430000 */ lw $v1, ($v0) /* 988E08 802402A8 24020001 */ addiu $v0, $zero, 1 @@ -71,8 +71,8 @@ glabel func_802401CC_988D2C /* 988E30 802402D0 080900BF */ j .L802402FC /* 988E34 802402D4 AE220294 */ sw $v0, 0x294($s1) .L802402D8: -/* 988E38 802402D8 3C06800F */ lui $a2, %hi(D_800F7F40) -/* 988E3C 802402DC 24C67F40 */ addiu $a2, $a2, %lo(D_800F7F40) +/* 988E38 802402D8 3C06800F */ lui $a2, %hi(wDisabledPartnerHudScripts) +/* 988E3C 802402DC 24C67F40 */ addiu $a2, $a2, %lo(wDisabledPartnerHudScripts) /* 988E40 802402E0 00461021 */ addu $v0, $v0, $a2 /* 988E44 802402E4 8C420000 */ lw $v0, ($v0) /* 988E48 802402E8 AE20018C */ sw $zero, 0x18c($s1) @@ -130,9 +130,9 @@ glabel func_802401CC_988D2C /* 988F00 802403A0 02621021 */ addu $v0, $s3, $v0 /* 988F04 802403A4 8C420108 */ lw $v0, 0x108($v0) /* 988F08 802403A8 00021100 */ sll $v0, $v0, 4 -/* 988F0C 802403AC 3C038009 */ lui $v1, %hi(D_8008EF20) +/* 988F0C 802403AC 3C038009 */ lui $v1, %hi(gPartnerPopupProperties) /* 988F10 802403B0 00621821 */ addu $v1, $v1, $v0 -/* 988F14 802403B4 8C63EF20 */ lw $v1, %lo(D_8008EF20)($v1) +/* 988F14 802403B4 8C63EF20 */ lw $v1, %lo(gPartnerPopupProperties)($v1) /* 988F18 802403B8 8EA20074 */ lw $v0, 0x74($s5) /* 988F1C 802403BC 2442FFFF */ addiu $v0, $v0, -1 /* 988F20 802403C0 00021080 */ sll $v0, $v0, 2 diff --git a/ver/us/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_802404BC_91EA2C.s b/ver/us/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_802404BC_91EA2C.s index 39e9544bf1..d59fc0fd33 100644 --- a/ver/us/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_802404BC_91EA2C.s +++ b/ver/us/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_802404BC_91EA2C.s @@ -42,8 +42,8 @@ glabel func_802404BC_91EA2C /* 91EABC 8024054C 5040002E */ beql $v0, $zero, .L80240608 /* 91EAC0 80240550 26520001 */ addiu $s2, $s2, 1 /* 91EAC4 80240554 00101100 */ sll $v0, $s0, 4 -/* 91EAC8 80240558 3C068009 */ lui $a2, %hi(D_8008EF20) -/* 91EACC 8024055C 24C6EF20 */ addiu $a2, $a2, %lo(D_8008EF20) +/* 91EAC8 80240558 3C068009 */ lui $a2, %hi(gPartnerPopupProperties) +/* 91EACC 8024055C 24C6EF20 */ addiu $a2, $a2, %lo(gPartnerPopupProperties) /* 91EAD0 80240560 00461021 */ addu $v0, $v0, $a2 /* 91EAD4 80240564 0200202D */ daddu $a0, $s0, $zero /* 91EAD8 80240568 AE300108 */ sw $s0, 0x108($s1) @@ -54,8 +54,8 @@ glabel func_802404BC_91EA2C /* 91EAEC 8024057C 0040202D */ daddu $a0, $v0, $zero /* 91EAF0 80240580 04800011 */ bltz $a0, .L802405C8 /* 91EAF4 80240584 00101080 */ sll $v0, $s0, 2 -/* 91EAF8 80240588 3C06800F */ lui $a2, %hi(D_800F7F00) -/* 91EAFC 8024058C 24C67F00 */ addiu $a2, $a2, %lo(D_800F7F00) +/* 91EAF8 80240588 3C06800F */ lui $a2, %hi(wPartnerHudScripts) +/* 91EAFC 8024058C 24C67F00 */ addiu $a2, $a2, %lo(wPartnerHudScripts) /* 91EB00 80240590 00461021 */ addu $v0, $v0, $a2 /* 91EB04 80240594 8C430000 */ lw $v1, ($v0) /* 91EB08 80240598 24020001 */ addiu $v0, $zero, 1 @@ -71,8 +71,8 @@ glabel func_802404BC_91EA2C /* 91EB30 802405C0 0809017B */ j .L802405EC /* 91EB34 802405C4 AE220294 */ sw $v0, 0x294($s1) .L802405C8: -/* 91EB38 802405C8 3C06800F */ lui $a2, %hi(D_800F7F40) -/* 91EB3C 802405CC 24C67F40 */ addiu $a2, $a2, %lo(D_800F7F40) +/* 91EB38 802405C8 3C06800F */ lui $a2, %hi(wDisabledPartnerHudScripts) +/* 91EB3C 802405CC 24C67F40 */ addiu $a2, $a2, %lo(wDisabledPartnerHudScripts) /* 91EB40 802405D0 00461021 */ addu $v0, $v0, $a2 /* 91EB44 802405D4 8C420000 */ lw $v0, ($v0) /* 91EB48 802405D8 AE20018C */ sw $zero, 0x18c($s1) @@ -130,9 +130,9 @@ glabel func_802404BC_91EA2C /* 91EC00 80240690 02621021 */ addu $v0, $s3, $v0 /* 91EC04 80240694 8C420108 */ lw $v0, 0x108($v0) /* 91EC08 80240698 00021100 */ sll $v0, $v0, 4 -/* 91EC0C 8024069C 3C038009 */ lui $v1, %hi(D_8008EF20) +/* 91EC0C 8024069C 3C038009 */ lui $v1, %hi(gPartnerPopupProperties) /* 91EC10 802406A0 00621821 */ addu $v1, $v1, $v0 -/* 91EC14 802406A4 8C63EF20 */ lw $v1, %lo(D_8008EF20)($v1) +/* 91EC14 802406A4 8C63EF20 */ lw $v1, %lo(gPartnerPopupProperties)($v1) /* 91EC18 802406A8 8EA20074 */ lw $v0, 0x74($s5) /* 91EC1C 802406AC 2442FFFF */ addiu $v0, $v0, -1 /* 91EC20 802406B0 00021080 */ sll $v0, $v0, 2 diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_8024082C_B5EADC.s b/ver/us/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_8024082C_B5EADC.s index 3edfba4a44..f24f6f8ed9 100644 --- a/ver/us/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_8024082C_B5EADC.s +++ b/ver/us/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_8024082C_B5EADC.s @@ -42,8 +42,8 @@ glabel func_8024082C_B5EADC /* B5EB6C 802408BC 5040002E */ beql $v0, $zero, .L80240978 /* B5EB70 802408C0 26520001 */ addiu $s2, $s2, 1 /* B5EB74 802408C4 00101100 */ sll $v0, $s0, 4 -/* B5EB78 802408C8 3C068009 */ lui $a2, %hi(D_8008EF20) -/* B5EB7C 802408CC 24C6EF20 */ addiu $a2, $a2, %lo(D_8008EF20) +/* B5EB78 802408C8 3C068009 */ lui $a2, %hi(gPartnerPopupProperties) +/* B5EB7C 802408CC 24C6EF20 */ addiu $a2, $a2, %lo(gPartnerPopupProperties) /* B5EB80 802408D0 00461021 */ addu $v0, $v0, $a2 /* B5EB84 802408D4 0200202D */ daddu $a0, $s0, $zero /* B5EB88 802408D8 AE300108 */ sw $s0, 0x108($s1) @@ -54,8 +54,8 @@ glabel func_8024082C_B5EADC /* B5EB9C 802408EC 0040202D */ daddu $a0, $v0, $zero /* B5EBA0 802408F0 04800011 */ bltz $a0, .L80240938 /* B5EBA4 802408F4 00101080 */ sll $v0, $s0, 2 -/* B5EBA8 802408F8 3C06800F */ lui $a2, %hi(D_800F7F00) -/* B5EBAC 802408FC 24C67F00 */ addiu $a2, $a2, %lo(D_800F7F00) +/* B5EBA8 802408F8 3C06800F */ lui $a2, %hi(wPartnerHudScripts) +/* B5EBAC 802408FC 24C67F00 */ addiu $a2, $a2, %lo(wPartnerHudScripts) /* B5EBB0 80240900 00461021 */ addu $v0, $v0, $a2 /* B5EBB4 80240904 8C430000 */ lw $v1, ($v0) /* B5EBB8 80240908 24020001 */ addiu $v0, $zero, 1 @@ -71,8 +71,8 @@ glabel func_8024082C_B5EADC /* B5EBE0 80240930 08090257 */ j .L8024095C /* B5EBE4 80240934 AE220294 */ sw $v0, 0x294($s1) .L80240938: -/* B5EBE8 80240938 3C06800F */ lui $a2, %hi(D_800F7F40) -/* B5EBEC 8024093C 24C67F40 */ addiu $a2, $a2, %lo(D_800F7F40) +/* B5EBE8 80240938 3C06800F */ lui $a2, %hi(wDisabledPartnerHudScripts) +/* B5EBEC 8024093C 24C67F40 */ addiu $a2, $a2, %lo(wDisabledPartnerHudScripts) /* B5EBF0 80240940 00461021 */ addu $v0, $v0, $a2 /* B5EBF4 80240944 8C420000 */ lw $v0, ($v0) /* B5EBF8 80240948 AE20018C */ sw $zero, 0x18c($s1) @@ -130,9 +130,9 @@ glabel func_8024082C_B5EADC /* B5ECB0 80240A00 02621021 */ addu $v0, $s3, $v0 /* B5ECB4 80240A04 8C420108 */ lw $v0, 0x108($v0) /* B5ECB8 80240A08 00021100 */ sll $v0, $v0, 4 -/* B5ECBC 80240A0C 3C038009 */ lui $v1, %hi(D_8008EF20) +/* B5ECBC 80240A0C 3C038009 */ lui $v1, %hi(gPartnerPopupProperties) /* B5ECC0 80240A10 00621821 */ addu $v1, $v1, $v0 -/* B5ECC4 80240A14 8C63EF20 */ lw $v1, %lo(D_8008EF20)($v1) +/* B5ECC4 80240A14 8C63EF20 */ lw $v1, %lo(gPartnerPopupProperties)($v1) /* B5ECC8 80240A18 8EA20074 */ lw $v0, 0x74($s5) /* B5ECCC 80240A1C 2442FFFF */ addiu $v0, $v0, -1 /* B5ECD0 80240A20 00021080 */ sll $v0, $v0, 2 diff --git a/ver/us/asm/nonmatchings/world/area_kkj/kkj_17/AF1C60/func_802402BC_AF1F1C.s b/ver/us/asm/nonmatchings/world/area_kkj/kkj_17/AF1C60/func_802402BC_AF1F1C.s index 68ff34d6cf..ea0b3c6055 100644 --- a/ver/us/asm/nonmatchings/world/area_kkj/kkj_17/AF1C60/func_802402BC_AF1F1C.s +++ b/ver/us/asm/nonmatchings/world/area_kkj/kkj_17/AF1C60/func_802402BC_AF1F1C.s @@ -42,8 +42,8 @@ glabel func_802402BC_AF1F1C /* AF1FA8 80240348 AEA20318 */ sw $v0, 0x318($s5) /* AF1FAC 8024034C 0000B02D */ daddu $s6, $zero, $zero /* AF1FB0 80240350 02C0902D */ daddu $s2, $s6, $zero -/* AF1FB4 80240354 3C1E8009 */ lui $fp, %hi(D_8008A680) -/* AF1FB8 80240358 27DEA680 */ addiu $fp, $fp, %lo(D_8008A680) +/* AF1FB4 80240354 3C1E8009 */ lui $fp, %hi(gItemHudScripts) +/* AF1FB8 80240358 27DEA680 */ addiu $fp, $fp, %lo(gItemHudScripts) /* AF1FBC 8024035C 24170001 */ addiu $s7, $zero, 1 /* AF1FC0 80240360 3C148024 */ lui $s4, %hi(D_8024092C_AF258C) /* AF1FC4 80240364 2694092C */ addiu $s4, $s4, %lo(D_8024092C_AF258C) diff --git a/ver/us/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_802406C4_AF8014.s b/ver/us/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_802406C4_AF8014.s index d8b76ece30..7cae326cab 100644 --- a/ver/us/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_802406C4_AF8014.s +++ b/ver/us/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_802406C4_AF8014.s @@ -58,8 +58,8 @@ glabel func_802406C4_AF8014 /* AF80C0 80240770 0681FFFD */ bgez $s4, .L80240768 /* AF80C4 80240774 2463FFFC */ addiu $v1, $v1, -4 /* AF80C8 80240778 2414000A */ addiu $s4, $zero, 0xa -/* AF80CC 8024077C 3C048011 */ lui $a0, %hi(D_80108B28) -/* AF80D0 80240780 24848B28 */ addiu $a0, $a0, %lo(D_80108B28) +/* AF80CC 8024077C 3C048011 */ lui $a0, %hi(HudScript_AButton) +/* AF80D0 80240780 24848B28 */ addiu $a0, $a0, %lo(HudScript_AButton) /* AF80D4 80240784 3C038024 */ lui $v1, %hi(D_80246538_C8BFE8) /* AF80D8 80240788 24636538 */ addiu $v1, $v1, %lo(D_80246538_C8BFE8) /* AF80DC 8024078C 2402000C */ addiu $v0, $zero, 0xc @@ -101,8 +101,8 @@ glabel func_802406C4_AF8014 /* AF816C 8024081C 0260202D */ daddu $a0, $s3, $zero /* AF8170 80240820 0C051280 */ jal set_hud_element_flags /* AF8174 80240824 24050082 */ addiu $a1, $zero, 0x82 -/* AF8178 80240828 3C048011 */ lui $a0, %hi(D_80108AFC) -/* AF817C 8024082C 24848AFC */ addiu $a0, $a0, %lo(D_80108AFC) +/* AF8178 80240828 3C048011 */ lui $a0, %hi(HudScript_BlueMeter) +/* AF817C 8024082C 24848AFC */ addiu $a0, $a0, %lo(HudScript_BlueMeter) /* AF8180 80240830 0C050529 */ jal create_hud_element /* AF8184 80240834 00000000 */ nop /* AF8188 80240838 0040982D */ daddu $s3, $v0, $zero @@ -175,8 +175,8 @@ glabel func_802406C4_AF8014 .L80240938_AF8288: /* AF8288 80240938 3C048024 */ lui $a0, %hi(D_80246568_C8C018) /* AF828C 8024093C 8C846568 */ lw $a0, %lo(D_80246568_C8C018)($a0) -/* AF8290 80240940 3C058011 */ lui $a1, %hi(D_80108B80) -/* AF8294 80240944 24A58B80 */ addiu $a1, $a1, %lo(D_80108B80) +/* AF8290 80240940 3C058011 */ lui $a1, %hi(HudScript_MashAButton) +/* AF8294 80240944 24A58B80 */ addiu $a1, $a1, %lo(HudScript_MashAButton) /* AF8298 80240948 0C0511FF */ jal set_hud_element_anim /* AF829C 8024094C 00000000 */ nop /* AF82A0 80240950 2402000B */ addiu $v0, $zero, 0xb diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_06/8D2A10/func_802417E0_8D2CF0.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_06/8D2A10/func_802417E0_8D2CF0.s index 67ef65aaba..131e1048ee 100644 --- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_06/8D2A10/func_802417E0_8D2CF0.s +++ b/ver/us/asm/nonmatchings/world/area_kmr/kmr_06/8D2A10/func_802417E0_8D2CF0.s @@ -46,16 +46,16 @@ glabel func_802417E0_8D2CF0 /* 8D2D94 80241884 E600001C */ swc1 $f0, 0x1c($s0) /* 8D2D98 80241888 E6000020 */ swc1 $f0, 0x20($s0) /* 8D2D9C 8024188C E6000024 */ swc1 $f0, 0x24($s0) -/* 8D2DA0 80241890 3C038009 */ lui $v1, %hi(D_8008E3D8) +/* 8D2DA0 80241890 3C038009 */ lui $v1, %hi(gItemIconRasterOffsets) /* 8D2DA4 80241894 00721821 */ addu $v1, $v1, $s2 -/* 8D2DA8 80241898 8C63E3D8 */ lw $v1, %lo(D_8008E3D8)($v1) +/* 8D2DA8 80241898 8C63E3D8 */ lw $v1, %lo(gItemIconRasterOffsets)($v1) /* 8D2DAC 8024189C 0040A02D */ daddu $s4, $v0, $zero /* 8D2DB0 802418A0 00712021 */ addu $a0, $v1, $s1 /* 8D2DB4 802418A4 0C00A5CF */ jal dma_copy /* 8D2DB8 802418A8 00652821 */ addu $a1, $v1, $a1 -/* 8D2DBC 802418AC 3C058009 */ lui $a1, %hi(D_8008E94C) +/* 8D2DBC 802418AC 3C058009 */ lui $a1, %hi(gItemIconPaletteOffsets) /* 8D2DC0 802418B0 00B22821 */ addu $a1, $a1, $s2 -/* 8D2DC4 802418B4 8CA5E94C */ lw $a1, %lo(D_8008E94C)($a1) +/* 8D2DC4 802418B4 8CA5E94C */ lw $a1, %lo(gItemIconPaletteOffsets)($a1) /* 8D2DC8 802418B8 0280302D */ daddu $a2, $s4, $zero /* 8D2DCC 802418BC 00B12021 */ addu $a0, $a1, $s1 /* 8D2DD0 802418C0 26310020 */ addiu $s1, $s1, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_802406C8_8EC4E8.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_802406C8_8EC4E8.s index ceab863ca2..d9ffa3f029 100644 --- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_802406C8_8EC4E8.s +++ b/ver/us/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_802406C8_8EC4E8.s @@ -95,8 +95,8 @@ glabel func_802406C8_8EC4E8 .L8024080C: /* 8EC62C 8024080C 1260001A */ beqz $s3, .L80240878 /* 8EC630 80240810 0240802D */ daddu $s0, $s2, $zero -/* 8EC634 80240814 3C028008 */ lui $v0, %hi(D_800822F8) -/* 8EC638 80240818 244222F8 */ addiu $v0, $v0, %lo(D_800822F8) +/* 8EC634 80240814 3C028008 */ lui $v0, %hi(HudScript_Item_ITEM_08B) +/* 8EC638 80240818 244222F8 */ addiu $v0, $v0, %lo(HudScript_Item_ITEM_08B) /* 8EC63C 8024081C AE220000 */ sw $v0, ($s1) /* 8EC640 80240820 AE320108 */ sw $s2, 0x108($s1) /* 8EC644 80240824 AE3E018C */ sw $fp, 0x18c($s1) @@ -115,8 +115,8 @@ glabel func_802406C8_8EC4E8 /* 8EC674 80240854 00508024 */ and $s0, $v0, $s0 /* 8EC678 80240858 12000005 */ beqz $s0, .L80240870 /* 8EC67C 8024085C AE200210 */ sw $zero, 0x210($s1) -/* 8EC680 80240860 3C028008 */ lui $v0, %hi(D_80082328) -/* 8EC684 80240864 24422328 */ addiu $v0, $v0, %lo(D_80082328) +/* 8EC680 80240860 3C028008 */ lui $v0, %hi(HudScript_Item_ITEM_08B_disabled) +/* 8EC684 80240864 24422328 */ addiu $v0, $v0, %lo(HudScript_Item_ITEM_08B_disabled) /* 8EC688 80240868 AE3E0210 */ sw $fp, 0x210($s1) /* 8EC68C 8024086C AE220000 */ sw $v0, ($s1) .L80240870: diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_80240B54_8EC974.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_80240B54_8EC974.s index 81fa683e81..3886261694 100644 --- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_80240B54_8EC974.s +++ b/ver/us/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_80240B54_8EC974.s @@ -30,8 +30,8 @@ glabel func_80240B54_8EC974 /* 8EC9D0 80240BB0 0000A82D */ daddu $s5, $zero, $zero /* 8EC9D4 80240BB4 02A0902D */ daddu $s2, $s5, $zero /* 8EC9D8 80240BB8 24160001 */ addiu $s6, $zero, 1 -/* 8EC9DC 80240BBC 3C1E8008 */ lui $fp, %hi(D_80082388) -/* 8EC9E0 80240BC0 27DE2388 */ addiu $fp, $fp, %lo(D_80082388) +/* 8EC9DC 80240BBC 3C1E8008 */ lui $fp, %hi(HudScript_Item_ITEM_08C_disabled) +/* 8EC9E0 80240BC0 27DE2388 */ addiu $fp, $fp, %lo(HudScript_Item_ITEM_08C_disabled) /* 8EC9E4 80240BC4 3C138024 */ lui $s3, %hi(D_80244FA0_8F0DC0) /* 8EC9E8 80240BC8 26734FA0 */ addiu $s3, $s3, %lo(D_80244FA0_8F0DC0) /* 8EC9EC 80240BCC 02E0882D */ daddu $s1, $s7, $zero @@ -45,8 +45,8 @@ glabel func_80240B54_8EC974 /* 8ECA08 80240BE8 54400019 */ bnel $v0, $zero, .L80240C50 /* 8ECA0C 80240BEC 26520001 */ addiu $s2, $s2, 1 /* 8ECA10 80240BF0 0240802D */ daddu $s0, $s2, $zero -/* 8ECA14 80240BF4 3C068008 */ lui $a2, %hi(D_80082358) -/* 8ECA18 80240BF8 24C62358 */ addiu $a2, $a2, %lo(D_80082358) +/* 8ECA14 80240BF4 3C068008 */ lui $a2, %hi(HudScript_Item_ITEM_08C) +/* 8ECA18 80240BF8 24C62358 */ addiu $a2, $a2, %lo(HudScript_Item_ITEM_08C) /* 8ECA1C 80240BFC AE260000 */ sw $a2, ($s1) /* 8ECA20 80240C00 AE320108 */ sw $s2, 0x108($s1) /* 8ECA24 80240C04 AE36018C */ sw $s6, 0x18c($s1) diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_802404DC_C6860C.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_802404DC_C6860C.s index 1725b27638..100d01d961 100644 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_802404DC_C6860C.s +++ b/ver/us/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_802404DC_C6860C.s @@ -42,8 +42,8 @@ glabel func_802404DC_C6860C /* C6869C 8024056C 5040002E */ beql $v0, $zero, .L80240628 /* C686A0 80240570 26520001 */ addiu $s2, $s2, 1 /* C686A4 80240574 00101100 */ sll $v0, $s0, 4 -/* C686A8 80240578 3C068009 */ lui $a2, %hi(D_8008EF20) -/* C686AC 8024057C 24C6EF20 */ addiu $a2, $a2, %lo(D_8008EF20) +/* C686A8 80240578 3C068009 */ lui $a2, %hi(gPartnerPopupProperties) +/* C686AC 8024057C 24C6EF20 */ addiu $a2, $a2, %lo(gPartnerPopupProperties) /* C686B0 80240580 00461021 */ addu $v0, $v0, $a2 /* C686B4 80240584 0200202D */ daddu $a0, $s0, $zero /* C686B8 80240588 AE300108 */ sw $s0, 0x108($s1) @@ -54,8 +54,8 @@ glabel func_802404DC_C6860C /* C686CC 8024059C 0040202D */ daddu $a0, $v0, $zero /* C686D0 802405A0 04800011 */ bltz $a0, .L802405E8 /* C686D4 802405A4 00101080 */ sll $v0, $s0, 2 -/* C686D8 802405A8 3C06800F */ lui $a2, %hi(D_800F7F00) -/* C686DC 802405AC 24C67F00 */ addiu $a2, $a2, %lo(D_800F7F00) +/* C686D8 802405A8 3C06800F */ lui $a2, %hi(wPartnerHudScripts) +/* C686DC 802405AC 24C67F00 */ addiu $a2, $a2, %lo(wPartnerHudScripts) /* C686E0 802405B0 00461021 */ addu $v0, $v0, $a2 /* C686E4 802405B4 8C430000 */ lw $v1, ($v0) /* C686E8 802405B8 24020001 */ addiu $v0, $zero, 1 @@ -71,8 +71,8 @@ glabel func_802404DC_C6860C /* C68710 802405E0 08090183 */ j .L8024060C /* C68714 802405E4 AE220294 */ sw $v0, 0x294($s1) .L802405E8: -/* C68718 802405E8 3C06800F */ lui $a2, %hi(D_800F7F40) -/* C6871C 802405EC 24C67F40 */ addiu $a2, $a2, %lo(D_800F7F40) +/* C68718 802405E8 3C06800F */ lui $a2, %hi(wDisabledPartnerHudScripts) +/* C6871C 802405EC 24C67F40 */ addiu $a2, $a2, %lo(wDisabledPartnerHudScripts) /* C68720 802405F0 00461021 */ addu $v0, $v0, $a2 /* C68724 802405F4 8C420000 */ lw $v0, ($v0) /* C68728 802405F8 AE20018C */ sw $zero, 0x18c($s1) @@ -130,9 +130,9 @@ glabel func_802404DC_C6860C /* C687E0 802406B0 02621021 */ addu $v0, $s3, $v0 /* C687E4 802406B4 8C420108 */ lw $v0, 0x108($v0) /* C687E8 802406B8 00021100 */ sll $v0, $v0, 4 -/* C687EC 802406BC 3C038009 */ lui $v1, %hi(D_8008EF20) +/* C687EC 802406BC 3C038009 */ lui $v1, %hi(gPartnerPopupProperties) /* C687F0 802406C0 00621821 */ addu $v1, $v1, $v0 -/* C687F4 802406C4 8C63EF20 */ lw $v1, %lo(D_8008EF20)($v1) +/* C687F4 802406C4 8C63EF20 */ lw $v1, %lo(gPartnerPopupProperties)($v1) /* C687F8 802406C8 8EA20074 */ lw $v0, 0x74($s5) /* C687FC 802406CC 2442FFFF */ addiu $v0, $v0, -1 /* C68800 802406D0 00021080 */ sll $v0, $v0, 2 diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_09/C76CE0/func_802401CC_C76EAC.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_09/C76CE0/func_802401CC_C76EAC.s index 22ed4614b4..4b6159852e 100644 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_09/C76CE0/func_802401CC_C76EAC.s +++ b/ver/us/asm/nonmatchings/world/area_kzn/kzn_09/C76CE0/func_802401CC_C76EAC.s @@ -42,8 +42,8 @@ glabel func_802401CC_C76EAC /* C76F3C 8024025C 5040002E */ beql $v0, $zero, .L80240318 /* C76F40 80240260 26520001 */ addiu $s2, $s2, 1 /* C76F44 80240264 00101100 */ sll $v0, $s0, 4 -/* C76F48 80240268 3C068009 */ lui $a2, %hi(D_8008EF20) -/* C76F4C 8024026C 24C6EF20 */ addiu $a2, $a2, %lo(D_8008EF20) +/* C76F48 80240268 3C068009 */ lui $a2, %hi(gPartnerPopupProperties) +/* C76F4C 8024026C 24C6EF20 */ addiu $a2, $a2, %lo(gPartnerPopupProperties) /* C76F50 80240270 00461021 */ addu $v0, $v0, $a2 /* C76F54 80240274 0200202D */ daddu $a0, $s0, $zero /* C76F58 80240278 AE300108 */ sw $s0, 0x108($s1) @@ -54,8 +54,8 @@ glabel func_802401CC_C76EAC /* C76F6C 8024028C 0040202D */ daddu $a0, $v0, $zero /* C76F70 80240290 04800011 */ bltz $a0, .L802402D8 /* C76F74 80240294 00101080 */ sll $v0, $s0, 2 -/* C76F78 80240298 3C06800F */ lui $a2, %hi(D_800F7F00) -/* C76F7C 8024029C 24C67F00 */ addiu $a2, $a2, %lo(D_800F7F00) +/* C76F78 80240298 3C06800F */ lui $a2, %hi(wPartnerHudScripts) +/* C76F7C 8024029C 24C67F00 */ addiu $a2, $a2, %lo(wPartnerHudScripts) /* C76F80 802402A0 00461021 */ addu $v0, $v0, $a2 /* C76F84 802402A4 8C430000 */ lw $v1, ($v0) /* C76F88 802402A8 24020001 */ addiu $v0, $zero, 1 @@ -71,8 +71,8 @@ glabel func_802401CC_C76EAC /* C76FB0 802402D0 080900BF */ j .L802402FC /* C76FB4 802402D4 AE220294 */ sw $v0, 0x294($s1) .L802402D8: -/* C76FB8 802402D8 3C06800F */ lui $a2, %hi(D_800F7F40) -/* C76FBC 802402DC 24C67F40 */ addiu $a2, $a2, %lo(D_800F7F40) +/* C76FB8 802402D8 3C06800F */ lui $a2, %hi(wDisabledPartnerHudScripts) +/* C76FBC 802402DC 24C67F40 */ addiu $a2, $a2, %lo(wDisabledPartnerHudScripts) /* C76FC0 802402E0 00461021 */ addu $v0, $v0, $a2 /* C76FC4 802402E4 8C420000 */ lw $v0, ($v0) /* C76FC8 802402E8 AE20018C */ sw $zero, 0x18c($s1) @@ -130,9 +130,9 @@ glabel func_802401CC_C76EAC /* C77080 802403A0 02621021 */ addu $v0, $s3, $v0 /* C77084 802403A4 8C420108 */ lw $v0, 0x108($v0) /* C77088 802403A8 00021100 */ sll $v0, $v0, 4 -/* C7708C 802403AC 3C038009 */ lui $v1, %hi(D_8008EF20) +/* C7708C 802403AC 3C038009 */ lui $v1, %hi(gPartnerPopupProperties) /* C77090 802403B0 00621821 */ addu $v1, $v1, $v0 -/* C77094 802403B4 8C63EF20 */ lw $v1, %lo(D_8008EF20)($v1) +/* C77094 802403B4 8C63EF20 */ lw $v1, %lo(gPartnerPopupProperties)($v1) /* C77098 802403B8 8EA20074 */ lw $v0, 0x74($s5) /* C7709C 802403BC 2442FFFF */ addiu $v0, $v0, -1 /* C770A0 802403C0 00021080 */ sll $v0, $v0, 2 diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80245028_8058A8.s b/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80245028_8058A8.s index eefa9ebbb8..32fce8743b 100644 --- a/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80245028_8058A8.s +++ b/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80245028_8058A8.s @@ -37,8 +37,8 @@ glabel func_80245028_8058A8 /* 805924 802450A4 26B50001 */ addiu $s5, $s5, 1 /* 805928 802450A8 0200202D */ daddu $a0, $s0, $zero /* 80592C 802450AC 00101100 */ sll $v0, $s0, 4 -/* 805930 802450B0 3C068009 */ lui $a2, %hi(D_8008EF20) -/* 805934 802450B4 24C6EF20 */ addiu $a2, $a2, %lo(D_8008EF20) +/* 805930 802450B0 3C068009 */ lui $a2, %hi(gPartnerPopupProperties) +/* 805934 802450B4 24C6EF20 */ addiu $a2, $a2, %lo(gPartnerPopupProperties) /* 805938 802450B8 00469021 */ addu $s2, $v0, $a2 /* 80593C 802450BC 0C0913D7 */ jal func_80244F5C_8057DC /* 805940 802450C0 AFA50010 */ sw $a1, 0x10($sp) @@ -47,8 +47,8 @@ glabel func_80245028_8058A8 /* 80594C 802450CC 50600019 */ beql $v1, $zero, .L80245134 /* 805950 802450D0 26B50001 */ addiu $s5, $s5, 1 /* 805954 802450D4 00102080 */ sll $a0, $s0, 2 -/* 805958 802450D8 3C06800F */ lui $a2, %hi(D_800F7F00) -/* 80595C 802450DC 24C67F00 */ addiu $a2, $a2, %lo(D_800F7F00) +/* 805958 802450D8 3C06800F */ lui $a2, %hi(wPartnerHudScripts) +/* 80595C 802450DC 24C67F00 */ addiu $a2, $a2, %lo(wPartnerHudScripts) /* 805960 802450E0 00861021 */ addu $v0, $a0, $a2 /* 805964 802450E4 8C420000 */ lw $v0, ($v0) /* 805968 802450E8 AE300108 */ sw $s0, 0x108($s1) @@ -61,8 +61,8 @@ glabel func_80245028_8058A8 /* 805984 80245104 82620015 */ lb $v0, 0x15($s3) /* 805988 80245108 14650007 */ bne $v1, $a1, .L80245128 /* 80598C 8024510C AE220210 */ sw $v0, 0x210($s1) -/* 805990 80245110 3C06800F */ lui $a2, %hi(D_800F7F40) -/* 805994 80245114 24C67F40 */ addiu $a2, $a2, %lo(D_800F7F40) +/* 805990 80245110 3C06800F */ lui $a2, %hi(wDisabledPartnerHudScripts) +/* 805994 80245114 24C67F40 */ addiu $a2, $a2, %lo(wDisabledPartnerHudScripts) /* 805998 80245118 00861021 */ addu $v0, $a0, $a2 /* 80599C 8024511C AE20018C */ sw $zero, 0x18c($s1) /* 8059A0 80245120 8C420000 */ lw $v0, ($v0) diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_8024522C_805AAC.s b/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_8024522C_805AAC.s index 7ba66865fe..672ae3cc91 100644 --- a/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_8024522C_805AAC.s +++ b/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_8024522C_805AAC.s @@ -44,8 +44,8 @@ glabel func_8024522C_805AAC /* 805B44 802452C4 26730001 */ addiu $s3, $s3, 1 /* 805B48 802452C8 3C028009 */ lui $v0, %hi(gItemTable+0xA84) /* 805B4C 802452CC 84428364 */ lh $v0, %lo(gItemTable+0xA84)($v0) -/* 805B50 802452D0 3C078009 */ lui $a3, %hi(D_8008A680) -/* 805B54 802452D4 24E7A680 */ addiu $a3, $a3, %lo(D_8008A680) +/* 805B50 802452D0 3C078009 */ lui $a3, %hi(gItemHudScripts) +/* 805B54 802452D4 24E7A680 */ addiu $a3, $a3, %lo(gItemHudScripts) /* 805B58 802452D8 AE330108 */ sw $s3, 0x108($s1) /* 805B5C 802452DC 8E430008 */ lw $v1, 8($s2) /* 805B60 802452E0 000210C0 */ sll $v0, $v0, 3 diff --git a/ver/us/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_802415EC_E13D4C.s b/ver/us/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_802415EC_E13D4C.s index e384003ab5..2df30c95d2 100644 --- a/ver/us/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_802415EC_E13D4C.s +++ b/ver/us/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_802415EC_E13D4C.s @@ -17,8 +17,8 @@ glabel func_802415EC_E13D4C /* E13D7C 8024161C 0040802D */ daddu $s0, $v0, $zero /* E13D80 80241620 0C048C56 */ jal create_generic_entity_world /* E13D84 80241624 AE300080 */ sw $s0, 0x80($s1) -/* E13D88 80241628 3C048011 */ lui $a0, %hi(D_80108558) -/* E13D8C 8024162C 24848558 */ addiu $a0, $a0, %lo(D_80108558) +/* E13D88 80241628 3C048011 */ lui $a0, %hi(HudScript_StatusCoin) +/* E13D8C 8024162C 24848558 */ addiu $a0, $a0, %lo(HudScript_StatusCoin) /* E13D90 80241630 0C050529 */ jal create_hud_element /* E13D94 80241634 AE020000 */ sw $v0, ($s0) /* E13D98 80241638 0040202D */ daddu $a0, $v0, $zero diff --git a/ver/us/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80240468_E161E8.s b/ver/us/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80240468_E161E8.s index 42cf178ab0..b4a9dd637f 100644 --- a/ver/us/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80240468_E161E8.s +++ b/ver/us/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80240468_E161E8.s @@ -17,8 +17,8 @@ glabel func_80240468_E161E8 /* E16218 80240498 24A50430 */ addiu $a1, $a1, %lo(func_80240430_E161B0) /* E1621C 8024049C 0C048C56 */ jal create_generic_entity_world /* E16220 802404A0 0000202D */ daddu $a0, $zero, $zero -/* E16224 802404A4 3C118011 */ lui $s1, %hi(D_80108B28) -/* E16228 802404A8 26318B28 */ addiu $s1, $s1, %lo(D_80108B28) +/* E16224 802404A4 3C118011 */ lui $s1, %hi(HudScript_AButton) +/* E16228 802404A8 26318B28 */ addiu $s1, $s1, %lo(HudScript_AButton) /* E1622C 802404AC 0220202D */ daddu $a0, $s1, $zero /* E16230 802404B0 0C050529 */ jal create_hud_element /* E16234 802404B4 AE420000 */ sw $v0, ($s2) @@ -38,8 +38,8 @@ glabel func_80240468_E161E8 /* E1626C 802404EC 0200202D */ daddu $a0, $s0, $zero /* E16270 802404F0 0C0511FF */ jal set_hud_element_anim /* E16274 802404F4 0220282D */ daddu $a1, $s1, $zero -/* E16278 802404F8 3C048011 */ lui $a0, %hi(D_80108AFC) -/* E1627C 802404FC 24848AFC */ addiu $a0, $a0, %lo(D_80108AFC) +/* E16278 802404F8 3C048011 */ lui $a0, %hi(HudScript_BlueMeter) +/* E1627C 802404FC 24848AFC */ addiu $a0, $a0, %lo(HudScript_BlueMeter) /* E16280 80240500 0C050529 */ jal create_hud_element /* E16284 80240504 00000000 */ nop /* E16288 80240508 0040802D */ daddu $s0, $v0, $zero diff --git a/ver/us/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80240BB0_E16930.s b/ver/us/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80240BB0_E16930.s index d53b6e732d..e016c886b4 100644 --- a/ver/us/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80240BB0_E16930.s +++ b/ver/us/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80240BB0_E16930.s @@ -189,8 +189,8 @@ glabel func_80240BB0_E16930 /* E16BDC 80240E5C E660000C */ swc1 $f0, 0xc($s3) .L80240E60_E16BE0: /* E16BE0 80240E60 8EA4000C */ lw $a0, 0xc($s5) -/* E16BE4 80240E64 3C058011 */ lui $a1, %hi(D_80108B28) -/* E16BE8 80240E68 24A58B28 */ addiu $a1, $a1, %lo(D_80108B28) +/* E16BE4 80240E64 3C058011 */ lui $a1, %hi(HudScript_AButton) +/* E16BE8 80240E68 24A58B28 */ addiu $a1, $a1, %lo(HudScript_AButton) /* E16BEC 80240E6C 0C0511FF */ jal set_hud_element_anim /* E16BF0 80240E70 00000000 */ nop /* E16BF4 80240E74 8EA4000C */ lw $a0, 0xc($s5) @@ -402,8 +402,8 @@ glabel func_80240BB0_E16930 /* E16F28 802411A8 46200020 */ cvt.s.d $f0, $f0 /* E16F2C 802411AC E6600040 */ swc1 $f0, 0x40($s3) /* E16F30 802411B0 8EA4000C */ lw $a0, 0xc($s5) -/* E16F34 802411B4 3C058011 */ lui $a1, %hi(D_80108B80) -/* E16F38 802411B8 24A58B80 */ addiu $a1, $a1, %lo(D_80108B80) +/* E16F34 802411B4 3C058011 */ lui $a1, %hi(HudScript_MashAButton) +/* E16F38 802411B8 24A58B80 */ addiu $a1, $a1, %lo(HudScript_MashAButton) /* E16F3C 802411BC 0C0511FF */ jal set_hud_element_anim /* E16F40 802411C0 00000000 */ nop /* E16F44 802411C4 8EA4000C */ lw $a0, 0xc($s5) @@ -450,8 +450,8 @@ glabel func_80240BB0_E16930 /* E16FE0 80241260 2402000A */ addiu $v0, $zero, 0xa /* E16FE4 80241264 A662008E */ sh $v0, 0x8e($s3) /* E16FE8 80241268 8EA4000C */ lw $a0, 0xc($s5) -/* E16FEC 8024126C 3C058011 */ lui $a1, %hi(D_80108B28) -/* E16FF0 80241270 24A58B28 */ addiu $a1, $a1, %lo(D_80108B28) +/* E16FEC 8024126C 3C058011 */ lui $a1, %hi(HudScript_AButton) +/* E16FF0 80241270 24A58B28 */ addiu $a1, $a1, %lo(HudScript_AButton) /* E16FF4 80241274 0C0511FF */ jal set_hud_element_anim /* E16FF8 80241278 2694001C */ addiu $s4, $s4, 0x1c /* E16FFC 8024127C 8EA4000C */ lw $a0, 0xc($s5) diff --git a/ver/us/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_80240A6C_BCF65C.s b/ver/us/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_80240A6C_BCF65C.s index 232cc9cd67..e6efde7ed5 100644 --- a/ver/us/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_80240A6C_BCF65C.s +++ b/ver/us/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_80240A6C_BCF65C.s @@ -93,8 +93,8 @@ glabel func_80240A6C_BCF65C /* BCF7A8 80240BB8 00000000 */ nop .L80240BBC: /* BCF7AC 80240BBC 8E24003C */ lw $a0, 0x3c($s1) -/* BCF7B0 80240BC0 3C058011 */ lui $a1, %hi(D_80108C34) -/* BCF7B4 80240BC4 24A58C34 */ addiu $a1, $a1, %lo(D_80108C34) +/* BCF7B0 80240BC0 3C058011 */ lui $a1, %hi(HudScript_SlowlyMashAButton) +/* BCF7B4 80240BC4 24A58C34 */ addiu $a1, $a1, %lo(HudScript_SlowlyMashAButton) /* BCF7B8 80240BC8 0C0511FF */ jal set_hud_element_anim /* BCF7BC 80240BCC 00000000 */ nop /* BCF7C0 80240BD0 2402000B */ addiu $v0, $zero, 0xb diff --git a/ver/us/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_80241168_BCFD58.s b/ver/us/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_80241168_BCFD58.s index 8d22d78cca..cef368adbb 100644 --- a/ver/us/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_80241168_BCFD58.s +++ b/ver/us/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_80241168_BCFD58.s @@ -42,8 +42,8 @@ glabel func_80241168_BCFD58 /* BCFDE8 802411F8 2484FFFF */ addiu $a0, $a0, -1 /* BCFDEC 802411FC 0481FFFD */ bgez $a0, .L802411F4 /* BCFDF0 80241200 2463FFFC */ addiu $v1, $v1, -4 -/* BCFDF4 80241204 3C048011 */ lui $a0, %hi(D_80108B28) -/* BCFDF8 80241208 24848B28 */ addiu $a0, $a0, %lo(D_80108B28) +/* BCFDF4 80241204 3C048011 */ lui $a0, %hi(HudScript_AButton) +/* BCFDF8 80241208 24848B28 */ addiu $a0, $a0, %lo(HudScript_AButton) /* BCFDFC 8024120C 3C013F80 */ lui $at, 0x3f80 /* BCFE00 80241210 44810000 */ mtc1 $at, $f0 /* BCFE04 80241214 2402FFD0 */ addiu $v0, $zero, -0x30 @@ -68,8 +68,8 @@ glabel func_80241168_BCFD58 /* BCFE50 80241260 0200202D */ daddu $a0, $s0, $zero /* BCFE54 80241264 0C051280 */ jal set_hud_element_flags /* BCFE58 80241268 24050082 */ addiu $a1, $zero, 0x82 -/* BCFE5C 8024126C 3C048011 */ lui $a0, %hi(D_80108AFC) -/* BCFE60 80241270 24848AFC */ addiu $a0, $a0, %lo(D_80108AFC) +/* BCFE5C 8024126C 3C048011 */ lui $a0, %hi(HudScript_BlueMeter) +/* BCFE60 80241270 24848AFC */ addiu $a0, $a0, %lo(HudScript_BlueMeter) /* BCFE64 80241274 0C050529 */ jal create_hud_element /* BCFE68 80241278 00000000 */ nop /* BCFE6C 8024127C 0040802D */ daddu $s0, $v0, $zero @@ -85,8 +85,8 @@ glabel func_80241168_BCFD58 /* BCFE94 802412A4 0200202D */ daddu $a0, $s0, $zero /* BCFE98 802412A8 0C051280 */ jal set_hud_element_flags /* BCFE9C 802412AC 24050082 */ addiu $a1, $zero, 0x82 -/* BCFEA0 802412B0 3C048011 */ lui $a0, %hi(D_80109244) -/* BCFEA4 802412B4 24849244 */ addiu $a0, $a0, %lo(D_80109244) +/* BCFEA0 802412B0 3C048011 */ lui $a0, %hi(HudScript_RunAwayOK) +/* BCFEA4 802412B4 24849244 */ addiu $a0, $a0, %lo(HudScript_RunAwayOK) /* BCFEA8 802412B8 0C050529 */ jal create_hud_element /* BCFEAC 802412BC 00000000 */ nop /* BCFEB0 802412C0 0040802D */ daddu $s0, $v0, $zero diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_8024095C_DDD18C.s b/ver/us/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_8024095C_DDD18C.s index 9875749887..c3ec4a135d 100644 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_8024095C_DDD18C.s +++ b/ver/us/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_8024095C_DDD18C.s @@ -42,8 +42,8 @@ glabel func_8024095C_DDD18C /* DDD21C 802409EC 5040002E */ beql $v0, $zero, .L80240AA8 /* DDD220 802409F0 26520001 */ addiu $s2, $s2, 1 /* DDD224 802409F4 00101100 */ sll $v0, $s0, 4 -/* DDD228 802409F8 3C068009 */ lui $a2, %hi(D_8008EF20) -/* DDD22C 802409FC 24C6EF20 */ addiu $a2, $a2, %lo(D_8008EF20) +/* DDD228 802409F8 3C068009 */ lui $a2, %hi(gPartnerPopupProperties) +/* DDD22C 802409FC 24C6EF20 */ addiu $a2, $a2, %lo(gPartnerPopupProperties) /* DDD230 80240A00 00461021 */ addu $v0, $v0, $a2 /* DDD234 80240A04 0200202D */ daddu $a0, $s0, $zero /* DDD238 80240A08 AE300108 */ sw $s0, 0x108($s1) @@ -54,8 +54,8 @@ glabel func_8024095C_DDD18C /* DDD24C 80240A1C 0040202D */ daddu $a0, $v0, $zero /* DDD250 80240A20 04800011 */ bltz $a0, .L80240A68 /* DDD254 80240A24 00101080 */ sll $v0, $s0, 2 -/* DDD258 80240A28 3C06800F */ lui $a2, %hi(D_800F7F00) -/* DDD25C 80240A2C 24C67F00 */ addiu $a2, $a2, %lo(D_800F7F00) +/* DDD258 80240A28 3C06800F */ lui $a2, %hi(wPartnerHudScripts) +/* DDD25C 80240A2C 24C67F00 */ addiu $a2, $a2, %lo(wPartnerHudScripts) /* DDD260 80240A30 00461021 */ addu $v0, $v0, $a2 /* DDD264 80240A34 8C430000 */ lw $v1, ($v0) /* DDD268 80240A38 24020001 */ addiu $v0, $zero, 1 @@ -71,8 +71,8 @@ glabel func_8024095C_DDD18C /* DDD290 80240A60 080902A3 */ j .L80240A8C /* DDD294 80240A64 AE220294 */ sw $v0, 0x294($s1) .L80240A68: -/* DDD298 80240A68 3C06800F */ lui $a2, %hi(D_800F7F40) -/* DDD29C 80240A6C 24C67F40 */ addiu $a2, $a2, %lo(D_800F7F40) +/* DDD298 80240A68 3C06800F */ lui $a2, %hi(wDisabledPartnerHudScripts) +/* DDD29C 80240A6C 24C67F40 */ addiu $a2, $a2, %lo(wDisabledPartnerHudScripts) /* DDD2A0 80240A70 00461021 */ addu $v0, $v0, $a2 /* DDD2A4 80240A74 8C420000 */ lw $v0, ($v0) /* DDD2A8 80240A78 AE20018C */ sw $zero, 0x18c($s1) @@ -130,9 +130,9 @@ glabel func_8024095C_DDD18C /* DDD360 80240B30 02621021 */ addu $v0, $s3, $v0 /* DDD364 80240B34 8C420108 */ lw $v0, 0x108($v0) /* DDD368 80240B38 00021100 */ sll $v0, $v0, 4 -/* DDD36C 80240B3C 3C038009 */ lui $v1, %hi(D_8008EF20) +/* DDD36C 80240B3C 3C038009 */ lui $v1, %hi(gPartnerPopupProperties) /* DDD370 80240B40 00621821 */ addu $v1, $v1, $v0 -/* DDD374 80240B44 8C63EF20 */ lw $v1, %lo(D_8008EF20)($v1) +/* DDD374 80240B44 8C63EF20 */ lw $v1, %lo(gPartnerPopupProperties)($v1) /* DDD378 80240B48 8EA20074 */ lw $v0, 0x74($s5) /* DDD37C 80240B4C 2442FFFF */ addiu $v0, $v0, -1 /* DDD380 80240B50 00021080 */ sll $v0, $v0, 2 diff --git a/ver/us/asm/nonmatchings/world/area_sam/sam_08/D2FC80/func_802401CC_D2FE4C.s b/ver/us/asm/nonmatchings/world/area_sam/sam_08/D2FC80/func_802401CC_D2FE4C.s index 669c7bbcc3..3532e86d63 100644 --- a/ver/us/asm/nonmatchings/world/area_sam/sam_08/D2FC80/func_802401CC_D2FE4C.s +++ b/ver/us/asm/nonmatchings/world/area_sam/sam_08/D2FC80/func_802401CC_D2FE4C.s @@ -42,8 +42,8 @@ glabel func_802401CC_D2FE4C /* D2FEDC 8024025C 5040002E */ beql $v0, $zero, .L80240318 /* D2FEE0 80240260 26520001 */ addiu $s2, $s2, 1 /* D2FEE4 80240264 00101100 */ sll $v0, $s0, 4 -/* D2FEE8 80240268 3C068009 */ lui $a2, %hi(D_8008EF20) -/* D2FEEC 8024026C 24C6EF20 */ addiu $a2, $a2, %lo(D_8008EF20) +/* D2FEE8 80240268 3C068009 */ lui $a2, %hi(gPartnerPopupProperties) +/* D2FEEC 8024026C 24C6EF20 */ addiu $a2, $a2, %lo(gPartnerPopupProperties) /* D2FEF0 80240270 00461021 */ addu $v0, $v0, $a2 /* D2FEF4 80240274 0200202D */ daddu $a0, $s0, $zero /* D2FEF8 80240278 AE300108 */ sw $s0, 0x108($s1) @@ -54,8 +54,8 @@ glabel func_802401CC_D2FE4C /* D2FF0C 8024028C 0040202D */ daddu $a0, $v0, $zero /* D2FF10 80240290 04800011 */ bltz $a0, .L802402D8 /* D2FF14 80240294 00101080 */ sll $v0, $s0, 2 -/* D2FF18 80240298 3C06800F */ lui $a2, %hi(D_800F7F00) -/* D2FF1C 8024029C 24C67F00 */ addiu $a2, $a2, %lo(D_800F7F00) +/* D2FF18 80240298 3C06800F */ lui $a2, %hi(wPartnerHudScripts) +/* D2FF1C 8024029C 24C67F00 */ addiu $a2, $a2, %lo(wPartnerHudScripts) /* D2FF20 802402A0 00461021 */ addu $v0, $v0, $a2 /* D2FF24 802402A4 8C430000 */ lw $v1, ($v0) /* D2FF28 802402A8 24020001 */ addiu $v0, $zero, 1 @@ -71,8 +71,8 @@ glabel func_802401CC_D2FE4C /* D2FF50 802402D0 080900BF */ j .L802402FC /* D2FF54 802402D4 AE220294 */ sw $v0, 0x294($s1) .L802402D8: -/* D2FF58 802402D8 3C06800F */ lui $a2, %hi(D_800F7F40) -/* D2FF5C 802402DC 24C67F40 */ addiu $a2, $a2, %lo(D_800F7F40) +/* D2FF58 802402D8 3C06800F */ lui $a2, %hi(wDisabledPartnerHudScripts) +/* D2FF5C 802402DC 24C67F40 */ addiu $a2, $a2, %lo(wDisabledPartnerHudScripts) /* D2FF60 802402E0 00461021 */ addu $v0, $v0, $a2 /* D2FF64 802402E4 8C420000 */ lw $v0, ($v0) /* D2FF68 802402E8 AE20018C */ sw $zero, 0x18c($s1) @@ -130,9 +130,9 @@ glabel func_802401CC_D2FE4C /* D30020 802403A0 02621021 */ addu $v0, $s3, $v0 /* D30024 802403A4 8C420108 */ lw $v0, 0x108($v0) /* D30028 802403A8 00021100 */ sll $v0, $v0, 4 -/* D3002C 802403AC 3C038009 */ lui $v1, %hi(D_8008EF20) +/* D3002C 802403AC 3C038009 */ lui $v1, %hi(gPartnerPopupProperties) /* D30030 802403B0 00621821 */ addu $v1, $v1, $v0 -/* D30034 802403B4 8C63EF20 */ lw $v1, %lo(D_8008EF20)($v1) +/* D30034 802403B4 8C63EF20 */ lw $v1, %lo(gPartnerPopupProperties)($v1) /* D30038 802403B8 8EA20074 */ lw $v0, 0x74($s5) /* D3003C 802403BC 2442FFFF */ addiu $v0, $v0, -1 /* D30040 802403C0 00021080 */ sll $v0, $v0, 2 diff --git a/ver/us/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_8024024C_95420C.s b/ver/us/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_8024024C_95420C.s index c8ac8b3895..add50b27ab 100644 --- a/ver/us/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_8024024C_95420C.s +++ b/ver/us/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_8024024C_95420C.s @@ -42,8 +42,8 @@ glabel func_8024024C_95420C /* 95429C 802402DC 5040002E */ beql $v0, $zero, .L80240398 /* 9542A0 802402E0 26520001 */ addiu $s2, $s2, 1 /* 9542A4 802402E4 00101100 */ sll $v0, $s0, 4 -/* 9542A8 802402E8 3C068009 */ lui $a2, %hi(D_8008EF20) -/* 9542AC 802402EC 24C6EF20 */ addiu $a2, $a2, %lo(D_8008EF20) +/* 9542A8 802402E8 3C068009 */ lui $a2, %hi(gPartnerPopupProperties) +/* 9542AC 802402EC 24C6EF20 */ addiu $a2, $a2, %lo(gPartnerPopupProperties) /* 9542B0 802402F0 00461021 */ addu $v0, $v0, $a2 /* 9542B4 802402F4 0200202D */ daddu $a0, $s0, $zero /* 9542B8 802402F8 AE300108 */ sw $s0, 0x108($s1) @@ -54,8 +54,8 @@ glabel func_8024024C_95420C /* 9542CC 8024030C 0040202D */ daddu $a0, $v0, $zero /* 9542D0 80240310 04800011 */ bltz $a0, .L80240358 /* 9542D4 80240314 00101080 */ sll $v0, $s0, 2 -/* 9542D8 80240318 3C06800F */ lui $a2, %hi(D_800F7F00) -/* 9542DC 8024031C 24C67F00 */ addiu $a2, $a2, %lo(D_800F7F00) +/* 9542D8 80240318 3C06800F */ lui $a2, %hi(wPartnerHudScripts) +/* 9542DC 8024031C 24C67F00 */ addiu $a2, $a2, %lo(wPartnerHudScripts) /* 9542E0 80240320 00461021 */ addu $v0, $v0, $a2 /* 9542E4 80240324 8C430000 */ lw $v1, ($v0) /* 9542E8 80240328 24020001 */ addiu $v0, $zero, 1 @@ -71,8 +71,8 @@ glabel func_8024024C_95420C /* 954310 80240350 080900DF */ j .L8024037C /* 954314 80240354 AE220294 */ sw $v0, 0x294($s1) .L80240358: -/* 954318 80240358 3C06800F */ lui $a2, %hi(D_800F7F40) -/* 95431C 8024035C 24C67F40 */ addiu $a2, $a2, %lo(D_800F7F40) +/* 954318 80240358 3C06800F */ lui $a2, %hi(wDisabledPartnerHudScripts) +/* 95431C 8024035C 24C67F40 */ addiu $a2, $a2, %lo(wDisabledPartnerHudScripts) /* 954320 80240360 00461021 */ addu $v0, $v0, $a2 /* 954324 80240364 8C420000 */ lw $v0, ($v0) /* 954328 80240368 AE20018C */ sw $zero, 0x18c($s1) @@ -130,9 +130,9 @@ glabel func_8024024C_95420C /* 9543E0 80240420 02621021 */ addu $v0, $s3, $v0 /* 9543E4 80240424 8C420108 */ lw $v0, 0x108($v0) /* 9543E8 80240428 00021100 */ sll $v0, $v0, 4 -/* 9543EC 8024042C 3C038009 */ lui $v1, %hi(D_8008EF20) +/* 9543EC 8024042C 3C038009 */ lui $v1, %hi(gPartnerPopupProperties) /* 9543F0 80240430 00621821 */ addu $v1, $v1, $v0 -/* 9543F4 80240434 8C63EF20 */ lw $v1, %lo(D_8008EF20)($v1) +/* 9543F4 80240434 8C63EF20 */ lw $v1, %lo(gPartnerPopupProperties)($v1) /* 9543F8 80240438 8EA20074 */ lw $v0, 0x74($s5) /* 9543FC 8024043C 2442FFFF */ addiu $v0, $v0, -1 /* 954400 80240440 00021080 */ sll $v0, $v0, 2 diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_802404AC_87A08C.s b/ver/us/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_802404AC_87A08C.s index c5682d5f1d..dbe7863fe8 100644 --- a/ver/us/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_802404AC_87A08C.s +++ b/ver/us/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_802404AC_87A08C.s @@ -42,8 +42,8 @@ glabel func_802404AC_87A08C /* 87A11C 8024053C 5040002E */ beql $v0, $zero, .L802405F8 /* 87A120 80240540 26520001 */ addiu $s2, $s2, 1 /* 87A124 80240544 00101100 */ sll $v0, $s0, 4 -/* 87A128 80240548 3C068009 */ lui $a2, %hi(D_8008EF20) -/* 87A12C 8024054C 24C6EF20 */ addiu $a2, $a2, %lo(D_8008EF20) +/* 87A128 80240548 3C068009 */ lui $a2, %hi(gPartnerPopupProperties) +/* 87A12C 8024054C 24C6EF20 */ addiu $a2, $a2, %lo(gPartnerPopupProperties) /* 87A130 80240550 00461021 */ addu $v0, $v0, $a2 /* 87A134 80240554 0200202D */ daddu $a0, $s0, $zero /* 87A138 80240558 AE300108 */ sw $s0, 0x108($s1) @@ -54,8 +54,8 @@ glabel func_802404AC_87A08C /* 87A14C 8024056C 0040202D */ daddu $a0, $v0, $zero /* 87A150 80240570 04800011 */ bltz $a0, .L802405B8 /* 87A154 80240574 00101080 */ sll $v0, $s0, 2 -/* 87A158 80240578 3C06800F */ lui $a2, %hi(D_800F7F00) -/* 87A15C 8024057C 24C67F00 */ addiu $a2, $a2, %lo(D_800F7F00) +/* 87A158 80240578 3C06800F */ lui $a2, %hi(wPartnerHudScripts) +/* 87A15C 8024057C 24C67F00 */ addiu $a2, $a2, %lo(wPartnerHudScripts) /* 87A160 80240580 00461021 */ addu $v0, $v0, $a2 /* 87A164 80240584 8C430000 */ lw $v1, ($v0) /* 87A168 80240588 24020001 */ addiu $v0, $zero, 1 @@ -71,8 +71,8 @@ glabel func_802404AC_87A08C /* 87A190 802405B0 08090177 */ j .L802405DC /* 87A194 802405B4 AE220294 */ sw $v0, 0x294($s1) .L802405B8: -/* 87A198 802405B8 3C06800F */ lui $a2, %hi(D_800F7F40) -/* 87A19C 802405BC 24C67F40 */ addiu $a2, $a2, %lo(D_800F7F40) +/* 87A198 802405B8 3C06800F */ lui $a2, %hi(wDisabledPartnerHudScripts) +/* 87A19C 802405BC 24C67F40 */ addiu $a2, $a2, %lo(wDisabledPartnerHudScripts) /* 87A1A0 802405C0 00461021 */ addu $v0, $v0, $a2 /* 87A1A4 802405C4 8C420000 */ lw $v0, ($v0) /* 87A1A8 802405C8 AE20018C */ sw $zero, 0x18c($s1) @@ -130,9 +130,9 @@ glabel func_802404AC_87A08C /* 87A260 80240680 02621021 */ addu $v0, $s3, $v0 /* 87A264 80240684 8C420108 */ lw $v0, 0x108($v0) /* 87A268 80240688 00021100 */ sll $v0, $v0, 4 -/* 87A26C 8024068C 3C038009 */ lui $v1, %hi(D_8008EF20) +/* 87A26C 8024068C 3C038009 */ lui $v1, %hi(gPartnerPopupProperties) /* 87A270 80240690 00621821 */ addu $v1, $v1, $v0 -/* 87A274 80240694 8C63EF20 */ lw $v1, %lo(D_8008EF20)($v1) +/* 87A274 80240694 8C63EF20 */ lw $v1, %lo(gPartnerPopupProperties)($v1) /* 87A278 80240698 8EA20074 */ lw $v0, 0x74($s5) /* 87A27C 8024069C 2442FFFF */ addiu $v0, $v0, -1 /* 87A280 802406A0 00021080 */ sll $v0, $v0, 2 diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_8024084C_886C0C.s b/ver/us/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_8024084C_886C0C.s index 76cc1f9608..af157c2470 100644 --- a/ver/us/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_8024084C_886C0C.s +++ b/ver/us/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_8024084C_886C0C.s @@ -42,8 +42,8 @@ glabel func_8024084C_886C0C /* 886C9C 802408DC 5040002E */ beql $v0, $zero, .L80240998 /* 886CA0 802408E0 26520001 */ addiu $s2, $s2, 1 /* 886CA4 802408E4 00101100 */ sll $v0, $s0, 4 -/* 886CA8 802408E8 3C068009 */ lui $a2, %hi(D_8008EF20) -/* 886CAC 802408EC 24C6EF20 */ addiu $a2, $a2, %lo(D_8008EF20) +/* 886CA8 802408E8 3C068009 */ lui $a2, %hi(gPartnerPopupProperties) +/* 886CAC 802408EC 24C6EF20 */ addiu $a2, $a2, %lo(gPartnerPopupProperties) /* 886CB0 802408F0 00461021 */ addu $v0, $v0, $a2 /* 886CB4 802408F4 0200202D */ daddu $a0, $s0, $zero /* 886CB8 802408F8 AE300108 */ sw $s0, 0x108($s1) @@ -54,8 +54,8 @@ glabel func_8024084C_886C0C /* 886CCC 8024090C 0040202D */ daddu $a0, $v0, $zero /* 886CD0 80240910 04800011 */ bltz $a0, .L80240958 /* 886CD4 80240914 00101080 */ sll $v0, $s0, 2 -/* 886CD8 80240918 3C06800F */ lui $a2, %hi(D_800F7F00) -/* 886CDC 8024091C 24C67F00 */ addiu $a2, $a2, %lo(D_800F7F00) +/* 886CD8 80240918 3C06800F */ lui $a2, %hi(wPartnerHudScripts) +/* 886CDC 8024091C 24C67F00 */ addiu $a2, $a2, %lo(wPartnerHudScripts) /* 886CE0 80240920 00461021 */ addu $v0, $v0, $a2 /* 886CE4 80240924 8C430000 */ lw $v1, ($v0) /* 886CE8 80240928 24020001 */ addiu $v0, $zero, 1 @@ -71,8 +71,8 @@ glabel func_8024084C_886C0C /* 886D10 80240950 0809025F */ j .L8024097C /* 886D14 80240954 AE220294 */ sw $v0, 0x294($s1) .L80240958: -/* 886D18 80240958 3C06800F */ lui $a2, %hi(D_800F7F40) -/* 886D1C 8024095C 24C67F40 */ addiu $a2, $a2, %lo(D_800F7F40) +/* 886D18 80240958 3C06800F */ lui $a2, %hi(wDisabledPartnerHudScripts) +/* 886D1C 8024095C 24C67F40 */ addiu $a2, $a2, %lo(wDisabledPartnerHudScripts) /* 886D20 80240960 00461021 */ addu $v0, $v0, $a2 /* 886D24 80240964 8C420000 */ lw $v0, ($v0) /* 886D28 80240968 AE20018C */ sw $zero, 0x18c($s1) @@ -130,9 +130,9 @@ glabel func_8024084C_886C0C /* 886DE0 80240A20 02621021 */ addu $v0, $s3, $v0 /* 886DE4 80240A24 8C420108 */ lw $v0, 0x108($v0) /* 886DE8 80240A28 00021100 */ sll $v0, $v0, 4 -/* 886DEC 80240A2C 3C038009 */ lui $v1, %hi(D_8008EF20) +/* 886DEC 80240A2C 3C038009 */ lui $v1, %hi(gPartnerPopupProperties) /* 886DF0 80240A30 00621821 */ addu $v1, $v1, $v0 -/* 886DF4 80240A34 8C63EF20 */ lw $v1, %lo(D_8008EF20)($v1) +/* 886DF4 80240A34 8C63EF20 */ lw $v1, %lo(gPartnerPopupProperties)($v1) /* 886DF8 80240A38 8EA20074 */ lw $v0, 0x74($s5) /* 886DFC 80240A3C 2442FFFF */ addiu $v0, $v0, -1 /* 886E00 80240A40 00021080 */ sll $v0, $v0, 2 diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80240DE8_8899B8.s b/ver/us/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80240DE8_8899B8.s index 8c0bf04834..a211652165 100644 --- a/ver/us/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80240DE8_8899B8.s +++ b/ver/us/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80240DE8_8899B8.s @@ -42,8 +42,8 @@ glabel func_80240DE8_8899B8 /* 889A48 80240E78 5040002E */ beql $v0, $zero, .L80240F34 /* 889A4C 80240E7C 26520001 */ addiu $s2, $s2, 1 /* 889A50 80240E80 00101100 */ sll $v0, $s0, 4 -/* 889A54 80240E84 3C068009 */ lui $a2, %hi(D_8008EF20) -/* 889A58 80240E88 24C6EF20 */ addiu $a2, $a2, %lo(D_8008EF20) +/* 889A54 80240E84 3C068009 */ lui $a2, %hi(gPartnerPopupProperties) +/* 889A58 80240E88 24C6EF20 */ addiu $a2, $a2, %lo(gPartnerPopupProperties) /* 889A5C 80240E8C 00461021 */ addu $v0, $v0, $a2 /* 889A60 80240E90 0200202D */ daddu $a0, $s0, $zero /* 889A64 80240E94 AE300108 */ sw $s0, 0x108($s1) @@ -54,8 +54,8 @@ glabel func_80240DE8_8899B8 /* 889A78 80240EA8 0040202D */ daddu $a0, $v0, $zero /* 889A7C 80240EAC 04800011 */ bltz $a0, .L80240EF4 /* 889A80 80240EB0 00101080 */ sll $v0, $s0, 2 -/* 889A84 80240EB4 3C06800F */ lui $a2, %hi(D_800F7F00) -/* 889A88 80240EB8 24C67F00 */ addiu $a2, $a2, %lo(D_800F7F00) +/* 889A84 80240EB4 3C06800F */ lui $a2, %hi(wPartnerHudScripts) +/* 889A88 80240EB8 24C67F00 */ addiu $a2, $a2, %lo(wPartnerHudScripts) /* 889A8C 80240EBC 00461021 */ addu $v0, $v0, $a2 /* 889A90 80240EC0 8C430000 */ lw $v1, ($v0) /* 889A94 80240EC4 24020001 */ addiu $v0, $zero, 1 @@ -71,8 +71,8 @@ glabel func_80240DE8_8899B8 /* 889ABC 80240EEC 080903C6 */ j .L80240F18 /* 889AC0 80240EF0 AE220294 */ sw $v0, 0x294($s1) .L80240EF4: -/* 889AC4 80240EF4 3C06800F */ lui $a2, %hi(D_800F7F40) -/* 889AC8 80240EF8 24C67F40 */ addiu $a2, $a2, %lo(D_800F7F40) +/* 889AC4 80240EF4 3C06800F */ lui $a2, %hi(wDisabledPartnerHudScripts) +/* 889AC8 80240EF8 24C67F40 */ addiu $a2, $a2, %lo(wDisabledPartnerHudScripts) /* 889ACC 80240EFC 00461021 */ addu $v0, $v0, $a2 /* 889AD0 80240F00 8C420000 */ lw $v0, ($v0) /* 889AD4 80240F04 AE20018C */ sw $zero, 0x18c($s1) @@ -130,9 +130,9 @@ glabel func_80240DE8_8899B8 /* 889B8C 80240FBC 02621021 */ addu $v0, $s3, $v0 /* 889B90 80240FC0 8C420108 */ lw $v0, 0x108($v0) /* 889B94 80240FC4 00021100 */ sll $v0, $v0, 4 -/* 889B98 80240FC8 3C038009 */ lui $v1, %hi(D_8008EF20) +/* 889B98 80240FC8 3C038009 */ lui $v1, %hi(gPartnerPopupProperties) /* 889B9C 80240FCC 00621821 */ addu $v1, $v1, $v0 -/* 889BA0 80240FD0 8C63EF20 */ lw $v1, %lo(D_8008EF20)($v1) +/* 889BA0 80240FD0 8C63EF20 */ lw $v1, %lo(gPartnerPopupProperties)($v1) /* 889BA4 80240FD4 8EA20074 */ lw $v0, 0x74($s5) /* 889BA8 80240FD8 2442FFFF */ addiu $v0, $v0, -1 /* 889BAC 80240FDC 00021080 */ sll $v0, $v0, 2 diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_17/892A50/func_802401FC_892C1C.s b/ver/us/asm/nonmatchings/world/area_tik/tik_17/892A50/func_802401FC_892C1C.s index 3823426426..282725a5ce 100644 --- a/ver/us/asm/nonmatchings/world/area_tik/tik_17/892A50/func_802401FC_892C1C.s +++ b/ver/us/asm/nonmatchings/world/area_tik/tik_17/892A50/func_802401FC_892C1C.s @@ -42,8 +42,8 @@ glabel func_802401FC_892C1C /* 892CAC 8024028C 5040002E */ beql $v0, $zero, .L80240348 /* 892CB0 80240290 26520001 */ addiu $s2, $s2, 1 /* 892CB4 80240294 00101100 */ sll $v0, $s0, 4 -/* 892CB8 80240298 3C068009 */ lui $a2, %hi(D_8008EF20) -/* 892CBC 8024029C 24C6EF20 */ addiu $a2, $a2, %lo(D_8008EF20) +/* 892CB8 80240298 3C068009 */ lui $a2, %hi(gPartnerPopupProperties) +/* 892CBC 8024029C 24C6EF20 */ addiu $a2, $a2, %lo(gPartnerPopupProperties) /* 892CC0 802402A0 00461021 */ addu $v0, $v0, $a2 /* 892CC4 802402A4 0200202D */ daddu $a0, $s0, $zero /* 892CC8 802402A8 AE300108 */ sw $s0, 0x108($s1) @@ -54,8 +54,8 @@ glabel func_802401FC_892C1C /* 892CDC 802402BC 0040202D */ daddu $a0, $v0, $zero /* 892CE0 802402C0 04800011 */ bltz $a0, .L80240308 /* 892CE4 802402C4 00101080 */ sll $v0, $s0, 2 -/* 892CE8 802402C8 3C06800F */ lui $a2, %hi(D_800F7F00) -/* 892CEC 802402CC 24C67F00 */ addiu $a2, $a2, %lo(D_800F7F00) +/* 892CE8 802402C8 3C06800F */ lui $a2, %hi(wPartnerHudScripts) +/* 892CEC 802402CC 24C67F00 */ addiu $a2, $a2, %lo(wPartnerHudScripts) /* 892CF0 802402D0 00461021 */ addu $v0, $v0, $a2 /* 892CF4 802402D4 8C430000 */ lw $v1, ($v0) /* 892CF8 802402D8 24020001 */ addiu $v0, $zero, 1 @@ -71,8 +71,8 @@ glabel func_802401FC_892C1C /* 892D20 80240300 080900CB */ j .L8024032C /* 892D24 80240304 AE220294 */ sw $v0, 0x294($s1) .L80240308: -/* 892D28 80240308 3C06800F */ lui $a2, %hi(D_800F7F40) -/* 892D2C 8024030C 24C67F40 */ addiu $a2, $a2, %lo(D_800F7F40) +/* 892D28 80240308 3C06800F */ lui $a2, %hi(wDisabledPartnerHudScripts) +/* 892D2C 8024030C 24C67F40 */ addiu $a2, $a2, %lo(wDisabledPartnerHudScripts) /* 892D30 80240310 00461021 */ addu $v0, $v0, $a2 /* 892D34 80240314 8C420000 */ lw $v0, ($v0) /* 892D38 80240318 AE20018C */ sw $zero, 0x18c($s1) @@ -130,9 +130,9 @@ glabel func_802401FC_892C1C /* 892DF0 802403D0 02621021 */ addu $v0, $s3, $v0 /* 892DF4 802403D4 8C420108 */ lw $v0, 0x108($v0) /* 892DF8 802403D8 00021100 */ sll $v0, $v0, 4 -/* 892DFC 802403DC 3C038009 */ lui $v1, %hi(D_8008EF20) +/* 892DFC 802403DC 3C038009 */ lui $v1, %hi(gPartnerPopupProperties) /* 892E00 802403E0 00621821 */ addu $v1, $v1, $v0 -/* 892E04 802403E4 8C63EF20 */ lw $v1, %lo(D_8008EF20)($v1) +/* 892E04 802403E4 8C63EF20 */ lw $v1, %lo(gPartnerPopupProperties)($v1) /* 892E08 802403E8 8EA20074 */ lw $v0, 0x74($s5) /* 892E0C 802403EC 2442FFFF */ addiu $v0, $v0, -1 /* 892E10 802403F0 00021080 */ sll $v0, $v0, 2 diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_802407BC_897D9C.s b/ver/us/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_802407BC_897D9C.s index cae047840f..d97a273068 100644 --- a/ver/us/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_802407BC_897D9C.s +++ b/ver/us/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_802407BC_897D9C.s @@ -42,8 +42,8 @@ glabel func_802407BC_897D9C /* 897E2C 8024084C 5040002E */ beql $v0, $zero, .L80240908 /* 897E30 80240850 26520001 */ addiu $s2, $s2, 1 /* 897E34 80240854 00101100 */ sll $v0, $s0, 4 -/* 897E38 80240858 3C068009 */ lui $a2, %hi(D_8008EF20) -/* 897E3C 8024085C 24C6EF20 */ addiu $a2, $a2, %lo(D_8008EF20) +/* 897E38 80240858 3C068009 */ lui $a2, %hi(gPartnerPopupProperties) +/* 897E3C 8024085C 24C6EF20 */ addiu $a2, $a2, %lo(gPartnerPopupProperties) /* 897E40 80240860 00461021 */ addu $v0, $v0, $a2 /* 897E44 80240864 0200202D */ daddu $a0, $s0, $zero /* 897E48 80240868 AE300108 */ sw $s0, 0x108($s1) @@ -54,8 +54,8 @@ glabel func_802407BC_897D9C /* 897E5C 8024087C 0040202D */ daddu $a0, $v0, $zero /* 897E60 80240880 04800011 */ bltz $a0, .L802408C8 /* 897E64 80240884 00101080 */ sll $v0, $s0, 2 -/* 897E68 80240888 3C06800F */ lui $a2, %hi(D_800F7F00) -/* 897E6C 8024088C 24C67F00 */ addiu $a2, $a2, %lo(D_800F7F00) +/* 897E68 80240888 3C06800F */ lui $a2, %hi(wPartnerHudScripts) +/* 897E6C 8024088C 24C67F00 */ addiu $a2, $a2, %lo(wPartnerHudScripts) /* 897E70 80240890 00461021 */ addu $v0, $v0, $a2 /* 897E74 80240894 8C430000 */ lw $v1, ($v0) /* 897E78 80240898 24020001 */ addiu $v0, $zero, 1 @@ -71,8 +71,8 @@ glabel func_802407BC_897D9C /* 897EA0 802408C0 0809023B */ j .L802408EC /* 897EA4 802408C4 AE220294 */ sw $v0, 0x294($s1) .L802408C8: -/* 897EA8 802408C8 3C06800F */ lui $a2, %hi(D_800F7F40) -/* 897EAC 802408CC 24C67F40 */ addiu $a2, $a2, %lo(D_800F7F40) +/* 897EA8 802408C8 3C06800F */ lui $a2, %hi(wDisabledPartnerHudScripts) +/* 897EAC 802408CC 24C67F40 */ addiu $a2, $a2, %lo(wDisabledPartnerHudScripts) /* 897EB0 802408D0 00461021 */ addu $v0, $v0, $a2 /* 897EB4 802408D4 8C420000 */ lw $v0, ($v0) /* 897EB8 802408D8 AE20018C */ sw $zero, 0x18c($s1) @@ -130,9 +130,9 @@ glabel func_802407BC_897D9C /* 897F70 80240990 02621021 */ addu $v0, $s3, $v0 /* 897F74 80240994 8C420108 */ lw $v0, 0x108($v0) /* 897F78 80240998 00021100 */ sll $v0, $v0, 4 -/* 897F7C 8024099C 3C038009 */ lui $v1, %hi(D_8008EF20) +/* 897F7C 8024099C 3C038009 */ lui $v1, %hi(gPartnerPopupProperties) /* 897F80 802409A0 00621821 */ addu $v1, $v1, $v0 -/* 897F84 802409A4 8C63EF20 */ lw $v1, %lo(D_8008EF20)($v1) +/* 897F84 802409A4 8C63EF20 */ lw $v1, %lo(gPartnerPopupProperties)($v1) /* 897F88 802409A8 8EA20074 */ lw $v0, 0x74($s5) /* 897F8C 802409AC 2442FFFF */ addiu $v0, $v0, -1 /* 897F90 802409B0 00021080 */ sll $v0, $v0, 2 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 077ad678e5..4e58206db0 100644 --- a/ver/us/asm/nonmatchings/world/partners/_use_partner_ability.s +++ b/ver/us/asm/nonmatchings/world/partners/_use_partner_ability.s @@ -134,8 +134,8 @@ glabel _use_partner_ability /* 83D44 800EA894 00000000 */ nop /* 83D48 800EA898 0C05272D */ jal sfx_play_sound /* 83D4C 800EA89C 2404000D */ addiu $a0, $zero, 0xd -/* 83D50 800EA8A0 3C108011 */ lui $s0, %hi(D_8010CFDC) -/* 83D54 800EA8A4 2610CFDC */ addiu $s0, $s0, %lo(D_8010CFDC) +/* 83D50 800EA8A0 3C108011 */ lui $s0, %hi(wPartnerCurrentScriptID) +/* 83D54 800EA8A4 2610CFDC */ addiu $s0, $s0, %lo(wPartnerCurrentScriptID) /* 83D58 800EA8A8 0C0B102B */ jal kill_script_by_ID /* 83D5C 800EA8AC 8E040000 */ lw $a0, ($s0) /* 83D60 800EA8B0 3C028011 */ lui $v0, %hi(wPartner) @@ -145,8 +145,8 @@ glabel _use_partner_ability /* 83D70 800EA8C0 0C0B0CF8 */ jal start_script /* 83D74 800EA8C4 24060020 */ addiu $a2, $zero, 0x20 /* 83D78 800EA8C8 8C430144 */ lw $v1, 0x144($v0) -/* 83D7C 800EA8CC 3C018011 */ lui $at, %hi(D_8010CFD4) -/* 83D80 800EA8D0 AC22CFD4 */ sw $v0, %lo(D_8010CFD4)($at) +/* 83D7C 800EA8CC 3C018011 */ lui $at, %hi(wPartnerCurrentScript) +/* 83D80 800EA8D0 AC22CFD4 */ sw $v0, %lo(wPartnerCurrentScript)($at) /* 83D84 800EA8D4 AE030000 */ sw $v1, ($s0) /* 83D88 800EA8D8 3C058011 */ lui $a1, %hi(wPartnerNpc) /* 83D8C 800EA8DC 8CA5C930 */ lw $a1, %lo(wPartnerNpc)($a1) @@ -161,8 +161,8 @@ glabel _use_partner_ability /* 83DB0 800EA900 0803AC53 */ j .L800EB14C_845FC /* 83DB4 800EA904 00000000 */ nop .L800EA908: -/* 83DB8 800EA908 3C048011 */ lui $a0, %hi(D_8010CFDC) -/* 83DBC 800EA90C 8C84CFDC */ lw $a0, %lo(D_8010CFDC)($a0) +/* 83DB8 800EA908 3C048011 */ lui $a0, %hi(wPartnerCurrentScriptID) +/* 83DBC 800EA90C 8C84CFDC */ lw $a0, %lo(wPartnerCurrentScriptID)($a0) /* 83DC0 800EA910 0C0B1059 */ jal does_script_exist /* 83DC4 800EA914 00000000 */ nop /* 83DC8 800EA918 1440020C */ bnez $v0, .L800EB14C_845FC @@ -201,10 +201,10 @@ glabel _use_partner_ability /* 83E48 800EA998 8CC6C930 */ lw $a2, %lo(wPartnerNpc)($a2) /* 83E4C 800EA99C 3C058011 */ lui $a1, %hi(D_8010CD34) /* 83E50 800EA9A0 24A5CD34 */ addiu $a1, $a1, %lo(D_8010CD34) -/* 83E54 800EA9A4 3C018011 */ lui $at, %hi(D_8010CFD4) -/* 83E58 800EA9A8 AC22CFD4 */ sw $v0, %lo(D_8010CFD4)($at) -/* 83E5C 800EA9AC 3C018011 */ lui $at, %hi(D_8010CFDC) -/* 83E60 800EA9B0 AC23CFDC */ sw $v1, %lo(D_8010CFDC)($at) +/* 83E54 800EA9A4 3C018011 */ lui $at, %hi(wPartnerCurrentScript) +/* 83E58 800EA9A8 AC22CFD4 */ sw $v0, %lo(wPartnerCurrentScript)($at) +/* 83E5C 800EA9AC 3C018011 */ lui $at, %hi(wPartnerCurrentScriptID) +/* 83E60 800EA9B0 AC23CFDC */ sw $v1, %lo(wPartnerCurrentScriptID)($at) /* 83E64 800EA9B4 2403000A */ addiu $v1, $zero, 0xa /* 83E68 800EA9B8 A0430004 */ sb $v1, 4($v0) /* 83E6C 800EA9BC 8CA30000 */ lw $v1, ($a1) @@ -216,8 +216,8 @@ glabel _use_partner_ability /* 83E84 800EA9D4 0803AC53 */ j .L800EB14C_845FC /* 83E88 800EA9D8 00000000 */ nop .L800EA9DC: -/* 83E8C 800EA9DC 3C108011 */ lui $s0, %hi(D_8010CFDC) -/* 83E90 800EA9E0 2610CFDC */ addiu $s0, $s0, %lo(D_8010CFDC) +/* 83E8C 800EA9DC 3C108011 */ lui $s0, %hi(wPartnerCurrentScriptID) +/* 83E90 800EA9E0 2610CFDC */ addiu $s0, $s0, %lo(wPartnerCurrentScriptID) /* 83E94 800EA9E4 0C0B1059 */ jal does_script_exist /* 83E98 800EA9E8 8E040000 */ lw $a0, ($s0) /* 83E9C 800EA9EC 144001D7 */ bnez $v0, .L800EB14C_845FC @@ -230,8 +230,8 @@ glabel _use_partner_ability /* 83EB8 800EAA08 3C038011 */ lui $v1, %hi(wPartnerNpc) /* 83EBC 800EAA0C 8C63C930 */ lw $v1, %lo(wPartnerNpc)($v1) /* 83EC0 800EAA10 8C440144 */ lw $a0, 0x144($v0) -/* 83EC4 800EAA14 3C018011 */ lui $at, %hi(D_8010CFD4) -/* 83EC8 800EAA18 AC22CFD4 */ sw $v0, %lo(D_8010CFD4)($at) +/* 83EC4 800EAA14 3C018011 */ lui $at, %hi(wPartnerCurrentScript) +/* 83EC8 800EAA18 AC22CFD4 */ sw $v0, %lo(wPartnerCurrentScript)($at) /* 83ECC 800EAA1C AC43014C */ sw $v1, 0x14c($v0) /* 83ED0 800EAA20 2403000A */ addiu $v1, $zero, 0xa /* 83ED4 800EAA24 AE040000 */ sw $a0, ($s0) @@ -267,8 +267,8 @@ glabel _use_partner_ability /* 83F44 800EAA94 0803AC53 */ j .L800EB14C_845FC /* 83F48 800EAA98 00000000 */ nop .L800EAA9C: -/* 83F4C 800EAA9C 3C048011 */ lui $a0, %hi(D_8010CFDC) -/* 83F50 800EAAA0 8C84CFDC */ lw $a0, %lo(D_8010CFDC)($a0) +/* 83F4C 800EAA9C 3C048011 */ lui $a0, %hi(wPartnerCurrentScriptID) +/* 83F50 800EAAA0 8C84CFDC */ lw $a0, %lo(wPartnerCurrentScriptID)($a0) /* 83F54 800EAAA4 0C0B102B */ jal kill_script_by_ID /* 83F58 800EAAA8 00000000 */ nop /* 83F5C 800EAAAC 8E020000 */ lw $v0, ($s0) @@ -285,12 +285,12 @@ glabel _use_partner_ability /* 83F84 800EAAD4 A2620012 */ sb $v0, 0x12($s3) /* 83F88 800EAAD8 3C048011 */ lui $a0, %hi(wPartnerNpc) /* 83F8C 800EAADC 8C84C930 */ lw $a0, %lo(wPartnerNpc)($a0) -/* 83F90 800EAAE0 3C018010 */ lui $at, %hi(D_800F833C) -/* 83F94 800EAAE4 C422833C */ lwc1 $f2, %lo(D_800F833C)($at) -/* 83F98 800EAAE8 3C018010 */ lui $at, %hi(D_800F8340) -/* 83F9C 800EAAEC C4248340 */ lwc1 $f4, %lo(D_800F8340)($at) -/* 83FA0 800EAAF0 3C018010 */ lui $at, %hi(D_800F8344) -/* 83FA4 800EAAF4 C4268344 */ lwc1 $f6, %lo(D_800F8344)($at) +/* 83F90 800EAAE0 3C018010 */ lui $at, %hi(SavedPartnerPosX) +/* 83F94 800EAAE4 C422833C */ lwc1 $f2, %lo(SavedPartnerPosX)($at) +/* 83F98 800EAAE8 3C018010 */ lui $at, %hi(SavedPartnerPosY) +/* 83F9C 800EAAEC C4248340 */ lwc1 $f4, %lo(SavedPartnerPosY)($at) +/* 83FA0 800EAAF0 3C018010 */ lui $at, %hi(SavedPartnerPosZ) +/* 83FA4 800EAAF4 C4268344 */ lwc1 $f6, %lo(SavedPartnerPosZ)($at) /* 83FA8 800EAAF8 3C013F80 */ lui $at, 0x3f80 /* 83FAC 800EAAFC 44810000 */ mtc1 $at, $f0 /* 83FB0 800EAB00 3C028011 */ lui $v0, %hi(wPartner) @@ -320,12 +320,12 @@ glabel _use_partner_ability /* 8400C 800EAB5C 3C038011 */ lui $v1, %hi(wPartnerNpc) /* 84010 800EAB60 8C63C930 */ lw $v1, %lo(wPartnerNpc)($v1) /* 84014 800EAB64 8C440144 */ lw $a0, 0x144($v0) -/* 84018 800EAB68 3C018011 */ lui $at, %hi(D_8010CFD4) -/* 8401C 800EAB6C AC22CFD4 */ sw $v0, %lo(D_8010CFD4)($at) +/* 84018 800EAB68 3C018011 */ lui $at, %hi(wPartnerCurrentScript) +/* 8401C 800EAB6C AC22CFD4 */ sw $v0, %lo(wPartnerCurrentScript)($at) /* 84020 800EAB70 AC43014C */ sw $v1, 0x14c($v0) /* 84024 800EAB74 2403000A */ addiu $v1, $zero, 0xa -/* 84028 800EAB78 3C018011 */ lui $at, %hi(D_8010CFDC) -/* 8402C 800EAB7C AC24CFDC */ sw $a0, %lo(D_8010CFDC)($at) +/* 84028 800EAB78 3C018011 */ lui $at, %hi(wPartnerCurrentScriptID) +/* 8402C 800EAB7C AC24CFDC */ sw $a0, %lo(wPartnerCurrentScriptID)($at) /* 84030 800EAB80 A0430004 */ sb $v1, 4($v0) /* 84034 800EAB84 3C018011 */ lui $at, %hi(D_8010CD30) /* 84038 800EAB88 0803AC53 */ j .L800EB14C_845FC @@ -345,8 +345,8 @@ glabel _use_partner_ability /* 84068 800EABB8 00000000 */ nop /* 8406C 800EABBC 0C05272D */ jal sfx_play_sound /* 84070 800EABC0 2404000D */ addiu $a0, $zero, 0xd -/* 84074 800EABC4 3C108011 */ lui $s0, %hi(D_8010CFDC) -/* 84078 800EABC8 2610CFDC */ addiu $s0, $s0, %lo(D_8010CFDC) +/* 84074 800EABC4 3C108011 */ lui $s0, %hi(wPartnerCurrentScriptID) +/* 84078 800EABC8 2610CFDC */ addiu $s0, $s0, %lo(wPartnerCurrentScriptID) /* 8407C 800EABCC 0C0B102B */ jal kill_script_by_ID /* 84080 800EABD0 8E040000 */ lw $a0, ($s0) /* 84084 800EABD4 3C028011 */ lui $v0, %hi(wPartner) @@ -355,8 +355,8 @@ glabel _use_partner_ability /* 84090 800EABE0 0803ABCE */ j .L800EAF38 /* 84094 800EABE4 24050014 */ addiu $a1, $zero, 0x14 .L800EABE8: -/* 84098 800EABE8 3C048011 */ lui $a0, %hi(D_8010CFDC) -/* 8409C 800EABEC 8C84CFDC */ lw $a0, %lo(D_8010CFDC)($a0) +/* 84098 800EABE8 3C048011 */ lui $a0, %hi(wPartnerCurrentScriptID) +/* 8409C 800EABEC 8C84CFDC */ lw $a0, %lo(wPartnerCurrentScriptID)($a0) /* 840A0 800EABF0 0C0B1059 */ jal does_script_exist /* 840A4 800EABF4 00000000 */ nop /* 840A8 800EABF8 14400154 */ bnez $v0, .L800EB14C_845FC @@ -378,8 +378,8 @@ glabel _use_partner_ability /* 840E4 800EAC34 8C42CD34 */ lw $v0, %lo(D_8010CD34)($v0) /* 840E8 800EAC38 14400144 */ bnez $v0, .L800EB14C_845FC /* 840EC 800EAC3C 00000000 */ nop -/* 840F0 800EAC40 3C048011 */ lui $a0, %hi(D_8010CFDC) -/* 840F4 800EAC44 8C84CFDC */ lw $a0, %lo(D_8010CFDC)($a0) +/* 840F0 800EAC40 3C048011 */ lui $a0, %hi(wPartnerCurrentScriptID) +/* 840F4 800EAC44 8C84CFDC */ lw $a0, %lo(wPartnerCurrentScriptID)($a0) /* 840F8 800EAC48 0C0B102B */ jal kill_script_by_ID /* 840FC 800EAC4C 00000000 */ nop /* 84100 800EAC50 0C03A9AA */ jal partner_free_npc @@ -442,10 +442,10 @@ glabel _use_partner_ability /* 841D4 800EAD24 8CA5C930 */ lw $a1, %lo(wPartnerNpc)($a1) /* 841D8 800EAD28 3C048011 */ lui $a0, %hi(D_8010CD34) /* 841DC 800EAD2C 2484CD34 */ addiu $a0, $a0, %lo(D_8010CD34) -/* 841E0 800EAD30 3C018011 */ lui $at, %hi(D_8010CFD4) -/* 841E4 800EAD34 AC22CFD4 */ sw $v0, %lo(D_8010CFD4)($at) -/* 841E8 800EAD38 3C018011 */ lui $at, %hi(D_8010CFDC) -/* 841EC 800EAD3C AC23CFDC */ sw $v1, %lo(D_8010CFDC)($at) +/* 841E0 800EAD30 3C018011 */ lui $at, %hi(wPartnerCurrentScript) +/* 841E4 800EAD34 AC22CFD4 */ sw $v0, %lo(wPartnerCurrentScript)($at) +/* 841E8 800EAD38 3C018011 */ lui $at, %hi(wPartnerCurrentScriptID) +/* 841EC 800EAD3C AC23CFDC */ sw $v1, %lo(wPartnerCurrentScriptID)($at) /* 841F0 800EAD40 2403000A */ addiu $v1, $zero, 0xa /* 841F4 800EAD44 A0430004 */ sb $v1, 4($v0) /* 841F8 800EAD48 8C830000 */ lw $v1, ($a0) @@ -454,8 +454,8 @@ glabel _use_partner_ability /* 84204 800EAD54 0803AC53 */ j .L800EB14C_845FC /* 84208 800EAD58 AC830000 */ sw $v1, ($a0) .L800EAD5C: -/* 8420C 800EAD5C 3C108011 */ lui $s0, %hi(D_8010CFDC) -/* 84210 800EAD60 2610CFDC */ addiu $s0, $s0, %lo(D_8010CFDC) +/* 8420C 800EAD5C 3C108011 */ lui $s0, %hi(wPartnerCurrentScriptID) +/* 84210 800EAD60 2610CFDC */ addiu $s0, $s0, %lo(wPartnerCurrentScriptID) /* 84214 800EAD64 0C0B1059 */ jal does_script_exist /* 84218 800EAD68 8E040000 */ lw $a0, ($s0) /* 8421C 800EAD6C 144000F7 */ bnez $v0, .L800EB14C_845FC @@ -468,8 +468,8 @@ glabel _use_partner_ability /* 84238 800EAD88 3C038011 */ lui $v1, %hi(wPartnerNpc) /* 8423C 800EAD8C 8C63C930 */ lw $v1, %lo(wPartnerNpc)($v1) /* 84240 800EAD90 8C440144 */ lw $a0, 0x144($v0) -/* 84244 800EAD94 3C018011 */ lui $at, %hi(D_8010CFD4) -/* 84248 800EAD98 AC22CFD4 */ sw $v0, %lo(D_8010CFD4)($at) +/* 84244 800EAD94 3C018011 */ lui $at, %hi(wPartnerCurrentScript) +/* 84248 800EAD98 AC22CFD4 */ sw $v0, %lo(wPartnerCurrentScript)($at) /* 8424C 800EAD9C AC43014C */ sw $v1, 0x14c($v0) /* 84250 800EADA0 2403000A */ addiu $v1, $zero, 0xa /* 84254 800EADA4 AE040000 */ sw $a0, ($s0) @@ -503,12 +503,12 @@ glabel _use_partner_ability /* 842BC 800EAE0C A2620012 */ sb $v0, 0x12($s3) /* 842C0 800EAE10 3C048011 */ lui $a0, %hi(wPartnerNpc) /* 842C4 800EAE14 8C84C930 */ lw $a0, %lo(wPartnerNpc)($a0) -/* 842C8 800EAE18 3C018010 */ lui $at, %hi(D_800F833C) -/* 842CC 800EAE1C C422833C */ lwc1 $f2, %lo(D_800F833C)($at) -/* 842D0 800EAE20 3C018010 */ lui $at, %hi(D_800F8340) -/* 842D4 800EAE24 C4248340 */ lwc1 $f4, %lo(D_800F8340)($at) -/* 842D8 800EAE28 3C018010 */ lui $at, %hi(D_800F8344) -/* 842DC 800EAE2C C4268344 */ lwc1 $f6, %lo(D_800F8344)($at) +/* 842C8 800EAE18 3C018010 */ lui $at, %hi(SavedPartnerPosX) +/* 842CC 800EAE1C C422833C */ lwc1 $f2, %lo(SavedPartnerPosX)($at) +/* 842D0 800EAE20 3C018010 */ lui $at, %hi(SavedPartnerPosY) +/* 842D4 800EAE24 C4248340 */ lwc1 $f4, %lo(SavedPartnerPosY)($at) +/* 842D8 800EAE28 3C018010 */ lui $at, %hi(SavedPartnerPosZ) +/* 842DC 800EAE2C C4268344 */ lwc1 $f6, %lo(SavedPartnerPosZ)($at) /* 842E0 800EAE30 3C013F80 */ lui $at, 0x3f80 /* 842E4 800EAE34 44810000 */ mtc1 $at, $f0 /* 842E8 800EAE38 3C028011 */ lui $v0, %hi(wPartner) @@ -536,10 +536,10 @@ glabel _use_partner_ability /* 8433C 800EAE8C 8C430144 */ lw $v1, 0x144($v0) /* 84340 800EAE90 3C058011 */ lui $a1, %hi(wPartnerNpc) /* 84344 800EAE94 24A5C930 */ addiu $a1, $a1, %lo(wPartnerNpc) -/* 84348 800EAE98 3C018011 */ lui $at, %hi(D_8010CFD4) -/* 8434C 800EAE9C AC22CFD4 */ sw $v0, %lo(D_8010CFD4)($at) -/* 84350 800EAEA0 3C018011 */ lui $at, %hi(D_8010CFDC) -/* 84354 800EAEA4 AC23CFDC */ sw $v1, %lo(D_8010CFDC)($at) +/* 84348 800EAE98 3C018011 */ lui $at, %hi(wPartnerCurrentScript) +/* 8434C 800EAE9C AC22CFD4 */ sw $v0, %lo(wPartnerCurrentScript)($at) +/* 84350 800EAEA0 3C018011 */ lui $at, %hi(wPartnerCurrentScriptID) +/* 84354 800EAEA4 AC23CFDC */ sw $v1, %lo(wPartnerCurrentScriptID)($at) /* 84358 800EAEA8 8CA40000 */ lw $a0, ($a1) /* 8435C 800EAEAC 2403000A */ addiu $v1, $zero, 0xa /* 84360 800EAEB0 A0430004 */ sb $v1, 4($v0) @@ -570,8 +570,8 @@ glabel _use_partner_ability /* 843C0 800EAF10 0803AC53 */ j .L800EB14C_845FC /* 843C4 800EAF14 00000000 */ nop .L800EAF18: -/* 843C8 800EAF18 3C108011 */ lui $s0, %hi(D_8010CFDC) -/* 843CC 800EAF1C 2610CFDC */ addiu $s0, $s0, %lo(D_8010CFDC) +/* 843C8 800EAF18 3C108011 */ lui $s0, %hi(wPartnerCurrentScriptID) +/* 843CC 800EAF1C 2610CFDC */ addiu $s0, $s0, %lo(wPartnerCurrentScriptID) /* 843D0 800EAF20 0C0B102B */ jal kill_script_by_ID /* 843D4 800EAF24 8E040000 */ lw $a0, ($s0) /* 843D8 800EAF28 3C028011 */ lui $v0, %hi(wPartner) @@ -582,8 +582,8 @@ glabel _use_partner_ability /* 843E8 800EAF38 0C0B0CF8 */ jal start_script /* 843EC 800EAF3C 24060020 */ addiu $a2, $zero, 0x20 /* 843F0 800EAF40 8C430144 */ lw $v1, 0x144($v0) -/* 843F4 800EAF44 3C018011 */ lui $at, %hi(D_8010CFD4) -/* 843F8 800EAF48 AC22CFD4 */ sw $v0, %lo(D_8010CFD4)($at) +/* 843F4 800EAF44 3C018011 */ lui $at, %hi(wPartnerCurrentScript) +/* 843F8 800EAF48 AC22CFD4 */ sw $v0, %lo(wPartnerCurrentScript)($at) /* 843FC 800EAF4C AE030000 */ sw $v1, ($s0) /* 84400 800EAF50 3C048011 */ lui $a0, %hi(wPartnerNpc) /* 84404 800EAF54 8C84C930 */ lw $a0, %lo(wPartnerNpc)($a0) @@ -595,8 +595,8 @@ glabel _use_partner_ability /* 8441C 800EAF6C 0803AC53 */ j .L800EB14C_845FC /* 84420 800EAF70 AE230000 */ sw $v1, ($s1) .L800EAF74: -/* 84424 800EAF74 3C118011 */ lui $s1, %hi(D_8010CFDC) -/* 84428 800EAF78 2631CFDC */ addiu $s1, $s1, %lo(D_8010CFDC) +/* 84424 800EAF74 3C118011 */ lui $s1, %hi(wPartnerCurrentScriptID) +/* 84428 800EAF78 2631CFDC */ addiu $s1, $s1, %lo(wPartnerCurrentScriptID) /* 8442C 800EAF7C 0C0B1059 */ jal does_script_exist /* 84430 800EAF80 8E240000 */ lw $a0, ($s1) /* 84434 800EAF84 14400071 */ bnez $v0, .L800EB14C_845FC @@ -609,8 +609,8 @@ glabel _use_partner_ability /* 84450 800EAFA0 3C038011 */ lui $v1, %hi(wPartnerNpc) /* 84454 800EAFA4 8C63C930 */ lw $v1, %lo(wPartnerNpc)($v1) /* 84458 800EAFA8 8C440144 */ lw $a0, 0x144($v0) -/* 8445C 800EAFAC 3C018011 */ lui $at, %hi(D_8010CFD4) -/* 84460 800EAFB0 AC22CFD4 */ sw $v0, %lo(D_8010CFD4)($at) +/* 8445C 800EAFAC 3C018011 */ lui $at, %hi(wPartnerCurrentScript) +/* 84460 800EAFB0 AC22CFD4 */ sw $v0, %lo(wPartnerCurrentScript)($at) /* 84464 800EAFB4 AC43014C */ sw $v1, 0x14c($v0) /* 84468 800EAFB8 2403000A */ addiu $v1, $zero, 0xa /* 8446C 800EAFBC AE240000 */ sw $a0, ($s1) @@ -669,23 +669,23 @@ glabel _use_partner_ability /* 84528 800EB078 C4C2002C */ lwc1 $f2, 0x2c($a2) /* 8452C 800EB07C C4C40030 */ lwc1 $f4, 0x30($a2) /* 84530 800EB080 8C440018 */ lw $a0, 0x18($v0) -/* 84534 800EB084 3C018010 */ lui $at, %hi(D_800F833C) -/* 84538 800EB088 E420833C */ swc1 $f0, %lo(D_800F833C)($at) -/* 8453C 800EB08C 3C018010 */ lui $at, %hi(D_800F8340) -/* 84540 800EB090 E4228340 */ swc1 $f2, %lo(D_800F8340)($at) -/* 84544 800EB094 3C018010 */ lui $at, %hi(D_800F8344) -/* 84548 800EB098 E4248344 */ swc1 $f4, %lo(D_800F8344)($at) +/* 84534 800EB084 3C018010 */ lui $at, %hi(SavedPartnerPosX) +/* 84538 800EB088 E420833C */ swc1 $f0, %lo(SavedPartnerPosX)($at) +/* 8453C 800EB08C 3C018010 */ lui $at, %hi(SavedPartnerPosY) +/* 84540 800EB090 E4228340 */ swc1 $f2, %lo(SavedPartnerPosY)($at) +/* 84544 800EB094 3C018010 */ lui $at, %hi(SavedPartnerPosZ) +/* 84548 800EB098 E4248344 */ swc1 $f4, %lo(SavedPartnerPosZ)($at) /* 8454C 800EB09C 0C0B0CF8 */ jal start_script /* 84550 800EB0A0 24060020 */ addiu $a2, $zero, 0x20 /* 84554 800EB0A4 3C038011 */ lui $v1, %hi(wPartnerNpc) /* 84558 800EB0A8 8C63C930 */ lw $v1, %lo(wPartnerNpc)($v1) /* 8455C 800EB0AC 8C440144 */ lw $a0, 0x144($v0) -/* 84560 800EB0B0 3C018011 */ lui $at, %hi(D_8010CFD4) -/* 84564 800EB0B4 AC22CFD4 */ sw $v0, %lo(D_8010CFD4)($at) +/* 84560 800EB0B0 3C018011 */ lui $at, %hi(wPartnerCurrentScript) +/* 84564 800EB0B4 AC22CFD4 */ sw $v0, %lo(wPartnerCurrentScript)($at) /* 84568 800EB0B8 AC43014C */ sw $v1, 0x14c($v0) /* 8456C 800EB0BC 2403000A */ addiu $v1, $zero, 0xa -/* 84570 800EB0C0 3C018011 */ lui $at, %hi(D_8010CFDC) -/* 84574 800EB0C4 AC24CFDC */ sw $a0, %lo(D_8010CFDC)($at) +/* 84570 800EB0C0 3C018011 */ lui $at, %hi(wPartnerCurrentScriptID) +/* 84574 800EB0C4 AC24CFDC */ sw $a0, %lo(wPartnerCurrentScriptID)($at) /* 84578 800EB0C8 A0430004 */ sb $v1, 4($v0) .L800EB0CC: /* 8457C 800EB0CC 0C038069 */ jal enable_player_input @@ -699,8 +699,8 @@ glabel _use_partner_ability /* 84598 800EB0E8 8E020000 */ lw $v0, ($s0) /* 8459C 800EB0EC 14400017 */ bnez $v0, .L800EB14C_845FC /* 845A0 800EB0F0 00000000 */ nop -/* 845A4 800EB0F4 3C118011 */ lui $s1, %hi(D_8010CFDC) -/* 845A8 800EB0F8 2631CFDC */ addiu $s1, $s1, %lo(D_8010CFDC) +/* 845A4 800EB0F4 3C118011 */ lui $s1, %hi(wPartnerCurrentScriptID) +/* 845A8 800EB0F8 2631CFDC */ addiu $s1, $s1, %lo(wPartnerCurrentScriptID) /* 845AC 800EB0FC 0C0B1059 */ jal does_script_exist /* 845B0 800EB100 8E240000 */ lw $a0, ($s1) /* 845B4 800EB104 10400003 */ beqz $v0, .L800EB114 diff --git a/ver/us/asm/nonmatchings/world/partners/partner_clear_player_tracking.s b/ver/us/asm/nonmatchings/world/partners/partner_clear_player_tracking.s index b405411b58..f540b0de9b 100644 --- a/ver/us/asm/nonmatchings/world/partners/partner_clear_player_tracking.s +++ b/ver/us/asm/nonmatchings/world/partners/partner_clear_player_tracking.s @@ -2,17 +2,17 @@ .set noreorder # don't insert nops after branches glabel partner_clear_player_tracking -/* 8890C 800EF45C 3C058011 */ lui $a1, %hi(D_8010CD38) -/* 88910 800EF460 24A5CD38 */ addiu $a1, $a1, %lo(D_8010CD38) +/* 8890C 800EF45C 3C058011 */ lui $a1, %hi(PlayerMoveHistory) +/* 88910 800EF460 24A5CD38 */ addiu $a1, $a1, %lo(PlayerMoveHistory) /* 88914 800EF464 0000302D */ daddu $a2, $zero, $zero -/* 88918 800EF468 3C028010 */ lui $v0, %hi(D_800F833C) -/* 8891C 800EF46C 2442833C */ addiu $v0, $v0, %lo(D_800F833C) +/* 88918 800EF468 3C028010 */ lui $v0, %hi(SavedPartnerPosX) +/* 8891C 800EF46C 2442833C */ addiu $v0, $v0, %lo(SavedPartnerPosX) /* 88920 800EF470 0040482D */ daddu $t1, $v0, $zero -/* 88924 800EF474 3C028010 */ lui $v0, %hi(D_800F8340) -/* 88928 800EF478 24428340 */ addiu $v0, $v0, %lo(D_800F8340) +/* 88924 800EF474 3C028010 */ lui $v0, %hi(SavedPartnerPosY) +/* 88928 800EF478 24428340 */ addiu $v0, $v0, %lo(SavedPartnerPosY) /* 8892C 800EF47C 0040402D */ daddu $t0, $v0, $zero -/* 88930 800EF480 3C028010 */ lui $v0, %hi(D_800F8344) -/* 88934 800EF484 24428344 */ addiu $v0, $v0, %lo(D_800F8344) +/* 88930 800EF480 3C028010 */ lui $v0, %hi(SavedPartnerPosZ) +/* 88934 800EF484 24428344 */ addiu $v0, $v0, %lo(SavedPartnerPosZ) /* 88938 800EF488 0040382D */ daddu $a3, $v0, $zero /* 8893C 800EF48C C4800038 */ lwc1 $f0, 0x38($a0) /* 88940 800EF490 C482003C */ lwc1 $f2, 0x3c($a0) diff --git a/ver/us/asm/nonmatchings/world/partners/partner_flying_enable.s b/ver/us/asm/nonmatchings/world/partners/partner_flying_enable.s index 9e206bf7df..1ff188bd9c 100644 --- a/ver/us/asm/nonmatchings/world/partners/partner_flying_enable.s +++ b/ver/us/asm/nonmatchings/world/partners/partner_flying_enable.s @@ -5,17 +5,17 @@ glabel partner_flying_enable /* 867C0 800ED310 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 867C4 800ED314 AFB00010 */ sw $s0, 0x10($sp) /* 867C8 800ED318 0080802D */ daddu $s0, $a0, $zero -/* 867CC 800ED31C 3C048011 */ lui $a0, %hi(D_8010CD38) -/* 867D0 800ED320 2484CD38 */ addiu $a0, $a0, %lo(D_8010CD38) +/* 867CC 800ED31C 3C048011 */ lui $a0, %hi(PlayerMoveHistory) +/* 867D0 800ED320 2484CD38 */ addiu $a0, $a0, %lo(PlayerMoveHistory) /* 867D4 800ED324 0000302D */ daddu $a2, $zero, $zero -/* 867D8 800ED328 3C028010 */ lui $v0, %hi(D_800F833C) -/* 867DC 800ED32C 2442833C */ addiu $v0, $v0, %lo(D_800F833C) +/* 867D8 800ED328 3C028010 */ lui $v0, %hi(SavedPartnerPosX) +/* 867DC 800ED32C 2442833C */ addiu $v0, $v0, %lo(SavedPartnerPosX) /* 867E0 800ED330 0040482D */ daddu $t1, $v0, $zero -/* 867E4 800ED334 3C028010 */ lui $v0, %hi(D_800F8340) -/* 867E8 800ED338 24428340 */ addiu $v0, $v0, %lo(D_800F8340) +/* 867E4 800ED334 3C028010 */ lui $v0, %hi(SavedPartnerPosY) +/* 867E8 800ED338 24428340 */ addiu $v0, $v0, %lo(SavedPartnerPosY) /* 867EC 800ED33C 0040402D */ daddu $t0, $v0, $zero -/* 867F0 800ED340 3C028010 */ lui $v0, %hi(D_800F8344) -/* 867F4 800ED344 24428344 */ addiu $v0, $v0, %lo(D_800F8344) +/* 867F0 800ED340 3C028010 */ lui $v0, %hi(SavedPartnerPosZ) +/* 867F4 800ED344 24428344 */ addiu $v0, $v0, %lo(SavedPartnerPosZ) /* 867F8 800ED348 0040382D */ daddu $a3, $v0, $zero /* 867FC 800ED34C AFBF0014 */ sw $ra, 0x14($sp) /* 86800 800ED350 C5200000 */ lwc1 $f0, ($t1) @@ -38,8 +38,8 @@ glabel partner_flying_enable /* 86840 800ED390 A0800000 */ sb $zero, ($a0) /* 86844 800ED394 1440FFF5 */ bnez $v0, .L800ED36C /* 86848 800ED398 24840010 */ addiu $a0, $a0, 0x10 -/* 8684C 800ED39C 3C018011 */ lui $at, %hi(D_8010CFB8) -/* 86850 800ED3A0 AC20CFB8 */ sw $zero, %lo(D_8010CFB8)($at) +/* 8684C 800ED39C 3C018011 */ lui $at, %hi(PlayerMoveHistoryIndex) +/* 86850 800ED3A0 AC20CFB8 */ sw $zero, %lo(PlayerMoveHistoryIndex)($at) /* 86854 800ED3A4 3C018011 */ lui $at, %hi(D_8010CFBC) /* 86858 800ED3A8 AC20CFBC */ sw $zero, %lo(D_8010CFBC)($at) /* 8685C 800ED3AC 14A00005 */ bnez $a1, .L800ED3C4 diff --git a/ver/us/asm/nonmatchings/world/partners/partner_flying_follow_player.s b/ver/us/asm/nonmatchings/world/partners/partner_flying_follow_player.s index 8befb34d1a..f45e7bd9c6 100644 --- a/ver/us/asm/nonmatchings/world/partners/partner_flying_follow_player.s +++ b/ver/us/asm/nonmatchings/world/partners/partner_flying_follow_player.s @@ -35,8 +35,8 @@ glabel partner_flying_follow_player /* 86F04 800EDA54 00400008 */ jr $v0 /* 86F08 800EDA58 00000000 */ nop .L800EDA5C_86F0C: -/* 86F0C 800EDA5C 3C038011 */ lui $v1, %hi(D_8010CD38) -/* 86F10 800EDA60 2463CD38 */ addiu $v1, $v1, %lo(D_8010CD38) +/* 86F0C 800EDA5C 3C038011 */ lui $v1, %hi(PlayerMoveHistory) +/* 86F10 800EDA60 2463CD38 */ addiu $v1, $v1, %lo(PlayerMoveHistory) /* 86F14 800EDA64 44806000 */ mtc1 $zero, $f12 /* 86F18 800EDA68 3C028011 */ lui $v0, %hi(D_8010CFBC) /* 86F1C 800EDA6C 8C42CFBC */ lw $v0, %lo(D_8010CFBC)($v0) @@ -56,12 +56,12 @@ glabel partner_flying_follow_player /* 86F54 800EDAA4 E7A20020 */ swc1 $f2, 0x20($sp) /* 86F58 800EDAA8 E7A40024 */ swc1 $f4, 0x24($sp) /* 86F5C 800EDAAC E7A00028 */ swc1 $f0, 0x28($sp) -/* 86F60 800EDAB0 3C018010 */ lui $at, %hi(D_800F833C) -/* 86F64 800EDAB4 E422833C */ swc1 $f2, %lo(D_800F833C)($at) -/* 86F68 800EDAB8 3C018010 */ lui $at, %hi(D_800F8340) -/* 86F6C 800EDABC E4248340 */ swc1 $f4, %lo(D_800F8340)($at) -/* 86F70 800EDAC0 3C018010 */ lui $at, %hi(D_800F8344) -/* 86F74 800EDAC4 E4208344 */ swc1 $f0, %lo(D_800F8344)($at) +/* 86F60 800EDAB0 3C018010 */ lui $at, %hi(SavedPartnerPosX) +/* 86F64 800EDAB4 E422833C */ swc1 $f2, %lo(SavedPartnerPosX)($at) +/* 86F68 800EDAB8 3C018010 */ lui $at, %hi(SavedPartnerPosY) +/* 86F6C 800EDABC E4248340 */ swc1 $f4, %lo(SavedPartnerPosY)($at) +/* 86F70 800EDAC0 3C018010 */ lui $at, %hi(SavedPartnerPosZ) +/* 86F74 800EDAC4 E4208344 */ swc1 $f0, %lo(SavedPartnerPosZ)($at) /* 86F78 800EDAC8 45020008 */ bc1fl .L800EDAEC /* 86F7C 800EDACC 46083000 */ add.s $f0, $f6, $f8 /* 86F80 800EDAD0 460A4081 */ sub.s $f2, $f8, $f10 @@ -172,8 +172,8 @@ glabel partner_flying_follow_player .L800EDC58: /* 87108 800EDC58 3C128011 */ lui $s2, %hi(D_8010CFBC) /* 8710C 800EDC5C 2652CFBC */ addiu $s2, $s2, %lo(D_8010CFBC) -/* 87110 800EDC60 3C148011 */ lui $s4, %hi(D_8010CD38) -/* 87114 800EDC64 2694CD38 */ addiu $s4, $s4, %lo(D_8010CD38) +/* 87110 800EDC60 3C148011 */ lui $s4, %hi(PlayerMoveHistory) +/* 87114 800EDC64 2694CD38 */ addiu $s4, $s4, %lo(PlayerMoveHistory) .L800EDC68: /* 87118 800EDC68 C7AC0020 */ lwc1 $f12, 0x20($sp) /* 8711C 800EDC6C C7AE0028 */ lwc1 $f14, 0x28($sp) @@ -234,8 +234,8 @@ glabel partner_flying_follow_player /* 871F4 800EDD44 46200020 */ cvt.s.d $f0, $f0 .L800EDD48: /* 871F8 800EDD48 8E430000 */ lw $v1, ($s2) -/* 871FC 800EDD4C 3C028011 */ lui $v0, %hi(D_8010CFB8) -/* 87200 800EDD50 8C42CFB8 */ lw $v0, %lo(D_8010CFB8)($v0) +/* 871FC 800EDD4C 3C028011 */ lui $v0, %hi(PlayerMoveHistoryIndex) +/* 87200 800EDD50 8C42CFB8 */ lw $v0, %lo(PlayerMoveHistoryIndex)($v0) /* 87204 800EDD54 1062FF92 */ beq $v1, $v0, .L800EDBA0 /* 87208 800EDD58 00000000 */ nop /* 8720C 800EDD5C C62C0038 */ lwc1 $f12, 0x38($s1) @@ -280,8 +280,8 @@ glabel partner_flying_follow_player /* 8729C 800EDDEC 3C048011 */ lui $a0, %hi(D_8010CFBC) /* 872A0 800EDDF0 2484CFBC */ addiu $a0, $a0, %lo(D_8010CFBC) /* 872A4 800EDDF4 8C830000 */ lw $v1, ($a0) -/* 872A8 800EDDF8 3C028011 */ lui $v0, %hi(D_8010CFB8) -/* 872AC 800EDDFC 8C42CFB8 */ lw $v0, %lo(D_8010CFB8)($v0) +/* 872A8 800EDDF8 3C028011 */ lui $v0, %hi(PlayerMoveHistoryIndex) +/* 872AC 800EDDFC 8C42CFB8 */ lw $v0, %lo(PlayerMoveHistoryIndex)($v0) /* 872B0 800EDE00 106202D9 */ beq $v1, $v0, .L800EE968_87E18 /* 872B4 800EDE04 24620001 */ addiu $v0, $v1, 1 /* 872B8 800EDE08 AC820000 */ sw $v0, ($a0) @@ -289,8 +289,8 @@ glabel partner_flying_follow_player /* 872C0 800EDE10 50400001 */ beql $v0, $zero, .L800EDE18 /* 872C4 800EDE14 AC800000 */ sw $zero, ($a0) .L800EDE18: -/* 872C8 800EDE18 3C038011 */ lui $v1, %hi(D_8010CD38) -/* 872CC 800EDE1C 2463CD38 */ addiu $v1, $v1, %lo(D_8010CD38) +/* 872C8 800EDE18 3C038011 */ lui $v1, %hi(PlayerMoveHistory) +/* 872CC 800EDE1C 2463CD38 */ addiu $v1, $v1, %lo(PlayerMoveHistory) /* 872D0 800EDE20 8C820000 */ lw $v0, ($a0) /* 872D4 800EDE24 3C013FA6 */ lui $at, 0x3fa6 /* 872D8 800EDE28 34216666 */ ori $at, $at, 0x6666 @@ -521,8 +521,8 @@ glabel partner_flying_follow_player /* 87634 800EE184 0803BA5A */ j .L800EE968_87E18 /* 87638 800EE188 A6020000 */ sh $v0, ($s0) .L800EE18C_8763C: -/* 8763C 800EE18C 3C038011 */ lui $v1, %hi(D_8010CD38) -/* 87640 800EE190 2463CD38 */ addiu $v1, $v1, %lo(D_8010CD38) +/* 8763C 800EE18C 3C038011 */ lui $v1, %hi(PlayerMoveHistory) +/* 87640 800EE190 2463CD38 */ addiu $v1, $v1, %lo(PlayerMoveHistory) /* 87644 800EE194 C62C0038 */ lwc1 $f12, 0x38($s1) /* 87648 800EE198 C62E0040 */ lwc1 $f14, 0x40($s1) /* 8764C 800EE19C 8E660028 */ lw $a2, 0x28($s3) @@ -733,8 +733,8 @@ glabel partner_flying_follow_player /* 87960 800EE4B0 4481C000 */ mtc1 $at, $f24 /* 87964 800EE4B4 3C128011 */ lui $s2, %hi(D_8010CFBC) /* 87968 800EE4B8 2652CFBC */ addiu $s2, $s2, %lo(D_8010CFBC) -/* 8796C 800EE4BC 3C148011 */ lui $s4, %hi(D_8010CD38) -/* 87970 800EE4C0 2694CD38 */ addiu $s4, $s4, %lo(D_8010CD38) +/* 8796C 800EE4BC 3C148011 */ lui $s4, %hi(PlayerMoveHistory) +/* 87970 800EE4C0 2694CD38 */ addiu $s4, $s4, %lo(PlayerMoveHistory) .L800EE4C4: /* 87974 800EE4C4 82020000 */ lb $v0, ($s0) /* 87978 800EE4C8 14400024 */ bnez $v0, .L800EE55C @@ -760,8 +760,8 @@ glabel partner_flying_follow_player /* 879C8 800EE518 45010010 */ bc1t .L800EE55C /* 879CC 800EE51C 00000000 */ nop /* 879D0 800EE520 8E430000 */ lw $v1, ($s2) -/* 879D4 800EE524 3C028011 */ lui $v0, %hi(D_8010CFB8) -/* 879D8 800EE528 8C42CFB8 */ lw $v0, %lo(D_8010CFB8)($v0) +/* 879D4 800EE524 3C028011 */ lui $v0, %hi(PlayerMoveHistoryIndex) +/* 879D8 800EE528 8C42CFB8 */ lw $v0, %lo(PlayerMoveHistoryIndex)($v0) /* 879DC 800EE52C 1062000B */ beq $v1, $v0, .L800EE55C /* 879E0 800EE530 24620001 */ addiu $v0, $v1, 1 /* 879E4 800EE534 AE420000 */ sw $v0, ($s2) 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 2c4bb57347..aaabb2dfcd 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 @@ -268,12 +268,12 @@ glabel partner_flying_update_motion /* 86E60 800ED9B0 C602003C */ lwc1 $f2, 0x3c($s0) /* 86E64 800ED9B4 C6040040 */ lwc1 $f4, 0x40($s0) .L800ED9B8: -/* 86E68 800ED9B8 3C018010 */ lui $at, %hi(D_800F833C) -/* 86E6C 800ED9BC E420833C */ swc1 $f0, %lo(D_800F833C)($at) -/* 86E70 800ED9C0 3C018010 */ lui $at, %hi(D_800F8340) -/* 86E74 800ED9C4 E4228340 */ swc1 $f2, %lo(D_800F8340)($at) -/* 86E78 800ED9C8 3C018010 */ lui $at, %hi(D_800F8344) -/* 86E7C 800ED9CC E4248344 */ swc1 $f4, %lo(D_800F8344)($at) +/* 86E68 800ED9B8 3C018010 */ lui $at, %hi(SavedPartnerPosX) +/* 86E6C 800ED9BC E420833C */ swc1 $f0, %lo(SavedPartnerPosX)($at) +/* 86E70 800ED9C0 3C018010 */ lui $at, %hi(SavedPartnerPosY) +/* 86E74 800ED9C4 E4228340 */ swc1 $f2, %lo(SavedPartnerPosY)($at) +/* 86E78 800ED9C8 3C018010 */ lui $at, %hi(SavedPartnerPosZ) +/* 86E7C 800ED9CC E4248344 */ swc1 $f4, %lo(SavedPartnerPosZ)($at) /* 86E80 800ED9D0 8FBF004C */ lw $ra, 0x4c($sp) /* 86E84 800ED9D4 8FB60048 */ lw $s6, 0x48($sp) /* 86E88 800ED9D8 8FB50044 */ lw $s5, 0x44($sp) diff --git a/ver/us/asm/nonmatchings/world/partners/partner_walking_enable.s b/ver/us/asm/nonmatchings/world/partners/partner_walking_enable.s index 1f28621aff..c8cb3cc5d0 100644 --- a/ver/us/asm/nonmatchings/world/partners/partner_walking_enable.s +++ b/ver/us/asm/nonmatchings/world/partners/partner_walking_enable.s @@ -7,15 +7,15 @@ glabel partner_walking_enable /* 84D60 800EB8B0 0080802D */ daddu $s0, $a0, $zero /* 84D64 800EB8B4 3C078011 */ lui $a3, %hi(gPlayerStatus) /* 84D68 800EB8B8 24E7EFC8 */ addiu $a3, $a3, %lo(gPlayerStatus) -/* 84D6C 800EB8BC 3C048011 */ lui $a0, %hi(D_8010CD38) -/* 84D70 800EB8C0 2484CD38 */ addiu $a0, $a0, %lo(D_8010CD38) +/* 84D6C 800EB8BC 3C048011 */ lui $a0, %hi(PlayerMoveHistory) +/* 84D70 800EB8C0 2484CD38 */ addiu $a0, $a0, %lo(PlayerMoveHistory) /* 84D74 800EB8C4 0000302D */ daddu $a2, $zero, $zero -/* 84D78 800EB8C8 3C018010 */ lui $at, %hi(D_800F833C) -/* 84D7C 800EB8CC C420833C */ lwc1 $f0, %lo(D_800F833C)($at) -/* 84D80 800EB8D0 3C018010 */ lui $at, %hi(D_800F8340) -/* 84D84 800EB8D4 C4228340 */ lwc1 $f2, %lo(D_800F8340)($at) -/* 84D88 800EB8D8 3C018010 */ lui $at, %hi(D_800F8344) -/* 84D8C 800EB8DC C4248344 */ lwc1 $f4, %lo(D_800F8344)($at) +/* 84D78 800EB8C8 3C018010 */ lui $at, %hi(SavedPartnerPosX) +/* 84D7C 800EB8CC C420833C */ lwc1 $f0, %lo(SavedPartnerPosX)($at) +/* 84D80 800EB8D0 3C018010 */ lui $at, %hi(SavedPartnerPosY) +/* 84D84 800EB8D4 C4228340 */ lwc1 $f2, %lo(SavedPartnerPosY)($at) +/* 84D88 800EB8D8 3C018010 */ lui $at, %hi(SavedPartnerPosZ) +/* 84D8C 800EB8DC C4248344 */ lwc1 $f4, %lo(SavedPartnerPosZ)($at) /* 84D90 800EB8E0 2483000C */ addiu $v1, $a0, 0xc /* 84D94 800EB8E4 AFBF0014 */ sw $ra, 0x14($sp) /* 84D98 800EB8E8 E6000038 */ swc1 $f0, 0x38($s0) @@ -36,8 +36,8 @@ glabel partner_walking_enable /* 84DD0 800EB920 24840010 */ addiu $a0, $a0, 0x10 /* 84DD4 800EB924 3C038011 */ lui $v1, %hi(D_8010CFCA) /* 84DD8 800EB928 2463CFCA */ addiu $v1, $v1, %lo(D_8010CFCA) -/* 84DDC 800EB92C 3C018011 */ lui $at, %hi(D_8010CFB8) -/* 84DE0 800EB930 AC20CFB8 */ sw $zero, %lo(D_8010CFB8)($at) +/* 84DDC 800EB92C 3C018011 */ lui $at, %hi(PlayerMoveHistoryIndex) +/* 84DE0 800EB930 AC20CFB8 */ sw $zero, %lo(PlayerMoveHistoryIndex)($at) /* 84DE4 800EB934 3C018011 */ lui $at, %hi(D_8010CFBC) /* 84DE8 800EB938 AC20CFBC */ sw $zero, %lo(D_8010CFBC)($at) /* 84DEC 800EB93C 10A00003 */ beqz $a1, .L800EB94C diff --git a/ver/us/asm/nonmatchings/world/partners/partner_walking_follow_player.s b/ver/us/asm/nonmatchings/world/partners/partner_walking_follow_player.s index 31cf63ef88..836780d573 100644 --- a/ver/us/asm/nonmatchings/world/partners/partner_walking_follow_player.s +++ b/ver/us/asm/nonmatchings/world/partners/partner_walking_follow_player.s @@ -52,8 +52,8 @@ glabel partner_walking_follow_player /* 851C0 800EBD10 0803B005 */ j .L800EC014 /* 851C4 800EBD14 AE230028 */ sw $v1, 0x28($s1) .L800EBD18_851C8: -/* 851C8 800EBD18 3C038011 */ lui $v1, %hi(D_8010CD38) -/* 851CC 800EBD1C 2463CD38 */ addiu $v1, $v1, %lo(D_8010CD38) +/* 851C8 800EBD18 3C038011 */ lui $v1, %hi(PlayerMoveHistory) +/* 851CC 800EBD1C 2463CD38 */ addiu $v1, $v1, %lo(PlayerMoveHistory) /* 851D0 800EBD20 C62C0038 */ lwc1 $f12, 0x38($s1) /* 851D4 800EBD24 C62E0040 */ lwc1 $f14, 0x40($s1) /* 851D8 800EBD28 3C028011 */ lui $v0, %hi(D_8010CFBC) @@ -129,8 +129,8 @@ glabel partner_walking_follow_player .L800EBE38: /* 852E8 800EBE38 3C128011 */ lui $s2, %hi(D_8010CFBC) /* 852EC 800EBE3C 2652CFBC */ addiu $s2, $s2, %lo(D_8010CFBC) -/* 852F0 800EBE40 3C148011 */ lui $s4, %hi(D_8010CD38) -/* 852F4 800EBE44 2694CD38 */ addiu $s4, $s4, %lo(D_8010CD38) +/* 852F0 800EBE40 3C148011 */ lui $s4, %hi(PlayerMoveHistory) +/* 852F4 800EBE44 2694CD38 */ addiu $s4, $s4, %lo(PlayerMoveHistory) .L800EBE48: /* 852F8 800EBE48 C7AC0028 */ lwc1 $f12, 0x28($sp) /* 852FC 800EBE4C C7AE0030 */ lwc1 $f14, 0x30($sp) @@ -211,8 +211,8 @@ glabel partner_walking_follow_player /* 85420 800EBF70 E620000C */ swc1 $f0, 0xc($s1) .L800EBF74: /* 85424 800EBF74 8E430000 */ lw $v1, ($s2) -/* 85428 800EBF78 3C028011 */ lui $v0, %hi(D_8010CFB8) -/* 8542C 800EBF7C 8C42CFB8 */ lw $v0, %lo(D_8010CFB8)($v0) +/* 85428 800EBF78 3C028011 */ lui $v0, %hi(PlayerMoveHistoryIndex) +/* 8542C 800EBF7C 8C42CFB8 */ lw $v0, %lo(PlayerMoveHistoryIndex)($v0) /* 85430 800EBF80 1062FF55 */ beq $v1, $v0, .L800EBCD8 /* 85434 800EBF84 24620001 */ addiu $v0, $v1, 1 /* 85438 800EBF88 AE420000 */ sw $v0, ($s2) @@ -309,8 +309,8 @@ glabel partner_walking_follow_player /* 8558C 800EC0DC AC600000 */ sw $zero, ($v1) .L800EC0E0: /* 85590 800EC0E0 8C620000 */ lw $v0, ($v1) -/* 85594 800EC0E4 3C038011 */ lui $v1, %hi(D_8010CD38) -/* 85598 800EC0E8 2463CD38 */ addiu $v1, $v1, %lo(D_8010CD38) +/* 85594 800EC0E4 3C038011 */ lui $v1, %hi(PlayerMoveHistory) +/* 85598 800EC0E8 2463CD38 */ addiu $v1, $v1, %lo(PlayerMoveHistory) /* 8559C 800EC0EC C62C0038 */ lwc1 $f12, 0x38($s1) /* 855A0 800EC0F0 C62E0040 */ lwc1 $f14, 0x40($s1) /* 855A4 800EC0F4 00021100 */ sll $v0, $v0, 4 @@ -340,8 +340,8 @@ glabel partner_walking_follow_player /* 85600 800EC150 3C058011 */ lui $a1, %hi(D_8010CFBC) /* 85604 800EC154 24A5CFBC */ addiu $a1, $a1, %lo(D_8010CFBC) /* 85608 800EC158 8CA40000 */ lw $a0, ($a1) -/* 8560C 800EC15C 3C038011 */ lui $v1, %hi(D_8010CFB8) -/* 85610 800EC160 8C63CFB8 */ lw $v1, %lo(D_8010CFB8)($v1) +/* 8560C 800EC15C 3C038011 */ lui $v1, %hi(PlayerMoveHistoryIndex) +/* 85610 800EC160 8C63CFB8 */ lw $v1, %lo(PlayerMoveHistoryIndex)($v1) /* 85614 800EC164 14830016 */ bne $a0, $v1, .L800EC1C0 /* 85618 800EC168 0040902D */ daddu $s2, $v0, $zero /* 8561C 800EC16C 2642FFFE */ addiu $v0, $s2, -2 @@ -373,8 +373,8 @@ glabel partner_walking_follow_player /* 85680 800EC1D0 ACA00000 */ sw $zero, ($a1) .L800EC1D4: /* 85684 800EC1D4 8CA20000 */ lw $v0, ($a1) -/* 85688 800EC1D8 3C038011 */ lui $v1, %hi(D_8010CD38) -/* 8568C 800EC1DC 2463CD38 */ addiu $v1, $v1, %lo(D_8010CD38) +/* 85688 800EC1D8 3C038011 */ lui $v1, %hi(PlayerMoveHistory) +/* 8568C 800EC1DC 2463CD38 */ addiu $v1, $v1, %lo(PlayerMoveHistory) /* 85690 800EC1E0 00021100 */ sll $v0, $v0, 4 /* 85694 800EC1E4 00438021 */ addu $s0, $v0, $v1 /* 85698 800EC1E8 C6000004 */ lwc1 $f0, 4($s0) @@ -716,8 +716,8 @@ glabel partner_walking_follow_player /* 85BA4 800EC6F4 0803B4B9 */ j .L800ED2E4_86794 /* 85BA8 800EC6F8 00000000 */ nop .L800EC6FC_85BAC: -/* 85BAC 800EC6FC 3C038011 */ lui $v1, %hi(D_8010CD38) -/* 85BB0 800EC700 2463CD38 */ addiu $v1, $v1, %lo(D_8010CD38) +/* 85BAC 800EC6FC 3C038011 */ lui $v1, %hi(PlayerMoveHistory) +/* 85BB0 800EC700 2463CD38 */ addiu $v1, $v1, %lo(PlayerMoveHistory) /* 85BB4 800EC704 C62C0038 */ lwc1 $f12, 0x38($s1) /* 85BB8 800EC708 C62E0040 */ lwc1 $f14, 0x40($s1) /* 85BBC 800EC70C 8E660028 */ lw $a2, 0x28($s3) @@ -1007,8 +1007,8 @@ glabel partner_walking_follow_player /* 85FF8 800ECB48 4481B000 */ mtc1 $at, $f22 /* 85FFC 800ECB4C 3C128011 */ lui $s2, %hi(D_8010CFBC) /* 86000 800ECB50 2652CFBC */ addiu $s2, $s2, %lo(D_8010CFBC) -/* 86004 800ECB54 3C148011 */ lui $s4, %hi(D_8010CD38) -/* 86008 800ECB58 2694CD38 */ addiu $s4, $s4, %lo(D_8010CD38) +/* 86004 800ECB54 3C148011 */ lui $s4, %hi(PlayerMoveHistory) +/* 86008 800ECB58 2694CD38 */ addiu $s4, $s4, %lo(PlayerMoveHistory) .L800ECB5C: /* 8600C 800ECB5C 82020000 */ lb $v0, ($s0) /* 86010 800ECB60 14400028 */ bnez $v0, .L800ECC04 @@ -1033,8 +1033,8 @@ glabel partner_walking_follow_player /* 8605C 800ECBAC 45010012 */ bc1t .L800ECBF8 /* 86060 800ECBB0 00000000 */ nop /* 86064 800ECBB4 8E430000 */ lw $v1, ($s2) -/* 86068 800ECBB8 3C028011 */ lui $v0, %hi(D_8010CFB8) -/* 8606C 800ECBBC 8C42CFB8 */ lw $v0, %lo(D_8010CFB8)($v0) +/* 86068 800ECBB8 3C028011 */ lui $v0, %hi(PlayerMoveHistoryIndex) +/* 8606C 800ECBBC 8C42CFB8 */ lw $v0, %lo(PlayerMoveHistoryIndex)($v0) /* 86070 800ECBC0 1062000D */ beq $v1, $v0, .L800ECBF8 /* 86074 800ECBC4 24620001 */ addiu $v0, $v1, 1 /* 86078 800ECBC8 AE420000 */ sw $v0, ($s2) @@ -1059,8 +1059,8 @@ glabel partner_walking_follow_player /* 860B8 800ECC08 4481B000 */ mtc1 $at, $f22 /* 860BC 800ECC0C 3C128011 */ lui $s2, %hi(D_8010CFBC) /* 860C0 800ECC10 2652CFBC */ addiu $s2, $s2, %lo(D_8010CFBC) -/* 860C4 800ECC14 3C148011 */ lui $s4, %hi(D_8010CD38) -/* 860C8 800ECC18 2694CD38 */ addiu $s4, $s4, %lo(D_8010CD38) +/* 860C4 800ECC14 3C148011 */ lui $s4, %hi(PlayerMoveHistory) +/* 860C8 800ECC18 2694CD38 */ addiu $s4, $s4, %lo(PlayerMoveHistory) .L800ECC1C: /* 860CC 800ECC1C 82020000 */ lb $v0, ($s0) /* 860D0 800ECC20 104001AE */ beqz $v0, .L800ED2DC @@ -1085,8 +1085,8 @@ glabel partner_walking_follow_player /* 8611C 800ECC6C 4501019B */ bc1t .L800ED2DC /* 86120 800ECC70 24020001 */ addiu $v0, $zero, 1 /* 86124 800ECC74 8E430000 */ lw $v1, ($s2) -/* 86128 800ECC78 3C028011 */ lui $v0, %hi(D_8010CFB8) -/* 8612C 800ECC7C 8C42CFB8 */ lw $v0, %lo(D_8010CFB8)($v0) +/* 86128 800ECC78 3C028011 */ lui $v0, %hi(PlayerMoveHistoryIndex) +/* 8612C 800ECC7C 8C42CFB8 */ lw $v0, %lo(PlayerMoveHistoryIndex)($v0) /* 86130 800ECC80 1062000D */ beq $v1, $v0, .L800ECCB8 /* 86134 800ECC84 24620001 */ addiu $v0, $v1, 1 /* 86138 800ECC88 AE420000 */ sw $v0, ($s2) diff --git a/ver/us/asm/nonmatchings/world/script_api/7E0E80/MakeShop.s b/ver/us/asm/nonmatchings/world/script_api/7E0E80/MakeShop.s index 49e173f895..871f296beb 100644 --- a/ver/us/asm/nonmatchings/world/script_api/7E0E80/MakeShop.s +++ b/ver/us/asm/nonmatchings/world/script_api/7E0E80/MakeShop.s @@ -164,8 +164,8 @@ glabel MakeShop /* 7E2944 80281AC4 1440FFB3 */ bnez $v0, .L80281994 /* 7E2948 80281AC8 26520001 */ addiu $s2, $s2, 1 .L80281ACC: -/* 7E294C 80281ACC 3C048008 */ lui $a0, %hi(D_80080868) -/* 7E2950 80281AD0 24840868 */ addiu $a0, $a0, %lo(D_80080868) +/* 7E294C 80281ACC 3C048008 */ lui $a0, %hi(HudScript_Item_Coin) +/* 7E2950 80281AD0 24840868 */ addiu $a0, $a0, %lo(HudScript_Item_Coin) /* 7E2954 80281AD4 0C050529 */ jal create_hud_element /* 7E2958 80281AD8 2410FFFF */ addiu $s0, $zero, -1 /* 7E295C 80281ADC 0040202D */ daddu $a0, $v0, $zero diff --git a/ver/us/asm/nonmatchings/world/script_api/7E0E80/shop_open_item_select_popup.s b/ver/us/asm/nonmatchings/world/script_api/7E0E80/shop_open_item_select_popup.s index 6dc2d61468..7b8ee6a5f8 100644 --- a/ver/us/asm/nonmatchings/world/script_api/7E0E80/shop_open_item_select_popup.s +++ b/ver/us/asm/nonmatchings/world/script_api/7E0E80/shop_open_item_select_popup.s @@ -56,8 +56,8 @@ glabel shop_open_item_select_popup /* 7E1888 80280A08 00041140 */ sll $v0, $a0, 5 /* 7E188C 80280A0C 00561821 */ addu $v1, $v0, $s6 /* 7E1890 80280A10 84620004 */ lh $v0, 4($v1) -/* 7E1894 80280A14 3C058009 */ lui $a1, %hi(D_8008A680) -/* 7E1898 80280A18 24A5A680 */ addiu $a1, $a1, %lo(D_8008A680) +/* 7E1894 80280A14 3C058009 */ lui $a1, %hi(gItemHudScripts) +/* 7E1898 80280A18 24A5A680 */ addiu $a1, $a1, %lo(gItemHudScripts) /* 7E189C 80280A1C 000210C0 */ sll $v0, $v0, 3 /* 7E18A0 80280A20 00451021 */ addu $v0, $v0, $a1 /* 7E18A4 80280A24 8C420000 */ lw $v0, ($v0) diff --git a/ver/us/splat.yaml b/ver/us/splat.yaml index 34b867d974..b8607f0efb 100644 --- a/ver/us/splat.yaml +++ b/ver/us/splat.yaml @@ -911,7 +911,7 @@ segments: - [0x134F40, palette, ui/blue_orb] - [0x134F60, ci4, ui/label_bubble, 56, 16] - [0x135120, palette, ui/label_bubble] - - [0x135140, bin, pause_icon_table] # TODO data + - [0x135140, data, pause_icon_table] - type: code dir: pause start: 0x135EE0 @@ -3453,6 +3453,7 @@ segments: overlay: True subsegments: - [0x4219F0, c, jump] + - [0x421FC0] - type: code start: 0x422000 vram: 0x802A9000 @@ -4577,10 +4578,11 @@ segments: overlay: True subsegments: - [0x72A750, c, insecticide_herb] - - start: 0x72B130 + - start: 0x72AB70 type: .data name: insecticide_herb subsegments: + - [0x72AB70] - [0x72B130, ci4, insecticide_herb, 32, 32] - [0x72B330, palette, insecticide_herb] - [0x72B350] diff --git a/ver/us/symbol_addrs.txt b/ver/us/symbol_addrs.txt index f741476768..fb5d64c3a2 100644 --- a/ver/us/symbol_addrs.txt +++ b/ver/us/symbol_addrs.txt @@ -2231,13 +2231,13 @@ D_800F7BE8 = 0x800F7BE8; // type:data rom:0x91098 world_actions_peachDisguises = 0x800F7C1C; // type:data rom:0x910CC size:0x60 D_800F7C7C = 0x800F7C7C; // type:data rom:0x9112C D_800F7C8C = 0x800F7C8C; // type:data rom:0x9113C -D_800F7F00 = 0x800F7F00; // type:data rom:0x913B0 -D_800F7F40 = 0x800F7F40; // type:data rom:0x913F0 -D_800F7F80 = 0x800F7F80; // type:data rom:0x91430 -D_800F7FA8 = 0x800F7FA8; // type:data rom:0x91458 -D_800F7FAC = 0x800F7FAC; // type:data rom:0x9145C -D_800F7FB0 = 0x800F7FB0; // type:data rom:0x91460 -D_800F7FCC = 0x800F7FCC; // type:data rom:0x9147C +wPartnerHudScripts = 0x800F7F00; // type:data rom:0x913B0 +wDisabledPartnerHudScripts = 0x800F7F40; // type:data rom:0x913F0 +DigitHudScripts = 0x800F7F80; // type:data rom:0x91430 +TimesHudScript = 0x800F7FA8; // type:data rom:0x91458 +SlashHudScript = 0x800F7FAC; // type:data rom:0x9145C +SPIncrementHudScripts = 0x800F7FB0; // type:data rom:0x91460 +SPStarHudScripts = 0x800F7FCC; // type:data rom:0x9147C D_800F7FE8 = 0x800F7FE8; // type:data rom:0x91498 D_800F7FEC = 0x800F7FEC; // type:data rom:0x9149C D_800F7FF0 = 0x800F7FF0; // type:data rom:0x914A0 @@ -2245,7 +2245,7 @@ D_800F7FF4 = 0x800F7FF4; // type:data rom:0x914A4 D_800F7FF8 = 0x800F7FF8; // type:data rom:0x914A8 D_800F7FFC = 0x800F7FFC; // type:data rom:0x914AC D_800F8000 = 0x800F8000; // type:data rom:0x914B0 -D_800F8010 = 0x800F8010; // type:data rom:0x914C0 +UseItemDmaArgs = 0x800F8010; // type:data rom:0x914C0 D_800F8020 = 0x800F8020; // type:data rom:0x914D0 wPartnerMoveGoalX = 0x800F8024; // type:data rom:0x914D4 wPartnerMoveGoalZ = 0x800F8028; // type:data rom:0x914D8 @@ -2254,9 +2254,9 @@ wPartnerMoveSpeed = 0x800F8030; // type:data rom:0x914E0 D_800F8034 = 0x800F8034; // type:data rom:0x914E4 D_800F803A = 0x800F803A; // type:data rom:0x914EA wPartners = 0x800F803C; // type:data rom:0x914EC size:0x300 -D_800F833C = 0x800F833C; // type:data rom:0x917EC -D_800F8340 = 0x800F8340; // type:data rom:0x917F0 -D_800F8344 = 0x800F8344; // type:data rom:0x917F4 +SavedPartnerPosX = 0x800F833C; // type:data rom:0x917EC +SavedPartnerPosY = 0x800F8340; // type:data rom:0x917F0 +SavedPartnerPosZ = 0x800F8344; // type:data rom:0x917F4 gPartnerAnimations = 0x800F8348; // rom:0x917F8 size:0x1B0 D_800B6590 = 0x800B6590; // type:data rom:0x91990 D_800F84F8 = 0x800F84F8; // type:data rom:0x919A8 @@ -2267,7 +2267,7 @@ D_801041A0 = 0x801041A0; // type:data rom:0x9D650 ui_stat_heart_png = 0x801041A8; // type:data rom:0x9D658 D_801045A8 = 0x801045A8; // type:data rom:0x9DA58 ui_stat_flower_png = 0x801045B0; // type:data rom:0x9DA60 -D_80108A64 = 0x80108A64; // type:data rom:0xA1F14 +HudScript_Refund = 0x80108A64; // type:data rom:0xA1F14 D_80109890 = 0x80109890; // type:data rom:0xA2D40 D_80109898 = 0x80109898; // type:data rom:0xA2D48 D_801098A0 = 0x801098A0; // type:data rom:0xA2D50 @@ -2771,7 +2771,7 @@ item_entity_load = 0x80131128; // type:func rom:0xC7828 make_item_entity = 0x801313F4; // type:func rom:0xC7AF4 make_item_entity_nodelay = 0x80131A94; // type:func rom:0xC8194 make_item_entity_delayed = 0x80131AC8; // type:func rom:0xC81C8 -init_got_item = 0x80131B00; // type:func rom:0xC8200 +make_item_entity_at_player = 0x80131B00; // type:func rom:0xC8200 item_entity_update = 0x80131DD4; // type:func rom:0xC84D4 update_item_entities = 0x80131EEC; // type:func rom:0xC85EC appendGfx_item_entity = 0x801321A4; // type:func rom:0xC88A4 @@ -4340,16 +4340,16 @@ D_802E9830 = 0x802E9830; // type:data rom:0x10B0B0 D_802E9850 = 0x802E9850; // type:data rom:0x10B0D0 D_802E9874 = 0x802E9874; // type:data rom:0x10B0F4 D_802E9898 = 0x802E9898; // type:data rom:0x10B118 -D_802E98BC = 0x802E98BC; // type:data rom:0x10B13C +CircularShadowA = 0x802E98BC; // type:data rom:0x10B13C D_802E98DC = 0x802E98DC; // type:data rom:0x10B15C -D_802E98E0 = 0x802E98E0; // type:data rom:0x10B160 +CircularShadowB = 0x802E98E0; // type:data rom:0x10B160 D_802E9900 = 0x802E9900; // type:data rom:0x10B180 -D_802E9904 = 0x802E9904; // type:data rom:0x10B184 +SquareShadow = 0x802E9904; // type:data rom:0x10B184 D_802E9924 = 0x802E9924; // type:data rom:0x10B1A4 D_802E9928 = 0x802E9928; // type:data rom:0x10B1A8 D_802E9930 = 0x802E9930; // type:data rom:0x10B1B0 D_802E99FC = 0x802E99FC; // type:data rom:0x10B27C -D_802E9A18 = 0x802E9A18; // type:data rom:0x10B298 +Entity_SavePoint = 0x802E9A18; // type:data rom:0x10B298 D_802E9A3C = 0x802E9A3C; // type:data rom:0x10B2BC D_802E9A40 = 0x802E9A40; // type:data rom:0x10B2C0 D_802E9A88 = 0x802E9A88; // type:data rom:0x10B308 @@ -4359,19 +4359,19 @@ D_802E9B40 = 0x802E9B40; // type:data rom:0x10B3C0 D_802E9B5C = 0x802E9B5C; // type:data rom:0x10B3DC D_802E9B78 = 0x802E9B78; // type:data rom:0x10B3F8 D_802E9B94 = 0x802E9B94; // type:data rom:0x10B414 -D_802E9BB0 = 0x802E9BB0; // type:data rom:0x10B430 -D_802E9BD4 = 0x802E9BD4; // type:data rom:0x10B454 -D_802E9BF8 = 0x802E9BF8; // type:data rom:0x10B478 -D_802E9C1C = 0x802E9C1C; // type:data rom:0x10B49C +Entity_RedSwitch = 0x802E9BB0; // type:data rom:0x10B430 +Entity_BlueSwitch = 0x802E9BD4; // type:data rom:0x10B454 +Entity_HugeBlueSwitch = 0x802E9BF8; // type:data rom:0x10B478 +Entity_GreenStompSwitch = 0x802E9C1C; // type:data rom:0x10B49C D_802E9C40 = 0x802E9C40; // type:data rom:0x10B4C0 D_802E9C70 = 0x802E9C70; // type:data rom:0x10B4F0 -D_802E9C8C = 0x802E9C8C; // type:data rom:0x10B50C -D_802E9CB0 = 0x802E9CB0; // type:data rom:0x10B530 -D_802E9CD4 = 0x802E9CD4; // type:data rom:0x10B554 -D_802E9CF8 = 0x802E9CF8; // type:data rom:0x10B578 -D_802E9D1C = 0x802E9D1C; // type:data rom:0x10B59C -D_802E9D40 = 0x802E9D40; // type:data rom:0x10B5C0 -D_802E9D64 = 0x802E9D64; // type:data rom:0x10B5E4 +Entity_ShatteringHammer1Block = 0x802E9C8C; // type:data rom:0x10B50C +Entity_ShatteringHammer2Block = 0x802E9CB0; // type:data rom:0x10B530 +Entity_ShatteringHammer3Block = 0x802E9CD4; // type:data rom:0x10B554 +Entity_ShatteringHammer1BlockTiny = 0x802E9CF8; // type:data rom:0x10B578 +Entity_ShatteringHammer2BlockTiny = 0x802E9D1C; // type:data rom:0x10B59C +Entity_ShatteringHammer3BlockTiny = 0x802E9D40; // type:data rom:0x10B5C0 +Entity_ShatteringBrickBlock = 0x802E9D64; // type:data rom:0x10B5E4 D_802EB028 = 0x802EB028; // type:data rom:0x10C8A8 D_802EB030 = 0x802EB030; // type:data rom:0x10C8B0 D_802EB038 = 0x802EB038; // type:data rom:0x10C8B8 @@ -4419,6 +4419,81 @@ D_802EB350 = 0x802EB350; // type:data rom:0x10CBD0 D_802EB358 = 0x802EB358; // type:data rom:0x10CBD8 D_802EB360 = 0x802EB360; // type:data rom:0x10CBE0 D_802EB368 = 0x802EB368; // type:data rom:0x10CBE8 +HudScript_UnusedBadge = 0x80241E00; // type:data rom:0x135140 +HudScript_UnusedBadge_disabled = 0x80241E28; // type:data rom:0x135168 +HudScript_UnusedCompass = 0x80241E50; // type:data rom:0x135190 +HudScript_UnusedCompass_disabled = 0x80241E78; // type:data rom:0x1351B8 +HudScript_CursorHand = 0x80241EA0; // type:data rom:0x1351E0 +HudScript_AnimatedCursorHand = 0x80241ECC; // type:data rom:0x13520C +HudScript_JpSuper = 0x80241F18; // type:data rom:0x135258 +HudScript_JpUltra = 0x80241F44; // type:data rom:0x135284 +HudScript_FilenameCaret = 0x80241F70; // type:data rom:0x1352B0 +HudScript_FilenameSpace = 0x80241FBC; // type:data rom:0x1352FC +HudScript_HeaderStats = 0x80241FE8; // type:data rom:0x135328 +HudScript_HeaderBadges = 0x80242014; // type:data rom:0x135354 +HudScript_HeaderItems = 0x80242040; // type:data rom:0x135380 +HudScript_HeaderParty = 0x8024206C; // type:data rom:0x1353AC +HudScript_HeaderSpirits = 0x80242098; // type:data rom:0x1353D8 +HudScript_HeaderMap = 0x802420C4; // type:data rom:0x135404 +HudScript_SmallText0 = 0x802420F0; // type:data rom:0x135430 +HudScript_SmallText1 = 0x8024211C; // type:data rom:0x13545C +HudScript_SmallText2 = 0x80242148; // type:data rom:0x135488 +HudScript_SmallText3 = 0x80242174; // type:data rom:0x1354B4 +HudScript_SmallText4 = 0x802421A0; // type:data rom:0x1354E0 +HudScript_SmallText5 = 0x802421CC; // type:data rom:0x13550C +HudScript_SmallText6 = 0x802421F8; // type:data rom:0x135538 +HudScript_SmallText7 = 0x80242224; // type:data rom:0x135564 +HudScript_SmallText8 = 0x80242250; // type:data rom:0x135590 +HudScript_SmallText9 = 0x8024227C; // type:data rom:0x1355BC +HudScript_SmallTextBp = 0x802422A8; // type:data rom:0x1355E8 +HudScript_JpFile = 0x802422D4; // type:data rom:0x135614 +HudScript_JpFileDisabled = 0x80242300; // type:data rom:0x135640 +HudScript_OptionMonoOn = 0x8024232C; // type:data rom:0x13566C +HudScript_OptionMonoOff = 0x80242358; // type:data rom:0x135698 +HudScript_OptionStereoOn = 0x80242384; // type:data rom:0x1356C4 +HudScript_OptionStereoOff = 0x802423B0; // type:data rom:0x1356F0 +HudScript_Spirit1 = 0x802423DC; // type:data rom:0x13571C +HudScript_Spirit1Missing = 0x80242408; // type:data rom:0x135748 +HudScript_Spirit2 = 0x80242434; // type:data rom:0x135774 +HudScript_Spirit2Missing = 0x80242460; // type:data rom:0x1357A0 +HudScript_Spirit3 = 0x8024248C; // type:data rom:0x1357CC +HudScript_Spirit3Missing = 0x802424B8; // type:data rom:0x1357F8 +HudScript_Spirit4 = 0x802424E4; // type:data rom:0x135824 +HudScript_Spirit4Missing = 0x80242510; // type:data rom:0x135850 +HudScript_Spirit5 = 0x8024253C; // type:data rom:0x13587C +HudScript_Spirit5Missing = 0x80242568; // type:data rom:0x1358A8 +HudScript_Spirit6 = 0x80242594; // type:data rom:0x1358D4 +HudScript_Spirit6Missing = 0x802425C0; // type:data rom:0x135900 +HudScript_Spirit7 = 0x802425EC; // type:data rom:0x13592C +HudScript_Spirit7Missing = 0x80242618; // type:data rom:0x135958 +HudScript_MapWalk0 = 0x80242644; // type:data rom:0x135984 +HudScript_ListPrevPage = 0x802426A0; // type:data rom:0x1359E0 +HudScript_ListNextPage = 0x802426CC; // type:data rom:0x135A0C +HudScript_133F40_133FC0 = 0x802426F8; // type:data rom:0x135A38 +HudScript_133FE0_134060 = 0x80242724; // type:data rom:0x135A64 +HudScript_LabelBpNeeded = 0x80242750; // type:data rom:0x135A90 +HudScript_MarioHeadLarge = 0x8024277C; // type:data rom:0x135ABC +HudScript_Dash = 0x802427A8; // type:data rom:0x135AE8 +HudScript_DescMsgPrev = 0x802427D4; // type:data rom:0x135B14 +HudScript_DescMsgNext = 0x80242820; // type:data rom:0x135B60 +HudScript_StatBoots0 = 0x8024286C; // type:data rom:0x135BAC +HudScript_StatBoots1 = 0x80242894; // type:data rom:0x135BD4 +HudScript_StatBoots2 = 0x802428BC; // type:data rom:0x135BFC +HudScript_StatBoots3 = 0x802428E4; // type:data rom:0x135C24 +HudScript_StatHammer0 = 0x8024290C; // type:data rom:0x135C4C +HudScript_StatHammer1 = 0x80242934; // type:data rom:0x135C74 +HudScript_StatHammer2 = 0x8024295C; // type:data rom:0x135C9C +HudScript_StatHammer3 = 0x80242984; // type:data rom:0x135CC4 +HudScript_StatBp = 0x802429AC; // type:data rom:0x135CEC +HudScript_MarioHeadSmall = 0x802429D4; // type:data rom:0x135D14 +HudScript_Clock = 0x802429FC; // type:data rom:0x135D3C +HudScript_StatStarPiece_1 = 0x80242A24; // type:data rom:0x135D64 +HudScript_StatStarPiece_2 = 0x80242A7C; // type:data rom:0x135DBC +HudScript_StatFp_1 = 0x80242AD4; // type:data rom:0x135E14 +HudScript_StatFp_2 = 0x80242AFC; // type:data rom:0x135E3C +HudScript_StatTimes = 0x80242B24; // type:data rom:0x135E64 +HudScript_PartnerRank = 0x80242B4C; // type:data rom:0x135E8C +HudScript_134F60_135120 = 0x80242B74; // type:data rom:0x135EB4 pause_set_cursor_opacity = 0x80242BA0; // type:func rom:0x135EE0 func_80242BAC = 0x80242BAC; // type:func rom:0x135EEC func_80242D04 = 0x80242D04; // type:func rom:0x136044 @@ -5404,7 +5479,7 @@ D_802809F5 = 0x802809F5; // type:data rom:0x1AF2D5 D_802809F6 = 0x802809F6; // type:data rom:0x1AF2D6 D_802809F8 = 0x802809F8; // type:data rom:0x1AF2D8 D_802809FA = 0x802809FA; // type:data rom:0x1AF2DA -D_802809FC = 0x802809FC; // type:data rom:0x1AF2DC +bHPDigitHudScripts = 0x802809FC; // type:data rom:0x1AF2DC D_80280A30 = 0x80280A30; // type:data rom:0x1AF310 BtlPutPartnerAway = 0x80280A34; // rom:0x1AF314 BtlBringPartnerOut = 0x80280B6C; // rom:0x1AF44C @@ -6769,31 +6844,31 @@ btl_state_update_22 = 0x802AB330; // type:func rom:0x4200C0 btl_state_draw_22 = 0x802AB338; // type:func rom:0x4200C8 D_802AB340 = 0x802AB340; // type:data rom:0x4200D0 D_802AB344 = 0x802AB344; // type:data rom:0x4200D4 -battle_menu_iconScripts = 0x802AB348; // type:data rom:0x4200D8 -D_802AB368 = 0x802AB368; // type:data rom:0x4200F8 -D_802AB388 = 0x802AB388; // type:data rom:0x420118 -D_802AB390 = 0x802AB390; // type:data rom:0x420120 -D_802AB398 = 0x802AB398; // type:data rom:0x420128 -D_802AB3F8 = 0x802AB3F8; // type:data rom:0x420188 -D_802AB438 = 0x802AB438; // type:data rom:0x4201C8 -D_802AB478 = 0x802AB478; // type:data rom:0x420208 -D_802AB47C = 0x802AB47C; // type:data rom:0x42020C -D_802AB480 = 0x802AB480; // type:data rom:0x420210 -D_802AB488 = 0x802AB488; // type:data rom:0x420218 -battle_menu_leftJustfiedMessages = 0x802AB490; // type:data rom:0x420220 -D_802AB4A4 = 0x802AB4A4; // type:data rom:0x420234 -D_802AB4B4 = 0x802AB4B4; // type:data rom:0x420244 -battle_menu_centeredMessages = 0x802AB4C0; // type:data rom:0x420250 -D_802AB4C8 = 0x802AB4C8; // type:data rom:0x420258 -D_802AB4DC = 0x802AB4DC; // type:data rom:0x42026C -D_802AB4E0 = 0x802AB4E0; // type:data rom:0x420270 +battle_menu_JumpHudScripts = 0x802AB348; // type:data rom:0x4200D8 +battle_menu_HammerHudScripts = 0x802AB368; // type:data rom:0x4200F8 +battle_menu_ItemHudScripts = 0x802AB388; // type:data rom:0x420118 +battle_menu_StarPowerHudScripts = 0x802AB390; // type:data rom:0x420120 +battle_menu_StarPowerMovesHudScripts = 0x802AB398; // type:data rom:0x420128 +battle_menu_PartnerHudScripts = 0x802AB3F8; // type:data rom:0x420188 +battle_menu_DisabledPartnerHudScripts = 0x802AB438; // type:data rom:0x4201C8 +battle_menu_StrategiesHudScript = 0x802AB478; // type:data rom:0x420208 +battle_menu_DisabledStrategiesHudScript = 0x802AB47C; // type:data rom:0x42020C +battle_menu_DoNothingHudScripts = 0x802AB480; // type:data rom:0x420210 +battle_menu_FleeHudScripts = 0x802AB488; // type:data rom:0x420218 +battle_menu_leftJustfiedMessagesA = 0x802AB490; // type:data rom:0x420220 +battle_menu_leftJustfiedMessagesB = 0x802AB4A4; // type:data rom:0x420234 +battle_menu_leftJustfiedMessagesC = 0x802AB4B4; // type:data rom:0x420244 +battle_menu_centeredMessagesA = 0x802AB4C0; // type:data rom:0x420250 +battle_menu_centeredMessagesB = 0x802AB4C8; // type:data rom:0x420258 +battle_menu_centeredMessagesC = 0x802AB4DC; // type:data rom:0x42026C +battle_menu_centeredMessagesD = 0x802AB4E0; // type:data rom:0x420270 D_802AB4F0 = 0x802AB4F0; // type:data rom:0x420280 D_802AB520 = 0x802AB520; // type:data rom:0x4202B0 D_802AB558 = 0x802AB558; // type:data rom:0x4202E8 -D_802AB590 = 0x802AB590; // type:data rom:0x420320 -D_802AB720 = 0x802AB720; // type:data rom:0x4204B0 +battle_menu_PartnerMoveHudScripts = 0x802AB590; // type:data rom:0x420320 +battle_menu_PeachStarPowerHudScripts = 0x802AB720; // type:data rom:0x4204B0 D_802AB728 = 0x802AB728; // type:data rom:0x4204B8 -D_802AB72C = 0x802AB72C; // type:data rom:0x4204BC +battle_menu_TwinkStarPowerHudScripts = 0x802AB72C; // type:data rom:0x4204BC D_802AB734 = 0x802AB734; // type:data rom:0x4204C4 D_802AB738 = 0x802AB738; // type:data rom:0x4204C8 D_802AB7F0 = 0x802AB7F0; // type:data rom:0x420580 @@ -21397,32 +21472,37 @@ EnemyNpcDefeat = 0x8007809C; // dead_gGameStatusPtr = 0x80079430; // type:data D_80079540 = 0x80079540; // type:data dead_gCurrentCameraID = 0x8007C760; // type:data -D_8007FF20 = 0x8007FF20; // type:data -D_80080208 = 0x80080208; // type:data -D_800806A0 = 0x800806A0; // type:data -D_800806D0 = 0x800806D0; // type:data -D_80080700 = 0x80080700; // type:data -D_80080730 = 0x80080730; // type:data -D_80080760 = 0x80080760; // type:data -D_80080790 = 0x80080790; // type:data -D_800807C0 = 0x800807C0; // type:data -D_80080868 = 0x80080868; // type:data -D_80080FC4 = 0x80080FC4; // type:data -D_80080FF0 = 0x80080FF0; // type:data -D_800810C8 = 0x800810C8; // type:data -D_800822F8 = 0x800822F8; // type:data -D_80082328 = 0x80082328; // type:data -D_80082358 = 0x80082358; // type:data -D_80082388 = 0x80082388; // type:data +HudScript_HandPointDownLoop = 0x8007FF20; // type:data +HudScript_HandPointDown = 0x800800A0; // type:data +HudScript_HandPointDownHeld = 0x800801D8; // type:data +HudScript_HandPointLeftLoop = 0x80080208; // type:data +HudScript_HandPointLeft = 0x80080388; // type:data +HudScript_HandPointLeftHeld = 0x800804C0; // type:data +HudScript_Item_Hammer1 = 0x800806A0; // type:data +HudScript_Item_Hammer2 = 0x800806D0; // type:data +HudScript_Item_Hammer3 = 0x80080700; // type:data +HudScript_Item_Boots1 = 0x80080730; // type:data +HudScript_Item_Boots2 = 0x80080760; // type:data +HudScript_Item_Boots3 = 0x80080790; // type:data +HudScript_Item_Items = 0x800807C0; // type:data +HudScript_Item_Coin = 0x80080868; // type:data +HudScript_Item_CoinSparkleRandom = 0x80080FC4; // type:data +HudScript_Item_StarPoint = 0x80080FF0; // type:data +HudScript_Item_SmallStarPoint = 0x800810C8; // type:data +HudScript_Item_ITEM_08B = 0x800822F8; // type:data +HudScript_Item_ITEM_08B_disabled = 0x80082328; // type:data +HudScript_Item_ITEM_08C = 0x80082358; // type:data +HudScript_Item_ITEM_08C_disabled = 0x80082388; // type:data gItemTable = 0x800878E0; // size:0x2D80 -D_8008A680 = 0x8008A680; // type:data +gItemHudScripts = 0x8008A680; // type:data dead_gItemTable = 0x8008D2C0; // type:data -D_8008DDD4 = 0x8008DDD4; // type:data -D_8008E3D8 = 0x8008E3D8; // type:data -D_8008E94C = 0x8008E94C; // type:data +gItemEntityScripts = 0x8008DDD4; // type:data +gItemIconRasterOffsets = 0x8008E3D8; // type:data +gItemIconPaletteOffsets = 0x8008E94C; // type:data D_8008EEC4 = 0x8008EEC4; // type:data D_8008EEF0 = 0x8008EEF0; // type:data -D_8008EF20 = 0x8008EF20; // type:data +gPartnerPopupProperties = 0x8008EF20; // type:data +gPartnerIconHudScripts = 0x8008EFF8; // type:data gMoveTable = 0x8008F060; // type:data D_8008F064 = 0x8008F064; // type:data D_8008F06C = 0x8008F06C; // type:data @@ -21442,7 +21522,7 @@ D_8008FA60 = 0x8008FA60; // type:data D_8008FA78 = 0x8008FA78; // type:data D_8008FA8C = 0x8008FA8C; // type:data D_8008FC44 = 0x8008FC44; // type:data -D_8008FEE0 = 0x8008FEE0; // type:data +gMessageBoxFrameParts = 0x8008FEE0; // type:data rdpstateinit_dl = 0x80093BB8; // type:data dtor.2 = 0x80093DC0; // type:data D_80094664 = 0x80094664; // type:data @@ -21481,110 +21561,165 @@ D_800FBBE0 = 0x800FBBE0; // type:data dead_gPlayerStatusPtr = 0x800FFC90; // type:data D_80100060 = 0x80100060; // type:data D_801000A0 = 0x801000A0; // type:data -D_80104A00 = 0x80104A00; // type:data -D_80104A28 = 0x80104A28; // type:data -D_80104AC0 = 0x80104AC0; // type:data -D_80104BEC = 0x80104BEC; // type:data -D_80104C10 = 0x80104C10; // type:data -D_80104CC4 = 0x80104CC4; // type:data -D_80104E64 = 0x80104E64; // type:data -D_801050A8 = 0x801050A8; // type:data -D_801052D8 = 0x801052D8; // type:data -D_8010551C = 0x8010551C; // type:data -D_8010574C = 0x8010574C; // type:data -D_80105900 = 0x80105900; // type:data -D_80105AA0 = 0x80105AA0; // type:data -D_80105C54 = 0x80105C54; // type:data -D_80105DF4 = 0x80105DF4; // type:data -D_80105FA8 = 0x80105FA8; // type:data -D_80106148 = 0x80106148; // type:data -D_801062A0 = 0x801062A0; // type:data -D_801062DC = 0x801062DC; // type:data -D_8010645C = 0x8010645C; // type:data -D_80106610 = 0x80106610; // type:data -D_801067B0 = 0x801067B0; // type:data -D_80106964 = 0x80106964; // type:data -D_80106B04 = 0x80106B04; // type:data -D_80106CD8 = 0x80106CD8; // type:data -D_80106E98 = 0x80106E98; // type:data -D_8010701C = 0x8010701C; // type:data -D_8010717C = 0x8010717C; // type:data -D_80107314 = 0x80107314; // type:data -D_80107474 = 0x80107474; // type:data -D_801075E0 = 0x801075E0; // type:data -D_8010760C = 0x8010760C; // type:data -D_80107638 = 0x80107638; // type:data -D_80107664 = 0x80107664; // type:data -D_80107690 = 0x80107690; // type:data -D_801076BC = 0x801076BC; // type:data -D_801076E8 = 0x801076E8; // type:data -D_80107714 = 0x80107714; // type:data -D_80107740 = 0x80107740; // type:data -D_8010776C = 0x8010776C; // type:data -D_80107798 = 0x80107798; // type:data -D_801077E4 = 0x801077E4; // type:data -D_8010790C = 0x8010790C; // type:data -D_80107CA8 = 0x80107CA8; // type:data -D_80107CD0 = 0x80107CD0; // type:data -D_80107CF8 = 0x80107CF8; // type:data -D_80107D20 = 0x80107D20; // type:data -D_80107D48 = 0x80107D48; // type:data -D_80107D70 = 0x80107D70; // type:data -D_80107D98 = 0x80107D98; // type:data -D_80107DC0 = 0x80107DC0; // type:data -D_80107DE8 = 0x80107DE8; // type:data -D_80107E10 = 0x80107E10; // type:data -D_80107E38 = 0x80107E38; // type:data -D_80107E60 = 0x80107E60; // type:data -D_80107E88 = 0x80107E88; // type:data -D_80107EB0 = 0x80107EB0; // type:data -D_80107ED8 = 0x80107ED8; // type:data -D_80107F00 = 0x80107F00; // type:data -D_80107F28 = 0x80107F28; // type:data -D_80107F50 = 0x80107F50; // type:data -D_80107FC8 = 0x80107FC8; // type:data -D_80107FF0 = 0x80107FF0; // type:data -D_80108068 = 0x80108068; // type:data -D_801080B8 = 0x801080B8; // type:data -D_801080E0 = 0x801080E0; // type:data -D_80108108 = 0x80108108; // type:data -D_80108130 = 0x80108130; // type:data -D_80108158 = 0x80108158; // type:data -D_80108180 = 0x80108180; // type:data -D_801081A8 = 0x801081A8; // type:data -D_801081D0 = 0x801081D0; // type:data -D_801081F8 = 0x801081F8; // type:data -D_80108220 = 0x80108220; // type:data -D_80108248 = 0x80108248; // type:data -D_80108270 = 0x80108270; // type:data -D_801083B0 = 0x801083B0; // type:data -D_801083D8 = 0x801083D8; // type:data -D_801084F0 = 0x801084F0; // type:data -D_80108518 = 0x80108518; // type:data -D_80108538 = 0x80108538; // type:data -D_80108558 = 0x80108558; // type:data -D_801086AC = 0x801086AC; // type:data -D_80108974 = 0x80108974; // type:data -D_801089C4 = 0x801089C4; // type:data -D_80108A14 = 0x80108A14; // type:data -D_80108AAC = 0x80108AAC; // type:data -D_80108AD4 = 0x80108AD4; // type:data -D_80108AFC = 0x80108AFC; // type:data -D_80108B28 = 0x80108B28; // type:data -D_80108B54 = 0x80108B54; // type:data -D_80108B80 = 0x80108B80; // type:data -D_80108BBC = 0x80108BBC; // type:data -D_80108C34 = 0x80108C34; // type:data -D_80108D6C = 0x80108D6C; // type:data -D_80108E1C = 0x80108E1C; // type:data -D_80108E48 = 0x80108E48; // type:data -D_80108E80 = 0x80108E80; // type:data -D_80108F30 = 0x80108F30; // type:data -D_80108F90 = 0x80108F90; // type:data -D_80108FF0 = 0x80108FF0; // type:data -D_801091E4 = 0x801091E4; // type:data -D_80109244 = 0x80109244; // type:data -D_80109270 = 0x80109270; // type:data +HudScript_ArrowLeft = 0x801049B0; // type:data +HudScript_ArrowRight = 0x801049D8; // type:data +HudScript_HandPointer = 0x80104A00; // type:data +HudScript_AnimatedHandPointer = 0x80104A28; // type:data +HudScript_FilledCircle = 0x80104A70; // type:data +HudScript_EmptyCircle = 0x80104A98; // type:data +SparkleScript_Coin = 0x80104AC0; // type:data +HudScript_StatusSPShine = 0x80104BEC; // type:data +HudScript_StatusStarPiece = 0x80104C10; // type:data +HudScript_AsleepLoop = 0x80104C68; // type:data +HudScript_AsleepBegin = 0x80104CC4; // type:data +HudScript_AsleepEnd = 0x80104E64; // type:data +HudScript_ElectrifiedLoop = 0x80104FBC; // type:data +HudScript_ElectrifiedBegin = 0x801050A8; // type:data +HudScript_ElectrifiedEnd = 0x801052D8; // type:data +HudScript_ParalyzedLoop = 0x80105430; // type:data +HudScript_ParalyzedBegin = 0x8010551C; // type:data +HudScript_ParalyzedEnd = 0x8010574C; // type:data +HudScript_DizzyLoop = 0x801058A4; // type:data +HudScript_DizzyBegin = 0x80105900; // type:data +HudScript_DizzyEnd = 0x80105AA0; // type:data +HudScript_PoisonedLoop = 0x80105BF8; // type:data +HudScript_PoisonedBegin = 0x80105C54; // type:data +HudScript_PoisonedEnd = 0x80105DF4; // type:data +HudScript_FrozenLoop = 0x80105F4C; // type:data +HudScript_FrozenBegin = 0x80105FA8; // type:data +HudScript_FrozenEnd = 0x80106148; // type:data +HudScript_WeakenedLoop = 0x801062A0; // type:data +HudScript_WeakenedBegin = 0x801062DC; // type:data +HudScript_WeakenedEnd = 0x8010645C; // type:data +HudScript_StoppedLoop = 0x801065B4; // type:data +HudScript_StoppedBegin = 0x80106610; // type:data +HudScript_StoppedEnd = 0x801067B0; // type:data +HudScript_ShrunkLoop = 0x80106908; // type:data +HudScript_ShrunkBegin = 0x80106964; // type:data +HudScript_ShrunkEnd = 0x80106B04; // type:data +HudScript_TransparentLoop = 0x80106C5C; // type:data +HudScript_TransparentBegin = 0x80106CD8; // type:data +HudScript_TransparentEnd = 0x80106E98; // type:data +HudScript_BoostJumpLoop = 0x80106FF0; // type:data +HudScript_BoostJumpBegin = 0x8010701C; // type:data +HudScript_BoostJumpEnd = 0x8010717C; // type:data +HudScript_BoostHammerLoop = 0x801072E8; // type:data +HudScript_BoostHammerBegin = 0x80107314; // type:data +HudScript_BoostHammerEnd = 0x80107474; // type:data +HudScript_BoostPartner = 0x801075E0; // type:data +HudScript_Surprise = 0x8010760C; // type:data +HudScript_FPCost = 0x80107638; // type:data +HudScript_FPCostReduced = 0x80107664; // type:data +HudScript_FPCostReducedTwice = 0x80107690; // type:data +HudScript_NotEnoughFP = 0x801076BC; // type:data +HudScript_POWCost = 0x801076E8; // type:data +HudScript_POWCostReduced = 0x80107714; // type:data +HudScript_POWCostReducedTwice = 0x80107740; // type:data +HudScript_NotEnoughPOW = 0x8010776C; // type:data +HudScript_GreenArrowDown = 0x80107798; // type:data +HudScript_GreenArrowUp = 0x801077E4; // type:data +HudScript_UnusedPinkFrame = 0x80107830; // type:data +HudScript_UnusedDigit1 = 0x8010785C; // type:data +HudScript_UnusedDigit2 = 0x80107888; // type:data +HudScript_UnusedDigit3 = 0x801078B4; // type:data +HudScript_RedBar1 = 0x801078E0; // type:data +HudScript_EmptyBar = 0x8010790C; // type:data +HudScript_RedBar2 = 0x80107938; // type:data +HudScript_Eldstar = 0x80107990; // type:data +HudScript_EldstarDisabled = 0x801079BC; // type:data +HudScript_Mamar = 0x801079E8; // type:data +HudScript_MamarDisabled = 0x80107A14; // type:data +HudScript_Skolar = 0x80107A40; // type:data +HudScript_SkolarDisabled = 0x80107A6C; // type:data +HudScript_Muskular = 0x80107A98; // type:data +HudScript_MuskularDisabled = 0x80107AC4; // type:data +HudScript_Misstar = 0x80107AF0; // type:data +HudScript_MisstarDisabled = 0x80107B1C; // type:data +HudScript_Klevar = 0x80107B48; // type:data +HudScript_KlevarDisabled = 0x80107B74; // type:data +HudScript_Kalmar = 0x80107BA0; // type:data +HudScript_KalmarDisabled = 0x80107BCC; // type:data +HudScript_StarBeam = 0x80107BF8; // type:data +HudScript_StarBeamDisabled = 0x80107C24; // type:data +HudScript_PeachBeam = 0x80107C50; // type:data +HudScript_PeachBeamDisabled = 0x80107C7C; // type:data +HudScript_Partner0 = 0x80107CA8; // type:data +HudScript_Partner0Disabled = 0x80107CD0; // type:data +HudScript_Goombario = 0x80107CF8; // type:data +HudScript_GoombarioDisabled = 0x80107D20; // type:data +HudScript_Kooper = 0x80107D48; // type:data +HudScript_KooperDisabled = 0x80107D70; // type:data +HudScript_Bombette = 0x80107D98; // type:data +HudScript_BombetteDisabled = 0x80107DC0; // type:data +HudScript_Parakarry = 0x80107DE8; // type:data +HudScript_ParakarryDisabled = 0x80107E10; // type:data +HudScript_Bow = 0x80107E38; // type:data +HudScript_BowDisabled = 0x80107E60; // type:data +HudScript_Watt = 0x80107E88; // type:data +HudScript_WattDisabled = 0x80107EB0; // type:data +HudScript_Sushie = 0x80107ED8; // type:data +HudScript_SushieDisabled = 0x80107F00; // type:data +HudScript_Lakilester = 0x80107F28; // type:data +HudScript_LakilesterDisabled = 0x80107F50; // type:data +HudScript_PartnerA = 0x80107FC8; // type:data +HudScript_PartnerADisabled = 0x80107FF0; // type:data +HudScript_StatusTimes = 0x80108068; // type:data +HudScript_StatusSlash = 0x80108090; // type:data +HudScript_StatusDigit0 = 0x801080B8; // type:data +HudScript_StatusDigit1 = 0x801080E0; // type:data +HudScript_StatusDigit2 = 0x80108108; // type:data +HudScript_StatusDigit3 = 0x80108130; // type:data +HudScript_StatusDigit4 = 0x80108158; // type:data +HudScript_StatusDigit5 = 0x80108180; // type:data +HudScript_StatusDigit6 = 0x801081A8; // type:data +HudScript_StatusDigit7 = 0x801081D0; // type:data +HudScript_StatusDigit8 = 0x801081F8; // type:data +HudScript_StatusDigit9 = 0x80108220; // type:data +HudScript_StatusHP = 0x80108248; // type:data +HudScript_StatusFP = 0x80108270; // type:data +HudScript_StatusSPEmptyIncrement = 0x801083B0; // type:data +HudScript_StatusStar1 = 0x801083D8; // type:data +HudScript_StatusStarEmpty = 0x801084F0; // type:data +HudScript_StatusHeart = 0x80108518; // type:data +HudScript_StatusFlower = 0x80108538; // type:data +HudScript_StatusCoin = 0x80108558; // type:data +HudScript_StatusStarPoint = 0x801086AC; // type:data +HudScript_MenuBoots1 = 0x80108744; // type:data +HudScript_MenuBoots1Disabled = 0x8010876C; // type:data +HudScript_MenuBoots2 = 0x80108794; // type:data +HudScript_MenuBoots2Disabled = 0x801087BC; // type:data +HudScript_MenuBoots3 = 0x801087E4; // type:data +HudScript_MenuBoots3Disabled = 0x8010880C; // type:data +HudScript_MenuHammer1 = 0x80108834; // type:data +HudScript_MenuHammer1Disabled = 0x8010885C; // type:data +HudScript_MenuHammer2 = 0x80108884; // type:data +HudScript_MenuHammer2Disabled = 0x801088AC; // type:data +HudScript_MenuHammer3 = 0x801088D4; // type:data +HudScript_MenuHammer3Disabled = 0x801088FC; // type:data +HudScript_MenuItem = 0x80108924; // type:data +HudScript_MenuItemDisabled = 0x8010894C; // type:data +HudScript_MenuStarPower = 0x80108974; // type:data +HudScript_MenuStarPowerDisabled = 0x8010899C; // type:data +HudScript_Peril = 0x801089C4; // type:data +HudScript_Danger = 0x80108A14; // type:data +HudScript_Happy = 0x80108AAC; // type:data +HudScript_HPDrain = 0x80108AD4; // type:data +HudScript_BlueMeter = 0x80108AFC; // type:data +HudScript_AButton = 0x80108B28; // type:data +HudScript_AButtonDown = 0x80108B54; // type:data +HudScript_MashAButton = 0x80108B80; // type:data +HudScript_PressAButton = 0x80108BBC; // type:data +HudScript_SlowlyMashAButton = 0x80108C34; // type:data +HudScript_RotateStickCW = 0x80108D6C; // type:data +HudScript_StickNeutral = 0x80108E1C; // type:data +HudScript_StickHoldLeft = 0x80108E48; // type:data +HudScript_StickBackAndForth = 0x80108E80; // type:data +HudScript_StickMashLeft = 0x80108F30; // type:data +HudScript_StickTapLeft = 0x80108F90; // type:data +HudScript_StickTapNeutral = 0x80108FF0; // type:data +HudScript_StickTapRight = 0x801091E4; // type:data +HudScript_RunAwayOK = 0x80109244; // type:data +HudScript_MenuTimes = 0x80109270; // type:data D_80109480 = 0x80109480; // type:data D_80109484 = 0x80109484; // type:data D_80109488 = 0x80109488; // type:data @@ -21613,7 +21748,63 @@ D_8010BBB8 = 0x8010BBB8; // type:data D_8010BBC8 = 0x8010BBC8; // type:data D_8010BC08 = 0x8010BC08; // type:data D_8010C920 = 0x8010C920; // type:data -D_8010CFB8 = 0x8010CFB8; // type:data +D_8010C924 = 0x8010C924; // type:data +D_8010C928 = 0x8010C928; // type:data +D_8010C92C = 0x8010C92C; // type:data +wPartnerNpc = 0x8010C930; // type:data +D_8010C934 = 0x8010C934; // type:data +D_8010C938 = 0x8010C938; // type:data +D_8010C93C = 0x8010C93C; // type:data +D_8010C940 = 0x8010C940; // type:data +gSpinHistoryBufferPos = 0x8010C944; // type:data +D_8010C94C = 0x8010C94C; // type:data +D_8010C950 = 0x8010C950; // type:data +D_8010C954 = 0x8010C954; // type:data +D_8010C958 = 0x8010C958; // type:data +D_8010C95C = 0x8010C95C; // type:data +D_8010C960 = 0x8010C960; // type:data +D_8010C964 = 0x8010C964; // type:data +D_8010C968 = 0x8010C968; // type:data +D_8010C96B = 0x8010C96B; // type:data +D_8010C96C = 0x8010C96C; // type:data +D_8010C970 = 0x8010C970; // type:data +D_8010C974 = 0x8010C974; // type:data +D_8010C978 = 0x8010C978; // type:data +D_8010C97A = 0x8010C97A; // type:data +D_8010C97C = 0x8010C97C; // type:data +D_8010C980 = 0x8010C980; // type:data +D_8010C984 = 0x8010C984; // type:data +D_8010C98C = 0x8010C98C; // type:data +D_8010C990 = 0x8010C990; // type:data +D_8010C9A0 = 0x8010C9A0; // type:data +D_8010C9B0 = 0x8010C9B0; // type:data +D_8010C9C0 = 0x8010C9C0; // type:data +D_8010C9C8 = 0x8010C9C8; // type:data +D_8010CCF8 = 0x8010CCF8; // type:data +D_8010CCFA = 0x8010CCFA; // type:data +D_8010CCFC = 0x8010CCFC; // type:data +D_8010CCFE = 0x8010CCFE; // type:data +D_8010CD00 = 0x8010CD00; // type:data +D_8010CD10 = 0x8010CD10; // type:data +D_8010CD12 = 0x8010CD12; // type:data +D_8010CD20 = 0x8010CD20; // type:data +D_8010CD30 = 0x8010CD30; // type:data +D_8010CD34 = 0x8010CD34; // type:data +PlayerMoveHistory = 0x8010CD38; // type:data +PlayerMoveHistoryIndex = 0x8010CFB8; // type:data +D_8010CFBC = 0x8010CFBC; // type:data +wPartnerTetherDistance = 0x8010CFC0; // type:data +D_8010CFC4 = 0x8010CFC4; // type:data +D_8010CFC8 = 0x8010CFC8; // type:data +D_8010CFCA = 0x8010CFCA; // type:data +D_8010CFCC = 0x8010CFCC; // type:data +D_8010CFCE = 0x8010CFCE; // type:data +D_8010CFD0 = 0x8010CFD0; // type:data +wPartnerCurrentScript = 0x8010CFD4; // type:data +D_8010CFD8 = 0x8010CFD8; // type:data +wPartnerCurrentScriptID = 0x8010CFDC; // type:data +D_8010CFE0 = 0x8010CFE0; // type:data +D_8010CFE4 = 0x8010CFE4; // type:data D_8010CFE8 = 0x8010CFE8; // type:data dead_gPartnerActionStatus2 = 0x80117160; // type:data dead_gPartnerActionStatus = 0x80117163; // type:data @@ -22428,49 +22619,49 @@ MerleeAttackBonus = 0x80288400; // MerleeDefenseBonus = 0x8028870C; // MerleeExpBonus = 0x80288A58; // PlayerHappy = 0x80288D64; // -D_80291FA8 = 0x80291FA8; // type:data -D_80291FD0 = 0x80291FD0; // type:data -D_80291FF8 = 0x80291FF8; // type:data -D_80292020 = 0x80292020; // type:data -D_80292048 = 0x80292048; // type:data -D_80292070 = 0x80292070; // type:data -D_80292098 = 0x80292098; // type:data -D_802920C0 = 0x802920C0; // type:data -D_802920E8 = 0x802920E8; // type:data -D_80292110 = 0x80292110; // type:data -D_802922F0 = 0x802922F0; // type:data -D_8029275C = 0x8029275C; // type:data -D_802927F0 = 0x802927F0; // type:data -D_8029281C = 0x8029281C; // type:data -D_80292848 = 0x80292848; // type:data -D_80292874 = 0x80292874; // type:data -D_802928A0 = 0x802928A0; // type:data -D_802928CC = 0x802928CC; // type:data -D_802928F8 = 0x802928F8; // type:data -D_80292974 = 0x80292974; // type:data -D_80292A2C = 0x80292A2C; // type:data -D_80292AFC = 0x80292AFC; // type:data -D_80292B54 = 0x80292B54; // type:data -D_80292B80 = 0x80292B80; // type:data -D_80292BAC = 0x80292BAC; // type:data -D_80292BD8 = 0x80292BD8; // type:data -D_80292C00 = 0x80292C00; // type:data -D_80292C50 = 0x80292C50; // type:data -D_80292C7C = 0x80292C7C; // type:data -D_80292CB8 = 0x80292CB8; // type:data +HudScript_HPDigit0 = 0x80291FA8; // type:data +HudScript_HPDigit1 = 0x80291FD0; // type:data +HudScript_HPDigit2 = 0x80291FF8; // type:data +HudScript_HPDigit3 = 0x80292020; // type:data +HudScript_HPDigit4 = 0x80292048; // type:data +HudScript_HPDigit5 = 0x80292070; // type:data +HudScript_HPDigit6 = 0x80292098; // type:data +HudScript_HPDigit7 = 0x802920C0; // type:data +HudScript_HPDigit8 = 0x802920E8; // type:data +HudScript_HPDigit9 = 0x80292110; // type:data +HudScript_TimingBar1Chance = 0x802922F0; // type:data +HudScript_TimingWait = 0x8029275C; // type:data +HudScript_TimingCharge4a = 0x802927F0; // type:data +HudScript_TimingCharge1 = 0x8029281C; // type:data +HudScript_TimingCharge4b = 0x80292848; // type:data +HudScript_TimingCharge2 = 0x80292874; // type:data +HudScript_TimingCharge4c = 0x802928A0; // type:data +HudScript_TimingCharge3 = 0x802928CC; // type:data +HudScript_RunningAway = 0x802928F8; // type:data +HudScript_100pct = 0x80292974; // type:data +HudScript_RightOn = 0x80292A2C; // type:data +HudScript_TimingBar3Chances = 0x80292AFC; // type:data +HudScript_TimingOK = 0x80292B54; // type:data +HudScript_TimingMiss = 0x80292B80; // type:data +HudScript_FillGaugeResult = 0x80292BAC; // type:data +HudScript_ProjectorReel = 0x80292BD8; // type:data +HudScript_ProjectorSpot = 0x80292C00; // type:data +HudScript_SwapZ = 0x80292C50; // type:data +HudScript_SwapArrowLeft = 0x80292C7C; // type:data +HudScript_SwapArrowRight = 0x80292CB8; // type:data D_80292CF4 = 0x80292CF4; // type:data -D_80292D1C = 0x80292D1C; // type:data -D_80292DB4 = 0x80292DB4; // type:data -D_80292E4C = 0x80292E4C; // type:data -D_80292EE4 = 0x80292EE4; // type:data -D_80292F7C = 0x80292F7C; // type:data -D_80293014 = 0x80293014; // type:data -D_802931DC = 0x802931DC; // type:data -D_80293274 = 0x80293274; // type:data -D_8029330C = 0x8029330C; // type:data -D_802933A4 = 0x802933A4; // type:data -D_8029343C = 0x8029343C; // type:data -D_802934D4 = 0x802934D4; // type:data +HudScript_AimMarkerA = 0x80292D1C; // type:data +HudScript_AimMarkerB = 0x80292DB4; // type:data +HudScript_AimMarkerC = 0x80292E4C; // type:data +HudScript_AimMarkerD = 0x80292EE4; // type:data +HudScript_AimMarkerE = 0x80292F7C; // type:data +HudScript_AimMarkerF = 0x80293014; // type:data +HudScript_AimShimmerA = 0x802931DC; // type:data +HudScript_AimShimmerB = 0x80293274; // type:data +HudScript_AimShimmerC = 0x8029330C; // type:data +HudScript_AimShimmerD = 0x802933A4; // type:data +HudScript_AimShimmerE = 0x8029343C; // type:data +HudScript_AimShimmerF = 0x802934D4; // type:data gBattleItemTable = 0x80293C04; // type:data UseMystery = 0x80293E40; // D_802941C0 = 0x802941C0; // type:data @@ -22758,7 +22949,7 @@ D_802AD06A = 0x802AD06A; // type:data D_802AD06B = 0x802AD06B; // type:data D_802AD06C = 0x802AD06C; // type:data D_802AD070 = 0x802AD070; // type:data -main_battle_menu_iconScripts = 0x802AD078; // type:data +main_battle_menu_JumpHudScripts = 0x802AD078; // type:data battle_menu_messageIDs = 0x802AD090; // type:data D_802AD0A8 = 0x802AD0A8; // type:data main_menu_numOptions = 0x802AD0AC; // type:data @@ -22988,9 +23179,9 @@ D_802EA0A0 = 0x802EA0A0; // type:data D_802EA0C4 = 0x802EA0C4; // type:data D_802EA2BC = 0x802EA2BC; // type:data D_802EA310 = 0x802EA310; // type:data -D_802EA618 = 0x802EA618; // type:data -D_802EA63C = 0x802EA63C; // type:data -D_802EA660 = 0x802EA660; // type:data +Entity_HitGroundedYellowBlock = 0x802EA618; // type:data +Entity_HitFloatingYellowBlock = 0x802EA63C; // type:data +Entity_HitRedBlock = 0x802EA660; // type:data D_802EA728 = 0x802EA728; // type:data D_802EA744 = 0x802EA744; // type:data D_802EA760 = 0x802EA760; // type:data diff --git a/ver/us/undefined_syms.txt b/ver/us/undefined_syms.txt index f3337e8dd8..f7338ea4e6 100644 --- a/ver/us/undefined_syms.txt +++ b/ver/us/undefined_syms.txt @@ -759,7 +759,7 @@ D_802AD06A = 0x802AD06A; D_802AD06B = 0x802AD06B; D_802AD06C = 0x802AD06C; D_802AD070 = 0x802AD070; -main_battle_menu_iconScripts = 0x802AD078; +main_battle_menu_JumpHudScripts = 0x802AD078; battle_menu_messageIDs = 0x802AD090; D_802AD0A8 = 0x802AD0A8; main_menu_numOptions = 0x802AD0AC;