From 49bee8512b112f5199cdfc5ad34a858b59cbf5a8 Mon Sep 17 00:00:00 2001 From: alex Date: Wed, 18 Aug 2021 17:28:32 +0100 Subject: [PATCH] hud_element.c (#371) * generate permuter_settings.toml * remove -Wshadow (#366) Co-authored-by: pixel-stuck --- .gitignore | 2 + include/common.h | 4 +- include/common_structs.h | 32 +- include/functions.h | 9 - include/macros.h | 5 +- include/variables.h | 1 - src/111f0_len_860.c | 2 +- src/18F340.c | 1 + src/415D90.c | 9 +- src/80850_len_3060.c | 8 +- src/battle/action_cmd/flee.c | 2 +- src/battle/action_cmd/hammer.c | 1 + src/battle/action_cmd/jump.c | 2 +- src/battle/action_cmd/stop_leech.c | 2 +- src/battle/action_cmd/tidal_wave.c | 9 +- src/battle/action_cmd/water_block.c | 4 +- src/battle/action_cmd/whirlwind.c | 8 +- src/d5a50_len_5fd0.c | 222 ------------ src/dc470_len_14c0.c | 4 +- src/evt/script_list.c | 80 ++++- src/heap.c | 6 +- src/hud_element.c | 319 ++++++++++++++++++ src/hud_element.h | 175 ++++++++++ src/main_loop.c | 2 +- src/world/script_api/7E0E80.c | 1 + tools/build/configure.py | 25 +- tools/disasm_hud_element_animation.py | 182 ++++++++++ tools/permuter_settings.toml | 10 - tools/rename.py | 3 +- tools/to_rename.txt | 2 + .../16c8e0/btl_draw_enemy_health_bars.s | 6 +- .../16c8e0/btl_update_starpoints_display.s | 12 +- .../asm/nonmatchings/17D6A0/func_8024FB3C.s | 26 +- .../18C790/btl_state_draw_celebration.s | 16 +- .../18C790/btl_state_update_celebration.s | 46 +-- .../20ec0_len_5040/func_80046030.s | 8 +- .../remove_status_icon_boost_hammer.s | 2 +- .../remove_status_icon_boost_jump.s | 2 +- .../415D90/btl_state_draw_select_target.s | 12 +- .../415D90/btl_state_update_select_target.s | 2 +- .../asm/nonmatchings/415D90/func_802A2C84.s | 2 +- .../asm/nonmatchings/415D90/func_802A3C98.s | 4 +- .../asm/nonmatchings/415D90/func_802A4A54.s | 2 +- .../80850_len_3060/status_menu_draw_number.s | 4 +- .../80850_len_3060/status_menu_draw_stat.s | 6 +- .../80850_len_3060/update_status_menu.s | 32 +- .../8a860_len_3f30/func_800F16CC.s | 2 +- .../popup_menu_draw_menu_contents.s | 8 +- .../8a860_len_3f30/popup_menu_update.s | 6 +- .../C50A0/update_item_entity_temp.s | 2 +- .../action_cmd/07/func_802A9228_425D78.s | 2 +- .../action_cmd/0A/func_802A928C_42763C.s | 2 +- .../air_lift/func_802A9278_428CE8.s | 2 +- .../air_raid/func_802A9294_4295B4.s | 2 +- .../body_slam/func_802A92D4_4285B4.s | 6 +- .../action_cmd/bomb/func_802A928C_427CFC.s | 2 +- .../break_free/func_802A92DC_4236CC.s | 2 +- .../dizzy_shell/func_802A928C_4263FC.s | 2 +- .../fire_shell/func_802A9294_426C64.s | 2 +- .../action_cmd/hammer/func_802A936C_42236C.s | 10 +- .../hurricane/func_802A92A0_42F980.s | 4 +- .../mega_shock/func_802A92A0_42DCB0.s | 4 +- .../power_shock/func_802A9310_42D220.s | 2 +- .../action_cmd/smack/func_802A9298_42E638.s | 2 +- .../spiny_surge/func_802A9254_42F074.s | 2 +- .../action_cmd/spook/func_802A9298_4302B8.s | 2 +- .../action_cmd/squirt/func_802A9208_429F28.s | 8 +- .../tidal_wave/func_802A9228_42C918.s | 4 +- .../water_block/func_802A948C_42A97C.s | 34 +- .../whirlwind/func_802A92F0_423F60.s | 2 +- .../partner/lakilester/func_8023803C_70BD4C.s | 2 +- .../partner/parakarry/func_80238000_6FFD80.s | 2 +- .../d5a50_len_5fd0/init_hud_element_list.s | 69 ---- .../evt/script_list/start_child_script.s | 154 --------- .../ALT_clear_hud_element_cache.s | 0 .../clear_hud_element_cache.s | 12 +- .../copy_world_hud_element_ref_to_battle.s | 0 .../create_hud_element.s | 12 +- .../create_hud_element_transform_A.s | 4 +- .../create_hud_element_transform_B.s | 4 +- .../create_hud_element_transform_C.s | 4 +- .../draw_hud_element.s | 4 +- .../draw_rect_hud_element.s | 0 .../func_801413F8.s | 0 .../func_80143C48.s | 4 +- .../func_80144E4C.s | 4 +- .../hud_element_update.s | 0 .../load_hud_element.s | 0 .../render_hud_element.s | 0 .../render_hud_elements_backUI.s | 12 +- .../render_hud_elements_frontUI.s | 12 +- .../render_hud_elements_world.s | 24 +- .../set_hud_element_nonworld_cache.s | 0 .../set_hud_element_render_depth.s | 4 +- .../set_hud_element_scale.s | 4 +- .../set_hud_element_transform_pos.s | 4 +- .../set_hud_element_transform_rotation.s | 4 +- ...set_hud_element_transform_rotation_pivot.s | 4 +- .../set_hud_element_transform_scale.s | 4 +- .../update_hud_elements.s | 4 +- .../135EE0/pause_textbox_draw_contents.s | 2 +- .../pause/138CC0/pause_badges_draw_contents.s | 2 +- .../pause/138CC0/pause_stats_draw_contents.s | 36 +- .../pause_items/pause_items_draw_contents.s | 2 +- .../kkj_19/AF7C00/func_802406C4_AF8014.s | 2 +- .../mgm_02/E15D80/func_80240468_E161E8.s | 2 +- .../mgm_02/E15D80/func_80240BB0_E16930.s | 6 +- .../obk_07/BCF0F0/func_80240A6C_BCF65C.s | 2 +- ver/us/splat.yaml | 4 +- ver/us/symbol_addrs.txt | 8 +- ver/us/undefined_syms_auto.txt | 2 +- 111 files changed, 1063 insertions(+), 784 deletions(-) delete mode 100644 src/d5a50_len_5fd0.c create mode 100644 src/hud_element.c create mode 100644 src/hud_element.h create mode 100755 tools/disasm_hud_element_animation.py delete mode 100644 tools/permuter_settings.toml create mode 100644 tools/to_rename.txt delete mode 100644 ver/us/asm/nonmatchings/d5a50_len_5fd0/init_hud_element_list.s delete mode 100644 ver/us/asm/nonmatchings/evt/script_list/start_child_script.s rename ver/us/asm/nonmatchings/{d5a50_len_5fd0 => hud_element}/ALT_clear_hud_element_cache.s (100%) rename ver/us/asm/nonmatchings/{d5a50_len_5fd0 => hud_element}/clear_hud_element_cache.s (94%) rename ver/us/asm/nonmatchings/{d5a50_len_5fd0 => hud_element}/copy_world_hud_element_ref_to_battle.s (100%) rename ver/us/asm/nonmatchings/{d5a50_len_5fd0 => hud_element}/create_hud_element.s (92%) rename ver/us/asm/nonmatchings/{d5a50_len_5fd0 => hud_element}/create_hud_element_transform_A.s (94%) rename ver/us/asm/nonmatchings/{d5a50_len_5fd0 => hud_element}/create_hud_element_transform_B.s (93%) rename ver/us/asm/nonmatchings/{d5a50_len_5fd0 => hud_element}/create_hud_element_transform_C.s (93%) rename ver/us/asm/nonmatchings/{d5a50_len_5fd0 => hud_element}/draw_hud_element.s (99%) rename ver/us/asm/nonmatchings/{d5a50_len_5fd0 => hud_element}/draw_rect_hud_element.s (100%) rename ver/us/asm/nonmatchings/{d5a50_len_5fd0 => hud_element}/func_801413F8.s (100%) rename ver/us/asm/nonmatchings/{d5a50_len_5fd0 => hud_element}/func_80143C48.s (99%) rename ver/us/asm/nonmatchings/{d5a50_len_5fd0 => hud_element}/func_80144E4C.s (79%) rename ver/us/asm/nonmatchings/{d5a50_len_5fd0 => hud_element}/hud_element_update.s (100%) rename ver/us/asm/nonmatchings/{d5a50_len_5fd0 => hud_element}/load_hud_element.s (100%) rename ver/us/asm/nonmatchings/{d5a50_len_5fd0 => hud_element}/render_hud_element.s (100%) rename ver/us/asm/nonmatchings/{d5a50_len_5fd0 => hud_element}/render_hud_elements_backUI.s (97%) rename ver/us/asm/nonmatchings/{d5a50_len_5fd0 => hud_element}/render_hud_elements_frontUI.s (97%) rename ver/us/asm/nonmatchings/{d5a50_len_5fd0 => hud_element}/render_hud_elements_world.s (95%) rename ver/us/asm/nonmatchings/{d5a50_len_5fd0 => hud_element}/set_hud_element_nonworld_cache.s (100%) rename ver/us/asm/nonmatchings/{d5a50_len_5fd0 => hud_element}/set_hud_element_render_depth.s (78%) rename ver/us/asm/nonmatchings/{d5a50_len_5fd0 => hud_element}/set_hud_element_scale.s (97%) rename ver/us/asm/nonmatchings/{d5a50_len_5fd0 => hud_element}/set_hud_element_transform_pos.s (88%) rename ver/us/asm/nonmatchings/{d5a50_len_5fd0 => hud_element}/set_hud_element_transform_rotation.s (88%) rename ver/us/asm/nonmatchings/{d5a50_len_5fd0 => hud_element}/set_hud_element_transform_rotation_pivot.s (86%) rename ver/us/asm/nonmatchings/{d5a50_len_5fd0 => hud_element}/set_hud_element_transform_scale.s (88%) rename ver/us/asm/nonmatchings/{d5a50_len_5fd0 => hud_element}/update_hud_elements.s (96%) diff --git a/.gitignore b/.gitignore index c545d98992..19a8313dde 100644 --- a/.gitignore +++ b/.gitignore @@ -11,6 +11,7 @@ ctx.c expected/ .vscode/launch.json /tools/star-rod +/tools/to_rename.txt /ver/current /ver/*/assets @@ -34,6 +35,7 @@ build/ /include/message_ids.h /include/sprite/ /include/map +/tools/permuter_settings.toml # Assets /assets/* diff --git a/include/common.h b/include/common.h index 68c576eff3..632fc3c5c8 100644 --- a/include/common.h +++ b/include/common.h @@ -4,6 +4,7 @@ #include "ultra64.h" #include "types.h" #include "common_structs.h" +#include "hud_element.h" // TEMP for Actor #include "functions.h" #include "variables.h" #include "macros.h" @@ -11,7 +12,8 @@ #include "si.h" #include "messages.h" -// these are just for the permuter +#ifdef PERMUTER extern int TEXEL0, TEXEL1, PRIMITIVE, PRIMITIVE_ALPHA; +#endif #endif diff --git a/include/common_structs.h b/include/common_structs.h index 190ac431b1..2b0bd8cf30 100644 --- a/include/common_structs.h +++ b/include/common_structs.h @@ -419,36 +419,6 @@ typedef struct MusicSettings { /* 0x2C */ s32 unk_2C; } MusicSettings; // size = 0x30 -typedef struct HudElement { - /* 0x00 */ s32 flags; - /* 0x04 */ s32* readPos; - /* 0x08 */ s32* startReadPos; - /* 0x0C */ s32* ptrPropertyList; - /* 0x10 */ s32* imageAddr; - /* 0x14 */ s32* paletteAddr; - /* 0x18 */ s32 memOffset; - /* 0x1C */ s32* hudTransform; - /* 0x20 */ f32 unk_20; - /* 0x24 */ f32 unk_24; - /* 0x28 */ f32 unkImgScale[2]; - /* 0x30 */ f32 uniformScale; - /* 0x34 */ s32 widthScale; /* X.10 fmt (divide by 1024.0 to get float) */ - /* 0x38 */ s32 heightScale; /* X.10 fmt (divide by 1024.0 to get float) */ - /* 0x3C */ s16 renderPosX; - /* 0x3E */ s16 renderPosY; - /* 0x40 */ u8 screenPosOffset[2]; - /* 0x42 */ u8 worldPosOffset[3]; - /* 0x45 */ s8 drawSizePreset; - /* 0x46 */ s8 tileSizePreset; - /* 0x47 */ u8 updateTimer; - /* 0x48 */ u8 sizeX; /* screen size? */ - /* 0x49 */ u8 sizeY; /* screen size? */ - /* 0x4A */ u8 opacity; - /* 0x4B */ s8 tint[3]; - /* 0x4E */ s8 customImageSize[2]; - /* 0x40 */ s8 customDrawSize[2]; -} HudElement; // size = 0x54 - typedef struct UiStatus { /* 0x00 */ s32 hpIconIndexes[2]; /* 0x08 */ s32 fpIconIndexes[2]; @@ -2262,7 +2232,7 @@ typedef struct RenderTaskEntry { typedef struct ActionCommandStatus { /* 0x00 */ s32 unk_00; - /* 0x04 */ HudElement* hudElements[15]; + /* 0x04 */ struct HudElement* hudElements[15]; /* 0x40 */ char unk_40[0x4]; /* 0x44 */ s16 unk_44; /* 0x46 */ s16 unk_46; diff --git a/include/functions.h b/include/functions.h index 345962b7ce..bd3271d755 100644 --- a/include/functions.h +++ b/include/functions.h @@ -55,7 +55,6 @@ f32 func_800E5348(void); void transform_point(Matrix4f mtx, f32, f32, f32, f32, f32*, f32*, f32*, f32*); void draw_number(s32 value, s32 x, s32 y, s32 arg3, s32 palette, s32 opacity, s32 style); -void set_hud_element_scale(s32 index, f32 scale); void set_entity_model_render_command_list(s32 idx, u32* commandList); void set_entity_model_flags(s32 idx, s32 newFlags); @@ -203,9 +202,6 @@ s32 test_ray_entities(f32 startX, f32 startY, f32 startZ, f32 dirX, f32 dirY, f3 void mem_clear(s8* data, s32 numBytes); -HudElement* create_hud_element(s32* iconIndex); -void set_hud_element_render_pos(s32 iconIndex, s32 posX, s32 posY); - void intro_logos_set_fade_color(s16 color); void intro_logos_set_fade_alpha(s16 alpha); @@ -482,10 +478,5 @@ s32 set_screen_overlay_center_worldpos(void); s32 mdl_get_next_texture_address(void); void draw_string(s32 stringID, s32 posX, s32 posY, s32 opacity, s32 palette, s32 style); void get_background_color_blend(u8* r, u8* g, u8* b, u8* a); -void set_hud_element_script(s32 arg0, s32 *arg1); -void set_hud_element_tint(s32 iconIndex, s32 tint1, s32 tint2, s32 tint3); -void set_window_update(s32 panelIndex, s32 arg1); -void set_hud_element_alpha(s32 iconIndex, s32 opacity); -void draw_hud_element_clipped(s32 arg0); #endif diff --git a/include/macros.h b/include/macros.h index 9f91391202..3222003d5a 100644 --- a/include/macros.h +++ b/include/macros.h @@ -83,9 +83,12 @@ #define CUBE(x) (x*x*x) #define QUART(x) (x*x*x*x) -// Fixed-point short literal +/// Fixed-point short literal #define F16(f) (s16)(f * 327.67f) +/// X.10 fixed-point literal +#define X10(f) (s32)(f * 1024.0f) + #define _NS(x, y) x ## _ ## y #define NS(x, y) _NS(x, y) diff --git a/include/variables.h b/include/variables.h index 587998759a..00e2ce0848 100644 --- a/include/variables.h +++ b/include/variables.h @@ -78,7 +78,6 @@ extern NpcList* gCurrentNpcListPtr; extern ShadowList gWorldShadowList; extern ShadowList gBattleShadowList; extern ShadowList* gCurrentShadowListPtr; -extern HudElement** gHudElementList; extern Camera gCameras[4]; extern s32 gCurrentCameraID; diff --git a/src/111f0_len_860.c b/src/111f0_len_860.c index f691a82ed1..b1665ca210 100644 --- a/src/111f0_len_860.c +++ b/src/111f0_len_860.c @@ -28,7 +28,7 @@ void init_enter_world_shared(void) { gOverrideFlags |= 0x8; - set_variable(0, SI_SAVE_VAR(1), gGameStatusPtr->unk_A9); + set_variable(NULL, SI_SAVE_VAR(1), gGameStatusPtr->unk_A9); timeFreezeMode = 0; } diff --git a/src/18F340.c b/src/18F340.c index 81ef636cd1..e88deadf65 100644 --- a/src/18F340.c +++ b/src/18F340.c @@ -1,5 +1,6 @@ #include "common.h" #include "effects.h" +#include "hud_element.h" extern s32 D_80108AAC; extern s32 D_80108AD4; diff --git a/src/415D90.c b/src/415D90.c index a605ec0087..7666e2e9eb 100644 --- a/src/415D90.c +++ b/src/415D90.c @@ -1,4 +1,5 @@ #include "common.h" +#include "hud_element.h" extern s32 D_80104A28; extern s32 D_80107D48; @@ -298,7 +299,7 @@ void func_802A2910(void) { set_hud_element_tint(moveOptionCostUnitIconIDs[i], 255, 255, 255); } - set_hud_element_script(battle_menu_moveCursorIcon, &D_80104A28); + set_hud_element_anim(battle_menu_moveCursorIcon, &D_80104A28); set_window_update(1, 5); if (!battle_menu_hasSpiritsMenu) { @@ -349,7 +350,7 @@ void func_802A2AB8(void) { set_hud_element_tint(moveOptionCostUnitIconIDs[i], 255, 255, 255); } - set_hud_element_script(battle_menu_moveCursorIcon, &D_80104A28); + set_hud_element_anim(battle_menu_moveCursorIcon, &D_80104A28); battle_menu_moveTextColor = 10; D_802AD10F = 1; battle_menu_moveState = 20; @@ -500,7 +501,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_script(D_802AD618, &D_80104A28); + set_hud_element_anim(D_802AD618, &D_80104A28); set_window_update(6, 5); set_window_update(7, 5); set_window_update(8, 1); @@ -524,7 +525,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_script(D_802AD618, &D_80104A28); + set_hud_element_anim(D_802AD618, &D_80104A28); D_802AD614 = 10; D_802AD60B = 1; D_802AD604 = 20; diff --git a/src/80850_len_3060.c b/src/80850_len_3060.c index 5d84604fd2..0bd15b02ea 100644 --- a/src/80850_len_3060.c +++ b/src/80850_len_3060.c @@ -1,11 +1,9 @@ #include "common.h" +#include "hud_element.h" extern s32 D_800F7FA8; extern s32 D_800F7F80[10]; -void clear_hud_element_flags(s32, s32); -void draw_hud_element_2(s32); - void clear_player_data(void) { PlayerData* playerData = &gPlayerData; s32 i; @@ -401,7 +399,7 @@ void status_menu_draw_number(s32 iconID, s32 x, s32 y, s32 value, s32 numDigits) s32 digit; s32 place; - set_hud_element_script(iconID, D_800F7FA8); + set_hud_element_anim(iconID, D_800F7FA8); x += 8; y2 = y + 8; set_hud_element_render_pos(iconID, x, y + 7); @@ -426,7 +424,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_script(iconID, D_800F7F80[digit]); + set_hud_element_anim(iconID, D_800F7F80[digit]); set_hud_element_render_pos(iconID, x, y2); clear_hud_element_flags(iconID, 2); draw_hud_element_2(iconID); diff --git a/src/battle/action_cmd/flee.c b/src/battle/action_cmd/flee.c index 23e07d27e3..63f4db30b9 100644 --- a/src/battle/action_cmd/flee.c +++ b/src/battle/action_cmd/flee.c @@ -143,7 +143,7 @@ void func_802A9378_422E48(void) { break; } - set_hud_element_script(actionCommandStatus->hudElements[0], &D_80108B80); + set_hud_element_anim(actionCommandStatus->hudElements[0], &D_80108B80); 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 f45ff27f11..b766b9d14f 100644 --- a/src/battle/action_cmd/hammer.c +++ b/src/battle/action_cmd/hammer.c @@ -1,4 +1,5 @@ #include "common.h" +#include "hud_element.h" #define NAMESPACE action_command_hammer diff --git a/src/battle/action_cmd/jump.c b/src/battle/action_cmd/jump.c index 3fa2b65d03..7dd94bdbfa 100644 --- a/src/battle/action_cmd/jump.c +++ b/src/battle/action_cmd/jump.c @@ -125,7 +125,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_script(actionCommandStatus->hudElements[0], &D_80108B54); + set_hud_element_anim(actionCommandStatus->hudElements[0], &D_80108B54); } if (((battleStatus->currentButtonsPressed & 0x8000) != 0) && (actionCommandStatus->autoSucceed == 0)) { actionCommandStatus->unk_60 = 1; diff --git a/src/battle/action_cmd/stop_leech.c b/src/battle/action_cmd/stop_leech.c index e27f758c16..92259cacd0 100644 --- a/src/battle/action_cmd/stop_leech.c +++ b/src/battle/action_cmd/stop_leech.c @@ -106,7 +106,7 @@ void func_802A91F8_425788(void) { actionCommandStatus->unk_4E -= 1; break; } - set_hud_element_script(actionCommandStatus->hudElements[0], &D_80108B80); + set_hud_element_anim(actionCommandStatus->hudElements[0], &D_80108B80); actionCommandStatus->unk_44 = 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 c095810744..a8a1108af4 100644 --- a/src/battle/action_cmd/tidal_wave.c +++ b/src/battle/action_cmd/tidal_wave.c @@ -9,12 +9,12 @@ extern s32 D_802944A0; ApiStatus N(CreateHudElements)(ScriptInstance* script, s32 isInitialCall) { ActionCommandStatus* actionCommandStatus = &gActionCommandStatus; BattleStatus* battleStatus = &gBattleStatus; - HudElement* hudElement; + s32 hudElement; s32 i; battleStatus->unk_82 = 5; battleStatus->unk_434 = &D_802944A0; - + if (battleStatus->unk_83 == 0) { battleStatus->actionSuccess = 0; return ApiStatus_DONE2; @@ -28,13 +28,14 @@ ApiStatus N(CreateHudElements)(ScriptInstance* script, s32 isInitialCall) { battleStatus->unk_84 = 0; actionCommandStatus->hudElementX = -48; actionCommandStatus->hudElementY = 80; + hudElement = create_hud_element(&D_80108AFC); 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 < 15; i++) { + for (i = 1; i < ARRAY_COUNT(actionCommandStatus->hudElements); i++) { hudElement = create_hud_element(&D_80108B28); actionCommandStatus->hudElements[i] = hudElement; set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); @@ -87,7 +88,7 @@ void N(free_hud_elements)(void) { s32 i; free_hud_element(gActionCommandStatus.hudElements[0]); - + for (i = 1; i < 15; i++) { free_hud_element(gActionCommandStatus.hudElements[i]); } diff --git a/src/battle/action_cmd/water_block.c b/src/battle/action_cmd/water_block.c index 00b839a25b..95f5ac296c 100644 --- a/src/battle/action_cmd/water_block.c +++ b/src/battle/action_cmd/water_block.c @@ -52,8 +52,8 @@ void func_802AA014_42B504(void) { draw_hud_element_clipped(actionCommandStatus->hudElements[13]); hudElement = actionCommandStatus->hudElements[10]; - if (get_hud_element_script(hudElement) != D_802AB180_42C670[battleStatus->unk_84]) { - set_hud_element_script(hudElement, D_802AB180_42C670[battleStatus->unk_84]); + if (get_hud_element_anim(hudElement) != D_802AB180_42C670[battleStatus->unk_84]) { + set_hud_element_anim(hudElement, D_802AB180_42C670[battleStatus->unk_84]); } draw_hud_element_clipped(hudElement); diff --git a/src/battle/action_cmd/whirlwind.c b/src/battle/action_cmd/whirlwind.c index 856a1c35b4..967588c4d0 100644 --- a/src/battle/action_cmd/whirlwind.c +++ b/src/battle/action_cmd/whirlwind.c @@ -89,12 +89,12 @@ void func_802A9744_4243B4(void) { draw_hud_element_clipped(actionCommandStatus->hudElements[3]); hudElement = actionCommandStatus->hudElements[2]; if (actionCommandStatus->unk_64 == 0) { - if (D_802AA888_4254F8[battleStatus->unk_84] != get_hud_element_script(hudElement)) { - set_hud_element_script(hudElement, D_802AA888_4254F8[battleStatus->unk_84]); + if (D_802AA888_4254F8[battleStatus->unk_84] != get_hud_element_anim(hudElement)) { + set_hud_element_anim(hudElement, D_802AA888_4254F8[battleStatus->unk_84]); } } else { - if (D_802AA8A0_425510[battleStatus->unk_84] != get_hud_element_script(hudElement)) { - set_hud_element_script(hudElement, D_802AA8A0_425510[battleStatus->unk_84]); + if (D_802AA8A0_425510[battleStatus->unk_84] != get_hud_element_anim(hudElement)) { + set_hud_element_anim(hudElement, D_802AA8A0_425510[battleStatus->unk_84]); } } draw_hud_element_clipped(hudElement); diff --git a/src/d5a50_len_5fd0.c b/src/d5a50_len_5fd0.c deleted file mode 100644 index f7b024ba65..0000000000 --- a/src/d5a50_len_5fd0.c +++ /dev/null @@ -1,222 +0,0 @@ -#include "common.h" - -void free_hud_element_transform(s32 arg0); - -s32 D_8014EFC0[] = { 0x00000000, }; -s32 D_8014EFC4[] = { 0x00011000, }; -s32 D_8014EFC8[] = { 0x00000000, }; -s32 D_8014EFCC[] = { 0x00080008, 0x00200010, 0x00100080, 0x00180018, 0x01200020, 0x00200200, 0x00300030, 0x04800040, - 0x00400800, 0x00080010, 0x00400010, 0x00080040, 0x00100018, 0x00C00010, 0x00200100, 0x00400020, - 0x04000020, 0x00100100, 0x000C000C, 0x00480030, 0x00180240, 0x00200008, 0x00800018, 0x00080060, - 0x00400010, 0x02000010, 0x00400200, 0x00C00020, 0x0C000028, 0x00280320, 0x00180010, 0x00C00020, - 0x00280280, 0x00280010, 0x01400028, 0x001801E0, 0x00200018, 0x01800014, 0x00200000, 0x00220020, - 0x00000028, 0x002803C8, 0x00000000, 0xED000000, 0x005003C0, 0xE7000000, 0x00000000, 0xE3000A11, - 0x00002CF0, 0xE2001E01, 0x00000000, 0xDF000000, 0x00000000, 0xED000000, 0x005003C0, 0xE7000000, - 0x00000000, 0xE3000A11, 0x00002CF0, 0xE2001E01, 0x00000000, 0xDF000000, 0x00000000, - }; -s32 D_8014F0C8[] = { 0xFFF40000, 0x00000000, 0x08000800, 0x000000FF, 0x00330000, 0x00000000, 0x00000800, 0x000000FF, - 0x0033003F, 0x00000000, 0x00000000, 0x000000FF, 0xFFF4003F, 0x00000000, 0x08000000, 0x000000FF, - 0xFFFFFF00, 0xFFFFFF00, - }; -s32 D_8014F110[] = { 0x00000000, 0x00000000, 0x00000000, 0x00000000 }; - -extern s32 D_801512B4; - -INCLUDE_ASM(s32, "d5a50_len_5fd0", load_hud_element); - -INCLUDE_ASM(s32, "d5a50_len_5fd0", draw_rect_hud_element); - -INCLUDE_ASM(s32, "d5a50_len_5fd0", clear_hud_element_cache); - -INCLUDE_ASM(s32, "d5a50_len_5fd0", init_hud_element_list); - -INCLUDE_ASM(s32, "d5a50_len_5fd0", func_801413F8); - -INCLUDE_ASM(HudElement*, "d5a50_len_5fd0", create_hud_element, s32* iconIndex); - -INCLUDE_ASM(s32, "d5a50_len_5fd0", update_hud_elements); - -INCLUDE_ASM(s32, "d5a50_len_5fd0", hud_element_update); - -INCLUDE_ASM(s32, "d5a50_len_5fd0", render_hud_elements_backUI); - -INCLUDE_ASM(s32, "d5a50_len_5fd0", render_hud_elements_frontUI); - -INCLUDE_ASM(s32, "d5a50_len_5fd0", render_hud_element); - -INCLUDE_ASM(s32, "d5a50_len_5fd0", render_hud_elements_world); - -INCLUDE_ASM(s32, "d5a50_len_5fd0", func_80143C48); - -void func_80144218 (s32 arg0) { - func_80143C48(arg0, 1, 3); -} - -void func_80144238(s32 arg0) { - func_80143C48(arg0, 0, 3); -} - -void func_80144258(s32 arg0) { - func_80143C48(arg0, 1, 1); -} - -void func_80144278(s32 arg0) { - func_80143C48(arg0, 0, 1); -} - -INCLUDE_ASM(s32, "d5a50_len_5fd0", draw_hud_element); - -void draw_hud_element_clipped(s32 arg0) { - draw_hud_element(arg0, 0); -} - -void draw_hud_element_2(s32 arg0) { - draw_hud_element(arg0, 1); -} - -void draw_icon_2(s32 iconID) { - draw_hud_element(iconID, 2); -} - -void set_hud_element_script(s32 arg0, s32 *arg1) { - HudElement* hudElement = gHudElementList[arg0 & ~0x800]; - - if (arg1 == NULL) { - arg1 = D_8014EFC8; - } - - hudElement->updateTimer = 1; - hudElement->widthScale = 1024; - hudElement->heightScale = 1024; - hudElement->readPos = arg1; - hudElement->startReadPos = arg1; - hudElement->ptrPropertyList = arg1; - hudElement->screenPosOffset[0] = 0; - hudElement->screenPosOffset[1] = 0; - hudElement->worldPosOffset[0] = 0; - hudElement->worldPosOffset[1] = 0; - hudElement->flags &= ~4; - hudElement->uniformScale = 1.0f; - hudElement->flags &= ~0x930; - load_hud_element(hudElement, arg1); - - while (hud_element_update(hudElement) != 0) {} -} - - -s32* get_hud_element_script(s32 arg0) { - return gHudElementList[arg0 & ~0x800]->startReadPos; -} - -HudElement* get_hud_element(s32 arg0) { - return gHudElementList[arg0 & ~0x800]; -} - -void free_hud_element(s32 arg0) { - if (gHudElementList[arg0 & ~0x800]->flags & 0x10000) { - free_hud_element_transform(arg0 & ~0x800); - } - - heap_free(gHudElementList[arg0 & ~0x800]); - gHudElementList[arg0 & ~0x800] = NULL; - D_801512B4--; -} - -void set_hud_element_render_pos(s32 iconIndex, s32 posX, s32 posY) { - HudElement* hudElement = gHudElementList[iconIndex & ~0x800]; - - hudElement->renderPosX = posX; - hudElement->renderPosY = posY; -} - -void get_hud_element_render_pos(s32 iconIndex, s32* x, s32* y) { - HudElement* hudElement = gHudElementList[iconIndex & ~0x800]; - - *x = hudElement->renderPosX; - *y = hudElement->renderPosY; -} - -INCLUDE_ASM(s32, "d5a50_len_5fd0", set_hud_element_render_depth); - -void set_hud_element_flags(s32 iconIndex, s32 flags) { - gHudElementList[iconIndex & ~0x800]->flags |= flags; -} - -void clear_hud_element_flags(s32 iconIndex, s32 flags) { - gHudElementList[iconIndex & ~0x800]->flags &= ~flags; -} - -INCLUDE_ASM(s32, "d5a50_len_5fd0", ALT_clear_hud_element_cache); - -INCLUDE_ASM(void, "d5a50_len_5fd0", set_hud_element_scale, s32 index, f32 scale); - -void set_hud_element_size(s32 arg0, s8 arg1) { - HudElement* hudElement = gHudElementList[arg0 & ~0x800]; - - hudElement->widthScale = 0x400; - hudElement->heightScale = 0x400; - hudElement->tileSizePreset = arg1; - hudElement->drawSizePreset = arg1; - hudElement->uniformScale = 1.0f; - hudElement->flags &= ~0x100; - hudElement->flags &= ~0x810; -} - -INCLUDE_ASM(s32, "d5a50_len_5fd0", func_80144E4C); - -void func_80144E74(s32 iconIndex, s32 arg1) { - HudElement* hudElement = gHudElementList[iconIndex & ~0x800]; - - hudElement->flags &= ~0xF000000; - hudElement->flags |= arg1 << 24; -} - -void set_hud_element_alpha(s32 iconIndex, s32 opacity) { - HudElement* hudElement = gHudElementList[iconIndex & ~0x800]; - - hudElement->flags |= 0x20; - hudElement->opacity = opacity; - - if (opacity == 255) { - hudElement->flags &= ~0x20; - } -} - -void set_hud_element_tint(s32 iconIndex, s32 tint1, s32 tint2, s32 tint3) { - HudElement* hudElement = gHudElementList[iconIndex & ~0x800]; - - hudElement->tint[0] = tint1; - hudElement->tint[1] = tint2; - hudElement->tint[2] = tint3; -} - -INCLUDE_ASM(s32, "d5a50_len_5fd0", create_hud_element_transform_A); - -INCLUDE_ASM(s32, "d5a50_len_5fd0", create_hud_element_transform_B); - -INCLUDE_ASM(s32, "d5a50_len_5fd0", create_hud_element_transform_C); - -void free_hud_element_transform(s32 arg0) { - HudElement* hudElement = gHudElementList[arg0 & ~0x800]; - s32* hudTransform = hudElement->hudTransform; - - if (!(hudElement->flags & 0x20000)) { - func_8013A854(*hudTransform); - } - - heap_free(hudElement->hudTransform); - hudElement->hudTransform = NULL; - hudElement->flags &= ~0x40030000; -} - -INCLUDE_ASM(s32, "d5a50_len_5fd0", set_hud_element_transform_pos); - -INCLUDE_ASM(s32, "d5a50_len_5fd0", set_hud_element_transform_scale); - -INCLUDE_ASM(s32, "d5a50_len_5fd0", set_hud_element_transform_rotation); - -INCLUDE_ASM(s32, "d5a50_len_5fd0", set_hud_element_transform_rotation_pivot); - -INCLUDE_ASM(s32, "d5a50_len_5fd0", copy_world_hud_element_ref_to_battle); - -INCLUDE_ASM(s32, "d5a50_len_5fd0", set_hud_element_nonworld_cache); diff --git a/src/dc470_len_14c0.c b/src/dc470_len_14c0.c index 304dd0d4c9..1d88fe6644 100644 --- a/src/dc470_len_14c0.c +++ b/src/dc470_len_14c0.c @@ -12,9 +12,9 @@ void load_map_bg(char* optAssetName) { u32 assetSize; char* assetName = optAssetName; - if (get_variable(0, SI_STORY_PROGRESS) >= STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE) { + if (get_variable(NULL, SI_STORY_PROGRESS) >= STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE) { // Use sunny Flower Fields bg rather than cloudy - if (!strcmp(assetName, gCloudyFlowerFieldsBg)) { + if (strcmp(assetName, gCloudyFlowerFieldsBg) == 0) { assetName = gSunnyFlowerFieldsBg; } } diff --git a/src/evt/script_list.c b/src/evt/script_list.c index f9796d34bd..7b37c562e2 100644 --- a/src/evt/script_list.c +++ b/src/evt/script_list.c @@ -192,11 +192,11 @@ ScriptInstance* start_script(Script* source, s32 priority, s32 initialState) { scriptListCount = 0; - for (i = 0; i < 16; i++) { + for (i = 0; i < ARRAY_COUNT(newScript->varTable); i++) { newScript->varTable[i] = 0; } - for (i = 0; i < 3; i++) { + for (i = 0; i < ARRAY_COUNT(newScript->varFlags); i++) { newScript->varFlags[i] = 0; } @@ -207,6 +207,7 @@ ScriptInstance* start_script(Script* source, s32 priority, s32 initialState) { gScriptIndexList[scriptListCount] = curScriptIndex; gScriptIdList[scriptListCount] = newScript->id; } + suspend_frozen_scripts(newScript); if (gStaticScriptCounter == 0) { @@ -262,10 +263,10 @@ ScriptInstance* start_script_in_group(Script* source, u8 priority, u8 initialSta newScript->timeScale = gGlobalTimeSpace; scriptListCount = 0; - for (i = 0; i < ((s32)((sizeof(newScript->varTable)) / (sizeof(newScript->varTable[0])))); i++) { + for (i = 0; i < ARRAY_COUNT(newScript->varTable); i++) { newScript->varTable[i] = 0; } - for (i = 0; i < ((s32)((sizeof(newScript->varFlags)) / (sizeof(newScript->varFlags[0])))); i++) { + for (i = 0; i < ARRAY_COUNT(newScript->varFlags); i++) { newScript->varFlags[i] = 0; } @@ -288,7 +289,76 @@ ScriptInstance* start_script_in_group(Script* source, u8 priority, u8 initialSta return newScript; } -INCLUDE_ASM(s32, "evt/script_list", start_child_script); +ScriptInstance* start_child_script(ScriptInstance* parentScript, Script* source, s32 initialState) { + s32 i; + s32 curScriptIndex; + s32 scriptListCount; + s32* tempCounter; + ScriptInstance* child; + + for (i = 0; i < MAX_SCRIPTS; i++) { + if ((*gCurrentScriptListPtr)[i] == NULL) { + break; + } + } + + ASSERT(i < MAX_SCRIPTS); + + curScriptIndex = i; + SCRIPT_ALLOC(child, curScriptIndex); + ASSERT(child != NULL); + + parentScript->childScript = child; + parentScript->state |= 0x10; + child->state = initialState | 1; + child->ptrCurrentLine = child->ptrFirstLine = child->ptrNextLine = source; + + + child->currentOpcode = 0; + child->userData = NULL; + child->blockingParent = parentScript; + child->childScript = NULL; + child->parentScript = NULL; + child->priority = parentScript->priority + 1; + child->id = gStaticScriptCounter++; + child->owner1 = parentScript->owner1; + child->owner2 = parentScript->owner2; + child->loopDepth = -1; + child->switchDepth = -1; + child->groupFlags = parentScript->groupFlags; + child->ptrSavedPosition = NULL; + child->array = parentScript->array; + child->flagArray = parentScript->flagArray; + child->timeScale = gGlobalTimeSpace; + child->frameCounter = 0.0f; + child->unk_158 = 0; + + scriptListCount = 0; + + for (i = 0; i < ARRAY_COUNT(child->varTable); i++) { + child->varTable[i] = parentScript->varTable[i]; + } + + for (i = 0; i < ARRAY_COUNT(child->varFlags); i++) { + child->varFlags[i] = parentScript->varFlags[i]; + } + + find_script_labels(child); + if (gIsUpdatingScripts) { + scriptListCount = gScriptListCount++; + gScriptIndexList[scriptListCount] = curScriptIndex; + gScriptIdList[scriptListCount] = child->id; + } + + suspend_frozen_scripts(child); + + tempCounter = &gStaticScriptCounter; + if (*tempCounter == 0) { + *tempCounter = 1; + } + + return child; +} ScriptInstance* func_802C39F8(ScriptInstance* parentScript, Bytecode* nextLine, s32 newState) { ScriptInstance* child; diff --git a/src/heap.c b/src/heap.c index 6f82bb07ca..e71cecd72c 100644 --- a/src/heap.c +++ b/src/heap.c @@ -39,11 +39,11 @@ void* heap_malloc(s32 size) { } } -s32 heap_free(s32 size) { +s32 heap_free(void* ptr) { if (gGameStatusPtr->isBattle != 0) { - return _heap_free(&D_803DA800, size); + return _heap_free(&D_803DA800, ptr); } else { - return general_heap_free(size); + return general_heap_free(ptr); } } diff --git a/src/hud_element.c b/src/hud_element.c new file mode 100644 index 0000000000..d71e81f80a --- /dev/null +++ b/src/hud_element.c @@ -0,0 +1,319 @@ +#include "common.h" +#include "hud_element.h" + +// TODO: probably BSS +extern HudElement** hudElements; + +s32 D_8014EFC0[] = { 0x00000000, }; +s32 D_8014EFC4[] = { 0x00011000, }; + +HudElementAnim hud_element_defaultAnim = { + he_End, +}; + +s32 D_8014EFCC[] = { 0x00080008, 0x00200010, 0x00100080, 0x00180018, 0x01200020, 0x00200200, 0x00300030, 0x04800040, + 0x00400800, 0x00080010, 0x00400010, 0x00080040, 0x00100018, 0x00C00010, 0x00200100, 0x00400020, + 0x04000020, 0x00100100, 0x000C000C, 0x00480030, 0x00180240, 0x00200008, 0x00800018, 0x00080060, + 0x00400010, 0x02000010, 0x00400200, 0x00C00020, 0x0C000028, 0x00280320, 0x00180010, 0x00C00020, + 0x00280280, 0x00280010, 0x01400028, 0x001801E0, 0x00200018, 0x01800014, 0x00200000, 0x00220020, + 0x00000028, 0x002803C8, 0x00000000, 0xED000000, 0x005003C0, 0xE7000000, 0x00000000, 0xE3000A11, + 0x00002CF0, 0xE2001E01, 0x00000000, 0xDF000000, 0x00000000, 0xED000000, 0x005003C0, 0xE7000000, + 0x00000000, 0xE3000A11, 0x00002CF0, 0xE2001E01, 0x00000000, 0xDF000000, 0x00000000, + }; +s32 D_8014F0C8[] = { 0xFFF40000, 0x00000000, 0x08000800, 0x000000FF, 0x00330000, 0x00000000, 0x00000800, 0x000000FF, + 0x0033003F, 0x00000000, 0x00000000, 0x000000FF, 0xFFF4003F, 0x00000000, 0x08000000, 0x000000FF, + 0xFFFFFF00, 0xFFFFFF00, + }; +s32 D_8014F110[] = { 0x00000000, 0x00000000, 0x00000000, 0x00000000 }; + +extern s32 D_801512B4; // no of hud elements? +extern s32 D_80159180; +extern HudElement* D_80156F60; +extern HudElement* D_80157460; +extern void* D_8015133C; +extern void* D_80157968; +extern void* D_801512C8; +extern void* D_80157970; +extern void* D_801512D0; +extern void* D_80157F70; +extern void* D_80158574; +extern void* D_80158580; +extern void* D_80158B80; +extern void* D_80157964; +extern void* D_80158570; +extern void* D_80151314; + +INCLUDE_ASM(s32, "hud_element", load_hud_element); + +INCLUDE_ASM(s32, "hud_element", draw_rect_hud_element); + +INCLUDE_ASM(s32, "hud_element", clear_hud_element_cache); + +void init_hud_element_list(void) { + if (!gGameStatusPtr->isBattle) { + if (D_80158570 != NULL) { + general_heap_free(D_80158570); + D_80158570 = NULL; + } + + hudElements = &D_80156F60; + D_8015133C = &D_80157968; + D_801512C8 = &D_80157970; + D_801512D0 = &D_80157F70; + D_80151314 = D_80157964; + } else { + hudElements = &D_80157460; + D_8015133C = &D_80158574; + D_801512C8 = &D_80158580; + D_801512D0 = &D_80158B80; + D_80151314 = D_80158570; + } + + D_801512B4 = 0; + D_80159180 = 0; +} + +INCLUDE_ASM(s32, "hud_element", func_801413F8); + +#ifdef NON_MATCHING +s32 create_hud_element(const HudElementAnim* anim) { + HudElement *hudElement; + s32 id; + + for (id = 0; id < 320; id++) { + if (hudElements[id] == NULL) { + break; + } + } + + ASSERT(id < 320); + + hudElements[id] = hudElement = heap_malloc(sizeof(HudElement)); + D_801512B4 += 1; + + ASSERT(hudElement != NULL); + + hudElement->flags = 1; + hudElement->readPos = anim; + if (anim == NULL) { + hudElement->readPos = hud_element_defaultAnim; + } + hudElement->updateTimer = 1; + hudElement->drawSizePreset = -1; + hudElement->tileSizePreset = -1; + hudElement->screenPosOffset.x = 0; + hudElement->screenPosOffset.y = 0; + hudElement->worldPosOffset.x = 0; + hudElement->worldPosOffset.y = 0; + hudElement->worldPosOffset.z = 0; + hudElement->opacity = 255; + hudElement->tint.r = 255; + hudElement->tint.b = 255; + hudElement->tint.g = 255; + hudElement->renderPosX = 0; + hudElement->renderPosY = 0; + hudElement->ptrPropertyList = (s32*) anim; // TODO: what + hudElement->widthScale = X10(1.0f); + hudElement->heightScale = X10(1.0f); + hudElement->anim = hudElement->readPos; + hudElement->uniformScale = 1.0f; + + if (gGameStatusPtr->isBattle) { + hudElement->flags |= 0x400; + id |= 0x800; + } + + load_hud_element(hudElement, hudElement->readPos); + while (hud_element_update(hudElement) != 0) {} + + return id; +} +#else +INCLUDE_ASM(s32, "hud_element", create_hud_element, const HudElementAnim* anim); +#endif + +INCLUDE_ASM(s32, "hud_element", update_hud_elements); + +INCLUDE_ASM(s32, "hud_element", hud_element_update); + +INCLUDE_ASM(s32, "hud_element", render_hud_elements_backUI); + +INCLUDE_ASM(s32, "hud_element", render_hud_elements_frontUI); + +INCLUDE_ASM(s32, "hud_element", render_hud_element); + +INCLUDE_ASM(s32, "hud_element", render_hud_elements_world); + +INCLUDE_ASM(void, "hud_element", func_80143C48, s32 arg0, s32 arg1, s32 arg2); + +void func_80144218(s32 arg0) { + func_80143C48(arg0, 1, 3); +} + +void func_80144238(s32 arg0) { + func_80143C48(arg0, 0, 3); +} + +void func_80144258(s32 arg0) { + func_80143C48(arg0, 1, 1); +} + +void func_80144278(s32 arg0) { + func_80143C48(arg0, 0, 1); +} + +INCLUDE_ASM(s32, "hud_element", draw_hud_element); + +void draw_hud_element_clipped(s32 id) { + draw_hud_element(id, 0); +} + +void draw_hud_element_2(s32 id) { + draw_hud_element(id, 1); +} + +void draw_icon_2(s32 id) { + draw_hud_element(id, 2); +} + +void set_hud_element_anim(s32 id, const HudElementAnim* anim) { + HudElement* hudElement = hudElements[id & ~0x800]; + + if (anim == NULL) { + anim = hud_element_defaultAnim; + } + + hudElement->updateTimer = 1; + hudElement->widthScale = 1024; + hudElement->heightScale = 1024; + hudElement->readPos = anim; + hudElement->anim = anim; + hudElement->ptrPropertyList = anim; + hudElement->screenPosOffset.x = 0; + hudElement->screenPosOffset.y = 0; + hudElement->worldPosOffset.x = 0; + hudElement->worldPosOffset.y = 0; + hudElement->flags &= ~4; + hudElement->uniformScale = 1.0f; + hudElement->flags &= ~0x930; + load_hud_element(hudElement, anim); + + while (hud_element_update(hudElement) != 0) {} +} + +HudElementAnim* get_hud_element_anim(s32 id) { + return hudElements[id & ~0x800]->anim; +} + +HudElement* get_hud_element(s32 id) { + return hudElements[id & ~0x800]; +} + +void free_hud_element(s32 id) { + if (hudElements[id & ~0x800]->flags & 0x10000) { + free_hud_element_transform(id & ~0x800); + } + + heap_free(hudElements[id & ~0x800]); + hudElements[id & ~0x800] = NULL; + D_801512B4--; +} + +void set_hud_element_render_pos(s32 id, s32 x, s32 y) { + HudElement* hudElement = hudElements[id & ~0x800]; + + hudElement->renderPosX = x; + hudElement->renderPosY = y; +} + +void get_hud_element_render_pos(s32 id, s32* x, s32* y) { + HudElement* hudElement = hudElements[id & ~0x800]; + + *x = hudElement->renderPosX; + *y = hudElement->renderPosY; +} + +INCLUDE_ASM(s32, "hud_element", set_hud_element_render_depth); + +void set_hud_element_flags(s32 id, s32 flags) { + hudElements[id & ~0x800]->flags |= flags; +} + +void clear_hud_element_flags(s32 id, s32 flags) { + hudElements[id & ~0x800]->flags &= ~flags; +} + +INCLUDE_ASM(s32, "hud_element", ALT_clear_hud_element_cache); + +INCLUDE_ASM(void, "hud_element", set_hud_element_scale, s32 index, f32 scale); + +void set_hud_element_size(s32 id, s8 size) { + HudElement* hudElement = hudElements[id & ~0x800]; + + hudElement->widthScale = 0x400; + hudElement->heightScale = 0x400; + hudElement->tileSizePreset = size; + hudElement->drawSizePreset = size; + hudElement->uniformScale = 1.0f; + hudElement->flags &= ~0x100; + hudElement->flags &= ~0x810; +} + +INCLUDE_ASM(s32, "hud_element", func_80144E4C); + +void func_80144E74(s32 id, s32 arg1) { + HudElement* hudElement = hudElements[id & ~0x800]; + + hudElement->flags &= ~0xF000000; + hudElement->flags |= arg1 << 24; +} + +void set_hud_element_alpha(s32 id, s32 opacity) { + HudElement* hudElement = hudElements[id & ~0x800]; + + hudElement->flags |= 0x20; + hudElement->opacity = opacity; + + if (opacity == 255) { + hudElement->flags &= ~0x20; + } +} + +void set_hud_element_tint(s32 id, s32 r, s32 g, s32 b) { + HudElement* hudElement = hudElements[id & ~0x800]; + + hudElement->tint.r = r; + hudElement->tint.g = g; + hudElement->tint.b = b; +} + +INCLUDE_ASM(s32, "hud_element", create_hud_element_transform_A); + +INCLUDE_ASM(s32, "hud_element", create_hud_element_transform_B); + +INCLUDE_ASM(s32, "hud_element", create_hud_element_transform_C); + +void free_hud_element_transform(s32 id) { + HudElement* hudElement = hudElements[id & ~0x800]; + s32* hudTransform = hudElement->hudTransform; + + if (!(hudElement->flags & 0x20000)) { + func_8013A854(*hudTransform); + } + + heap_free(hudElement->hudTransform); + hudElement->hudTransform = NULL; + hudElement->flags &= ~0x40030000; +} + +INCLUDE_ASM(s32, "hud_element", set_hud_element_transform_pos); + +INCLUDE_ASM(s32, "hud_element", set_hud_element_transform_scale); + +INCLUDE_ASM(s32, "hud_element", set_hud_element_transform_rotation); + +INCLUDE_ASM(s32, "hud_element", set_hud_element_transform_rotation_pivot); + +INCLUDE_ASM(s32, "hud_element", copy_world_hud_element_ref_to_battle); + +INCLUDE_ASM(s32, "hud_element", set_hud_element_nonworld_cache); diff --git a/src/hud_element.h b/src/hud_element.h new file mode 100644 index 0000000000..e541219960 --- /dev/null +++ b/src/hud_element.h @@ -0,0 +1,175 @@ +#ifndef HUD_ELEMENT_H +#define HUD_ELEMENT_H + +#include "common.h" + +typedef enum { + HUD_ELEMENT_OP_End, + HUD_ELEMENT_OP_SetRGBA, + HUD_ELEMENT_OP_SetCI, + HUD_ELEMENT_OP_Restart, + HUD_ELEMENT_OP_Loop, + HUD_ELEMENT_OP_SetTileSize, + HUD_ELEMENT_OP_SetSizesAutoScale, + HUD_ELEMENT_OP_SetSizesFixedScale, + HUD_ELEMENT_OP_SetVisible, + HUD_ELEMENT_OP_SetHidden, + HUD_ELEMENT_OP_AddTexelOffsetX, + HUD_ELEMENT_OP_AddTexelOffsetY, + HUD_ELEMENT_OP_AddTexelOffset, + HUD_ELEMENT_OP_SetImage, + HUD_ELEMENT_OP_SetScale, + HUD_ELEMENT_OP_SetAlpha, + HUD_ELEMENT_OP_RandomDelay, + HUD_ELEMENT_OP_Delete, + HUD_ELEMENT_OP_UseIA8, + HUD_ELEMENT_OP_SetCustomSize, + HUD_ELEMENT_OP_RandomRestart, + HUD_ELEMENT_OP_op_15, + HUD_ELEMENT_OP_op_16, + HUD_ELEMENT_OP_RandomBranch, + HUD_ELEMENT_OP_SetFlags, + HUD_ELEMENT_OP_ClearFlags, + HUD_ELEMENT_OP_PlaySound, + HUD_ELEMENT_OP_op_1B, +} HudElementAnim[0]; + +enum { + HUD_ELEMENT_SIZE_8x8, + HUD_ELEMENT_SIZE_16x16, + HUD_ELEMENT_SIZE_24x24, + HUD_ELEMENT_SIZE_32x32, + HUD_ELEMENT_SIZE_48x48, + HUD_ELEMENT_SIZE_64x64, + HUD_ELEMENT_SIZE_8x16, + HUD_ELEMENT_SIZE_16x8, + HUD_ELEMENT_SIZE_16x24, + HUD_ELEMENT_SIZE_16x32, + HUD_ELEMENT_SIZE_64x32, + HUD_ELEMENT_SIZE_32x16, + HUD_ELEMENT_SIZE_12x12, + HUD_ELEMENT_SIZE_48x24, + HUD_ELEMENT_SIZE_32x8, + HUD_ELEMENT_SIZE_24x8, + HUD_ELEMENT_SIZE_64x16, + HUD_ELEMENT_SIZE_16x64, + HUD_ELEMENT_SIZE_192x32, + HUD_ELEMENT_SIZE_40x40, + HUD_ELEMENT_SIZE_24x16, + HUD_ELEMENT_SIZE_32x40, + HUD_ELEMENT_SIZE_40x16, + HUD_ELEMENT_SIZE_40x24, + HUD_ELEMENT_SIZE_32x24, +}; + +typedef struct HudElement { + /* 0x00 */ s32 flags; + /* 0x04 */ const HudElementAnim* readPos; + /* 0x08 */ const HudElementAnim* anim; + /* 0x0C */ s32* ptrPropertyList; + /* 0x10 */ s32* imageAddr; + /* 0x14 */ s32* paletteAddr; + /* 0x18 */ s32 memOffset; + /* 0x1C */ s32* hudTransform; + /* 0x20 */ f32 unk_20; + /* 0x24 */ f32 unk_24; + /* 0x28 */ f32 unkImgScale[2]; + /* 0x30 */ f32 uniformScale; + /* 0x34 */ s32 widthScale; ///< X10 + /* 0x38 */ s32 heightScale; ///< X10 + /* 0x3C */ s16 renderPosX; + /* 0x3E */ s16 renderPosY; + /* 0x40 */ Vec2b screenPosOffset; + /* 0x42 */ Vec3b worldPosOffset; + /* 0x45 */ s8 drawSizePreset; + /* 0x46 */ s8 tileSizePreset; + /* 0x47 */ u8 updateTimer; + /* 0x48 */ u8 sizeX; /* screen size? */ + /* 0x49 */ u8 sizeY; /* screen size? */ + /* 0x4A */ u8 opacity; + /* 0x4B */ struct { s8 r; s8 g; s8 b; } tint; + /* 0x4E */ Vec2b customImageSize; + /* 0x40 */ Vec2b customDrawSize; +} HudElement; // size = 0x54 + +#define he_End HUD_ELEMENT_OP_End +#define he_SetRGBA(arg0, image) HUD_ELEMENT_OP_SetRGBA, arg0, (s32)image +#define he_SetCI(arg0, raster, palette) HUD_ELEMENT_OP_SetCI, arg0, (s32) raster, (s32)palette +#define he_Restart HUD_ELEMENT_OP_Restart +#define he_Loop HUD_ELEMENT_OP_Loop +#define he_SetTileSize(size) HUD_ELEMENT_OP_SetTileSize, size +#define he_SetSizesAutoScale(size1, size2) HUD_ELEMENT_OP_SetSizesAutoScale, size1, size1 +#define he_SetSizesFixedScale(size1, size2) HUD_ELEMENT_OP_SetSizesFixedScale, size2, size2 +#define he_SetVisible HUD_ELEMENT_OP_SetVisible +#define he_SetHidden HUD_ELEMENT_OP_SetHidden +#define he_AddTexelOffsetX(x) HUD_ELEMENT_OP_AddTexelOffsetX, x +#define he_AddTexelOffsetY(y) HUD_ELEMENT_OP_AddTexelOffsetY, y +#define he_AddTexelOffset(x, y) HUD_ELEMENT_OP_AddTexelOffset, x, y +#define he_SetImage(arg0, raster, palette, arg2, arg3) HUD_ELEMENT_OP_SetImage, arg0, raster, palette, arg2, arg3 +#define he_SetScale(scale) HUD_ELEMENT_OP_SetScale, (s32)(scale * 65536.0f) +#define he_SetAlpha(alpha) HUD_ELEMENT_OP_SetAlpha, alpha +#define he_RandomDelay(arg0, arg1) HUD_ELEMENT_OP_RandomDelay, arg0, arg1 +#define he_Delete HUD_ELEMENT_OP_Delete +#define he_UseIA8 HUD_ELEMENT_OP_UseIA8 +#define he_SetCustomSize(arg0, arg1) HUD_ELEMENT_OP_SetCustomSize, arg0, arg1 + +/// Restarts the loop if cutoff < rand_int(max) +#define he_RandomRestart(max, cutoff) HUD_ELEMENT_OP_RandomRestart, max, cutoff + +#define he_op_15(arg0) HUD_ELEMENT_OP_op_15, arg0 +#define he_RandomBranch(...) HUD_ELEMENT_OP_RandomBranch, ARRAY_COUNT({__VA_ARGS__}), __VA_ARGS__ +#define he_SetFlags(arg0) HUD_ELEMENT_OP_SetFlags, arg0 +#define he_ClearFlags(arg0) HUD_ELEMENT_OP_ClearFlags, arg0 +#define he_PlaySound(arg0) HUD_ELEMENT_OP_PlaySound, arg0 +#define he_op_1B(arg0, arg1) HUD_ELEMENT_OP_op_1B, arg0, arg1 + +s32 load_hud_element(); +s32 draw_rect_hud_element(); +s32 clear_hud_element_cache(); +void init_hud_element_list(void); + +/// Creates a new HUD element and returns its ID. +s32 create_hud_element(const HudElementAnim* anim); + +s32 update_hud_elements(); +s32 hud_element_update(); +s32 render_hud_elements_backUI(); +s32 render_hud_elements_frontUI(); +s32 render_hud_element(); +s32 render_hud_elements_world(); +void func_80143C48(s32 arg0, s32 arg1, s32 arg2); +void func_80144218(s32 arg0); +void func_80144258(s32 arg0); +void func_80144278(s32 arg0); +s32 draw_hud_element(); +void draw_hud_element_clipped(s32 id); +void draw_hud_element_2(s32 id); +void draw_icon_2(s32 id); +void set_hud_element_anim(s32 id, const HudElementAnim* anim); +HudElementAnim* get_hud_element_anim(s32 id); +HudElement* get_hud_element(s32 id); +void free_hud_element(s32 id); +void set_hud_element_render_pos(s32 id, s32 posX, s32 posY); +void get_hud_element_render_pos(s32 id, s32* x, s32* y); +s32 set_hud_element_render_depth(); +void set_hud_element_flags(s32 id, s32 flags); +void clear_hud_element_flags(s32 id, s32 flags); +s32 ALT_clear_hud_element_cache(); +void set_hud_element_scale(s32 index, f32 scale); +void set_hud_element_size(s32 arg0, s8 arg1); +s32 func_80144E4C(); +void func_80144E74(s32 id, s32 arg1); +void set_hud_element_alpha(s32 id, s32 opacity); +void set_hud_element_tint(s32 id, s32 tint1, s32 tint2, s32 tint3); +s32 create_hud_element_transform_A(); +s32 create_hud_element_transform_B(); +s32 create_hud_element_transform_C(); +void free_hud_element_transform(s32 arg0); +s32 set_hud_element_transform_pos(); +s32 set_hud_element_transform_scale(); +s32 set_hud_element_transform_rotation(); +s32 set_hud_element_transform_rotation_pivot(); +s32 copy_world_hud_element_ref_to_battle(); +s32 set_hud_element_nonworld_cache(); + +#endif diff --git a/src/main_loop.c b/src/main_loop.c index 4452e6826d..727080a582 100644 --- a/src/main_loop.c +++ b/src/main_loop.c @@ -232,7 +232,7 @@ void gfx_draw_frame(void) { nuGfxTaskStart(gDisplayContext->mainGfx, (u32)(gMasterGfxPos - gDisplayContext->mainGfx) * 8, NU_GFX_UCODE_F3DEX2, NU_SC_TASK_LODABLE | NU_SC_SWAPBUFFER); gCurrentDisplayContextIndex = gCurrentDisplayContextIndex ^ 1; - func_8002C890(nuGfxCfb_ptr, 0x140, 0xF0); + func_8002C890(nuGfxCfb_ptr, SCREEN_WIDTH, SCREEN_HEIGHT); } void load_engine_data(void) { diff --git a/src/world/script_api/7E0E80.c b/src/world/script_api/7E0E80.c index dda1d6d0a6..bfe2f3ae87 100644 --- a/src/world/script_api/7E0E80.c +++ b/src/world/script_api/7E0E80.c @@ -1,4 +1,5 @@ #include "common.h" +#include "hud_element.h" extern s32 MessagePlural; extern s32 MessageSingular; diff --git a/tools/build/configure.py b/tools/build/configure.py index 66359b5177..9067f850f2 100755 --- a/tools/build/configure.py +++ b/tools/build/configure.py @@ -11,8 +11,9 @@ VERSIONS = ["us", "jp"] DO_SHA1_CHECK = True CPPFLAGS = "-w -Iver/$version/build/include -Iinclude -Isrc -Iassets/$version -D _LANGUAGE_C -D _FINALROM -D VERSION=$version " \ - "-ffreestanding -DF3DEX_GBI_2 -D_MIPS_SZLONG=32 -MD -MF $out.d" - + "-ffreestanding -DF3DEX_GBI_2 -D_MIPS_SZLONG=32" +CFLAGS = "-O2 -quiet -fno-common -G0 -mcpu=vr4300 -mfix4300 -mips3 -mgp32 -mfp32 " \ + "-Wuninitialized -Wmissing-braces" ASFLAGS = "-EB -G 0" # Paths: @@ -59,7 +60,7 @@ def write_ninja_rules(ninja: ninja_syntax.Writer, cpp: str, cppflags: str, extra cc1 = f"{BUILD_TOOLS}/{os_dir}/cc1" nu64as = f"{BUILD_TOOLS}/{os_dir}/mips-nintendo-nu64-as" - cflags = "-O2 -quiet -fno-common -G0 -mcpu=vr4300 -mfix4300 -mips3 -mgp32 -mfp32 -Wuninitialized -Wshadow -Wmissing-braces " + extra_cflags + cflags = CFLAGS + " " + extra_cflags ninja.variable("python", sys.executable) @@ -80,14 +81,14 @@ def write_ninja_rules(ninja: ninja_syntax.Writer, cpp: str, cppflags: str, extra ninja.rule("cc", description="cc($version) $in $cflags", - command=f"bash -o pipefail -c '{cpp} {CPPFLAGS} {cppflags} $in -o - | {iconv} | {cc1} {cflags} $cflags -o - | {nu64as} {ASFLAGS} - -o $out'", + command=f"bash -o pipefail -c '{cpp} {CPPFLAGS} {cppflags} -MD -MF $out.d $in -o - | {iconv} | {cc1} {cflags} $cflags -o - | {nu64as} {ASFLAGS} - -o $out'", depfile="$out.d", deps="gcc", ) ninja.rule("cc_dsl", description="cc_dsl($version) $in $cflags", - command=f"bash -o pipefail -c '{cpp} {CPPFLAGS} {cppflags} $in -o - | $python {BUILD_TOOLS}/cc_dsl/compile_script.py | {iconv} | {cc1} {cflags} $cflags -o - | {nu64as} {ASFLAGS} - -o $out'", + command=f"bash -o pipefail -c '{cpp} {CPPFLAGS} {cppflags} -MD -MF $out.d $in -o - | $python {BUILD_TOOLS}/cc_dsl/compile_script.py | {iconv} | {cc1} {cflags} $cflags -o - | {nu64as} {ASFLAGS} - -o $out'", depfile="$out.d", deps="gcc", ) @@ -163,6 +164,20 @@ def write_ninja_rules(ninja: ninja_syntax.Writer, cpp: str, cppflags: str, extra ninja.rule("pm_charset_palettes", command=f"$python {BUILD_TOOLS}/pm_charset_palettes.py $out $in") + with Path("tools/permuter_settings.toml").open("w") as f: + f.write(f"compiler_command = \"{cpp} {CPPFLAGS} {cppflags} -DPERMUTER | {iconv} | {cc1} {cflags} -o - | {nu64as} {ASFLAGS}\"\n") + f.write(f"assembler_command = \"{cross}as -EB -march=vr4300 -mtune=vr4300 -Iinclude\"\n") + f.write( +""" +[preserve_macros] +"gs?[DS]P.*" = "void" +OVERRIDE_FLAG_CHECK = "int" +OS_K0_TO_PHYSICAL = "int" +"G_.*" = "int" +"TEXEL.*" = "int" +PRIMITIVE = "int" +""") + def write_ninja_for_tools(ninja: ninja_syntax.Writer): ninja.rule("cc_tool", description="cc_tool $in", diff --git a/tools/disasm_hud_element_animation.py b/tools/disasm_hud_element_animation.py new file mode 100755 index 0000000000..65de0cec78 --- /dev/null +++ b/tools/disasm_hud_element_animation.py @@ -0,0 +1,182 @@ +#! /usr/bin/python3 + +import struct + +def fmt_size(val): + if val == 0: + return 'HUD_ELEMENT_SIZE_8x8' + elif val == 1: + return 'HUD_ELEMENT_SIZE_16x16' + elif val == 2: + return 'HUD_ELEMENT_SIZE_24x24' + elif val == 3: + return 'HUD_ELEMENT_SIZE_32x32' + elif val == 4: + return 'HUD_ELEMENT_SIZE_48x48' + elif val == 5: + return 'HUD_ELEMENT_SIZE_64x64' + elif val == 6: + return 'HUD_ELEMENT_SIZE_8x16' + elif val == 7: + return 'HUD_ELEMENT_SIZE_16x8' + elif val == 8: + return 'HUD_ELEMENT_SIZE_16x24' + elif val == 9: + return 'HUD_ELEMENT_SIZE_16x32' + elif val == 10: + return 'HUD_ELEMENT_SIZE_64x32' + elif val == 11: + return 'HUD_ELEMENT_SIZE_32x16' + elif val == 12: + return 'HUD_ELEMENT_SIZE_12x12' + elif val == 13: + return 'HUD_ELEMENT_SIZE_48x24' + elif val == 14: + return 'HUD_ELEMENT_SIZE_32x8' + elif val == 15: + return 'HUD_ELEMENT_SIZE_24x8' + elif val == 16: + return 'HUD_ELEMENT_SIZE_64x16' + elif val == 17: + return 'HUD_ELEMENT_SIZE_16x64' + elif val == 18: + return 'HUD_ELEMENT_SIZE_192x32' + elif val == 19: + return 'HUD_ELEMENT_SIZE_40x40' + elif val == 20: + return 'HUD_ELEMENT_SIZE_24x16' + elif val == 21: + return 'HUD_ELEMENT_SIZE_32x40' + elif val == 22: + return 'HUD_ELEMENT_SIZE_40x16' + elif val == 23: + return 'HUD_ELEMENT_SIZE_40x24' + elif val == 24: + return 'HUD_ELEMENT_SIZE_32x24' + else: + return val + +class HudElementScript(): + def __init__(self, symbol): + self.symbol = symbol + self.buffer = [] + + def feed(self, word): + self.buffer.append(word) + + def print(self): + buf = iter(self.buffer) + indent = " " + op = 99 + + print(f"HudElementAnim {self.symbol} = {{") + + while op: + op = next(buf, -1) + if op == -1: + break + + if op == 0x00: + print(f"{indent}he_End,") + elif op == 0x01: + print(f"{indent}he_SetRGBA({next(buf)}, {next(buf)}, {next(buf)}),") + elif op == 0x02: + print(f"{indent}he_SetCI({next(buf)}, {next(buf)}, {next(buf)}),") + elif op == 0x03: + indent = indent[4:] + print(f"{indent}he_Restart,") + elif op == 0x04: + print(f"{indent}he_Loop,") + indent = indent + " " + elif op == 0x05: + print(f"{indent}he_SetTileSize({fmt_size(next(buf))}),") + elif op == 0x06: + print(f"{indent}he_SetSizesAutoScale({fmt_size(next(buf))}, {fmt_size(next(buf))}),") + elif op == 0x07: + print(f"{indent}he_SetSizesFixedScale({fmt_size(next(buf))}, {fmt_size(next(buf))}),") + elif op == 0x08: + print(f"{indent}he_SetVisible,") + elif op == 0x09: + print(f"{indent}he_SetHidden,") + elif op == 0x0A: + print(f"{indent}he_AddTexelOffsetX({next(buf)}),") + elif op == 0x0B: + print(f"{indent}he_AddTexelOffsetY({next(buf)}),") + elif op == 0x0C: + print(f"{indent}he_AddTexelOffset({next(buf)}, {next(buf)}),") + elif op == 0x0D: + print(f"{indent}he_SetImage({next(buf)}, {next(buf)}, {next(buf)}, {next(buf)}, {next(buf)}),") + elif op == 0x0E: + print(f"{indent}he_SetScale({next(buf)}),") + elif op == 0x0F: + print(f"{indent}he_SetAlpha({next(buf)}),") + elif op == 0x10: + print(f"{indent}he_RandomDelay({next(buf)}, {next(buf)}),") + elif op == 0x11: + print(f"{indent}he_Delete,") + elif op == 0x12: + print(f"{indent}he_UseIA8,") + elif op == 0x13: + print(f"{indent}he_SetCustomSize({next(buf)}, {next(buf)}),") + elif op == 0x14: + print(f"{indent}he_RandomRestart({next(buf)}, {next(buf)}),") + elif op == 0x15: + print(f"{indent}he_op_15({next(buf)}),") + elif op == 0x17: + count = next(buf) + args = [] + for i in range(count): + args.append(next(buf)) + print(f"{indent}he_RandomBranch({', '.join(args)}),") + elif op == 0x18: + print(f"{indent}he_SetFlags({next(buf)}),") + elif op == 0x19: + print(f"{indent}he_ClearFlags({next(buf)}),") + elif op == 0x1A: + print(f"{indent}he_PlaySound({next(buf)}),") + elif op == 0x1B: + print(f"{indent}he_op_1B({next(buf)}),") + else: + print(f"{indent}{op},") + + print("};\n") + +if __name__ == "__main__": + import argparse + + parser = argparse.ArgumentParser() + parser.add_argument("file", type=str, help=".data.s file to dissassemble") + + args = parser.parse_args() + + with open(args.file, "r") as f: + lines = f.readlines() + current_script = None + + for line in lines: + line = line.strip() + + if line.startswith("glabel"): + if current_script: + current_script.print() + + current_script = HudElementScript(line.split(" ")[1]) + elif line.startswith(".word"): + words = line[6:].split(", ") + + for word in words: + try: + word = int(word, base=0) + + if word > 0x8000000: + word = f"0x{word:X}" + else: + word, = struct.unpack(">i", struct.pack(">I", word)) + print(word) + except ValueError: + pass + + current_script.feed(word) + + if current_script: + current_script.print() diff --git a/tools/permuter_settings.toml b/tools/permuter_settings.toml deleted file mode 100644 index c236f55a60..0000000000 --- a/tools/permuter_settings.toml +++ /dev/null @@ -1,10 +0,0 @@ -compiler_command = "cpp -w -Iver/us/build/include -Iinclude -Isrc -DPERMUTER -D _LANGUAGE_C -D _FINALROM -D VERSION=us -ffreestanding -DF3DEX_GBI_2 -D_MIPS_SZLONG=32 -D SCRIPT(...)={} | iconv --from UTF-8 --to SHIFT-JIS | tools/build/linux/cc1 -O2 -quiet -G 0 -mcpu=vr4300 -mfix4300 -mips3 -mgp32 -mfp32 -Wuninitialized -Wshadow -fforce-addr -o - | tools/build/linux/mips-nintendo-nu64-as -EB -G 0 -" -assembler_command = "mips-linux-gnu-as -march=vr4300 -mabi=32" - -[preserve_macros] -"gs?[DS]P.*" = "void" -OVERRIDE_FLAG_CHECK = "int" -OS_K0_TO_PHYSICAL = "int" -"G_.*" = "int" -"TEXEL.*" = "int" -PRIMITIVE = "int" diff --git a/tools/rename.py b/tools/rename.py index b9d60bc68a..4cd30d5c98 100755 --- a/tools/rename.py +++ b/tools/rename.py @@ -1,6 +1,7 @@ #!/usr/bin/python3 import os +import re script_dir = os.path.dirname(os.path.realpath(__file__)) root_dir = script_dir + "/../" @@ -22,7 +23,7 @@ def handle_file(f_path, try_rename_file=False): f_text = f_text_orig for rename in renames: - f_text = f_text.replace(rename, renames[rename]) + f_text = re.sub(r"(?:\b)" + rename + r"(?:\b)", renames[rename], f_text) if f_text != f_text_orig: with open(f_path, "w", newline="\n") as f: diff --git a/tools/to_rename.txt b/tools/to_rename.txt new file mode 100644 index 0000000000..a8b74ca5db --- /dev/null +++ b/tools/to_rename.txt @@ -0,0 +1,2 @@ +get_hud_element_script get_hud_element_anim +set_hud_element_script set_hud_element_anim 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 91b116534e..6497d2a034 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 @@ -131,7 +131,7 @@ glabel btl_draw_enemy_health_bars /* 16EA5C 8024017C AFA20024 */ sw $v0, 0x24($sp) /* 16EA60 80240180 3C058029 */ lui $a1, %hi(D_80291F80) /* 16EA64 80240184 24A51F80 */ addiu $a1, $a1, %lo(D_80291F80) -/* 16EA68 80240188 0C0511FF */ jal set_hud_element_script +/* 16EA68 80240188 0C0511FF */ jal set_hud_element_anim /* 16EA6C 8024018C 0200202D */ daddu $a0, $s0, $zero /* 16EA70 80240190 8FA50020 */ lw $a1, 0x20($sp) /* 16EA74 80240194 8FA60024 */ lw $a2, 0x24($sp) @@ -160,7 +160,7 @@ glabel btl_draw_enemy_health_bars /* 16EAD0 802401F0 250809FC */ addiu $t0, $t0, %lo(D_802809FC) /* 16EAD4 802401F4 02481021 */ addu $v0, $s2, $t0 /* 16EAD8 802401F8 8C450000 */ lw $a1, ($v0) -/* 16EADC 802401FC 0C0511FF */ jal set_hud_element_script +/* 16EADC 802401FC 0C0511FF */ jal set_hud_element_anim /* 16EAE0 80240200 0200202D */ daddu $a0, $s0, $zero /* 16EAE4 80240204 0000202D */ daddu $a0, $zero, $zero /* 16EAE8 80240208 0080282D */ daddu $a1, $a0, $zero @@ -194,7 +194,7 @@ glabel btl_draw_enemy_health_bars /* 16EB54 80240274 250809FC */ addiu $t0, $t0, %lo(D_802809FC) /* 16EB58 80240278 00481021 */ addu $v0, $v0, $t0 /* 16EB5C 8024027C 8C450000 */ lw $a1, ($v0) -/* 16EB60 80240280 0C0511FF */ jal set_hud_element_script +/* 16EB60 80240280 0C0511FF */ jal set_hud_element_anim /* 16EB64 80240284 0200202D */ daddu $a0, $s0, $zero /* 16EB68 80240288 0000202D */ daddu $a0, $zero, $zero /* 16EB6C 8024028C 0080282D */ daddu $a1, $a0, $zero 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 204be31aad..8e5baa5f32 100644 --- a/ver/us/asm/nonmatchings/16c8e0/btl_update_starpoints_display.s +++ b/ver/us/asm/nonmatchings/16c8e0/btl_update_starpoints_display.s @@ -235,11 +235,11 @@ glabel btl_update_starpoints_display /* 16EFFC 8024071C 2673EFC0 */ addiu $s3, $s3, %lo(D_8029EFC0) .L80240720: /* 16F000 80240720 8E700000 */ lw $s0, ($s3) -/* 16F004 80240724 0C05122C */ jal get_hud_element_script +/* 16F004 80240724 0C05122C */ jal get_hud_element_anim /* 16F008 80240728 0200202D */ daddu $a0, $s0, $zero /* 16F00C 8024072C 105E0004 */ beq $v0, $fp, .L80240740 /* 16F010 80240730 0200202D */ daddu $a0, $s0, $zero -/* 16F014 80240734 0C0511FF */ jal set_hud_element_script +/* 16F014 80240734 0C0511FF */ jal set_hud_element_anim /* 16F018 80240738 03C0282D */ daddu $a1, $fp, $zero /* 16F01C 8024073C 0200202D */ daddu $a0, $s0, $zero .L80240740: @@ -252,11 +252,11 @@ glabel btl_update_starpoints_display /* 16F038 80240758 0C0511EA */ jal draw_hud_element_clipped /* 16F03C 8024075C 0200202D */ daddu $a0, $s0, $zero /* 16F040 80240760 8E900000 */ lw $s0, ($s4) -/* 16F044 80240764 0C05122C */ jal get_hud_element_script +/* 16F044 80240764 0C05122C */ jal get_hud_element_anim /* 16F048 80240768 0200202D */ daddu $a0, $s0, $zero /* 16F04C 8024076C 10570004 */ beq $v0, $s7, .L80240780 /* 16F050 80240770 0200202D */ daddu $a0, $s0, $zero -/* 16F054 80240774 0C0511FF */ jal set_hud_element_script +/* 16F054 80240774 0C0511FF */ jal set_hud_element_anim /* 16F058 80240778 02E0282D */ daddu $a1, $s7, $zero /* 16F05C 8024077C 0200202D */ daddu $a0, $s0, $zero .L80240780: @@ -367,11 +367,11 @@ glabel btl_update_starpoints_display /* 16F1EC 8024090C 2673F010 */ addiu $s3, $s3, %lo(D_8029F010) .L80240910: /* 16F1F0 80240910 8E700000 */ lw $s0, ($s3) -/* 16F1F4 80240914 0C05122C */ jal get_hud_element_script +/* 16F1F4 80240914 0C05122C */ jal get_hud_element_anim /* 16F1F8 80240918 0200202D */ daddu $a0, $s0, $zero /* 16F1FC 8024091C 10540004 */ beq $v0, $s4, .L80240930 /* 16F200 80240920 0200202D */ daddu $a0, $s0, $zero -/* 16F204 80240924 0C0511FF */ jal set_hud_element_script +/* 16F204 80240924 0C0511FF */ jal set_hud_element_anim /* 16F208 80240928 0280282D */ daddu $a1, $s4, $zero /* 16F20C 8024092C 0200202D */ daddu $a0, $s0, $zero .L80240930: diff --git a/ver/us/asm/nonmatchings/17D6A0/func_8024FB3C.s b/ver/us/asm/nonmatchings/17D6A0/func_8024FB3C.s index a043393a83..45387baec2 100644 --- a/ver/us/asm/nonmatchings/17D6A0/func_8024FB3C.s +++ b/ver/us/asm/nonmatchings/17D6A0/func_8024FB3C.s @@ -513,7 +513,7 @@ glabel L80250254_17EB34 /* 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) -/* 17EB44 80250264 0C0511FF */ jal set_hud_element_script +/* 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) @@ -526,7 +526,7 @@ glabel L80250284_17EB64 /* 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) -/* 17EB74 80250294 0C0511FF */ jal set_hud_element_script +/* 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) @@ -539,19 +539,19 @@ glabel L802502B4_17EB94 /* 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) -/* 17EBA4 802502C4 0C0511FF */ jal set_hud_element_script +/* 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) -/* 17EBBC 802502DC 0C0511FF */ jal set_hud_element_script +/* 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) -/* 17EBD4 802502F4 0C0511FF */ jal set_hud_element_script +/* 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) @@ -571,13 +571,13 @@ glabel L8025032C_17EC0C /* 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) -/* 17EC1C 8025033C 0C0511FF */ jal set_hud_element_script +/* 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) -/* 17EC34 80250354 0C0511FF */ jal set_hud_element_script +/* 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) @@ -597,7 +597,7 @@ glabel L8025038C_17EC6C /* 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) -/* 17EC7C 8025039C 0C0511FF */ jal set_hud_element_script +/* 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) @@ -610,7 +610,7 @@ glabel L802503BC_17EC9C /* 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) -/* 17ECAC 802503CC 0C0511FF */ jal set_hud_element_script +/* 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) @@ -623,7 +623,7 @@ glabel L802503EC_17ECCC /* 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) -/* 17ECDC 802503FC 0C0511FF */ jal set_hud_element_script +/* 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) @@ -643,7 +643,7 @@ glabel L80250434_17ED14 /* 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) -/* 17ED24 80250444 0C0511FF */ jal set_hud_element_script +/* 17ED24 80250444 0C0511FF */ jal set_hud_element_anim /* 17ED28 80250448 00000000 */ nop /* 17ED2C 8025044C 3C04802A */ lui $a0, %hi(D_8029F644) /* 17ED30 80250450 8484F644 */ lh $a0, %lo(D_8029F644)($a0) @@ -668,7 +668,7 @@ glabel L8025048C_17ED6C /* 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) -/* 17ED7C 8025049C 0C0511FF */ jal set_hud_element_script +/* 17ED7C 8025049C 0C0511FF */ jal set_hud_element_anim /* 17ED80 802504A0 00000000 */ nop glabel L802504A4_17ED84 /* 17ED84 802504A4 3C04802A */ lui $a0, %hi(D_8029F642) @@ -677,7 +677,7 @@ glabel L802504A4_17ED84 /* 17ED8C 802504AC 3C058011 */ lui $a1, %hi(D_80108BBC) /* 17ED90 802504B0 24A58BBC */ addiu $a1, $a1, %lo(D_80108BBC) .L802504B4: -/* 17ED94 802504B4 0C0511FF */ jal set_hud_element_script +/* 17ED94 802504B4 0C0511FF */ jal set_hud_element_anim /* 17ED98 802504B8 00000000 */ nop .L802504BC: /* 17ED9C 802504BC 86230014 */ lh $v1, 0x14($s1) diff --git a/ver/us/asm/nonmatchings/18C790/btl_state_draw_celebration.s b/ver/us/asm/nonmatchings/18C790/btl_state_draw_celebration.s index 1e6c99186a..ed8a9eb89b 100644 --- a/ver/us/asm/nonmatchings/18C790/btl_state_draw_celebration.s +++ b/ver/us/asm/nonmatchings/18C790/btl_state_draw_celebration.s @@ -172,43 +172,43 @@ glabel L80260300_18EBE0 /* 18ED00 80260420 3C10802A */ lui $s0, %hi(D_8029FA80) /* 18ED04 80260424 2610FA80 */ addiu $s0, $s0, %lo(D_8029FA80) /* 18ED08 80260428 8E110000 */ lw $s1, ($s0) -/* 18ED0C 8026042C 0C05122C */ jal get_hud_element_script +/* 18ED0C 8026042C 0C05122C */ jal get_hud_element_anim /* 18ED10 80260430 0220202D */ daddu $a0, $s1, $zero /* 18ED14 80260434 3C05802B */ lui $a1, %hi(D_802A9F34) /* 18ED18 80260438 24A59F34 */ addiu $a1, $a1, %lo(D_802A9F34) /* 18ED1C 8026043C 10450003 */ beq $v0, $a1, .L8026044C /* 18ED20 80260440 00000000 */ nop -/* 18ED24 80260444 0C0511FF */ jal set_hud_element_script +/* 18ED24 80260444 0C0511FF */ jal set_hud_element_anim /* 18ED28 80260448 0220202D */ daddu $a0, $s1, $zero .L8026044C: /* 18ED2C 8026044C 8E11000C */ lw $s1, 0xc($s0) -/* 18ED30 80260450 0C05122C */ jal get_hud_element_script +/* 18ED30 80260450 0C05122C */ jal get_hud_element_anim /* 18ED34 80260454 0220202D */ daddu $a0, $s1, $zero /* 18ED38 80260458 3C05802B */ lui $a1, %hi(D_802A9F84) /* 18ED3C 8026045C 24A59F84 */ addiu $a1, $a1, %lo(D_802A9F84) /* 18ED40 80260460 10450003 */ beq $v0, $a1, .L80260470 /* 18ED44 80260464 00000000 */ nop -/* 18ED48 80260468 0C0511FF */ jal set_hud_element_script +/* 18ED48 80260468 0C0511FF */ jal set_hud_element_anim /* 18ED4C 8026046C 0220202D */ daddu $a0, $s1, $zero .L80260470: /* 18ED50 80260470 8E110004 */ lw $s1, 4($s0) -/* 18ED54 80260474 0C05122C */ jal get_hud_element_script +/* 18ED54 80260474 0C05122C */ jal get_hud_element_anim /* 18ED58 80260478 0220202D */ daddu $a0, $s1, $zero /* 18ED5C 8026047C 3C05802B */ lui $a1, %hi(D_802A9F5C) /* 18ED60 80260480 24A59F5C */ addiu $a1, $a1, %lo(D_802A9F5C) /* 18ED64 80260484 10450003 */ beq $v0, $a1, .L80260494 /* 18ED68 80260488 00000000 */ nop -/* 18ED6C 8026048C 0C0511FF */ jal set_hud_element_script +/* 18ED6C 8026048C 0C0511FF */ jal set_hud_element_anim /* 18ED70 80260490 0220202D */ daddu $a0, $s1, $zero .L80260494: /* 18ED74 80260494 8E110008 */ lw $s1, 8($s0) -/* 18ED78 80260498 0C05122C */ jal get_hud_element_script +/* 18ED78 80260498 0C05122C */ jal get_hud_element_anim /* 18ED7C 8026049C 0220202D */ daddu $a0, $s1, $zero /* 18ED80 802604A0 3C05802B */ lui $a1, %hi(D_802A9FAC) /* 18ED84 802604A4 24A59FAC */ addiu $a1, $a1, %lo(D_802A9FAC) /* 18ED88 802604A8 10450082 */ beq $v0, $a1, .L802606B4 /* 18ED8C 802604AC 00000000 */ nop -/* 18ED90 802604B0 0C0511FF */ jal set_hud_element_script +/* 18ED90 802604B0 0C0511FF */ jal set_hud_element_anim /* 18ED94 802604B4 0220202D */ daddu $a0, $s1, $zero /* 18ED98 802604B8 080981AD */ j .L802606B4 /* 18ED9C 802604BC 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 99c40ba92a..2464f451fc 100644 --- a/ver/us/asm/nonmatchings/18C790/btl_state_update_celebration.s +++ b/ver/us/asm/nonmatchings/18C790/btl_state_update_celebration.s @@ -643,7 +643,7 @@ glabel L8025E6A0_18CF80 /* 18D3EC 8025EB0C 3C058028 */ lui $a1, %hi(D_80284238) /* 18D3F0 8025EB10 00A22821 */ addu $a1, $a1, $v0 /* 18D3F4 8025EB14 8CA54238 */ lw $a1, %lo(D_80284238)($a1) -/* 18D3F8 8025EB18 0C0511FF */ jal set_hud_element_script +/* 18D3F8 8025EB18 0C0511FF */ jal set_hud_element_anim /* 18D3FC 8025EB1C 0280202D */ daddu $a0, $s4, $zero /* 18D400 8025EB20 12000004 */ beqz $s0, .L8025EB34 /* 18D404 8025EB24 0280202D */ daddu $a0, $s4, $zero @@ -666,7 +666,7 @@ glabel L8025E6A0_18CF80 /* 18D444 8025EB64 00511021 */ addu $v0, $v0, $s1 /* 18D448 8025EB68 8EF40008 */ lw $s4, 8($s7) /* 18D44C 8025EB6C 8C450000 */ lw $a1, ($v0) -/* 18D450 8025EB70 0C0511FF */ jal set_hud_element_script +/* 18D450 8025EB70 0C0511FF */ jal set_hud_element_anim /* 18D454 8025EB74 0280202D */ daddu $a0, $s4, $zero /* 18D458 8025EB78 0280202D */ daddu $a0, $s4, $zero /* 18D45C 8025EB7C 0C05128B */ jal clear_hud_element_flags @@ -684,7 +684,7 @@ glabel L8025E6A0_18CF80 /* 18D48C 8025EBAC 8EF4000C */ lw $s4, 0xc($s7) /* 18D490 8025EBB0 3C05802B */ lui $a1, %hi(D_802AA320) /* 18D494 8025EBB4 24A5A320 */ addiu $a1, $a1, %lo(D_802AA320) -/* 18D498 8025EBB8 0C0511FF */ jal set_hud_element_script +/* 18D498 8025EBB8 0C0511FF */ jal set_hud_element_anim /* 18D49C 8025EBBC 0280202D */ daddu $a0, $s4, $zero /* 18D4A0 8025EBC0 0280202D */ daddu $a0, $s4, $zero /* 18D4A4 8025EBC4 0C05128B */ jal clear_hud_element_flags @@ -719,7 +719,7 @@ glabel L8025E6A0_18CF80 /* 18D518 8025EC38 3C058028 */ lui $a1, %hi(D_802841C0) /* 18D51C 8025EC3C 00A22821 */ addu $a1, $a1, $v0 /* 18D520 8025EC40 8CA541C0 */ lw $a1, %lo(D_802841C0)($a1) -/* 18D524 8025EC44 0C0511FF */ jal set_hud_element_script +/* 18D524 8025EC44 0C0511FF */ jal set_hud_element_anim /* 18D528 8025EC48 0280202D */ daddu $a0, $s4, $zero /* 18D52C 8025EC4C 12000003 */ beqz $s0, .L8025EC5C /* 18D530 8025EC50 0280202D */ daddu $a0, $s4, $zero @@ -740,7 +740,7 @@ glabel L8025E6A0_18CF80 /* 18D568 8025EC88 00511021 */ addu $v0, $v0, $s1 /* 18D56C 8025EC8C 8EF40014 */ lw $s4, 0x14($s7) /* 18D570 8025EC90 8C450000 */ lw $a1, ($v0) -/* 18D574 8025EC94 0C0511FF */ jal set_hud_element_script +/* 18D574 8025EC94 0C0511FF */ jal set_hud_element_anim /* 18D578 8025EC98 0280202D */ daddu $a0, $s4, $zero /* 18D57C 8025EC9C 0280202D */ daddu $a0, $s4, $zero /* 18D580 8025ECA0 0C05128B */ jal clear_hud_element_flags @@ -785,7 +785,7 @@ glabel L8025E6A0_18CF80 /* 18D618 8025ED38 3C058028 */ lui $a1, %hi(D_802841C0) /* 18D61C 8025ED3C 00A22821 */ addu $a1, $a1, $v0 /* 18D620 8025ED40 8CA541C0 */ lw $a1, %lo(D_802841C0)($a1) -/* 18D624 8025ED44 0C0511FF */ jal set_hud_element_script +/* 18D624 8025ED44 0C0511FF */ jal set_hud_element_anim /* 18D628 8025ED48 0280202D */ daddu $a0, $s4, $zero /* 18D62C 8025ED4C 12000004 */ beqz $s0, .L8025ED60 /* 18D630 8025ED50 0280202D */ daddu $a0, $s4, $zero @@ -808,7 +808,7 @@ glabel L8025E6A0_18CF80 /* 18D670 8025ED90 00531021 */ addu $v0, $v0, $s3 /* 18D674 8025ED94 8EF40014 */ lw $s4, 0x14($s7) /* 18D678 8025ED98 8C450000 */ lw $a1, ($v0) -/* 18D67C 8025ED9C 0C0511FF */ jal set_hud_element_script +/* 18D67C 8025ED9C 0C0511FF */ jal set_hud_element_anim /* 18D680 8025EDA0 0280202D */ daddu $a0, $s4, $zero /* 18D684 8025EDA4 0280202D */ daddu $a0, $s4, $zero /* 18D688 8025EDA8 0C05128B */ jal clear_hud_element_flags @@ -838,7 +838,7 @@ glabel L8025E6A0_18CF80 /* 18D6E4 8025EE04 3C058009 */ lui $a1, %hi(D_8008A680) /* 18D6E8 8025EE08 00A22821 */ addu $a1, $a1, $v0 /* 18D6EC 8025EE0C 8CA5A680 */ lw $a1, %lo(D_8008A680)($a1) -/* 18D6F0 8025EE10 0C0511FF */ jal set_hud_element_script +/* 18D6F0 8025EE10 0C0511FF */ jal set_hud_element_anim /* 18D6F4 8025EE14 0280202D */ daddu $a0, $s4, $zero /* 18D6F8 8025EE18 0280202D */ daddu $a0, $s4, $zero /* 18D6FC 8025EE1C 0C05128B */ jal clear_hud_element_flags @@ -888,7 +888,7 @@ glabel L8025E6A0_18CF80 /* 18D7A8 8025EEC8 3C058028 */ lui $a1, %hi(D_80284260) /* 18D7AC 8025EECC 00A22821 */ addu $a1, $a1, $v0 /* 18D7B0 8025EED0 8CA54260 */ lw $a1, %lo(D_80284260)($a1) -/* 18D7B4 8025EED4 0C0511FF */ jal set_hud_element_script +/* 18D7B4 8025EED4 0C0511FF */ jal set_hud_element_anim /* 18D7B8 8025EED8 0280202D */ daddu $a0, $s4, $zero /* 18D7BC 8025EEDC 12000004 */ beqz $s0, .L8025EEF0 /* 18D7C0 8025EEE0 0280202D */ daddu $a0, $s4, $zero @@ -911,7 +911,7 @@ glabel L8025E6A0_18CF80 /* 18D800 8025EF20 00511021 */ addu $v0, $v0, $s1 /* 18D804 8025EF24 8EF40024 */ lw $s4, 0x24($s7) /* 18D808 8025EF28 8C450028 */ lw $a1, 0x28($v0) -/* 18D80C 8025EF2C 0C0511FF */ jal set_hud_element_script +/* 18D80C 8025EF2C 0C0511FF */ jal set_hud_element_anim /* 18D810 8025EF30 0280202D */ daddu $a0, $s4, $zero /* 18D814 8025EF34 0280202D */ daddu $a0, $s4, $zero /* 18D818 8025EF38 0C05128B */ jal clear_hud_element_flags @@ -929,7 +929,7 @@ glabel L8025E6A0_18CF80 /* 18D848 8025EF68 8EF40028 */ lw $s4, 0x28($s7) /* 18D84C 8025EF6C 3C05802B */ lui $a1, %hi(D_802AA694) /* 18D850 8025EF70 24A5A694 */ addiu $a1, $a1, %lo(D_802AA694) -/* 18D854 8025EF74 0C0511FF */ jal set_hud_element_script +/* 18D854 8025EF74 0C0511FF */ jal set_hud_element_anim /* 18D858 8025EF78 0280202D */ daddu $a0, $s4, $zero /* 18D85C 8025EF7C 0280202D */ daddu $a0, $s4, $zero /* 18D860 8025EF80 0C05128B */ jal clear_hud_element_flags @@ -964,7 +964,7 @@ glabel L8025E6A0_18CF80 /* 18D8D4 8025EFF4 3C058028 */ lui $a1, %hi(D_802841E8) /* 18D8D8 8025EFF8 00A22821 */ addu $a1, $a1, $v0 /* 18D8DC 8025EFFC 8CA541E8 */ lw $a1, %lo(D_802841E8)($a1) -/* 18D8E0 8025F000 0C0511FF */ jal set_hud_element_script +/* 18D8E0 8025F000 0C0511FF */ jal set_hud_element_anim /* 18D8E4 8025F004 0280202D */ daddu $a0, $s4, $zero /* 18D8E8 8025F008 12000003 */ beqz $s0, .L8025F018 /* 18D8EC 8025F00C 0280202D */ daddu $a0, $s4, $zero @@ -985,7 +985,7 @@ glabel L8025E6A0_18CF80 /* 18D924 8025F044 00511021 */ addu $v0, $v0, $s1 /* 18D928 8025F048 8EF40030 */ lw $s4, 0x30($s7) /* 18D92C 8025F04C 8C450028 */ lw $a1, 0x28($v0) -/* 18D930 8025F050 0C0511FF */ jal set_hud_element_script +/* 18D930 8025F050 0C0511FF */ jal set_hud_element_anim /* 18D934 8025F054 0280202D */ daddu $a0, $s4, $zero /* 18D938 8025F058 0280202D */ daddu $a0, $s4, $zero /* 18D93C 8025F05C 0C05128B */ jal clear_hud_element_flags @@ -1030,7 +1030,7 @@ glabel L8025E6A0_18CF80 /* 18D9D4 8025F0F4 3C058028 */ lui $a1, %hi(D_802841E8) /* 18D9D8 8025F0F8 00A22821 */ addu $a1, $a1, $v0 /* 18D9DC 8025F0FC 8CA541E8 */ lw $a1, %lo(D_802841E8)($a1) -/* 18D9E0 8025F100 0C0511FF */ jal set_hud_element_script +/* 18D9E0 8025F100 0C0511FF */ jal set_hud_element_anim /* 18D9E4 8025F104 0280202D */ daddu $a0, $s4, $zero /* 18D9E8 8025F108 12000004 */ beqz $s0, .L8025F11C /* 18D9EC 8025F10C 0280202D */ daddu $a0, $s4, $zero @@ -1053,7 +1053,7 @@ glabel L8025E6A0_18CF80 /* 18DA2C 8025F14C 00531021 */ addu $v0, $v0, $s3 /* 18DA30 8025F150 8ED40030 */ lw $s4, 0x30($s6) /* 18DA34 8025F154 8C450028 */ lw $a1, 0x28($v0) -/* 18DA38 8025F158 0C0511FF */ jal set_hud_element_script +/* 18DA38 8025F158 0C0511FF */ jal set_hud_element_anim /* 18DA3C 8025F15C 0280202D */ daddu $a0, $s4, $zero /* 18DA40 8025F160 0280202D */ daddu $a0, $s4, $zero /* 18DA44 8025F164 0C05128B */ jal clear_hud_element_flags @@ -1084,7 +1084,7 @@ glabel L8025E6A0_18CF80 /* 18DAA4 8025F1C4 3C058009 */ lui $a1, %hi(D_8008A680) /* 18DAA8 8025F1C8 00A22821 */ addu $a1, $a1, $v0 /* 18DAAC 8025F1CC 8CA5A680 */ lw $a1, %lo(D_8008A680)($a1) -/* 18DAB0 8025F1D0 0C0511FF */ jal set_hud_element_script +/* 18DAB0 8025F1D0 0C0511FF */ jal set_hud_element_anim /* 18DAB4 8025F1D4 0280202D */ daddu $a0, $s4, $zero /* 18DAB8 8025F1D8 0280202D */ daddu $a0, $s4, $zero /* 18DABC 8025F1DC 0C05128B */ jal clear_hud_element_flags @@ -1133,7 +1133,7 @@ glabel L8025E6A0_18CF80 /* 18DB64 8025F284 3C058028 */ lui $a1, %hi(D_80284288) /* 18DB68 8025F288 00A22821 */ addu $a1, $a1, $v0 /* 18DB6C 8025F28C 8CA54288 */ lw $a1, %lo(D_80284288)($a1) -/* 18DB70 8025F290 0C0511FF */ jal set_hud_element_script +/* 18DB70 8025F290 0C0511FF */ jal set_hud_element_anim /* 18DB74 8025F294 0280202D */ daddu $a0, $s4, $zero /* 18DB78 8025F298 12000004 */ beqz $s0, .L8025F2AC /* 18DB7C 8025F29C 0280202D */ daddu $a0, $s4, $zero @@ -1156,7 +1156,7 @@ glabel L8025E6A0_18CF80 /* 18DBBC 8025F2DC 00511021 */ addu $v0, $v0, $s1 /* 18DBC0 8025F2E0 8EF40040 */ lw $s4, 0x40($s7) /* 18DBC4 8025F2E4 8C450050 */ lw $a1, 0x50($v0) -/* 18DBC8 8025F2E8 0C0511FF */ jal set_hud_element_script +/* 18DBC8 8025F2E8 0C0511FF */ jal set_hud_element_anim /* 18DBCC 8025F2EC 0280202D */ daddu $a0, $s4, $zero /* 18DBD0 8025F2F0 0280202D */ daddu $a0, $s4, $zero /* 18DBD4 8025F2F4 0C05128B */ jal clear_hud_element_flags @@ -1174,7 +1174,7 @@ glabel L8025E6A0_18CF80 /* 18DC04 8025F324 8EF40044 */ lw $s4, 0x44($s7) /* 18DC08 8025F328 3C05802B */ lui $a1, %hi(D_802AAA08) /* 18DC0C 8025F32C 24A5AA08 */ addiu $a1, $a1, %lo(D_802AAA08) -/* 18DC10 8025F330 0C0511FF */ jal set_hud_element_script +/* 18DC10 8025F330 0C0511FF */ jal set_hud_element_anim /* 18DC14 8025F334 0280202D */ daddu $a0, $s4, $zero /* 18DC18 8025F338 0280202D */ daddu $a0, $s4, $zero /* 18DC1C 8025F33C 0C05128B */ jal clear_hud_element_flags @@ -1209,7 +1209,7 @@ glabel L8025E6A0_18CF80 /* 18DC90 8025F3B0 3C058028 */ lui $a1, %hi(D_80284210) /* 18DC94 8025F3B4 00A22821 */ addu $a1, $a1, $v0 /* 18DC98 8025F3B8 8CA54210 */ lw $a1, %lo(D_80284210)($a1) -/* 18DC9C 8025F3BC 0C0511FF */ jal set_hud_element_script +/* 18DC9C 8025F3BC 0C0511FF */ jal set_hud_element_anim /* 18DCA0 8025F3C0 0280202D */ daddu $a0, $s4, $zero /* 18DCA4 8025F3C4 12000004 */ beqz $s0, .L8025F3D8 /* 18DCA8 8025F3C8 0280202D */ daddu $a0, $s4, $zero @@ -1230,7 +1230,7 @@ glabel L8025E6A0_18CF80 /* 18DCE0 8025F400 00511021 */ addu $v0, $v0, $s1 /* 18DCE4 8025F404 8EF4004C */ lw $s4, 0x4c($s7) /* 18DCE8 8025F408 8C450050 */ lw $a1, 0x50($v0) -/* 18DCEC 8025F40C 0C0511FF */ jal set_hud_element_script +/* 18DCEC 8025F40C 0C0511FF */ jal set_hud_element_anim /* 18DCF0 8025F410 0280202D */ daddu $a0, $s4, $zero /* 18DCF4 8025F414 0280202D */ daddu $a0, $s4, $zero /* 18DCF8 8025F418 0C05128B */ jal clear_hud_element_flags @@ -1254,7 +1254,7 @@ glabel L8025E6A0_18CF80 /* 18DD3C 8025F45C 265241C0 */ addiu $s2, $s2, %lo(D_802841C0) /* 18DD40 8025F460 8E740048 */ lw $s4, 0x48($s3) /* 18DD44 8025F464 8E45005C */ lw $a1, 0x5c($s2) -/* 18DD48 8025F468 0C0511FF */ jal set_hud_element_script +/* 18DD48 8025F468 0C0511FF */ jal set_hud_element_anim /* 18DD4C 8025F46C 0280202D */ daddu $a0, $s4, $zero /* 18DD50 8025F470 0280202D */ daddu $a0, $s4, $zero /* 18DD54 8025F474 0C05128B */ jal clear_hud_element_flags @@ -1273,7 +1273,7 @@ glabel L8025E6A0_18CF80 /* 18DD88 8025F4A8 24C6002E */ addiu $a2, $a2, 0x2e /* 18DD8C 8025F4AC 8E74004C */ lw $s4, 0x4c($s3) /* 18DD90 8025F4B0 8E450050 */ lw $a1, 0x50($s2) -/* 18DD94 8025F4B4 0C0511FF */ jal set_hud_element_script +/* 18DD94 8025F4B4 0C0511FF */ jal set_hud_element_anim /* 18DD98 8025F4B8 0280202D */ daddu $a0, $s4, $zero /* 18DD9C 8025F4BC 0280202D */ daddu $a0, $s4, $zero /* 18DDA0 8025F4C0 0C05128B */ jal clear_hud_element_flags diff --git a/ver/us/asm/nonmatchings/20ec0_len_5040/func_80046030.s b/ver/us/asm/nonmatchings/20ec0_len_5040/func_80046030.s index 606c5ff823..69f81aa8f0 100644 --- a/ver/us/asm/nonmatchings/20ec0_len_5040/func_80046030.s +++ b/ver/us/asm/nonmatchings/20ec0_len_5040/func_80046030.s @@ -180,7 +180,7 @@ glabel L80046254_21654 /* 2166C 8004626C 3C058008 */ lui $a1, %hi(D_800804F0) /* 21670 80046270 24A504F0 */ addiu $a1, $a1, %lo(D_800804F0) .L80046274: -/* 21674 80046274 0C0511FF */ jal set_hud_element_script +/* 21674 80046274 0C0511FF */ jal set_hud_element_anim /* 21678 80046278 00000000 */ nop /* 2167C 8004627C 2402000A */ addiu $v0, $zero, 0xa /* 21680 80046280 A222FFB8 */ sb $v0, -0x48($s1) @@ -246,7 +246,7 @@ glabel L80046254_21654 /* 21754 80046354 3C058008 */ lui $a1, %hi(D_800804F0) /* 21758 80046358 24A504F0 */ addiu $a1, $a1, %lo(D_800804F0) .L8004635C: -/* 2175C 8004635C 0C0511FF */ jal set_hud_element_script +/* 2175C 8004635C 0C0511FF */ jal set_hud_element_anim /* 21760 80046360 00000000 */ nop /* 21764 80046364 A237FFC8 */ sb $s7, -0x38($s1) /* 21768 80046368 080118E6 */ j .L80046398 @@ -311,7 +311,7 @@ glabel L80046254_21654 /* 21838 80046438 3C058008 */ lui $a1, %hi(D_800804F0) /* 2183C 8004643C 24A504F0 */ addiu $a1, $a1, %lo(D_800804F0) .L80046440: -/* 21840 80046440 0C0511FF */ jal set_hud_element_script +/* 21840 80046440 0C0511FF */ jal set_hud_element_anim /* 21844 80046444 00000000 */ nop /* 21848 80046448 A237FFD8 */ sb $s7, -0x28($s1) /* 2184C 8004644C 0801191F */ j .L8004647C @@ -359,7 +359,7 @@ glabel L80046254_21654 /* 218E0 800464E0 8E24FFEF */ lw $a0, -0x11($s1) /* 218E4 800464E4 3C058010 */ lui $a1, %hi(D_8010645C) /* 218E8 800464E8 24A5645C */ addiu $a1, $a1, %lo(D_8010645C) -/* 218EC 800464EC 0C0511FF */ jal set_hud_element_script +/* 218EC 800464EC 0C0511FF */ jal set_hud_element_anim /* 218F0 800464F0 00000000 */ nop /* 218F4 800464F4 A237FFE8 */ sb $s7, -0x18($s1) /* 218F8 800464F8 0801194A */ j .L80046528 diff --git a/ver/us/asm/nonmatchings/20ec0_len_5040/remove_status_icon_boost_hammer.s b/ver/us/asm/nonmatchings/20ec0_len_5040/remove_status_icon_boost_hammer.s index e6ae5cbaeb..487c327fa0 100644 --- a/ver/us/asm/nonmatchings/20ec0_len_5040/remove_status_icon_boost_hammer.s +++ b/ver/us/asm/nonmatchings/20ec0_len_5040/remove_status_icon_boost_hammer.s @@ -20,7 +20,7 @@ glabel remove_status_icon_boost_hammer /* 231FC 80047DFC 24A57474 */ addiu $a1, $a1, %lo(D_80107474) /* 23200 80047E00 A0600084 */ sb $zero, 0x84($v1) /* 23204 80047E04 A0600085 */ sb $zero, 0x85($v1) -/* 23208 80047E08 0C0511FF */ jal set_hud_element_script +/* 23208 80047E08 0C0511FF */ jal set_hud_element_anim /* 2320C 80047E0C AC64008C */ sw $a0, 0x8c($v1) .L80047E10: /* 23210 80047E10 8FBF0010 */ lw $ra, 0x10($sp) diff --git a/ver/us/asm/nonmatchings/20ec0_len_5040/remove_status_icon_boost_jump.s b/ver/us/asm/nonmatchings/20ec0_len_5040/remove_status_icon_boost_jump.s index 44d04bf81c..e81627127f 100644 --- a/ver/us/asm/nonmatchings/20ec0_len_5040/remove_status_icon_boost_jump.s +++ b/ver/us/asm/nonmatchings/20ec0_len_5040/remove_status_icon_boost_jump.s @@ -20,7 +20,7 @@ glabel remove_status_icon_boost_jump /* 230E0 80047CE0 24A5717C */ addiu $a1, $a1, %lo(D_8010717C) /* 230E4 80047CE4 A0600078 */ sb $zero, 0x78($v1) /* 230E8 80047CE8 A0620079 */ sb $v0, 0x79($v1) -/* 230EC 80047CEC 0C0511FF */ jal set_hud_element_script +/* 230EC 80047CEC 0C0511FF */ jal set_hud_element_anim /* 230F0 80047CF0 AC640080 */ sw $a0, 0x80($v1) .L80047CF4: /* 230F4 80047CF4 8FBF0010 */ lw $ra, 0x10($sp) 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 053dae5024..6164ef2b9a 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 @@ -72,7 +72,7 @@ glabel btl_state_draw_select_target /* 41FB6C 802AADDC 10400008 */ beqz $v0, .L802AAE00 /* 41FB70 802AADE0 24140010 */ addiu $s4, $zero, 0x10 /* 41FB74 802AADE4 24130002 */ addiu $s3, $zero, 2 -/* 41FB78 802AADE8 0C05122C */ jal get_hud_element_script +/* 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) @@ -81,14 +81,14 @@ glabel btl_state_draw_select_target .L802AAE00: /* 41FB90 802AAE00 24140005 */ addiu $s4, $zero, 5 /* 41FB94 802AAE04 2413FFF5 */ addiu $s3, $zero, -0xb -/* 41FB98 802AAE08 0C05122C */ jal get_hud_element_script +/* 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) .L802AAE18: /* 41FBA8 802AAE18 50450004 */ beql $v0, $a1, .L802AAE2C /* 41FBAC 802AAE1C 24040001 */ addiu $a0, $zero, 1 -/* 41FBB0 802AAE20 0C0511FF */ jal set_hud_element_script +/* 41FBB0 802AAE20 0C0511FF */ jal set_hud_element_anim /* 41FBB4 802AAE24 0200202D */ daddu $a0, $s0, $zero /* 41FBB8 802AAE28 24040001 */ addiu $a0, $zero, 1 .L802AAE2C: @@ -149,7 +149,7 @@ glabel btl_state_draw_select_target /* 41FC8C 802AAEFC 1040000A */ beqz $v0, .L802AAF28 /* 41FC90 802AAF00 24140010 */ addiu $s4, $zero, 0x10 /* 41FC94 802AAF04 24130002 */ addiu $s3, $zero, 2 -/* 41FC98 802AAF08 0C05122C */ jal get_hud_element_script +/* 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) @@ -160,13 +160,13 @@ glabel btl_state_draw_select_target .L802AAF28: /* 41FCB8 802AAF28 24140005 */ addiu $s4, $zero, 5 /* 41FCBC 802AAF2C 2413FFF5 */ addiu $s3, $zero, -0xb -/* 41FCC0 802AAF30 0C05122C */ jal get_hud_element_script +/* 41FCC0 802AAF30 0C05122C */ jal get_hud_element_anim /* 41FCC4 802AAF34 0200202D */ daddu $a0, $s0, $zero /* 41FCC8 802AAF38 105E0004 */ beq $v0, $fp, .L802AAF4C /* 41FCCC 802AAF3C 03C0282D */ daddu $a1, $fp, $zero /* 41FCD0 802AAF40 0200202D */ daddu $a0, $s0, $zero .L802AAF44: -/* 41FCD4 802AAF44 0C0511FF */ jal set_hud_element_script +/* 41FCD4 802AAF44 0C0511FF */ jal set_hud_element_anim /* 41FCD8 802AAF48 00000000 */ nop .L802AAF4C: /* 41FCDC 802AAF4C 24040001 */ addiu $a0, $zero, 1 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 bb73798ec2..70fb27deb7 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 @@ -274,7 +274,7 @@ glabel btl_state_update_select_target /* 41F7EC 802AAA5C 3C058008 */ lui $a1, %hi(D_8007FF20) /* 41F7F0 802AAA60 24A5FF20 */ addiu $a1, $a1, %lo(D_8007FF20) .L802AAA64: -/* 41F7F4 802AAA64 0C0511FF */ jal set_hud_element_script +/* 41F7F4 802AAA64 0C0511FF */ jal set_hud_element_anim /* 41F7F8 802AAA68 00000000 */ nop /* 41F7FC 802AAA6C 0C05272D */ jal sfx_play_sound /* 41F800 802AAA70 240400C7 */ addiu $a0, $zero, 0xc7 diff --git a/ver/us/asm/nonmatchings/415D90/func_802A2C84.s b/ver/us/asm/nonmatchings/415D90/func_802A2C84.s index 7a5d29f043..c5eb4819bf 100644 --- a/ver/us/asm/nonmatchings/415D90/func_802A2C84.s +++ b/ver/us/asm/nonmatchings/415D90/func_802A2C84.s @@ -799,7 +799,7 @@ glabel L802A3718_4184A8 /* 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) -/* 4185A8 802A3818 0C0511FF */ jal set_hud_element_script +/* 4185A8 802A3818 0C0511FF */ jal set_hud_element_anim /* 4185AC 802A381C 00000000 */ nop /* 4185B0 802A3820 24040001 */ addiu $a0, $zero, 1 /* 4185B4 802A3824 2402000D */ addiu $v0, $zero, 0xd diff --git a/ver/us/asm/nonmatchings/415D90/func_802A3C98.s b/ver/us/asm/nonmatchings/415D90/func_802A3C98.s index c37160b248..c27f901a6c 100644 --- a/ver/us/asm/nonmatchings/415D90/func_802A3C98.s +++ b/ver/us/asm/nonmatchings/415D90/func_802A3C98.s @@ -297,7 +297,7 @@ glabel L802A3D00_418A90 /* 418E5C 802A40CC 0200202D */ daddu $a0, $s0, $zero /* 418E60 802A40D0 3C058010 */ lui $a1, %hi(D_801076BC) /* 418E64 802A40D4 24A576BC */ addiu $a1, $a1, %lo(D_801076BC) -/* 418E68 802A40D8 0C0511FF */ jal set_hud_element_script +/* 418E68 802A40D8 0C0511FF */ jal set_hud_element_anim /* 418E6C 802A40DC 0200202D */ daddu $a0, $s0, $zero /* 418E70 802A40E0 0200202D */ daddu $a0, $s0, $zero .L802A40E4: @@ -322,7 +322,7 @@ glabel L802A3D00_418A90 /* 418EB8 802A4128 0200202D */ daddu $a0, $s0, $zero /* 418EBC 802A412C 3C058010 */ lui $a1, %hi(D_8010776C) /* 418EC0 802A4130 24A5776C */ addiu $a1, $a1, %lo(D_8010776C) -/* 418EC4 802A4134 0C0511FF */ jal set_hud_element_script +/* 418EC4 802A4134 0C0511FF */ jal set_hud_element_anim /* 418EC8 802A4138 0200202D */ daddu $a0, $s0, $zero /* 418ECC 802A413C 0200202D */ daddu $a0, $s0, $zero .L802A4140: diff --git a/ver/us/asm/nonmatchings/415D90/func_802A4A54.s b/ver/us/asm/nonmatchings/415D90/func_802A4A54.s index 74a6a3f262..a75d58cd34 100644 --- a/ver/us/asm/nonmatchings/415D90/func_802A4A54.s +++ b/ver/us/asm/nonmatchings/415D90/func_802A4A54.s @@ -396,7 +396,7 @@ glabel L802A4F74_419D04 /* 419D98 802A5008 8E040000 */ lw $a0, ($s0) /* 419D9C 802A500C 3C058010 */ lui $a1, %hi(D_80104A00) /* 419DA0 802A5010 24A54A00 */ addiu $a1, $a1, %lo(D_80104A00) -/* 419DA4 802A5014 0C0511FF */ jal set_hud_element_script +/* 419DA4 802A5014 0C0511FF */ jal set_hud_element_anim /* 419DA8 802A5018 00000000 */ nop /* 419DAC 802A501C 24040006 */ addiu $a0, $zero, 6 /* 419DB0 802A5020 2402000D */ addiu $v0, $zero, 0xd 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 f5fa589ff4..5a5eb027f3 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 @@ -20,7 +20,7 @@ glabel status_menu_draw_number /* 81190 800E7CE0 AFBF003C */ sw $ra, 0x3c($sp) /* 81194 800E7CE4 AFBE0038 */ sw $fp, 0x38($sp) /* 81198 800E7CE8 AFB70034 */ sw $s7, 0x34($sp) -/* 8119C 800E7CEC 0C0511FF */ jal set_hud_element_script +/* 8119C 800E7CEC 0C0511FF */ jal set_hud_element_anim /* 811A0 800E7CF0 AFB60030 */ sw $s6, 0x30($sp) /* 811A4 800E7CF4 26310008 */ addiu $s1, $s1, 8 /* 811A8 800E7CF8 0280202D */ daddu $a0, $s4, $zero @@ -79,7 +79,7 @@ glabel status_menu_draw_number /* 8126C 800E7DBC 00021080 */ sll $v0, $v0, 2 /* 81270 800E7DC0 00571021 */ addu $v0, $v0, $s7 /* 81274 800E7DC4 8C450000 */ lw $a1, ($v0) -/* 81278 800E7DC8 0C0511FF */ jal set_hud_element_script +/* 81278 800E7DC8 0C0511FF */ jal set_hud_element_anim /* 8127C 800E7DCC 0280202D */ daddu $a0, $s4, $zero /* 81280 800E7DD0 0280202D */ daddu $a0, $s4, $zero /* 81284 800E7DD4 0220282D */ daddu $a1, $s1, $zero 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 d29252c6c5..45f07fc65f 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 @@ -25,7 +25,7 @@ glabel status_menu_draw_stat /* 81334 800E7E84 AFBF0044 */ sw $ra, 0x44($sp) /* 81338 800E7E88 AFBE0040 */ sw $fp, 0x40($sp) /* 8133C 800E7E8C AFB7003C */ sw $s7, 0x3c($sp) -/* 81340 800E7E90 0C0511FF */ jal set_hud_element_script +/* 81340 800E7E90 0C0511FF */ jal set_hud_element_anim /* 81344 800E7E94 AFA8001C */ sw $t0, 0x1c($sp) /* 81348 800E7E98 0280202D */ daddu $a0, $s4, $zero /* 8134C 800E7E9C 26050016 */ addiu $a1, $s0, 0x16 @@ -80,7 +80,7 @@ glabel status_menu_draw_stat /* 81404 800E7F54 25087F80 */ addiu $t0, $t0, %lo(D_800F7F80) /* 81408 800E7F58 00481021 */ addu $v0, $v0, $t0 /* 8140C 800E7F5C 8C450000 */ lw $a1, ($v0) -/* 81410 800E7F60 0C0511FF */ jal set_hud_element_script +/* 81410 800E7F60 0C0511FF */ jal set_hud_element_anim /* 81414 800E7F64 0280202D */ daddu $a0, $s4, $zero /* 81418 800E7F68 0280202D */ daddu $a0, $s4, $zero /* 8141C 800E7F6C 0200282D */ daddu $a1, $s0, $zero @@ -144,7 +144,7 @@ glabel status_menu_draw_stat /* 814EC 800E803C 00021080 */ sll $v0, $v0, 2 /* 814F0 800E8040 005E1021 */ addu $v0, $v0, $fp /* 814F4 800E8044 8C450000 */ lw $a1, ($v0) -/* 814F8 800E8048 0C0511FF */ jal set_hud_element_script +/* 814F8 800E8048 0C0511FF */ jal set_hud_element_anim /* 814FC 800E804C 0280202D */ daddu $a0, $s4, $zero /* 81500 800E8050 0280202D */ daddu $a0, $s4, $zero /* 81504 800E8054 0200282D */ daddu $a1, $s0, $zero 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 f3de005a07..14bc93a5ab 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 @@ -878,7 +878,7 @@ glabel update_status_menu /* 82200 800E8D50 01229821 */ addu $s3, $t1, $v0 /* 82204 800E8D54 AFA90058 */ sw $t1, 0x58($sp) /* 82208 800E8D58 8E650000 */ lw $a1, ($s3) -/* 8220C 800E8D5C 0C0511FF */ jal set_hud_element_script +/* 8220C 800E8D5C 0C0511FF */ jal set_hud_element_anim /* 82210 800E8D60 26310001 */ addiu $s1, $s1, 1 /* 82214 800E8D64 0240202D */ daddu $a0, $s2, $zero /* 82218 800E8D68 3C05800F */ lui $a1, %hi(D_800F7FE8) @@ -900,7 +900,7 @@ glabel update_status_menu .L800E8DA8: /* 82258 800E8DA8 0240202D */ daddu $a0, $s2, $zero /* 8225C 800E8DAC 8E650000 */ lw $a1, ($s3) -/* 82260 800E8DB0 0C0511FF */ jal set_hud_element_script +/* 82260 800E8DB0 0C0511FF */ jal set_hud_element_anim /* 82264 800E8DB4 26310001 */ addiu $s1, $s1, 1 /* 82268 800E8DB8 0240202D */ daddu $a0, $s2, $zero /* 8226C 800E8DBC 3C05800F */ lui $a1, %hi(D_800F7FEC) @@ -922,7 +922,7 @@ glabel update_status_menu .L800E8DFC: /* 822AC 800E8DFC 0240202D */ daddu $a0, $s2, $zero /* 822B0 800E8E00 8E650000 */ lw $a1, ($s3) -/* 822B4 800E8E04 0C0511FF */ jal set_hud_element_script +/* 822B4 800E8E04 0C0511FF */ jal set_hud_element_anim /* 822B8 800E8E08 26310001 */ addiu $s1, $s1, 1 /* 822BC 800E8E0C 0240202D */ daddu $a0, $s2, $zero /* 822C0 800E8E10 3C05800F */ lui $a1, %hi(D_800F7FF0) @@ -944,7 +944,7 @@ glabel update_status_menu .L800E8E50: /* 82300 800E8E50 0240202D */ daddu $a0, $s2, $zero /* 82304 800E8E54 8E650000 */ lw $a1, ($s3) -/* 82308 800E8E58 0C0511FF */ jal set_hud_element_script +/* 82308 800E8E58 0C0511FF */ jal set_hud_element_anim /* 8230C 800E8E5C 26310001 */ addiu $s1, $s1, 1 /* 82310 800E8E60 0240202D */ daddu $a0, $s2, $zero /* 82314 800E8E64 3C05800F */ lui $a1, %hi(D_800F7FF4) @@ -966,7 +966,7 @@ glabel update_status_menu .L800E8EA4: /* 82354 800E8EA4 0240202D */ daddu $a0, $s2, $zero /* 82358 800E8EA8 8E650000 */ lw $a1, ($s3) -/* 8235C 800E8EAC 0C0511FF */ jal set_hud_element_script +/* 8235C 800E8EAC 0C0511FF */ jal set_hud_element_anim /* 82360 800E8EB0 26310001 */ addiu $s1, $s1, 1 /* 82364 800E8EB4 0240202D */ daddu $a0, $s2, $zero /* 82368 800E8EB8 3C05800F */ lui $a1, %hi(D_800F7FF8) @@ -988,7 +988,7 @@ glabel update_status_menu .L800E8EF8: /* 823A8 800E8EF8 0240202D */ daddu $a0, $s2, $zero /* 823AC 800E8EFC 8E650000 */ lw $a1, ($s3) -/* 823B0 800E8F00 0C0511FF */ jal set_hud_element_script +/* 823B0 800E8F00 0C0511FF */ jal set_hud_element_anim /* 823B4 800E8F04 26310001 */ addiu $s1, $s1, 1 /* 823B8 800E8F08 0240202D */ daddu $a0, $s2, $zero /* 823BC 800E8F0C 3C05800F */ lui $a1, %hi(D_800F7FFC) @@ -1010,7 +1010,7 @@ glabel update_status_menu .L800E8F4C: /* 823FC 800E8F4C 0240202D */ daddu $a0, $s2, $zero /* 82400 800E8F50 8E650000 */ lw $a1, ($s3) -/* 82404 800E8F54 0C0511FF */ jal set_hud_element_script +/* 82404 800E8F54 0C0511FF */ jal set_hud_element_anim /* 82408 800E8F58 26310001 */ addiu $s1, $s1, 1 /* 8240C 800E8F5C 0240202D */ daddu $a0, $s2, $zero /* 82410 800E8F60 3C058010 */ lui $a1, %hi(D_800F8000) @@ -1039,7 +1039,7 @@ glabel update_status_menu /* 82468 800E8FB8 8FA90050 */ lw $t1, 0x50($sp) /* 8246C 800E8FBC 26D60014 */ addiu $s6, $s6, 0x14 /* 82470 800E8FC0 25290001 */ addiu $t1, $t1, 1 -/* 82474 800E8FC4 0C0511FF */ jal set_hud_element_script +/* 82474 800E8FC4 0C0511FF */ jal set_hud_element_anim /* 82478 800E8FC8 AFA90050 */ sw $t1, 0x50($sp) /* 8247C 800E8FCC 0240202D */ daddu $a0, $s2, $zero /* 82480 800E8FD0 8FA90060 */ lw $t1, 0x60($sp) @@ -1081,7 +1081,7 @@ glabel update_status_menu /* 82508 800E9058 26100001 */ addiu $s0, $s0, 1 /* 8250C 800E905C 3C058011 */ lui $a1, %hi(D_801083B0) /* 82510 800E9060 24A583B0 */ addiu $a1, $a1, %lo(D_801083B0) -/* 82514 800E9064 0C0511FF */ jal set_hud_element_script +/* 82514 800E9064 0C0511FF */ jal set_hud_element_anim /* 82518 800E9068 0240202D */ daddu $a0, $s2, $zero /* 8251C 800E906C 0240202D */ daddu $a0, $s2, $zero /* 82520 800E9070 3C05800F */ lui $a1, %hi(D_800F7FE8) @@ -1101,7 +1101,7 @@ glabel update_status_menu /* 82554 800E90A4 02028021 */ addu $s0, $s0, $v0 /* 82558 800E90A8 3C058011 */ lui $a1, %hi(D_801083B0) /* 8255C 800E90AC 24A583B0 */ addiu $a1, $a1, %lo(D_801083B0) -/* 82560 800E90B0 0C0511FF */ jal set_hud_element_script +/* 82560 800E90B0 0C0511FF */ jal set_hud_element_anim /* 82564 800E90B4 0240202D */ daddu $a0, $s2, $zero /* 82568 800E90B8 0240202D */ daddu $a0, $s2, $zero /* 8256C 800E90BC 8EC50004 */ lw $a1, 4($s6) @@ -1120,7 +1120,7 @@ glabel update_status_menu /* 8259C 800E90EC 26100001 */ addiu $s0, $s0, 1 /* 825A0 800E90F0 3C058011 */ lui $a1, %hi(D_801083B0) /* 825A4 800E90F4 24A583B0 */ addiu $a1, $a1, %lo(D_801083B0) -/* 825A8 800E90F8 0C0511FF */ jal set_hud_element_script +/* 825A8 800E90F8 0C0511FF */ jal set_hud_element_anim /* 825AC 800E90FC 0240202D */ daddu $a0, $s2, $zero /* 825B0 800E9100 0240202D */ daddu $a0, $s2, $zero /* 825B4 800E9104 8EC50008 */ lw $a1, 8($s6) @@ -1139,7 +1139,7 @@ glabel update_status_menu /* 825E4 800E9134 26100001 */ addiu $s0, $s0, 1 /* 825E8 800E9138 3C058011 */ lui $a1, %hi(D_801083B0) /* 825EC 800E913C 24A583B0 */ addiu $a1, $a1, %lo(D_801083B0) -/* 825F0 800E9140 0C0511FF */ jal set_hud_element_script +/* 825F0 800E9140 0C0511FF */ jal set_hud_element_anim /* 825F4 800E9144 0240202D */ daddu $a0, $s2, $zero /* 825F8 800E9148 0240202D */ daddu $a0, $s2, $zero /* 825FC 800E914C 8EC5000C */ lw $a1, 0xc($s6) @@ -1158,7 +1158,7 @@ glabel update_status_menu /* 8262C 800E917C 26100001 */ addiu $s0, $s0, 1 /* 82630 800E9180 3C058011 */ lui $a1, %hi(D_801083B0) /* 82634 800E9184 24A583B0 */ addiu $a1, $a1, %lo(D_801083B0) -/* 82638 800E9188 0C0511FF */ jal set_hud_element_script +/* 82638 800E9188 0C0511FF */ jal set_hud_element_anim /* 8263C 800E918C 0240202D */ daddu $a0, $s2, $zero /* 82640 800E9190 0240202D */ daddu $a0, $s2, $zero /* 82644 800E9194 8EC50010 */ lw $a1, 0x10($s6) @@ -1177,7 +1177,7 @@ glabel update_status_menu /* 82674 800E91C4 26100001 */ addiu $s0, $s0, 1 /* 82678 800E91C8 3C058011 */ lui $a1, %hi(D_801083B0) /* 8267C 800E91CC 24A583B0 */ addiu $a1, $a1, %lo(D_801083B0) -/* 82680 800E91D0 0C0511FF */ jal set_hud_element_script +/* 82680 800E91D0 0C0511FF */ jal set_hud_element_anim /* 82684 800E91D4 0240202D */ daddu $a0, $s2, $zero /* 82688 800E91D8 0240202D */ daddu $a0, $s2, $zero /* 8268C 800E91DC 8EC50014 */ lw $a1, 0x14($s6) @@ -1196,7 +1196,7 @@ glabel update_status_menu /* 826BC 800E920C 26100001 */ addiu $s0, $s0, 1 /* 826C0 800E9210 3C058011 */ lui $a1, %hi(D_801083B0) /* 826C4 800E9214 24A583B0 */ addiu $a1, $a1, %lo(D_801083B0) -/* 826C8 800E9218 0C0511FF */ jal set_hud_element_script +/* 826C8 800E9218 0C0511FF */ jal set_hud_element_anim /* 826CC 800E921C 0240202D */ daddu $a0, $s2, $zero /* 826D0 800E9220 0240202D */ daddu $a0, $s2, $zero /* 826D4 800E9224 8EC50018 */ lw $a1, 0x18($s6) @@ -1215,7 +1215,7 @@ glabel update_status_menu /* 82704 800E9254 26100001 */ addiu $s0, $s0, 1 /* 82708 800E9258 3C058011 */ lui $a1, %hi(D_801084F0) /* 8270C 800E925C 24A584F0 */ addiu $a1, $a1, %lo(D_801084F0) -/* 82710 800E9260 0C0511FF */ jal set_hud_element_script +/* 82710 800E9260 0C0511FF */ jal set_hud_element_anim /* 82714 800E9264 0240202D */ daddu $a0, $s2, $zero /* 82718 800E9268 0240202D */ daddu $a0, $s2, $zero /* 8271C 800E926C 03D72821 */ addu $a1, $fp, $s7 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 19880ed1f9..c95a6fdf1b 100644 --- a/ver/us/asm/nonmatchings/8a860_len_3f30/func_800F16CC.s +++ b/ver/us/asm/nonmatchings/8a860_len_3f30/func_800F16CC.s @@ -228,7 +228,7 @@ glabel L800F17E8_8AC98 /* 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) -/* 8AE88 800F19D8 0C0511FF */ jal set_hud_element_script +/* 8AE88 800F19D8 0C0511FF */ jal set_hud_element_anim /* 8AE8C 800F19DC 00000000 */ nop /* 8AE90 800F19E0 8FBF001C */ lw $ra, 0x1c($sp) /* 8AE94 800F19E4 8FB20018 */ lw $s2, 0x18($sp) diff --git a/ver/us/asm/nonmatchings/8a860_len_3f30/popup_menu_draw_menu_contents.s b/ver/us/asm/nonmatchings/8a860_len_3f30/popup_menu_draw_menu_contents.s index 51392a5bc0..6f8eb9d47c 100644 --- a/ver/us/asm/nonmatchings/8a860_len_3f30/popup_menu_draw_menu_contents.s +++ b/ver/us/asm/nonmatchings/8a860_len_3f30/popup_menu_draw_menu_contents.s @@ -569,7 +569,7 @@ glabel L800F3D94_8D244 .L800F3E74: /* 8D324 800F3E74 8EA50000 */ lw $a1, ($s5) .L800F3E78: -/* 8D328 800F3E78 0C0511FF */ jal set_hud_element_script +/* 8D328 800F3E78 0C0511FF */ jal set_hud_element_anim /* 8D32C 800F3E7C 0200202D */ daddu $a0, $s0, $zero /* 8D330 800F3E80 3C028011 */ lui $v0, %hi(D_8010D69C) /* 8D334 800F3E84 8C42D69C */ lw $v0, %lo(D_8010D69C)($v0) @@ -710,7 +710,7 @@ glabel L800F4000_8D4B0 /* 8D514 800F4064 8E10D678 */ lw $s0, %lo(D_8010D678)($s0) /* 8D518 800F4068 00431021 */ addu $v0, $v0, $v1 /* 8D51C 800F406C 8C450000 */ lw $a1, ($v0) -/* 8D520 800F4070 0C0511FF */ jal set_hud_element_script +/* 8D520 800F4070 0C0511FF */ jal set_hud_element_anim /* 8D524 800F4074 0200202D */ daddu $a0, $s0, $zero /* 8D528 800F4078 0200202D */ daddu $a0, $s0, $zero /* 8D52C 800F407C 8FA50020 */ lw $a1, 0x20($sp) @@ -773,7 +773,7 @@ glabel L800F40E8_8D598 /* 8D5FC 800F414C 8E10D678 */ lw $s0, %lo(D_8010D678)($s0) /* 8D600 800F4150 00431021 */ addu $v0, $v0, $v1 /* 8D604 800F4154 8C450000 */ lw $a1, ($v0) -/* 8D608 800F4158 0C0511FF */ jal set_hud_element_script +/* 8D608 800F4158 0C0511FF */ jal set_hud_element_anim /* 8D60C 800F415C 0200202D */ daddu $a0, $s0, $zero /* 8D610 800F4160 0200202D */ daddu $a0, $s0, $zero /* 8D614 800F4164 8FA50020 */ lw $a1, 0x20($sp) @@ -836,7 +836,7 @@ glabel L800F41D0_8D680 /* 8D6E4 800F4234 8E10D678 */ lw $s0, %lo(D_8010D678)($s0) /* 8D6E8 800F4238 00431021 */ addu $v0, $v0, $v1 /* 8D6EC 800F423C 8C450000 */ lw $a1, ($v0) -/* 8D6F0 800F4240 0C0511FF */ jal set_hud_element_script +/* 8D6F0 800F4240 0C0511FF */ jal set_hud_element_anim /* 8D6F4 800F4244 0200202D */ daddu $a0, $s0, $zero /* 8D6F8 800F4248 0200202D */ daddu $a0, $s0, $zero /* 8D6FC 800F424C 8FA50020 */ lw $a1, 0x20($sp) diff --git a/ver/us/asm/nonmatchings/8a860_len_3f30/popup_menu_update.s b/ver/us/asm/nonmatchings/8a860_len_3f30/popup_menu_update.s index d02ad410bc..e04c71d5b9 100644 --- a/ver/us/asm/nonmatchings/8a860_len_3f30/popup_menu_update.s +++ b/ver/us/asm/nonmatchings/8a860_len_3f30/popup_menu_update.s @@ -1352,7 +1352,7 @@ glabel L800F2CC0_8C170 /* 8C1EC 800F2D3C 8E040000 */ lw $a0, ($s0) /* 8C1F0 800F2D40 3C058010 */ lui $a1, %hi(D_80104A00) /* 8C1F4 800F2D44 24A54A00 */ addiu $a1, $a1, %lo(D_80104A00) -/* 8C1F8 800F2D48 0C0511FF */ jal set_hud_element_script +/* 8C1F8 800F2D48 0C0511FF */ jal set_hud_element_anim /* 8C1FC 800F2D4C 00000000 */ nop /* 8C200 800F2D50 3C108011 */ lui $s0, %hi(D_8010D69C) /* 8C204 800F2D54 2610D69C */ addiu $s0, $s0, %lo(D_8010D69C) @@ -1684,7 +1684,7 @@ glabel L800F3184_8C634 /* 8C6B0 800F3200 8E040000 */ lw $a0, ($s0) /* 8C6B4 800F3204 3C058010 */ lui $a1, %hi(D_80104A00) /* 8C6B8 800F3208 24A54A00 */ addiu $a1, $a1, %lo(D_80104A00) -/* 8C6BC 800F320C 0C0511FF */ jal set_hud_element_script +/* 8C6BC 800F320C 0C0511FF */ jal set_hud_element_anim /* 8C6C0 800F3210 00000000 */ nop /* 8C6C4 800F3214 3C108011 */ lui $s0, %hi(D_8010D69C) /* 8C6C8 800F3218 2610D69C */ addiu $s0, $s0, %lo(D_8010D69C) @@ -1946,7 +1946,7 @@ glabel L800F3464_8C914 /* 8CA7C 800F35CC 8C84D66C */ lw $a0, %lo(D_8010D66C)($a0) /* 8CA80 800F35D0 3C058010 */ lui $a1, %hi(D_80104A00) /* 8CA84 800F35D4 24A54A00 */ addiu $a1, $a1, %lo(D_80104A00) -/* 8CA88 800F35D8 0C0511FF */ jal set_hud_element_script +/* 8CA88 800F35D8 0C0511FF */ jal set_hud_element_anim /* 8CA8C 800F35DC 00000000 */ nop /* 8CA90 800F35E0 8E020000 */ lw $v0, ($s0) /* 8CA94 800F35E4 8C430318 */ lw $v1, 0x318($v0) 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 f5b48f95e5..beb8d77a53 100644 --- a/ver/us/asm/nonmatchings/C50A0/update_item_entity_temp.s +++ b/ver/us/asm/nonmatchings/C50A0/update_item_entity_temp.s @@ -774,7 +774,7 @@ glabel L8013614C_CC84C /* CC8D4 801361D4 8C420108 */ lw $v0, 0x108($v0) /* CC8D8 801361D8 3C108015 */ lui $s0, %hi(D_801568EC) /* CC8DC 801361DC 261068EC */ addiu $s0, $s0, %lo(D_801568EC) -/* CC8E0 801361E0 0C0511FF */ jal set_hud_element_script +/* CC8E0 801361E0 0C0511FF */ jal set_hud_element_anim /* CC8E4 801361E4 AE020000 */ sw $v0, ($s0) /* CC8E8 801361E8 8E040000 */ lw $a0, ($s0) /* CC8EC 801361EC 8E650028 */ lw $a1, 0x28($s3) 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 1062067fb6..bc7c8ae511 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 @@ -98,7 +98,7 @@ glabel L802A935C_425EAC /* 425ECC 802A937C 8E240004 */ lw $a0, 4($s1) /* 425ED0 802A9380 3C058011 */ lui $a1, %hi(D_80108B80) /* 425ED4 802A9384 24A58B80 */ addiu $a1, $a1, %lo(D_80108B80) -/* 425ED8 802A9388 0C0511FF */ jal set_hud_element_script +/* 425ED8 802A9388 0C0511FF */ jal set_hud_element_anim /* 425EDC 802A938C 00000000 */ nop /* 425EE0 802A9390 A2000081 */ sb $zero, 0x81($s0) /* 425EE4 802A9394 96230052 */ lhu $v1, 0x52($s1) 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 c44abd1b31..7c0e60c81e 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 @@ -83,7 +83,7 @@ glabel L802A9388_427738 /* 427758 802A93A8 8E240004 */ lw $a0, 4($s1) /* 42775C 802A93AC 3C058011 */ lui $a1, %hi(D_80108B80) /* 427760 802A93B0 24A58B80 */ addiu $a1, $a1, %lo(D_80108B80) -/* 427764 802A93B4 0C0511FF */ jal set_hud_element_script +/* 427764 802A93B4 0C0511FF */ jal set_hud_element_anim /* 427768 802A93B8 00000000 */ nop /* 42776C 802A93BC 96230052 */ lhu $v1, 0x52($s1) /* 427770 802A93C0 2402000B */ addiu $v0, $zero, 0xb 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 ce73fe2cee..14c8397d00 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 @@ -90,7 +90,7 @@ glabel L802A938C_428DFC /* 428E1C 802A93AC 8E240004 */ lw $a0, 4($s1) /* 428E20 802A93B0 3C058011 */ lui $a1, %hi(D_80108B80) /* 428E24 802A93B4 24A58B80 */ addiu $a1, $a1, %lo(D_80108B80) -/* 428E28 802A93B8 0C0511FF */ jal set_hud_element_script +/* 428E28 802A93B8 0C0511FF */ jal set_hud_element_anim /* 428E2C 802A93BC 00000000 */ nop /* 428E30 802A93C0 3C048000 */ lui $a0, 0x8000 /* 428E34 802A93C4 34840041 */ ori $a0, $a0, 0x41 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 7ce890f13b..4e4cef9206 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 @@ -92,7 +92,7 @@ glabel L802A93B0_4296D0 /* 4296F0 802A93D0 8E240004 */ lw $a0, 4($s1) /* 4296F4 802A93D4 3C058011 */ lui $a1, %hi(D_80108F30) /* 4296F8 802A93D8 24A58F30 */ addiu $a1, $a1, %lo(D_80108F30) -/* 4296FC 802A93DC 0C0511FF */ jal set_hud_element_script +/* 4296FC 802A93DC 0C0511FF */ jal set_hud_element_anim /* 429700 802A93E0 00000000 */ nop /* 429704 802A93E4 3C048000 */ lui $a0, 0x8000 /* 429708 802A93E8 34840041 */ ori $a0, $a0, 0x41 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 c65236e3e2..8c2eea7d34 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 @@ -114,7 +114,7 @@ glabel L802A9444_428724 /* 428744 802A9464 8E240004 */ lw $a0, 4($s1) /* 428748 802A9468 3C058011 */ lui $a1, %hi(D_80108B54) /* 42874C 802A946C 24A58B54 */ addiu $a1, $a1, %lo(D_80108B54) -/* 428750 802A9470 0C0511FF */ jal set_hud_element_script +/* 428750 802A9470 0C0511FF */ jal set_hud_element_anim /* 428754 802A9474 00000000 */ nop /* 428758 802A9478 3C048000 */ lui $a0, 0x8000 /* 42875C 802A947C 34840041 */ ori $a0, $a0, 0x41 @@ -150,12 +150,12 @@ glabel L802A94A8_428788 /* 4287CC 802A94EC 24A52788 */ addiu $a1, $a1, %lo(D_80292788) /* 4287D0 802A94F0 8E24000C */ lw $a0, 0xc($s1) /* 4287D4 802A94F4 24022710 */ addiu $v0, $zero, 0x2710 -/* 4287D8 802A94F8 0C0511FF */ jal set_hud_element_script +/* 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) -/* 4287EC 802A950C 0C0511FF */ jal set_hud_element_script +/* 4287EC 802A950C 0C0511FF */ jal set_hud_element_anim /* 4287F0 802A9510 00000000 */ nop /* 4287F4 802A9514 86220068 */ lh $v0, 0x68($s1) /* 4287F8 802A9518 14400006 */ bnez $v0, .L802A9534 diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/bomb/func_802A928C_427CFC.s b/ver/us/asm/nonmatchings/battle/action_cmd/bomb/func_802A928C_427CFC.s index 380d01f0fc..0c98acda42 100644 --- a/ver/us/asm/nonmatchings/battle/action_cmd/bomb/func_802A928C_427CFC.s +++ b/ver/us/asm/nonmatchings/battle/action_cmd/bomb/func_802A928C_427CFC.s @@ -83,7 +83,7 @@ glabel L802A9388_427DF8 /* 427E18 802A93A8 8E240004 */ lw $a0, 4($s1) /* 427E1C 802A93AC 3C058011 */ lui $a1, %hi(D_80108B80) /* 427E20 802A93B0 24A58B80 */ addiu $a1, $a1, %lo(D_80108B80) -/* 427E24 802A93B4 0C0511FF */ jal set_hud_element_script +/* 427E24 802A93B4 0C0511FF */ jal set_hud_element_anim /* 427E28 802A93B8 00000000 */ nop /* 427E2C 802A93BC 3C048000 */ lui $a0, 0x8000 /* 427E30 802A93C0 34840041 */ ori $a0, $a0, 0x41 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 b453544409..0655e4cbb2 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 @@ -114,7 +114,7 @@ glabel L802A944C_42383C /* 42385C 802A946C 8E240004 */ lw $a0, 4($s1) /* 423860 802A9470 3C058011 */ lui $a1, %hi(D_80108B80) /* 423864 802A9474 24A58B80 */ addiu $a1, $a1, %lo(D_80108B80) -/* 423868 802A9478 0C0511FF */ jal set_hud_element_script +/* 423868 802A9478 0C0511FF */ jal set_hud_element_anim /* 42386C 802A947C 00000000 */ nop /* 423870 802A9480 96230052 */ lhu $v1, 0x52($s1) /* 423874 802A9484 2402000B */ addiu $v0, $zero, 0xb 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 0078875bef..8e0c100e28 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 @@ -83,7 +83,7 @@ glabel L802A9388_4264F8 /* 426518 802A93A8 8E240004 */ lw $a0, 4($s1) /* 42651C 802A93AC 3C058011 */ lui $a1, %hi(D_80108B80) /* 426520 802A93B0 24A58B80 */ addiu $a1, $a1, %lo(D_80108B80) -/* 426524 802A93B4 0C0511FF */ jal set_hud_element_script +/* 426524 802A93B4 0C0511FF */ jal set_hud_element_anim /* 426528 802A93B8 00000000 */ nop /* 42652C 802A93BC 3C048000 */ lui $a0, 0x8000 /* 426530 802A93C0 34840041 */ ori $a0, $a0, 0x41 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 4388228614..3495f09bf8 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 @@ -85,7 +85,7 @@ glabel L802A9398_426D68 /* 426D88 802A93B8 8E240004 */ lw $a0, 4($s1) /* 426D8C 802A93BC 3C058011 */ lui $a1, %hi(D_80108F30) /* 426D90 802A93C0 24A58F30 */ addiu $a1, $a1, %lo(D_80108F30) -/* 426D94 802A93C4 0C0511FF */ jal set_hud_element_script +/* 426D94 802A93C4 0C0511FF */ jal set_hud_element_anim /* 426D98 802A93C8 00000000 */ nop /* 426D9C 802A93CC 3C048000 */ lui $a0, 0x8000 /* 426DA0 802A93D0 34840041 */ ori $a0, $a0, 0x41 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 2f5adfbbde..84589e7029 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 @@ -231,7 +231,7 @@ glabel L802A9644_422644 /* 4226B8 802A96B8 8E240014 */ lw $a0, 0x14($s1) /* 4226BC 802A96BC 3C058029 */ lui $a1, %hi(D_802928CC) /* 4226C0 802A96C0 24A528CC */ addiu $a1, $a1, %lo(D_802928CC) -/* 4226C4 802A96C4 0C0511FF */ jal set_hud_element_script +/* 4226C4 802A96C4 0C0511FF */ jal set_hud_element_anim /* 4226C8 802A96C8 00000000 */ nop /* 4226CC 802A96CC 86220054 */ lh $v0, 0x54($s1) /* 4226D0 802A96D0 14400031 */ bnez $v0, .L802A9798 @@ -246,7 +246,7 @@ glabel L802A9644_422644 /* 4226F0 802A96F0 8E240010 */ lw $a0, 0x10($s1) /* 4226F4 802A96F4 3C058029 */ lui $a1, %hi(D_80292874) /* 4226F8 802A96F8 24A52874 */ addiu $a1, $a1, %lo(D_80292874) -/* 4226FC 802A96FC 0C0511FF */ jal set_hud_element_script +/* 4226FC 802A96FC 0C0511FF */ jal set_hud_element_anim /* 422700 802A9700 00000000 */ nop /* 422704 802A9704 86220054 */ lh $v0, 0x54($s1) /* 422708 802A9708 24030001 */ addiu $v1, $zero, 1 @@ -269,7 +269,7 @@ glabel L802A9644_422644 /* 422748 802A9748 8E24000C */ lw $a0, 0xc($s1) /* 42274C 802A974C 3C058029 */ lui $a1, %hi(D_8029281C) /* 422750 802A9750 24A5281C */ addiu $a1, $a1, %lo(D_8029281C) -/* 422754 802A9754 0C0511FF */ jal set_hud_element_script +/* 422754 802A9754 0C0511FF */ jal set_hud_element_anim /* 422758 802A9758 00000000 */ nop /* 42275C 802A975C 86220054 */ lh $v0, 0x54($s1) /* 422760 802A9760 24030002 */ addiu $v1, $zero, 2 @@ -299,12 +299,12 @@ glabel L802A9644_422644 /* 4227B0 802A97B0 3C058029 */ lui $a1, %hi(D_80292788) /* 4227B4 802A97B4 24A52788 */ addiu $a1, $a1, %lo(D_80292788) /* 4227B8 802A97B8 8E240008 */ lw $a0, 8($s1) -/* 4227BC 802A97BC 0C0511FF */ jal set_hud_element_script +/* 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) -/* 4227D0 802A97D0 0C0511FF */ jal set_hud_element_script +/* 4227D0 802A97D0 0C0511FF */ jal set_hud_element_anim /* 4227D4 802A97D4 00000000 */ nop /* 4227D8 802A97D8 82220062 */ lb $v0, 0x62($s1) /* 4227DC 802A97DC 10400003 */ beqz $v0, .L802A97EC 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 a05c3e75f3..23cada2f43 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 @@ -106,12 +106,12 @@ glabel L802A93F0_42FAD0 /* 42FAF0 802A9410 8E240004 */ lw $a0, 4($s1) /* 42FAF4 802A9414 3C058011 */ lui $a1, %hi(D_80108B80) /* 42FAF8 802A9418 24A58B80 */ addiu $a1, $a1, %lo(D_80108B80) -/* 42FAFC 802A941C 0C0511FF */ jal set_hud_element_script +/* 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) -/* 42FB10 802A9430 0C0511FF */ jal set_hud_element_script +/* 42FB10 802A9430 0C0511FF */ jal set_hud_element_anim /* 42FB14 802A9434 00000000 */ nop /* 42FB18 802A9438 96230052 */ lhu $v1, 0x52($s1) /* 42FB1C 802A943C 2402000B */ addiu $v0, $zero, 0xb diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/mega_shock/func_802A92A0_42DCB0.s b/ver/us/asm/nonmatchings/battle/action_cmd/mega_shock/func_802A92A0_42DCB0.s index e7bcceba95..7a2bcf0b37 100644 --- a/ver/us/asm/nonmatchings/battle/action_cmd/mega_shock/func_802A92A0_42DCB0.s +++ b/ver/us/asm/nonmatchings/battle/action_cmd/mega_shock/func_802A92A0_42DCB0.s @@ -106,12 +106,12 @@ glabel L802A93F0_42DE00 /* 42DE20 802A9410 8E240004 */ lw $a0, 4($s1) /* 42DE24 802A9414 3C058011 */ lui $a1, %hi(D_80108B80) /* 42DE28 802A9418 24A58B80 */ addiu $a1, $a1, %lo(D_80108B80) -/* 42DE2C 802A941C 0C0511FF */ jal set_hud_element_script +/* 42DE2C 802A941C 0C0511FF */ jal set_hud_element_anim /* 42DE30 802A9420 00000000 */ nop /* 42DE34 802A9424 8E24000C */ lw $a0, 0xc($s1) /* 42DE38 802A9428 3C058029 */ lui $a1, %hi(D_80292374) /* 42DE3C 802A942C 24A52374 */ addiu $a1, $a1, %lo(D_80292374) -/* 42DE40 802A9430 0C0511FF */ jal set_hud_element_script +/* 42DE40 802A9430 0C0511FF */ jal set_hud_element_anim /* 42DE44 802A9434 00000000 */ nop /* 42DE48 802A9438 3C048000 */ lui $a0, 0x8000 /* 42DE4C 802A943C 34840041 */ ori $a0, $a0, 0x41 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 e9976f7e80..fa11a0481f 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 @@ -121,7 +121,7 @@ glabel L802A949C_42D3AC /* 42D3CC 802A94BC 8E240004 */ lw $a0, 4($s1) /* 42D3D0 802A94C0 3C058011 */ lui $a1, %hi(D_80108B80) /* 42D3D4 802A94C4 24A58B80 */ addiu $a1, $a1, %lo(D_80108B80) -/* 42D3D8 802A94C8 0C0511FF */ jal set_hud_element_script +/* 42D3D8 802A94C8 0C0511FF */ jal set_hud_element_anim /* 42D3DC 802A94CC 00000000 */ nop /* 42D3E0 802A94D0 3C048000 */ lui $a0, 0x8000 /* 42D3E4 802A94D4 34840041 */ ori $a0, $a0, 0x41 diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/smack/func_802A9298_42E638.s b/ver/us/asm/nonmatchings/battle/action_cmd/smack/func_802A9298_42E638.s index e741543cd0..f57e126522 100644 --- a/ver/us/asm/nonmatchings/battle/action_cmd/smack/func_802A9298_42E638.s +++ b/ver/us/asm/nonmatchings/battle/action_cmd/smack/func_802A9298_42E638.s @@ -92,7 +92,7 @@ glabel L802A93B4_42E754 /* 42E774 802A93D4 8E240004 */ lw $a0, 4($s1) /* 42E778 802A93D8 3C058011 */ lui $a1, %hi(D_80108F30) /* 42E77C 802A93DC 24A58F30 */ addiu $a1, $a1, %lo(D_80108F30) -/* 42E780 802A93E0 0C0511FF */ jal set_hud_element_script +/* 42E780 802A93E0 0C0511FF */ jal set_hud_element_anim /* 42E784 802A93E4 00000000 */ nop /* 42E788 802A93E8 3C048000 */ lui $a0, 0x8000 /* 42E78C 802A93EC 34840041 */ ori $a0, $a0, 0x41 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 b9629bc3bb..0008afd9d1 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 @@ -90,7 +90,7 @@ glabel L802A9368_42F188 /* 42F1A8 802A9388 8E240004 */ lw $a0, 4($s1) /* 42F1AC 802A938C 3C058011 */ lui $a1, %hi(D_80108F30) /* 42F1B0 802A9390 24A58F30 */ addiu $a1, $a1, %lo(D_80108F30) -/* 42F1B4 802A9394 0C0511FF */ jal set_hud_element_script +/* 42F1B4 802A9394 0C0511FF */ jal set_hud_element_anim /* 42F1B8 802A9398 00000000 */ nop /* 42F1BC 802A939C 3C048000 */ lui $a0, 0x8000 /* 42F1C0 802A93A0 34840041 */ ori $a0, $a0, 0x41 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 abcc30df41..5f6a4029a9 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 @@ -83,7 +83,7 @@ glabel L802A9394_4303B4 /* 4303D4 802A93B4 8E240004 */ lw $a0, 4($s1) /* 4303D8 802A93B8 3C058011 */ lui $a1, %hi(D_80108F30) /* 4303DC 802A93BC 24A58F30 */ addiu $a1, $a1, %lo(D_80108F30) -/* 4303E0 802A93C0 0C0511FF */ jal set_hud_element_script +/* 4303E0 802A93C0 0C0511FF */ jal set_hud_element_anim /* 4303E4 802A93C4 00000000 */ nop /* 4303E8 802A93C8 3C048000 */ lui $a0, 0x8000 /* 4303EC 802A93CC 34840041 */ ori $a0, $a0, 0x41 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 c0cca9633e..9f82324804 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 @@ -84,7 +84,7 @@ glabel L802A9308_42A028 /* 42A048 802A9328 8E240004 */ lw $a0, 4($s1) /* 42A04C 802A932C 3C058011 */ lui $a1, %hi(D_80108B54) /* 42A050 802A9330 24A58B54 */ addiu $a1, $a1, %lo(D_80108B54) -/* 42A054 802A9334 0C0511FF */ jal set_hud_element_script +/* 42A054 802A9334 0C0511FF */ jal set_hud_element_anim /* 42A058 802A9338 00000000 */ nop /* 42A05C 802A933C 3C048000 */ lui $a0, 0x8000 /* 42A060 802A9340 34840041 */ ori $a0, $a0, 0x41 @@ -213,21 +213,21 @@ glabel L802A936C_42A08C /* 42A230 802A9510 2A420050 */ slti $v0, $s2, 0x50 /* 42A234 802A9514 10400007 */ beqz $v0, .L802A9534 /* 42A238 802A9518 8E300004 */ lw $s0, 4($s1) -/* 42A23C 802A951C 0C05122C */ jal get_hud_element_script +/* 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) /* 42A24C 802A952C 080AA551 */ j .L802A9544 /* 42A250 802A9530 00000000 */ nop .L802A9534: -/* 42A254 802A9534 0C05122C */ jal get_hud_element_script +/* 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) .L802A9544: /* 42A264 802A9544 10450003 */ beq $v0, $a1, .L802A9554 /* 42A268 802A9548 00000000 */ nop -/* 42A26C 802A954C 0C0511FF */ jal set_hud_element_script +/* 42A26C 802A954C 0C0511FF */ jal set_hud_element_anim /* 42A270 802A9550 0200202D */ daddu $a0, $s0, $zero .L802A9554: /* 42A274 802A9554 86220054 */ lh $v0, 0x54($s1) diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/tidal_wave/func_802A9228_42C918.s b/ver/us/asm/nonmatchings/battle/action_cmd/tidal_wave/func_802A9228_42C918.s index aa9cd128c0..ba82982bfa 100644 --- a/ver/us/asm/nonmatchings/battle/action_cmd/tidal_wave/func_802A9228_42C918.s +++ b/ver/us/asm/nonmatchings/battle/action_cmd/tidal_wave/func_802A9228_42C918.s @@ -110,7 +110,7 @@ glabel L802A9354_42CA44 /* 42CA80 802A9390 3C05802B */ lui $a1, %hi(D_802A97C0_42CEB0) /* 42CA84 802A9394 00A22821 */ addu $a1, $a1, $v0 /* 42CA88 802A9398 8CA597C0 */ lw $a1, %lo(D_802A97C0_42CEB0)($a1) -/* 42CA8C 802A939C 0C0511FF */ jal set_hud_element_script +/* 42CA8C 802A939C 0C0511FF */ jal set_hud_element_anim /* 42CA90 802A93A0 0200202D */ daddu $a0, $s0, $zero /* 42CA94 802A93A4 0200202D */ daddu $a0, $s0, $zero /* 42CA98 802A93A8 8223005D */ lb $v1, 0x5d($s1) @@ -257,7 +257,7 @@ glabel L802A93F4_42CAE4 /* 42CC90 802A95A0 007E1821 */ addu $v1, $v1, $fp /* 42CC94 802A95A4 8C500004 */ lw $s0, 4($v0) /* 42CC98 802A95A8 8C650000 */ lw $a1, ($v1) -/* 42CC9C 802A95AC 0C0511FF */ jal set_hud_element_script +/* 42CC9C 802A95AC 0C0511FF */ jal set_hud_element_anim /* 42CCA0 802A95B0 0200202D */ daddu $a0, $s0, $zero /* 42CCA4 802A95B4 3C053F00 */ lui $a1, 0x3f00 /* 42CCA8 802A95B8 0C051308 */ jal set_hud_element_scale 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 c11492fca4..6734525419 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 @@ -248,7 +248,7 @@ glabel L802A97E4_42ACD4 /* 42ACEC 802A97FC 8E240030 */ lw $a0, 0x30($s1) /* 42ACF0 802A9800 3C058029 */ lui $a1, %hi(D_802928CC) /* 42ACF4 802A9804 24A528CC */ addiu $a1, $a1, %lo(D_802928CC) -/* 42ACF8 802A9808 0C0511FF */ jal set_hud_element_script +/* 42ACF8 802A9808 0C0511FF */ jal set_hud_element_anim /* 42ACFC 802A980C 00000000 */ nop /* 42AD00 802A9810 0C05272D */ jal sfx_play_sound /* 42AD04 802A9814 24040233 */ addiu $a0, $zero, 0x233 @@ -260,7 +260,7 @@ glabel L802A97E4_42ACD4 /* 42AD18 802A9828 8E240034 */ lw $a0, 0x34($s1) /* 42AD1C 802A982C 3C058029 */ lui $a1, %hi(D_80292874) /* 42AD20 802A9830 24A52874 */ addiu $a1, $a1, %lo(D_80292874) -/* 42AD24 802A9834 0C0511FF */ jal set_hud_element_script +/* 42AD24 802A9834 0C0511FF */ jal set_hud_element_anim /* 42AD28 802A9838 00000000 */ nop /* 42AD2C 802A983C 0C05272D */ jal sfx_play_sound /* 42AD30 802A9840 24040233 */ addiu $a0, $zero, 0x233 @@ -272,12 +272,12 @@ glabel L802A97E4_42ACD4 /* 42AD44 802A9854 8E24000C */ lw $a0, 0xc($s1) /* 42AD48 802A9858 3C058029 */ lui $a1, %hi(D_80292788) /* 42AD4C 802A985C 24A52788 */ addiu $a1, $a1, %lo(D_80292788) -/* 42AD50 802A9860 0C0511FF */ jal set_hud_element_script +/* 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) -/* 42AD64 802A9874 0C0511FF */ jal set_hud_element_script +/* 42AD64 802A9874 0C0511FF */ jal set_hud_element_anim /* 42AD68 802A9878 00000000 */ nop /* 42AD6C 802A987C 0C05272D */ jal sfx_play_sound /* 42AD70 802A9880 24040234 */ addiu $a0, $zero, 0x234 @@ -386,7 +386,7 @@ glabel L802A98A8_42AD98 /* 42AED8 802A99E8 3C058029 */ lui $a1, %hi(D_80292B80) /* 42AEDC 802A99EC 24A52B80 */ addiu $a1, $a1, %lo(D_80292B80) .L802A99F0: -/* 42AEE0 802A99F0 0C0511FF */ jal set_hud_element_script +/* 42AEE0 802A99F0 0C0511FF */ jal set_hud_element_anim /* 42AEE4 802A99F4 00000000 */ nop /* 42AEE8 802A99F8 0200202D */ daddu $a0, $s0, $zero /* 42AEEC 802A99FC 86250056 */ lh $a1, 0x56($s1) @@ -414,7 +414,7 @@ glabel L802A98A8_42AD98 /* 42AF3C 802A9A4C 3C058029 */ lui $a1, %hi(D_80292B80) /* 42AF40 802A9A50 24A52B80 */ addiu $a1, $a1, %lo(D_80292B80) .L802A9A54: -/* 42AF44 802A9A54 0C0511FF */ jal set_hud_element_script +/* 42AF44 802A9A54 0C0511FF */ jal set_hud_element_anim /* 42AF48 802A9A58 00000000 */ nop /* 42AF4C 802A9A5C 0200202D */ daddu $a0, $s0, $zero /* 42AF50 802A9A60 86250056 */ lh $a1, 0x56($s1) @@ -428,7 +428,7 @@ glabel L802A98A8_42AD98 /* 42AF70 802A9A80 8E240004 */ lw $a0, 4($s1) /* 42AF74 802A9A84 3C058011 */ lui $a1, %hi(D_80108B28) /* 42AF78 802A9A88 24A58B28 */ addiu $a1, $a1, %lo(D_80108B28) -/* 42AF7C 802A9A8C 0C0511FF */ jal set_hud_element_script +/* 42AF7C 802A9A8C 0C0511FF */ jal set_hud_element_anim /* 42AF80 802A9A90 00000000 */ nop .L802A9A94: /* 42AF84 802A9A94 9222005D */ lbu $v0, 0x5d($s1) @@ -441,12 +441,12 @@ glabel L802A98A8_42AD98 /* 42AFA0 802A9AB0 8E240010 */ lw $a0, 0x10($s1) /* 42AFA4 802A9AB4 3C058029 */ lui $a1, %hi(D_80292788) /* 42AFA8 802A9AB8 24A52788 */ addiu $a1, $a1, %lo(D_80292788) -/* 42AFAC 802A9ABC 0C0511FF */ jal set_hud_element_script +/* 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) -/* 42AFC0 802A9AD0 0C0511FF */ jal set_hud_element_script +/* 42AFC0 802A9AD0 0C0511FF */ jal set_hud_element_anim /* 42AFC4 802A9AD4 00000000 */ nop /* 42AFC8 802A9AD8 0C05272D */ jal sfx_play_sound /* 42AFCC 802A9ADC 24040234 */ addiu $a0, $zero, 0x234 @@ -559,7 +559,7 @@ glabel L802A9B04_42AFF4 /* 42B140 802A9C50 3C058029 */ lui $a1, %hi(D_80292B80) /* 42B144 802A9C54 24A52B80 */ addiu $a1, $a1, %lo(D_80292B80) .L802A9C58: -/* 42B148 802A9C58 0C0511FF */ jal set_hud_element_script +/* 42B148 802A9C58 0C0511FF */ jal set_hud_element_anim /* 42B14C 802A9C5C 00000000 */ nop /* 42B150 802A9C60 0200202D */ daddu $a0, $s0, $zero /* 42B154 802A9C64 86250056 */ lh $a1, 0x56($s1) @@ -587,7 +587,7 @@ glabel L802A9B04_42AFF4 /* 42B1A4 802A9CB4 3C058029 */ lui $a1, %hi(D_80292B80) /* 42B1A8 802A9CB8 24A52B80 */ addiu $a1, $a1, %lo(D_80292B80) .L802A9CBC: -/* 42B1AC 802A9CBC 0C0511FF */ jal set_hud_element_script +/* 42B1AC 802A9CBC 0C0511FF */ jal set_hud_element_anim /* 42B1B0 802A9CC0 00000000 */ nop /* 42B1B4 802A9CC4 0200202D */ daddu $a0, $s0, $zero /* 42B1B8 802A9CC8 86250056 */ lh $a1, 0x56($s1) @@ -601,7 +601,7 @@ glabel L802A9B04_42AFF4 /* 42B1D8 802A9CE8 8E240004 */ lw $a0, 4($s1) /* 42B1DC 802A9CEC 3C058011 */ lui $a1, %hi(D_80108B28) /* 42B1E0 802A9CF0 24A58B28 */ addiu $a1, $a1, %lo(D_80108B28) -/* 42B1E4 802A9CF4 0C0511FF */ jal set_hud_element_script +/* 42B1E4 802A9CF4 0C0511FF */ jal set_hud_element_anim /* 42B1E8 802A9CF8 00000000 */ nop .L802A9CFC: /* 42B1EC 802A9CFC 9222005D */ lbu $v0, 0x5d($s1) @@ -614,12 +614,12 @@ glabel L802A9B04_42AFF4 /* 42B208 802A9D18 8E240014 */ lw $a0, 0x14($s1) /* 42B20C 802A9D1C 3C058029 */ lui $a1, %hi(D_80292788) /* 42B210 802A9D20 24A52788 */ addiu $a1, $a1, %lo(D_80292788) -/* 42B214 802A9D24 0C0511FF */ jal set_hud_element_script +/* 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) -/* 42B228 802A9D38 0C0511FF */ jal set_hud_element_script +/* 42B228 802A9D38 0C0511FF */ jal set_hud_element_anim /* 42B22C 802A9D3C 00000000 */ nop /* 42B230 802A9D40 0C05272D */ jal sfx_play_sound /* 42B234 802A9D44 24040234 */ addiu $a0, $zero, 0x234 @@ -737,7 +737,7 @@ glabel L802A9D7C_42B26C /* 42B3B8 802A9EC8 3C058029 */ lui $a1, %hi(D_80292B80) /* 42B3BC 802A9ECC 24A52B80 */ addiu $a1, $a1, %lo(D_80292B80) .L802A9ED0: -/* 42B3C0 802A9ED0 0C0511FF */ jal set_hud_element_script +/* 42B3C0 802A9ED0 0C0511FF */ jal set_hud_element_anim /* 42B3C4 802A9ED4 00000000 */ nop /* 42B3C8 802A9ED8 0200202D */ daddu $a0, $s0, $zero /* 42B3CC 802A9EDC 86250056 */ lh $a1, 0x56($s1) @@ -766,7 +766,7 @@ glabel L802A9D7C_42B26C /* 42B420 802A9F30 3C058029 */ lui $a1, %hi(D_80292B80) /* 42B424 802A9F34 24A52B80 */ addiu $a1, $a1, %lo(D_80292B80) .L802A9F38: -/* 42B428 802A9F38 0C0511FF */ jal set_hud_element_script +/* 42B428 802A9F38 0C0511FF */ jal set_hud_element_anim /* 42B42C 802A9F3C 00000000 */ nop /* 42B430 802A9F40 0200202D */ daddu $a0, $s0, $zero /* 42B434 802A9F44 86250056 */ lh $a1, 0x56($s1) @@ -780,7 +780,7 @@ glabel L802A9D7C_42B26C /* 42B454 802A9F64 8E240004 */ lw $a0, 4($s1) /* 42B458 802A9F68 3C058011 */ lui $a1, %hi(D_80108B28) /* 42B45C 802A9F6C 24A58B28 */ addiu $a1, $a1, %lo(D_80108B28) -/* 42B460 802A9F70 0C0511FF */ jal set_hud_element_script +/* 42B460 802A9F70 0C0511FF */ jal set_hud_element_anim /* 42B464 802A9F74 00000000 */ nop /* 42B468 802A9F78 24020010 */ addiu $v0, $zero, 0x10 /* 42B46C 802A9F7C 080AA800 */ j L802AA000_42B4F0 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 669e8f5f07..9a1fa5dc05 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 @@ -115,7 +115,7 @@ glabel L802A9464_4240D4 /* 4240F4 802A9484 8E240004 */ lw $a0, 4($s1) /* 4240F8 802A9488 3C058011 */ lui $a1, %hi(D_80108B80) /* 4240FC 802A948C 24A58B80 */ addiu $a1, $a1, %lo(D_80108B80) -/* 424100 802A9490 0C0511FF */ jal set_hud_element_script +/* 424100 802A9490 0C0511FF */ jal set_hud_element_anim /* 424104 802A9494 00000000 */ nop /* 424108 802A9498 96230052 */ lhu $v1, 0x52($s1) /* 42410C 802A949C 2402000B */ addiu $v0, $zero, 0xb 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 b2257ae4ca..fa9dc632b7 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 @@ -236,7 +236,7 @@ glabel func_8023803C_70BD4C /* 70C0C8 802383B8 3C048024 */ lui $a0, %hi(D_8023D2BC) /* 70C0CC 802383BC 8C84D2BC */ lw $a0, %lo(D_8023D2BC)($a0) /* 70C0D0 802383C0 24020050 */ addiu $v0, $zero, 0x50 -/* 70C0D4 802383C4 0C0511FF */ jal set_hud_element_script +/* 70C0D4 802383C4 0C0511FF */ jal set_hud_element_anim /* 70C0D8 802383C8 AC620000 */ sw $v0, ($v1) /* 70C0DC 802383CC 44800000 */ mtc1 $zero, $f0 /* 70C0E0 802383D0 24040312 */ addiu $a0, $zero, 0x312 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 ae6cf35898..8a0c92d374 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 @@ -686,7 +686,7 @@ glabel func_80238000_6FFD80 /* 7007AC 80238A2C 3C058011 */ lui $a1, %hi(D_80108E48) /* 7007B0 80238A30 24A58E48 */ addiu $a1, $a1, %lo(D_80108E48) .L80238A34: -/* 7007B4 80238A34 0C0511FF */ jal set_hud_element_script +/* 7007B4 80238A34 0C0511FF */ jal set_hud_element_anim /* 7007B8 80238A38 00000000 */ nop /* 7007BC 80238A3C 3C058024 */ lui $a1, %hi(D_8023BDC4) /* 7007C0 80238A40 24A5BDC4 */ addiu $a1, $a1, %lo(D_8023BDC4) diff --git a/ver/us/asm/nonmatchings/d5a50_len_5fd0/init_hud_element_list.s b/ver/us/asm/nonmatchings/d5a50_len_5fd0/init_hud_element_list.s deleted file mode 100644 index 9be63f871f..0000000000 --- a/ver/us/asm/nonmatchings/d5a50_len_5fd0/init_hud_element_list.s +++ /dev/null @@ -1,69 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel init_hud_element_list -/* D7A00 80141300 3C028007 */ lui $v0, %hi(gGameStatusPtr) -/* D7A04 80141304 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) -/* D7A08 80141308 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D7A0C 8014130C AFBF0014 */ sw $ra, 0x14($sp) -/* D7A10 80141310 AFB00010 */ sw $s0, 0x10($sp) -/* D7A14 80141314 80420070 */ lb $v0, 0x70($v0) -/* D7A18 80141318 1440001B */ bnez $v0, .L80141388 -/* D7A1C 8014131C 00000000 */ nop -/* D7A20 80141320 3C108016 */ lui $s0, %hi(D_80158570) -/* D7A24 80141324 26108570 */ addiu $s0, $s0, %lo(D_80158570) -/* D7A28 80141328 8E040000 */ lw $a0, ($s0) -/* D7A2C 8014132C 10800004 */ beqz $a0, .L80141340 -/* D7A30 80141330 00000000 */ nop -/* D7A34 80141334 0C00AB1E */ jal general_heap_free -/* D7A38 80141338 00000000 */ nop -/* D7A3C 8014133C AE000000 */ sw $zero, ($s0) -.L80141340: -/* D7A40 80141340 3C038015 */ lui $v1, %hi(D_80157964) -/* D7A44 80141344 8C637964 */ lw $v1, %lo(D_80157964)($v1) -/* D7A48 80141348 3C028015 */ lui $v0, %hi(D_80156F60) -/* D7A4C 8014134C 24426F60 */ addiu $v0, $v0, %lo(D_80156F60) -/* D7A50 80141350 3C018015 */ lui $at, %hi(gHudElementList) -/* D7A54 80141354 AC227960 */ sw $v0, %lo(gHudElementList)($at) -/* D7A58 80141358 3C028015 */ lui $v0, %hi(D_80157968) -/* D7A5C 8014135C 24427968 */ addiu $v0, $v0, %lo(D_80157968) -/* D7A60 80141360 3C018015 */ lui $at, %hi(D_8015133C) -/* D7A64 80141364 AC22133C */ sw $v0, %lo(D_8015133C)($at) -/* D7A68 80141368 3C028015 */ lui $v0, %hi(D_80157970) -/* D7A6C 8014136C 24427970 */ addiu $v0, $v0, %lo(D_80157970) -/* D7A70 80141370 3C018015 */ lui $at, %hi(D_801512C8) -/* D7A74 80141374 AC2212C8 */ sw $v0, %lo(D_801512C8)($at) -/* D7A78 80141378 3C028015 */ lui $v0, %hi(D_80157F70) -/* D7A7C 8014137C 24427F70 */ addiu $v0, $v0, %lo(D_80157F70) -/* D7A80 80141380 080504F2 */ j .L801413C8 -/* D7A84 80141384 00000000 */ nop -.L80141388: -/* D7A88 80141388 3C038016 */ lui $v1, %hi(D_80158570) -/* D7A8C 8014138C 8C638570 */ lw $v1, %lo(D_80158570)($v1) -/* D7A90 80141390 3C028015 */ lui $v0, %hi(D_80157460) -/* D7A94 80141394 24427460 */ addiu $v0, $v0, %lo(D_80157460) -/* D7A98 80141398 3C018015 */ lui $at, %hi(gHudElementList) -/* D7A9C 8014139C AC227960 */ sw $v0, %lo(gHudElementList)($at) -/* D7AA0 801413A0 3C028016 */ lui $v0, %hi(D_80158574) -/* D7AA4 801413A4 24428574 */ addiu $v0, $v0, %lo(D_80158574) -/* D7AA8 801413A8 3C018015 */ lui $at, %hi(D_8015133C) -/* D7AAC 801413AC AC22133C */ sw $v0, %lo(D_8015133C)($at) -/* D7AB0 801413B0 3C028016 */ lui $v0, %hi(D_80158580) -/* D7AB4 801413B4 24428580 */ addiu $v0, $v0, %lo(D_80158580) -/* D7AB8 801413B8 3C018015 */ lui $at, %hi(D_801512C8) -/* D7ABC 801413BC AC2212C8 */ sw $v0, %lo(D_801512C8)($at) -/* D7AC0 801413C0 3C028016 */ lui $v0, %hi(D_80158B80) -/* D7AC4 801413C4 24428B80 */ addiu $v0, $v0, %lo(D_80158B80) -.L801413C8: -/* D7AC8 801413C8 3C018015 */ lui $at, %hi(D_801512D0) -/* D7ACC 801413CC AC2212D0 */ sw $v0, %lo(D_801512D0)($at) -/* D7AD0 801413D0 3C018015 */ lui $at, %hi(D_80151314) -/* D7AD4 801413D4 AC231314 */ sw $v1, %lo(D_80151314)($at) -/* D7AD8 801413D8 8FBF0014 */ lw $ra, 0x14($sp) -/* D7ADC 801413DC 8FB00010 */ lw $s0, 0x10($sp) -/* D7AE0 801413E0 3C018015 */ lui $at, %hi(D_801512B4) -/* D7AE4 801413E4 AC2012B4 */ sw $zero, %lo(D_801512B4)($at) -/* D7AE8 801413E8 3C018016 */ lui $at, %hi(D_80159180) -/* D7AEC 801413EC AC209180 */ sw $zero, %lo(D_80159180)($at) -/* D7AF0 801413F0 03E00008 */ jr $ra -/* D7AF4 801413F4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/evt/script_list/start_child_script.s b/ver/us/asm/nonmatchings/evt/script_list/start_child_script.s deleted file mode 100644 index b82a9a6a9e..0000000000 --- a/ver/us/asm/nonmatchings/evt/script_list/start_child_script.s +++ /dev/null @@ -1,154 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel start_child_script -/* E8178 802C37C8 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* E817C 802C37CC AFB10014 */ sw $s1, 0x14($sp) -/* E8180 802C37D0 0080882D */ daddu $s1, $a0, $zero -/* E8184 802C37D4 AFB20018 */ sw $s2, 0x18($sp) -/* E8188 802C37D8 00A0902D */ daddu $s2, $a1, $zero -/* E818C 802C37DC AFB40020 */ sw $s4, 0x20($sp) -/* E8190 802C37E0 00C0A02D */ daddu $s4, $a2, $zero -/* E8194 802C37E4 3C04802E */ lui $a0, %hi(gCurrentScriptListPtr) -/* E8198 802C37E8 8C84A890 */ lw $a0, %lo(gCurrentScriptListPtr)($a0) -/* E819C 802C37EC 0000182D */ daddu $v1, $zero, $zero -/* E81A0 802C37F0 AFBF0024 */ sw $ra, 0x24($sp) -/* E81A4 802C37F4 AFB3001C */ sw $s3, 0x1c($sp) -/* E81A8 802C37F8 AFB00010 */ sw $s0, 0x10($sp) -.L802C37FC: -/* E81AC 802C37FC 8C820000 */ lw $v0, ($a0) -/* E81B0 802C3800 10400006 */ beqz $v0, .L802C381C -/* E81B4 802C3804 28620080 */ slti $v0, $v1, 0x80 -/* E81B8 802C3808 24630001 */ addiu $v1, $v1, 1 -/* E81BC 802C380C 28620080 */ slti $v0, $v1, 0x80 -/* E81C0 802C3810 1440FFFA */ bnez $v0, .L802C37FC -/* E81C4 802C3814 24840004 */ addiu $a0, $a0, 4 -/* E81C8 802C3818 28620080 */ slti $v0, $v1, 0x80 -.L802C381C: -/* E81CC 802C381C 54400003 */ bnel $v0, $zero, .L802C382C -/* E81D0 802C3820 24040168 */ addiu $a0, $zero, 0x168 -.L802C3824: -/* E81D4 802C3824 080B0E09 */ j .L802C3824 -/* E81D8 802C3828 00000000 */ nop -.L802C382C: -/* E81DC 802C382C 0C00AB39 */ jal heap_malloc -/* E81E0 802C3830 0060982D */ daddu $s3, $v1, $zero -/* E81E4 802C3834 00132080 */ sll $a0, $s3, 2 -/* E81E8 802C3838 3C03802E */ lui $v1, %hi(gCurrentScriptListPtr) -/* E81EC 802C383C 8C63A890 */ lw $v1, %lo(gCurrentScriptListPtr)($v1) -/* E81F0 802C3840 3C05802E */ lui $a1, %hi(gNumScripts) -/* E81F4 802C3844 24A5A488 */ addiu $a1, $a1, %lo(gNumScripts) -/* E81F8 802C3848 00832021 */ addu $a0, $a0, $v1 -/* E81FC 802C384C 8CA30000 */ lw $v1, ($a1) -/* E8200 802C3850 0040802D */ daddu $s0, $v0, $zero -/* E8204 802C3854 AC900000 */ sw $s0, ($a0) -/* E8208 802C3858 24630001 */ addiu $v1, $v1, 1 -/* E820C 802C385C 16000003 */ bnez $s0, .L802C386C -/* E8210 802C3860 ACA30000 */ sw $v1, ($a1) -.L802C3864: -/* E8214 802C3864 080B0E19 */ j .L802C3864 -/* E8218 802C3868 00000000 */ nop -.L802C386C: -/* E821C 802C386C 92220000 */ lbu $v0, ($s1) -/* E8220 802C3870 AE300068 */ sw $s0, 0x68($s1) -/* E8224 802C3874 34420010 */ ori $v0, $v0, 0x10 -/* E8228 802C3878 A2220000 */ sb $v0, ($s1) -/* E822C 802C387C 36820001 */ ori $v0, $s4, 1 -/* E8230 802C3880 A2020000 */ sb $v0, ($s0) -/* E8234 802C3884 AE120008 */ sw $s2, 8($s0) -/* E8238 802C3888 AE12015C */ sw $s2, 0x15c($s0) -/* E823C 802C388C AE120164 */ sw $s2, 0x164($s0) -/* E8240 802C3890 A2000002 */ sb $zero, 2($s0) -/* E8244 802C3894 AE000060 */ sw $zero, 0x60($s0) -/* E8248 802C3898 AE110064 */ sw $s1, 0x64($s0) -/* E824C 802C389C AE000068 */ sw $zero, 0x68($s0) -/* E8250 802C38A0 AE00006C */ sw $zero, 0x6c($s0) -/* E8254 802C38A4 92220003 */ lbu $v0, 3($s1) -/* E8258 802C38A8 3C04802E */ lui $a0, %hi(gStaticScriptCounter) -/* E825C 802C38AC 24849CA0 */ addiu $a0, $a0, %lo(gStaticScriptCounter) -/* E8260 802C38B0 24420001 */ addiu $v0, $v0, 1 -/* E8264 802C38B4 A2020003 */ sb $v0, 3($s0) -/* E8268 802C38B8 8C820000 */ lw $v0, ($a0) -/* E826C 802C38BC AE020144 */ sw $v0, 0x144($s0) -/* E8270 802C38C0 8E230148 */ lw $v1, 0x148($s1) -/* E8274 802C38C4 24420001 */ addiu $v0, $v0, 1 -/* E8278 802C38C8 AC820000 */ sw $v0, ($a0) -/* E827C 802C38CC AE030148 */ sw $v1, 0x148($s0) -/* E8280 802C38D0 8E23014C */ lw $v1, 0x14c($s1) -/* E8284 802C38D4 2402FFFF */ addiu $v0, $zero, -1 -/* E8288 802C38D8 A2020006 */ sb $v0, 6($s0) -/* E828C 802C38DC A2020007 */ sb $v0, 7($s0) -/* E8290 802C38E0 AE03014C */ sw $v1, 0x14c($s0) -/* E8294 802C38E4 92220004 */ lbu $v0, 4($s1) -/* E8298 802C38E8 0220282D */ daddu $a1, $s1, $zero -/* E829C 802C38EC AE000160 */ sw $zero, 0x160($s0) -/* E82A0 802C38F0 A2020004 */ sb $v0, 4($s0) -/* E82A4 802C38F4 8E22013C */ lw $v0, 0x13c($s1) -/* E82A8 802C38F8 3C01802E */ lui $at, %hi(gGlobalTimeSpace) -/* E82AC 802C38FC C4209CA8 */ lwc1 $f0, %lo(gGlobalTimeSpace)($at) -/* E82B0 802C3900 0200202D */ daddu $a0, $s0, $zero -/* E82B4 802C3904 AE02013C */ sw $v0, 0x13c($s0) -/* E82B8 802C3908 8E220140 */ lw $v0, 0x140($s1) -/* E82BC 802C390C 0000182D */ daddu $v1, $zero, $zero -/* E82C0 802C3910 E6000150 */ swc1 $f0, 0x150($s0) -/* E82C4 802C3914 AE000154 */ sw $zero, 0x154($s0) -/* E82C8 802C3918 AE020140 */ sw $v0, 0x140($s0) -/* E82CC 802C391C AE000158 */ sw $zero, 0x158($s0) -.L802C3920: -/* E82D0 802C3920 8CA20084 */ lw $v0, 0x84($a1) -/* E82D4 802C3924 24A50004 */ addiu $a1, $a1, 4 -/* E82D8 802C3928 24630001 */ addiu $v1, $v1, 1 -/* E82DC 802C392C AC820084 */ sw $v0, 0x84($a0) -/* E82E0 802C3930 28620010 */ slti $v0, $v1, 0x10 -/* E82E4 802C3934 1440FFFA */ bnez $v0, .L802C3920 -/* E82E8 802C3938 24840004 */ addiu $a0, $a0, 4 -/* E82EC 802C393C 0000182D */ daddu $v1, $zero, $zero -/* E82F0 802C3940 0220202D */ daddu $a0, $s1, $zero -/* E82F4 802C3944 0200282D */ daddu $a1, $s0, $zero -.L802C3948: -/* E82F8 802C3948 8C8200C4 */ lw $v0, 0xc4($a0) -/* E82FC 802C394C 24840004 */ addiu $a0, $a0, 4 -/* E8300 802C3950 24630001 */ addiu $v1, $v1, 1 -/* E8304 802C3954 ACA200C4 */ sw $v0, 0xc4($a1) -/* E8308 802C3958 28620003 */ slti $v0, $v1, 3 -/* E830C 802C395C 1440FFFA */ bnez $v0, .L802C3948 -/* E8310 802C3960 24A50004 */ addiu $a1, $a1, 4 -/* E8314 802C3964 0C0B0C52 */ jal find_script_labels -/* E8318 802C3968 0200202D */ daddu $a0, $s0, $zero -/* E831C 802C396C 3C02802E */ lui $v0, %hi(gIsUpdatingScripts) -/* E8320 802C3970 8C429CA4 */ lw $v0, %lo(gIsUpdatingScripts)($v0) -/* E8324 802C3974 1040000E */ beqz $v0, .L802C39B0 -/* E8328 802C3978 00000000 */ nop -/* E832C 802C397C 3C05802E */ lui $a1, %hi(gScriptListCount) -/* E8330 802C3980 24A5AC98 */ addiu $a1, $a1, %lo(gScriptListCount) -/* E8334 802C3984 8CA20000 */ lw $v0, ($a1) -/* E8338 802C3988 00022080 */ sll $a0, $v0, 2 -/* E833C 802C398C 3C01802E */ lui $at, %hi(gScriptIndexList) -/* E8340 802C3990 00240821 */ addu $at, $at, $a0 -/* E8344 802C3994 AC33A898 */ sw $s3, %lo(gScriptIndexList)($at) -/* E8348 802C3998 8E030144 */ lw $v1, 0x144($s0) -/* E834C 802C399C 24420001 */ addiu $v0, $v0, 1 -/* E8350 802C39A0 ACA20000 */ sw $v0, ($a1) -/* E8354 802C39A4 3C01802E */ lui $at, %hi(gScriptIdList) -/* E8358 802C39A8 00240821 */ addu $at, $at, $a0 -/* E835C 802C39AC AC23AA98 */ sw $v1, %lo(gScriptIdList)($at) -.L802C39B0: -/* E8360 802C39B0 0C0B0CE4 */ jal suspend_frozen_scripts -/* E8364 802C39B4 0200202D */ daddu $a0, $s0, $zero -/* E8368 802C39B8 3C03802E */ lui $v1, %hi(gStaticScriptCounter) -/* E836C 802C39BC 24639CA0 */ addiu $v1, $v1, %lo(gStaticScriptCounter) -/* E8370 802C39C0 8C620000 */ lw $v0, ($v1) -/* E8374 802C39C4 14400004 */ bnez $v0, .L802C39D8 -/* E8378 802C39C8 0200102D */ daddu $v0, $s0, $zero -/* E837C 802C39CC 24020001 */ addiu $v0, $zero, 1 -/* E8380 802C39D0 AC620000 */ sw $v0, ($v1) -/* E8384 802C39D4 0200102D */ daddu $v0, $s0, $zero -.L802C39D8: -/* E8388 802C39D8 8FBF0024 */ lw $ra, 0x24($sp) -/* E838C 802C39DC 8FB40020 */ lw $s4, 0x20($sp) -/* E8390 802C39E0 8FB3001C */ lw $s3, 0x1c($sp) -/* E8394 802C39E4 8FB20018 */ lw $s2, 0x18($sp) -/* E8398 802C39E8 8FB10014 */ lw $s1, 0x14($sp) -/* E839C 802C39EC 8FB00010 */ lw $s0, 0x10($sp) -/* E83A0 802C39F0 03E00008 */ jr $ra -/* E83A4 802C39F4 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/d5a50_len_5fd0/ALT_clear_hud_element_cache.s b/ver/us/asm/nonmatchings/hud_element/ALT_clear_hud_element_cache.s similarity index 100% rename from ver/us/asm/nonmatchings/d5a50_len_5fd0/ALT_clear_hud_element_cache.s rename to ver/us/asm/nonmatchings/hud_element/ALT_clear_hud_element_cache.s diff --git a/ver/us/asm/nonmatchings/d5a50_len_5fd0/clear_hud_element_cache.s b/ver/us/asm/nonmatchings/hud_element/clear_hud_element_cache.s similarity index 94% rename from ver/us/asm/nonmatchings/d5a50_len_5fd0/clear_hud_element_cache.s rename to ver/us/asm/nonmatchings/hud_element/clear_hud_element_cache.s index 115080a84e..84fb9910fd 100644 --- a/ver/us/asm/nonmatchings/d5a50_len_5fd0/clear_hud_element_cache.s +++ b/ver/us/asm/nonmatchings/hud_element/clear_hud_element_cache.s @@ -11,8 +11,8 @@ glabel clear_hud_element_cache /* D7818 80141118 00000000 */ nop /* D781C 8014111C 3C028015 */ lui $v0, %hi(D_80156F60) /* D7820 80141120 24426F60 */ addiu $v0, $v0, %lo(D_80156F60) -/* D7824 80141124 3C018015 */ lui $at, %hi(gHudElementList) -/* D7828 80141128 AC227960 */ sw $v0, %lo(gHudElementList)($at) +/* D7824 80141124 3C018015 */ lui $at, %hi(hudElements) +/* D7828 80141128 AC227960 */ sw $v0, %lo(hudElements)($at) /* D782C 8014112C 3C028015 */ lui $v0, %hi(D_80157968) /* D7830 80141130 24427968 */ addiu $v0, $v0, %lo(D_80157968) /* D7834 80141134 3C018015 */ lui $at, %hi(D_8015133C) @@ -28,8 +28,8 @@ glabel clear_hud_element_cache .L8014115C: /* D785C 8014115C 3C028015 */ lui $v0, %hi(D_80157460) /* D7860 80141160 24427460 */ addiu $v0, $v0, %lo(D_80157460) -/* D7864 80141164 3C018015 */ lui $at, %hi(gHudElementList) -/* D7868 80141168 AC227960 */ sw $v0, %lo(gHudElementList)($at) +/* D7864 80141164 3C018015 */ lui $at, %hi(hudElements) +/* D7868 80141168 AC227960 */ sw $v0, %lo(hudElements)($at) /* D786C 8014116C 3C028016 */ lui $v0, %hi(D_80158574) /* D7870 80141170 24428574 */ addiu $v0, $v0, %lo(D_80158574) /* D7874 80141174 3C018015 */ lui $at, %hi(D_8015133C) @@ -124,8 +124,8 @@ glabel clear_hud_element_cache /* D79B4 801412B4 1440FFFA */ bnez $v0, .L801412A0 /* D79B8 801412B8 24630008 */ addiu $v1, $v1, 8 .L801412BC: -/* D79BC 801412BC 3C028015 */ lui $v0, %hi(gHudElementList) -/* D79C0 801412C0 8C427960 */ lw $v0, %lo(gHudElementList)($v0) +/* D79BC 801412BC 3C028015 */ lui $v0, %hi(hudElements) +/* D79C0 801412C0 8C427960 */ lw $v0, %lo(hudElements)($v0) /* D79C4 801412C4 2404013F */ addiu $a0, $zero, 0x13f /* D79C8 801412C8 244204FC */ addiu $v0, $v0, 0x4fc .L801412CC: diff --git a/ver/us/asm/nonmatchings/d5a50_len_5fd0/copy_world_hud_element_ref_to_battle.s b/ver/us/asm/nonmatchings/hud_element/copy_world_hud_element_ref_to_battle.s similarity index 100% rename from ver/us/asm/nonmatchings/d5a50_len_5fd0/copy_world_hud_element_ref_to_battle.s rename to ver/us/asm/nonmatchings/hud_element/copy_world_hud_element_ref_to_battle.s diff --git a/ver/us/asm/nonmatchings/d5a50_len_5fd0/create_hud_element.s b/ver/us/asm/nonmatchings/hud_element/create_hud_element.s similarity index 92% rename from ver/us/asm/nonmatchings/d5a50_len_5fd0/create_hud_element.s rename to ver/us/asm/nonmatchings/hud_element/create_hud_element.s index ca6a752b5b..da140dc795 100644 --- a/ver/us/asm/nonmatchings/d5a50_len_5fd0/create_hud_element.s +++ b/ver/us/asm/nonmatchings/hud_element/create_hud_element.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel create_hud_element -/* D7BA4 801414A4 3C038015 */ lui $v1, %hi(gHudElementList) -/* D7BA8 801414A8 8C637960 */ lw $v1, %lo(gHudElementList)($v1) +/* D7BA4 801414A4 3C038015 */ lui $v1, %hi(hudElements) +/* D7BA8 801414A8 8C637960 */ lw $v1, %lo(hudElements)($v1) /* D7BAC 801414AC 27BDFFE0 */ addiu $sp, $sp, -0x20 /* D7BB0 801414B0 AFB20018 */ sw $s2, 0x18($sp) /* D7BB4 801414B4 0080902D */ daddu $s2, $a0, $zero @@ -30,8 +30,8 @@ glabel create_hud_element /* D7BF8 801414F8 0C00AB39 */ jal heap_malloc /* D7BFC 801414FC 24040054 */ addiu $a0, $zero, 0x54 /* D7C00 80141500 00112080 */ sll $a0, $s1, 2 -/* D7C04 80141504 3C038015 */ lui $v1, %hi(gHudElementList) -/* D7C08 80141508 8C637960 */ lw $v1, %lo(gHudElementList)($v1) +/* D7C04 80141504 3C038015 */ lui $v1, %hi(hudElements) +/* D7C08 80141508 8C637960 */ lw $v1, %lo(hudElements)($v1) /* D7C0C 8014150C 3C058015 */ lui $a1, %hi(D_801512B4) /* D7C10 80141510 24A512B4 */ addiu $a1, $a1, %lo(D_801512B4) /* D7C14 80141514 00832021 */ addu $a0, $a0, $v1 @@ -49,8 +49,8 @@ glabel create_hud_element /* D7C3C 8014153C AE030000 */ sw $v1, ($s0) /* D7C40 80141540 16400004 */ bnez $s2, .L80141554 /* D7C44 80141544 AE120004 */ sw $s2, 4($s0) -/* D7C48 80141548 3C028015 */ lui $v0, %hi(D_8014EFC8) -/* D7C4C 8014154C 2442EFC8 */ addiu $v0, $v0, %lo(D_8014EFC8) +/* D7C48 80141548 3C028015 */ lui $v0, %hi(hud_element_defaultAnim) +/* D7C4C 8014154C 2442EFC8 */ addiu $v0, $v0, %lo(hud_element_defaultAnim) /* D7C50 80141550 AE020004 */ sw $v0, 4($s0) .L80141554: /* D7C54 80141554 A2030047 */ sb $v1, 0x47($s0) diff --git a/ver/us/asm/nonmatchings/d5a50_len_5fd0/create_hud_element_transform_A.s b/ver/us/asm/nonmatchings/hud_element/create_hud_element_transform_A.s similarity index 94% rename from ver/us/asm/nonmatchings/d5a50_len_5fd0/create_hud_element_transform_A.s rename to ver/us/asm/nonmatchings/hud_element/create_hud_element_transform_A.s index e103c3cfa1..5442934532 100644 --- a/ver/us/asm/nonmatchings/d5a50_len_5fd0/create_hud_element_transform_A.s +++ b/ver/us/asm/nonmatchings/hud_element/create_hud_element_transform_A.s @@ -5,8 +5,8 @@ glabel create_hud_element_transform_A /* DB628 80144F28 27BDFFE0 */ addiu $sp, $sp, -0x20 /* DB62C 80144F2C 2402F7FF */ addiu $v0, $zero, -0x801 /* DB630 80144F30 00821024 */ and $v0, $a0, $v0 -/* DB634 80144F34 3C038015 */ lui $v1, %hi(gHudElementList) -/* DB638 80144F38 8C637960 */ lw $v1, %lo(gHudElementList)($v1) +/* DB634 80144F34 3C038015 */ lui $v1, %hi(hudElements) +/* DB638 80144F38 8C637960 */ lw $v1, %lo(hudElements)($v1) /* DB63C 80144F3C 00021080 */ sll $v0, $v0, 2 /* DB640 80144F40 AFBF0018 */ sw $ra, 0x18($sp) /* DB644 80144F44 AFB10014 */ sw $s1, 0x14($sp) diff --git a/ver/us/asm/nonmatchings/d5a50_len_5fd0/create_hud_element_transform_B.s b/ver/us/asm/nonmatchings/hud_element/create_hud_element_transform_B.s similarity index 93% rename from ver/us/asm/nonmatchings/d5a50_len_5fd0/create_hud_element_transform_B.s rename to ver/us/asm/nonmatchings/hud_element/create_hud_element_transform_B.s index 7e2dccaeb8..5c032d0a41 100644 --- a/ver/us/asm/nonmatchings/d5a50_len_5fd0/create_hud_element_transform_B.s +++ b/ver/us/asm/nonmatchings/hud_element/create_hud_element_transform_B.s @@ -6,8 +6,8 @@ glabel create_hud_element_transform_B /* DB6DC 80144FDC 2402F7FF */ addiu $v0, $zero, -0x801 /* DB6E0 80144FE0 00821024 */ and $v0, $a0, $v0 /* DB6E4 80144FE4 00021080 */ sll $v0, $v0, 2 -/* DB6E8 80144FE8 3C038015 */ lui $v1, %hi(gHudElementList) -/* DB6EC 80144FEC 8C637960 */ lw $v1, %lo(gHudElementList)($v1) +/* DB6E8 80144FE8 3C038015 */ lui $v1, %hi(hudElements) +/* DB6EC 80144FEC 8C637960 */ lw $v1, %lo(hudElements)($v1) /* DB6F0 80144FF0 AFBF0014 */ sw $ra, 0x14($sp) /* DB6F4 80144FF4 AFB00010 */ sw $s0, 0x10($sp) /* DB6F8 80144FF8 00431021 */ addu $v0, $v0, $v1 diff --git a/ver/us/asm/nonmatchings/d5a50_len_5fd0/create_hud_element_transform_C.s b/ver/us/asm/nonmatchings/hud_element/create_hud_element_transform_C.s similarity index 93% rename from ver/us/asm/nonmatchings/d5a50_len_5fd0/create_hud_element_transform_C.s rename to ver/us/asm/nonmatchings/hud_element/create_hud_element_transform_C.s index e3b99b21cc..54d461ce7b 100644 --- a/ver/us/asm/nonmatchings/d5a50_len_5fd0/create_hud_element_transform_C.s +++ b/ver/us/asm/nonmatchings/hud_element/create_hud_element_transform_C.s @@ -6,8 +6,8 @@ glabel create_hud_element_transform_C /* DB774 80145074 2402F7FF */ addiu $v0, $zero, -0x801 /* DB778 80145078 00821024 */ and $v0, $a0, $v0 /* DB77C 8014507C 00021080 */ sll $v0, $v0, 2 -/* DB780 80145080 3C038015 */ lui $v1, %hi(gHudElementList) -/* DB784 80145084 8C637960 */ lw $v1, %lo(gHudElementList)($v1) +/* DB780 80145080 3C038015 */ lui $v1, %hi(hudElements) +/* DB784 80145084 8C637960 */ lw $v1, %lo(hudElements)($v1) /* DB788 80145088 AFBF0014 */ sw $ra, 0x14($sp) /* DB78C 8014508C AFB00010 */ sw $s0, 0x10($sp) /* DB790 80145090 00431021 */ addu $v0, $v0, $v1 diff --git a/ver/us/asm/nonmatchings/d5a50_len_5fd0/draw_hud_element.s b/ver/us/asm/nonmatchings/hud_element/draw_hud_element.s similarity index 99% rename from ver/us/asm/nonmatchings/d5a50_len_5fd0/draw_hud_element.s rename to ver/us/asm/nonmatchings/hud_element/draw_hud_element.s index e1aada2f52..3f3dd6c799 100644 --- a/ver/us/asm/nonmatchings/d5a50_len_5fd0/draw_hud_element.s +++ b/ver/us/asm/nonmatchings/hud_element/draw_hud_element.s @@ -5,8 +5,8 @@ glabel draw_hud_element /* DA998 80144298 27BDFFB8 */ addiu $sp, $sp, -0x48 /* DA99C 8014429C 2402F7FF */ addiu $v0, $zero, -0x801 /* DA9A0 801442A0 00822024 */ and $a0, $a0, $v0 -/* DA9A4 801442A4 3C028015 */ lui $v0, %hi(gHudElementList) -/* DA9A8 801442A8 8C427960 */ lw $v0, %lo(gHudElementList)($v0) +/* DA9A4 801442A4 3C028015 */ lui $v0, %hi(hudElements) +/* DA9A8 801442A8 8C427960 */ lw $v0, %lo(hudElements)($v0) /* DA9AC 801442AC 00042080 */ sll $a0, $a0, 2 /* DA9B0 801442B0 AFBF0044 */ sw $ra, 0x44($sp) /* DA9B4 801442B4 AFB60040 */ sw $s6, 0x40($sp) diff --git a/ver/us/asm/nonmatchings/d5a50_len_5fd0/draw_rect_hud_element.s b/ver/us/asm/nonmatchings/hud_element/draw_rect_hud_element.s similarity index 100% rename from ver/us/asm/nonmatchings/d5a50_len_5fd0/draw_rect_hud_element.s rename to ver/us/asm/nonmatchings/hud_element/draw_rect_hud_element.s diff --git a/ver/us/asm/nonmatchings/d5a50_len_5fd0/func_801413F8.s b/ver/us/asm/nonmatchings/hud_element/func_801413F8.s similarity index 100% rename from ver/us/asm/nonmatchings/d5a50_len_5fd0/func_801413F8.s rename to ver/us/asm/nonmatchings/hud_element/func_801413F8.s diff --git a/ver/us/asm/nonmatchings/d5a50_len_5fd0/func_80143C48.s b/ver/us/asm/nonmatchings/hud_element/func_80143C48.s similarity index 99% rename from ver/us/asm/nonmatchings/d5a50_len_5fd0/func_80143C48.s rename to ver/us/asm/nonmatchings/hud_element/func_80143C48.s index 2934ce4646..e7ef3508d5 100644 --- a/ver/us/asm/nonmatchings/d5a50_len_5fd0/func_80143C48.s +++ b/ver/us/asm/nonmatchings/hud_element/func_80143C48.s @@ -336,8 +336,8 @@ glabel func_80143C48 /* DA870 80144170 07C0001D */ bltz $fp, .L801441E8 /* DA874 80144174 2402F7FF */ addiu $v0, $zero, -0x801 /* DA878 80144178 03C2F024 */ and $fp, $fp, $v0 -/* DA87C 8014417C 3C038015 */ lui $v1, %hi(gHudElementList) -/* DA880 80144180 8C637960 */ lw $v1, %lo(gHudElementList)($v1) +/* DA87C 8014417C 3C038015 */ lui $v1, %hi(hudElements) +/* DA880 80144180 8C637960 */ lw $v1, %lo(hudElements)($v1) /* DA884 80144184 001E1080 */ sll $v0, $fp, 2 /* DA888 80144188 00431021 */ addu $v0, $v0, $v1 /* DA88C 8014418C 8C440000 */ lw $a0, ($v0) diff --git a/ver/us/asm/nonmatchings/d5a50_len_5fd0/func_80144E4C.s b/ver/us/asm/nonmatchings/hud_element/func_80144E4C.s similarity index 79% rename from ver/us/asm/nonmatchings/d5a50_len_5fd0/func_80144E4C.s rename to ver/us/asm/nonmatchings/hud_element/func_80144E4C.s index 3e90930844..ed50623ae3 100644 --- a/ver/us/asm/nonmatchings/d5a50_len_5fd0/func_80144E4C.s +++ b/ver/us/asm/nonmatchings/hud_element/func_80144E4C.s @@ -4,8 +4,8 @@ glabel func_80144E4C /* DB54C 80144E4C 2402F7FF */ addiu $v0, $zero, -0x801 /* DB550 80144E50 00822024 */ and $a0, $a0, $v0 -/* DB554 80144E54 3C028015 */ lui $v0, %hi(gHudElementList) -/* DB558 80144E58 8C427960 */ lw $v0, %lo(gHudElementList)($v0) +/* DB554 80144E54 3C028015 */ lui $v0, %hi(hudElements) +/* DB558 80144E58 8C427960 */ lw $v0, %lo(hudElements)($v0) /* DB55C 80144E5C 00042080 */ sll $a0, $a0, 2 /* DB560 80144E60 00822021 */ addu $a0, $a0, $v0 /* DB564 80144E64 8C820000 */ lw $v0, ($a0) diff --git a/ver/us/asm/nonmatchings/d5a50_len_5fd0/hud_element_update.s b/ver/us/asm/nonmatchings/hud_element/hud_element_update.s similarity index 100% rename from ver/us/asm/nonmatchings/d5a50_len_5fd0/hud_element_update.s rename to ver/us/asm/nonmatchings/hud_element/hud_element_update.s diff --git a/ver/us/asm/nonmatchings/d5a50_len_5fd0/load_hud_element.s b/ver/us/asm/nonmatchings/hud_element/load_hud_element.s similarity index 100% rename from ver/us/asm/nonmatchings/d5a50_len_5fd0/load_hud_element.s rename to ver/us/asm/nonmatchings/hud_element/load_hud_element.s diff --git a/ver/us/asm/nonmatchings/d5a50_len_5fd0/render_hud_element.s b/ver/us/asm/nonmatchings/hud_element/render_hud_element.s similarity index 100% rename from ver/us/asm/nonmatchings/d5a50_len_5fd0/render_hud_element.s rename to ver/us/asm/nonmatchings/hud_element/render_hud_element.s diff --git a/ver/us/asm/nonmatchings/d5a50_len_5fd0/render_hud_elements_backUI.s b/ver/us/asm/nonmatchings/hud_element/render_hud_elements_backUI.s similarity index 97% rename from ver/us/asm/nonmatchings/d5a50_len_5fd0/render_hud_elements_backUI.s rename to ver/us/asm/nonmatchings/hud_element/render_hud_elements_backUI.s index d4d8e8f7a8..a223311885 100644 --- a/ver/us/asm/nonmatchings/d5a50_len_5fd0/render_hud_elements_backUI.s +++ b/ver/us/asm/nonmatchings/hud_element/render_hud_elements_backUI.s @@ -30,8 +30,8 @@ glabel render_hud_elements_backUI /* D8970 80142270 3C03800A */ lui $v1, %hi(gMasterGfxPos) /* D8974 80142274 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* D8978 80142278 8C620000 */ lw $v0, ($v1) -/* D897C 8014227C 3C058015 */ lui $a1, %hi(gHudElementList) -/* D8980 80142280 8CA57960 */ lw $a1, %lo(gHudElementList)($a1) +/* D897C 8014227C 3C058015 */ lui $a1, %hi(hudElements) +/* D8980 80142280 8CA57960 */ lw $a1, %lo(hudElements)($a1) /* D8984 80142284 0040202D */ daddu $a0, $v0, $zero /* D8988 80142288 24420008 */ addiu $v0, $v0, 8 /* D898C 8014228C AC620000 */ sw $v0, ($v1) @@ -70,8 +70,8 @@ glabel render_hud_elements_backUI /* D8A08 80142308 27C2FFFF */ addiu $v0, $fp, -1 /* D8A0C 8014230C 18400024 */ blez $v0, .L801423A0 /* D8A10 80142310 0000B82D */ daddu $s7, $zero, $zero -/* D8A14 80142314 3C0D8015 */ lui $t5, %hi(gHudElementList) -/* D8A18 80142318 25AD7960 */ addiu $t5, $t5, %lo(gHudElementList) +/* D8A14 80142314 3C0D8015 */ lui $t5, %hi(hudElements) +/* D8A18 80142318 25AD7960 */ addiu $t5, $t5, %lo(hudElements) /* D8A1C 8014231C 27AC0028 */ addiu $t4, $sp, 0x28 /* D8A20 80142320 0180582D */ daddu $t3, $t4, $zero .L80142324: @@ -116,8 +116,8 @@ glabel render_hud_elements_backUI .L801423AC: /* D8AAC 801423AC 03A21021 */ addu $v0, $sp, $v0 /* D8AB0 801423B0 8C420028 */ lw $v0, 0x28($v0) -/* D8AB4 801423B4 3C038015 */ lui $v1, %hi(gHudElementList) -/* D8AB8 801423B8 8C637960 */ lw $v1, %lo(gHudElementList)($v1) +/* D8AB4 801423B4 3C038015 */ lui $v1, %hi(hudElements) +/* D8AB8 801423B8 8C637960 */ lw $v1, %lo(hudElements)($v1) /* D8ABC 801423BC 00021080 */ sll $v0, $v0, 2 /* D8AC0 801423C0 00431021 */ addu $v0, $v0, $v1 /* D8AC4 801423C4 8C500000 */ lw $s0, ($v0) diff --git a/ver/us/asm/nonmatchings/d5a50_len_5fd0/render_hud_elements_frontUI.s b/ver/us/asm/nonmatchings/hud_element/render_hud_elements_frontUI.s similarity index 97% rename from ver/us/asm/nonmatchings/d5a50_len_5fd0/render_hud_elements_frontUI.s rename to ver/us/asm/nonmatchings/hud_element/render_hud_elements_frontUI.s index 85d263e30b..bb236cdb18 100644 --- a/ver/us/asm/nonmatchings/d5a50_len_5fd0/render_hud_elements_frontUI.s +++ b/ver/us/asm/nonmatchings/hud_element/render_hud_elements_frontUI.s @@ -21,8 +21,8 @@ glabel render_hud_elements_frontUI /* D8E5C 8014275C AFB1052C */ sw $s1, 0x52c($sp) /* D8E60 80142760 AFB00528 */ sw $s0, 0x528($sp) /* D8E64 80142764 8C620000 */ lw $v0, ($v1) -/* D8E68 80142768 3C058015 */ lui $a1, %hi(gHudElementList) -/* D8E6C 8014276C 8CA57960 */ lw $a1, %lo(gHudElementList)($a1) +/* D8E68 80142768 3C058015 */ lui $a1, %hi(hudElements) +/* D8E6C 8014276C 8CA57960 */ lw $a1, %lo(hudElements)($a1) /* D8E70 80142770 0040202D */ daddu $a0, $v0, $zero /* D8E74 80142774 24420008 */ addiu $v0, $v0, 8 /* D8E78 80142778 AC620000 */ sw $v0, ($v1) @@ -61,8 +61,8 @@ glabel render_hud_elements_frontUI /* D8EF4 801427F4 27C2FFFF */ addiu $v0, $fp, -1 /* D8EF8 801427F8 18400024 */ blez $v0, .L8014288C /* D8EFC 801427FC 0000B82D */ daddu $s7, $zero, $zero -/* D8F00 80142800 3C0D8015 */ lui $t5, %hi(gHudElementList) -/* D8F04 80142804 25AD7960 */ addiu $t5, $t5, %lo(gHudElementList) +/* D8F00 80142800 3C0D8015 */ lui $t5, %hi(hudElements) +/* D8F04 80142804 25AD7960 */ addiu $t5, $t5, %lo(hudElements) /* D8F08 80142808 27AC0028 */ addiu $t4, $sp, 0x28 /* D8F0C 8014280C 0180582D */ daddu $t3, $t4, $zero .L80142810: @@ -107,8 +107,8 @@ glabel render_hud_elements_frontUI .L80142898: /* D8F98 80142898 03A21021 */ addu $v0, $sp, $v0 /* D8F9C 8014289C 8C420028 */ lw $v0, 0x28($v0) -/* D8FA0 801428A0 3C038015 */ lui $v1, %hi(gHudElementList) -/* D8FA4 801428A4 8C637960 */ lw $v1, %lo(gHudElementList)($v1) +/* D8FA0 801428A0 3C038015 */ lui $v1, %hi(hudElements) +/* D8FA4 801428A4 8C637960 */ lw $v1, %lo(hudElements)($v1) /* D8FA8 801428A8 00021080 */ sll $v0, $v0, 2 /* D8FAC 801428AC 00431021 */ addu $v0, $v0, $v1 /* D8FB0 801428B0 8C500000 */ lw $s0, ($v0) diff --git a/ver/us/asm/nonmatchings/d5a50_len_5fd0/render_hud_elements_world.s b/ver/us/asm/nonmatchings/hud_element/render_hud_elements_world.s similarity index 95% rename from ver/us/asm/nonmatchings/d5a50_len_5fd0/render_hud_elements_world.s rename to ver/us/asm/nonmatchings/hud_element/render_hud_elements_world.s index 8ddce54eea..c6aa0b9590 100644 --- a/ver/us/asm/nonmatchings/d5a50_len_5fd0/render_hud_elements_world.s +++ b/ver/us/asm/nonmatchings/hud_element/render_hud_elements_world.s @@ -16,8 +16,8 @@ glabel render_hud_elements_world /* D9DE0 801436E0 3C091020 */ lui $t1, 0x1020 /* D9DE4 801436E4 3C080001 */ lui $t0, 1 /* D9DE8 801436E8 3C074000 */ lui $a3, 0x4000 -/* D9DEC 801436EC 3C068015 */ lui $a2, %hi(gHudElementList) -/* D9DF0 801436F0 8CC67960 */ lw $a2, %lo(gHudElementList)($a2) +/* D9DEC 801436EC 3C068015 */ lui $a2, %hi(hudElements) +/* D9DF0 801436F0 8CC67960 */ lw $a2, %lo(hudElements)($a2) /* D9DF4 801436F4 27A50010 */ addiu $a1, $sp, 0x10 .L801436F8: /* D9DF8 801436F8 8CC40000 */ lw $a0, ($a2) @@ -59,8 +59,8 @@ glabel render_hud_elements_world /* D9E84 80143784 2642FFFF */ addiu $v0, $s2, -1 /* D9E88 80143788 18400024 */ blez $v0, .L8014381C /* D9E8C 8014378C 0000882D */ daddu $s1, $zero, $zero -/* D9E90 80143790 3C0C8015 */ lui $t4, %hi(gHudElementList) -/* D9E94 80143794 258C7960 */ addiu $t4, $t4, %lo(gHudElementList) +/* D9E90 80143790 3C0C8015 */ lui $t4, %hi(hudElements) +/* D9E94 80143794 258C7960 */ addiu $t4, $t4, %lo(hudElements) /* D9E98 80143798 27AB0010 */ addiu $t3, $sp, 0x10 /* D9E9C 8014379C 0160502D */ daddu $t2, $t3, $zero .L801437A0: @@ -178,8 +178,8 @@ glabel render_hud_elements_world .L8014394C: /* DA04C 8014394C 8E020000 */ lw $v0, ($s0) /* DA050 80143950 26100004 */ addiu $s0, $s0, 4 -/* DA054 80143954 3C038015 */ lui $v1, %hi(gHudElementList) -/* DA058 80143958 8C637960 */ lw $v1, %lo(gHudElementList)($v1) +/* DA054 80143954 3C038015 */ lui $v1, %hi(hudElements) +/* DA058 80143958 8C637960 */ lw $v1, %lo(hudElements)($v1) /* DA05C 8014395C 00021080 */ sll $v0, $v0, 2 /* DA060 80143960 00431021 */ addu $v0, $v0, $v1 /* DA064 80143964 8C440000 */ lw $a0, ($v0) @@ -199,8 +199,8 @@ glabel render_hud_elements_world /* DA094 80143994 3C091020 */ lui $t1, 0x1020 /* DA098 80143998 3C080001 */ lui $t0, 1 /* DA09C 8014399C 3C074000 */ lui $a3, 0x4000 -/* DA0A0 801439A0 3C068015 */ lui $a2, %hi(gHudElementList) -/* DA0A4 801439A4 8CC67960 */ lw $a2, %lo(gHudElementList)($a2) +/* DA0A0 801439A0 3C068015 */ lui $a2, %hi(hudElements) +/* DA0A4 801439A4 8CC67960 */ lw $a2, %lo(hudElements)($a2) /* DA0A8 801439A8 27A50010 */ addiu $a1, $sp, 0x10 .L801439AC: /* DA0AC 801439AC 8CC40000 */ lw $a0, ($a2) @@ -242,8 +242,8 @@ glabel render_hud_elements_world /* DA138 80143A38 2642FFFF */ addiu $v0, $s2, -1 /* DA13C 80143A3C 18400024 */ blez $v0, .L80143AD0 /* DA140 80143A40 0000882D */ daddu $s1, $zero, $zero -/* DA144 80143A44 3C0C8015 */ lui $t4, %hi(gHudElementList) -/* DA148 80143A48 258C7960 */ addiu $t4, $t4, %lo(gHudElementList) +/* DA144 80143A44 3C0C8015 */ lui $t4, %hi(hudElements) +/* DA148 80143A48 258C7960 */ addiu $t4, $t4, %lo(hudElements) /* DA14C 80143A4C 27AB0010 */ addiu $t3, $sp, 0x10 /* DA150 80143A50 0160502D */ daddu $t2, $t3, $zero .L80143A54: @@ -361,8 +361,8 @@ glabel render_hud_elements_world .L80143C00: /* DA300 80143C00 8E020000 */ lw $v0, ($s0) /* DA304 80143C04 26100004 */ addiu $s0, $s0, 4 -/* DA308 80143C08 3C038015 */ lui $v1, %hi(gHudElementList) -/* DA30C 80143C0C 8C637960 */ lw $v1, %lo(gHudElementList)($v1) +/* DA308 80143C08 3C038015 */ lui $v1, %hi(hudElements) +/* DA30C 80143C0C 8C637960 */ lw $v1, %lo(hudElements)($v1) /* DA310 80143C10 00021080 */ sll $v0, $v0, 2 /* DA314 80143C14 00431021 */ addu $v0, $v0, $v1 /* DA318 80143C18 8C440000 */ lw $a0, ($v0) diff --git a/ver/us/asm/nonmatchings/d5a50_len_5fd0/set_hud_element_nonworld_cache.s b/ver/us/asm/nonmatchings/hud_element/set_hud_element_nonworld_cache.s similarity index 100% rename from ver/us/asm/nonmatchings/d5a50_len_5fd0/set_hud_element_nonworld_cache.s rename to ver/us/asm/nonmatchings/hud_element/set_hud_element_nonworld_cache.s diff --git a/ver/us/asm/nonmatchings/d5a50_len_5fd0/set_hud_element_render_depth.s b/ver/us/asm/nonmatchings/hud_element/set_hud_element_render_depth.s similarity index 78% rename from ver/us/asm/nonmatchings/d5a50_len_5fd0/set_hud_element_render_depth.s rename to ver/us/asm/nonmatchings/hud_element/set_hud_element_render_depth.s index aee11ceff9..748244e2a4 100644 --- a/ver/us/asm/nonmatchings/d5a50_len_5fd0/set_hud_element_render_depth.s +++ b/ver/us/asm/nonmatchings/hud_element/set_hud_element_render_depth.s @@ -4,8 +4,8 @@ glabel set_hud_element_render_depth /* DB0DC 801449DC 2402F7FF */ addiu $v0, $zero, -0x801 /* DB0E0 801449E0 00822024 */ and $a0, $a0, $v0 -/* DB0E4 801449E4 3C028015 */ lui $v0, %hi(gHudElementList) -/* DB0E8 801449E8 8C427960 */ lw $v0, %lo(gHudElementList)($v0) +/* DB0E4 801449E4 3C028015 */ lui $v0, %hi(hudElements) +/* DB0E8 801449E8 8C427960 */ lw $v0, %lo(hudElements)($v0) /* DB0EC 801449EC 00042080 */ sll $a0, $a0, 2 /* DB0F0 801449F0 00822021 */ addu $a0, $a0, $v0 /* DB0F4 801449F4 8C820000 */ lw $v0, ($a0) diff --git a/ver/us/asm/nonmatchings/d5a50_len_5fd0/set_hud_element_scale.s b/ver/us/asm/nonmatchings/hud_element/set_hud_element_scale.s similarity index 97% rename from ver/us/asm/nonmatchings/d5a50_len_5fd0/set_hud_element_scale.s rename to ver/us/asm/nonmatchings/hud_element/set_hud_element_scale.s index 80bcd5e3f9..0ad9c97ff5 100644 --- a/ver/us/asm/nonmatchings/d5a50_len_5fd0/set_hud_element_scale.s +++ b/ver/us/asm/nonmatchings/hud_element/set_hud_element_scale.s @@ -5,8 +5,8 @@ glabel set_hud_element_scale /* DB320 80144C20 2402F7FF */ addiu $v0, $zero, -0x801 /* DB324 80144C24 00822024 */ and $a0, $a0, $v0 /* DB328 80144C28 00042080 */ sll $a0, $a0, 2 -/* DB32C 80144C2C 3C028015 */ lui $v0, %hi(gHudElementList) -/* DB330 80144C30 8C427960 */ lw $v0, %lo(gHudElementList)($v0) +/* DB32C 80144C2C 3C028015 */ lui $v0, %hi(hudElements) +/* DB330 80144C30 8C427960 */ lw $v0, %lo(hudElements)($v0) /* DB334 80144C34 44853000 */ mtc1 $a1, $f6 /* DB338 80144C38 00822021 */ addu $a0, $a0, $v0 /* DB33C 80144C3C 8C850000 */ lw $a1, ($a0) diff --git a/ver/us/asm/nonmatchings/d5a50_len_5fd0/set_hud_element_transform_pos.s b/ver/us/asm/nonmatchings/hud_element/set_hud_element_transform_pos.s similarity index 88% rename from ver/us/asm/nonmatchings/d5a50_len_5fd0/set_hud_element_transform_pos.s rename to ver/us/asm/nonmatchings/hud_element/set_hud_element_transform_pos.s index a79afde560..e77a2a4fc2 100644 --- a/ver/us/asm/nonmatchings/d5a50_len_5fd0/set_hud_element_transform_pos.s +++ b/ver/us/asm/nonmatchings/hud_element/set_hud_element_transform_pos.s @@ -6,8 +6,8 @@ glabel set_hud_element_transform_pos /* DB888 80145188 00822024 */ and $a0, $a0, $v0 /* DB88C 8014518C 00042080 */ sll $a0, $a0, 2 /* DB890 80145190 3C030001 */ lui $v1, 1 -/* DB894 80145194 3C028015 */ lui $v0, %hi(gHudElementList) -/* DB898 80145198 8C427960 */ lw $v0, %lo(gHudElementList)($v0) +/* DB894 80145194 3C028015 */ lui $v0, %hi(hudElements) +/* DB898 80145198 8C427960 */ lw $v0, %lo(hudElements)($v0) /* DB89C 8014519C 44850000 */ mtc1 $a1, $f0 /* DB8A0 801451A0 00822021 */ addu $a0, $a0, $v0 /* DB8A4 801451A4 8C840000 */ lw $a0, ($a0) diff --git a/ver/us/asm/nonmatchings/d5a50_len_5fd0/set_hud_element_transform_rotation.s b/ver/us/asm/nonmatchings/hud_element/set_hud_element_transform_rotation.s similarity index 88% rename from ver/us/asm/nonmatchings/d5a50_len_5fd0/set_hud_element_transform_rotation.s rename to ver/us/asm/nonmatchings/hud_element/set_hud_element_transform_rotation.s index 4e6db95e14..f05e37f0cc 100644 --- a/ver/us/asm/nonmatchings/d5a50_len_5fd0/set_hud_element_transform_rotation.s +++ b/ver/us/asm/nonmatchings/hud_element/set_hud_element_transform_rotation.s @@ -6,8 +6,8 @@ glabel set_hud_element_transform_rotation /* DB928 80145228 00822024 */ and $a0, $a0, $v0 /* DB92C 8014522C 00042080 */ sll $a0, $a0, 2 /* DB930 80145230 3C030001 */ lui $v1, 1 -/* DB934 80145234 3C028015 */ lui $v0, %hi(gHudElementList) -/* DB938 80145238 8C427960 */ lw $v0, %lo(gHudElementList)($v0) +/* DB934 80145234 3C028015 */ lui $v0, %hi(hudElements) +/* DB938 80145238 8C427960 */ lw $v0, %lo(hudElements)($v0) /* DB93C 8014523C 44850000 */ mtc1 $a1, $f0 /* DB940 80145240 00822021 */ addu $a0, $a0, $v0 /* DB944 80145244 8C840000 */ lw $a0, ($a0) diff --git a/ver/us/asm/nonmatchings/d5a50_len_5fd0/set_hud_element_transform_rotation_pivot.s b/ver/us/asm/nonmatchings/hud_element/set_hud_element_transform_rotation_pivot.s similarity index 86% rename from ver/us/asm/nonmatchings/d5a50_len_5fd0/set_hud_element_transform_rotation_pivot.s rename to ver/us/asm/nonmatchings/hud_element/set_hud_element_transform_rotation_pivot.s index 90612ec908..5adfde3828 100644 --- a/ver/us/asm/nonmatchings/d5a50_len_5fd0/set_hud_element_transform_rotation_pivot.s +++ b/ver/us/asm/nonmatchings/hud_element/set_hud_element_transform_rotation_pivot.s @@ -4,8 +4,8 @@ glabel set_hud_element_transform_rotation_pivot /* DB974 80145274 2402F7FF */ addiu $v0, $zero, -0x801 /* DB978 80145278 00822024 */ and $a0, $a0, $v0 -/* DB97C 8014527C 3C028015 */ lui $v0, %hi(gHudElementList) -/* DB980 80145280 8C427960 */ lw $v0, %lo(gHudElementList)($v0) +/* DB97C 8014527C 3C028015 */ lui $v0, %hi(hudElements) +/* DB980 80145280 8C427960 */ lw $v0, %lo(hudElements)($v0) /* DB984 80145284 00042080 */ sll $a0, $a0, 2 /* DB988 80145288 00822021 */ addu $a0, $a0, $v0 /* DB98C 8014528C 8C840000 */ lw $a0, ($a0) diff --git a/ver/us/asm/nonmatchings/d5a50_len_5fd0/set_hud_element_transform_scale.s b/ver/us/asm/nonmatchings/hud_element/set_hud_element_transform_scale.s similarity index 88% rename from ver/us/asm/nonmatchings/d5a50_len_5fd0/set_hud_element_transform_scale.s rename to ver/us/asm/nonmatchings/hud_element/set_hud_element_transform_scale.s index 3a0c6e25e4..e140a31a00 100644 --- a/ver/us/asm/nonmatchings/d5a50_len_5fd0/set_hud_element_transform_scale.s +++ b/ver/us/asm/nonmatchings/hud_element/set_hud_element_transform_scale.s @@ -6,8 +6,8 @@ glabel set_hud_element_transform_scale /* DB8D8 801451D8 00822024 */ and $a0, $a0, $v0 /* DB8DC 801451DC 00042080 */ sll $a0, $a0, 2 /* DB8E0 801451E0 3C030001 */ lui $v1, 1 -/* DB8E4 801451E4 3C028015 */ lui $v0, %hi(gHudElementList) -/* DB8E8 801451E8 8C427960 */ lw $v0, %lo(gHudElementList)($v0) +/* DB8E4 801451E4 3C028015 */ lui $v0, %hi(hudElements) +/* DB8E8 801451E8 8C427960 */ lw $v0, %lo(hudElements)($v0) /* DB8EC 801451EC 44850000 */ mtc1 $a1, $f0 /* DB8F0 801451F0 00822021 */ addu $a0, $a0, $v0 /* DB8F4 801451F4 8C840000 */ lw $a0, ($a0) diff --git a/ver/us/asm/nonmatchings/d5a50_len_5fd0/update_hud_elements.s b/ver/us/asm/nonmatchings/hud_element/update_hud_elements.s similarity index 96% rename from ver/us/asm/nonmatchings/d5a50_len_5fd0/update_hud_elements.s rename to ver/us/asm/nonmatchings/hud_element/update_hud_elements.s index f256c8d998..ad3a1c0747 100644 --- a/ver/us/asm/nonmatchings/d5a50_len_5fd0/update_hud_elements.s +++ b/ver/us/asm/nonmatchings/hud_element/update_hud_elements.s @@ -10,8 +10,8 @@ glabel update_hud_elements /* D7D24 80141624 AFBF001C */ sw $ra, 0x1c($sp) /* D7D28 80141628 AFB00010 */ sw $s0, 0x10($sp) .L8014162C: -/* D7D2C 8014162C 3C038015 */ lui $v1, %hi(gHudElementList) -/* D7D30 80141630 8C637960 */ lw $v1, %lo(gHudElementList)($v1) +/* D7D2C 8014162C 3C038015 */ lui $v1, %hi(hudElements) +/* D7D30 80141630 8C637960 */ lw $v1, %lo(hudElements)($v1) /* D7D34 80141634 00111080 */ sll $v0, $s1, 2 /* D7D38 80141638 00431021 */ addu $v0, $v0, $v1 /* D7D3C 8014163C 8C500000 */ lw $s0, ($v0) diff --git a/ver/us/asm/nonmatchings/pause/135EE0/pause_textbox_draw_contents.s b/ver/us/asm/nonmatchings/pause/135EE0/pause_textbox_draw_contents.s index 5cbc75bcaf..f9c564d307 100644 --- a/ver/us/asm/nonmatchings/pause/135EE0/pause_textbox_draw_contents.s +++ b/ver/us/asm/nonmatchings/pause/135EE0/pause_textbox_draw_contents.s @@ -142,7 +142,7 @@ glabel pause_textbox_draw_contents /* 136ACC 8024378C 0C051261 */ jal set_hud_element_render_pos /* 136AD0 80243790 AE230000 */ sw $v1, ($s1) /* 136AD4 80243794 8E04000C */ lw $a0, 0xc($s0) -/* 136AD8 80243798 0C0511FF */ jal set_hud_element_script +/* 136AD8 80243798 0C0511FF */ jal set_hud_element_anim /* 136ADC 8024379C 8E450000 */ lw $a1, ($s2) /* 136AE0 802437A0 8E04000C */ lw $a0, 0xc($s0) /* 136AE4 802437A4 0C051280 */ jal set_hud_element_flags 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 d4edee29ef..825717a764 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 @@ -551,7 +551,7 @@ glabel pause_badges_draw_contents /* 13B064 80247D24 004A1021 */ addu $v0, $v0, $t2 /* 13B068 80247D28 8C450000 */ lw $a1, ($v0) .L80247D2C: -/* 13B06C 80247D2C 0C0511FF */ jal set_hud_element_script +/* 13B06C 80247D2C 0C0511FF */ jal set_hud_element_anim /* 13B070 80247D30 0220202D */ daddu $a0, $s1, $zero /* 13B074 80247D34 3C053F2B */ lui $a1, 0x3f2b /* 13B078 80247D38 34A5BA99 */ ori $a1, $a1, 0xba99 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 0d06ebda92..c3e7c11f56 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 @@ -550,7 +550,7 @@ glabel pause_stats_draw_contents /* 139528 802461E8 3C058025 */ lui $a1, %hi(D_8024F360) /* 13952C 802461EC 00B02821 */ addu $a1, $a1, $s0 /* 139530 802461F0 8CA5F360 */ lw $a1, %lo(D_8024F360)($a1) -/* 139534 802461F4 0C0511FF */ jal set_hud_element_script +/* 139534 802461F4 0C0511FF */ jal set_hud_element_anim /* 139538 802461F8 24140001 */ addiu $s4, $zero, 1 /* 13953C 802461FC 27C6001D */ addiu $a2, $fp, 0x1d /* 139540 80246200 8FA80084 */ lw $t0, 0x84($sp) @@ -580,7 +580,7 @@ glabel pause_stats_draw_contents /* 1395A0 80246260 3C058025 */ lui $a1, %hi(D_8024F370) /* 1395A4 80246264 00B02821 */ addu $a1, $a1, $s0 /* 1395A8 80246268 8CA5F370 */ lw $a1, %lo(D_8024F370)($a1) -/* 1395AC 8024626C 0C0511FF */ jal set_hud_element_script +/* 1395AC 8024626C 0C0511FF */ jal set_hud_element_anim /* 1395B0 80246270 0000982D */ daddu $s3, $zero, $zero /* 1395B4 80246274 0220282D */ daddu $a1, $s1, $zero /* 1395B8 80246278 8EC40008 */ lw $a0, 8($s6) @@ -641,7 +641,7 @@ glabel pause_stats_draw_contents /* 139688 80246348 3C058025 */ lui $a1, %hi(D_8024F434) /* 13968C 8024634C 00B02821 */ addu $a1, $a1, $s0 /* 139690 80246350 8CA5F434 */ lw $a1, %lo(D_8024F434)($a1) -/* 139694 80246354 0C0511FF */ jal set_hud_element_script +/* 139694 80246354 0C0511FF */ jal set_hud_element_anim /* 139698 80246358 0220202D */ daddu $a0, $s1, $zero /* 13969C 8024635C 0220202D */ daddu $a0, $s1, $zero /* 1396A0 80246360 27C6004B */ addiu $a2, $fp, 0x4b @@ -672,7 +672,7 @@ glabel pause_stats_draw_contents /* 1396FC 802463BC 3C058025 */ lui $a1, %hi(D_8024F434) /* 139700 802463C0 00B02821 */ addu $a1, $a1, $s0 /* 139704 802463C4 8CA5F434 */ lw $a1, %lo(D_8024F434)($a1) -/* 139708 802463C8 0C0511FF */ jal set_hud_element_script +/* 139708 802463C8 0C0511FF */ jal set_hud_element_anim /* 13970C 802463CC 0220202D */ daddu $a0, $s1, $zero /* 139710 802463D0 0220202D */ daddu $a0, $s1, $zero /* 139714 802463D4 27C6004B */ addiu $a2, $fp, 0x4b @@ -703,7 +703,7 @@ glabel pause_stats_draw_contents /* 139770 80246430 3C058025 */ lui $a1, %hi(D_8024F434) /* 139774 80246434 00B02821 */ addu $a1, $a1, $s0 /* 139778 80246438 8CA5F434 */ lw $a1, %lo(D_8024F434)($a1) -/* 13977C 8024643C 0C0511FF */ jal set_hud_element_script +/* 13977C 8024643C 0C0511FF */ jal set_hud_element_anim /* 139780 80246440 0220202D */ daddu $a0, $s1, $zero /* 139784 80246444 0220202D */ daddu $a0, $s1, $zero /* 139788 80246448 27C6004B */ addiu $a2, $fp, 0x4b @@ -734,7 +734,7 @@ glabel pause_stats_draw_contents /* 1397E4 802464A4 3C058025 */ lui $a1, %hi(D_8024F434) /* 1397E8 802464A8 00B02821 */ addu $a1, $a1, $s0 /* 1397EC 802464AC 8CA5F434 */ lw $a1, %lo(D_8024F434)($a1) -/* 1397F0 802464B0 0C0511FF */ jal set_hud_element_script +/* 1397F0 802464B0 0C0511FF */ jal set_hud_element_anim /* 1397F4 802464B4 0220202D */ daddu $a0, $s1, $zero /* 1397F8 802464B8 0220202D */ daddu $a0, $s1, $zero /* 1397FC 802464BC 27C6004B */ addiu $a2, $fp, 0x4b @@ -765,7 +765,7 @@ glabel pause_stats_draw_contents /* 139858 80246518 3C058025 */ lui $a1, %hi(D_8024F434) /* 13985C 8024651C 00B02821 */ addu $a1, $a1, $s0 /* 139860 80246520 8CA5F434 */ lw $a1, %lo(D_8024F434)($a1) -/* 139864 80246524 0C0511FF */ jal set_hud_element_script +/* 139864 80246524 0C0511FF */ jal set_hud_element_anim /* 139868 80246528 0220202D */ daddu $a0, $s1, $zero /* 13986C 8024652C 0220202D */ daddu $a0, $s1, $zero /* 139870 80246530 27C6004B */ addiu $a2, $fp, 0x4b @@ -796,7 +796,7 @@ glabel pause_stats_draw_contents /* 1398CC 8024658C 3C058025 */ lui $a1, %hi(D_8024F434) /* 1398D0 80246590 00B02821 */ addu $a1, $a1, $s0 /* 1398D4 80246594 8CA5F434 */ lw $a1, %lo(D_8024F434)($a1) -/* 1398D8 80246598 0C0511FF */ jal set_hud_element_script +/* 1398D8 80246598 0C0511FF */ jal set_hud_element_anim /* 1398DC 8024659C 0220202D */ daddu $a0, $s1, $zero /* 1398E0 802465A0 0220202D */ daddu $a0, $s1, $zero /* 1398E4 802465A4 27C6004B */ addiu $a2, $fp, 0x4b @@ -827,7 +827,7 @@ glabel pause_stats_draw_contents /* 139940 80246600 3C058025 */ lui $a1, %hi(D_8024F434) /* 139944 80246604 00B02821 */ addu $a1, $a1, $s0 /* 139948 80246608 8CA5F434 */ lw $a1, %lo(D_8024F434)($a1) -/* 13994C 8024660C 0C0511FF */ jal set_hud_element_script +/* 13994C 8024660C 0C0511FF */ jal set_hud_element_anim /* 139950 80246610 0220202D */ daddu $a0, $s1, $zero /* 139954 80246614 0220202D */ daddu $a0, $s1, $zero /* 139958 80246618 27C6004B */ addiu $a2, $fp, 0x4b @@ -858,7 +858,7 @@ glabel pause_stats_draw_contents /* 1399B4 80246674 3C058025 */ lui $a1, %hi(D_8024F450) /* 1399B8 80246678 00B02821 */ addu $a1, $a1, $s0 /* 1399BC 8024667C 8CA5F450 */ lw $a1, %lo(D_8024F450)($a1) -/* 1399C0 80246680 0C0511FF */ jal set_hud_element_script +/* 1399C0 80246680 0C0511FF */ jal set_hud_element_anim /* 1399C4 80246684 0220202D */ daddu $a0, $s1, $zero /* 1399C8 80246688 0220202D */ daddu $a0, $s1, $zero /* 1399CC 8024668C 02158021 */ addu $s0, $s0, $s5 @@ -901,7 +901,7 @@ glabel pause_stats_draw_contents /* 139A50 80246710 26730001 */ addiu $s3, $s3, 1 /* 139A54 80246714 3C058011 */ lui $a1, %hi(D_801083B0) /* 139A58 80246718 24A583B0 */ addiu $a1, $a1, %lo(D_801083B0) -/* 139A5C 8024671C 0C0511FF */ jal set_hud_element_script +/* 139A5C 8024671C 0C0511FF */ jal set_hud_element_anim /* 139A60 80246720 0220202D */ daddu $a0, $s1, $zero /* 139A64 80246724 0220202D */ daddu $a0, $s1, $zero /* 139A68 80246728 27C6004B */ addiu $a2, $fp, 0x4b @@ -931,7 +931,7 @@ glabel pause_stats_draw_contents /* 139ABC 8024677C 02629821 */ addu $s3, $s3, $v0 /* 139AC0 80246780 3C058011 */ lui $a1, %hi(D_801083B0) /* 139AC4 80246784 24A583B0 */ addiu $a1, $a1, %lo(D_801083B0) -/* 139AC8 80246788 0C0511FF */ jal set_hud_element_script +/* 139AC8 80246788 0C0511FF */ jal set_hud_element_anim /* 139ACC 8024678C 0220202D */ daddu $a0, $s1, $zero /* 139AD0 80246790 0220202D */ daddu $a0, $s1, $zero /* 139AD4 80246794 27C6004B */ addiu $a2, $fp, 0x4b @@ -960,7 +960,7 @@ glabel pause_stats_draw_contents /* 139B24 802467E4 26730001 */ addiu $s3, $s3, 1 /* 139B28 802467E8 3C058011 */ lui $a1, %hi(D_801083B0) /* 139B2C 802467EC 24A583B0 */ addiu $a1, $a1, %lo(D_801083B0) -/* 139B30 802467F0 0C0511FF */ jal set_hud_element_script +/* 139B30 802467F0 0C0511FF */ jal set_hud_element_anim /* 139B34 802467F4 0220202D */ daddu $a0, $s1, $zero /* 139B38 802467F8 0220202D */ daddu $a0, $s1, $zero /* 139B3C 802467FC 27C6004B */ addiu $a2, $fp, 0x4b @@ -989,7 +989,7 @@ glabel pause_stats_draw_contents /* 139B8C 8024684C 26730001 */ addiu $s3, $s3, 1 /* 139B90 80246850 3C058011 */ lui $a1, %hi(D_801083B0) /* 139B94 80246854 24A583B0 */ addiu $a1, $a1, %lo(D_801083B0) -/* 139B98 80246858 0C0511FF */ jal set_hud_element_script +/* 139B98 80246858 0C0511FF */ jal set_hud_element_anim /* 139B9C 8024685C 0220202D */ daddu $a0, $s1, $zero /* 139BA0 80246860 0220202D */ daddu $a0, $s1, $zero /* 139BA4 80246864 27C6004B */ addiu $a2, $fp, 0x4b @@ -1018,7 +1018,7 @@ glabel pause_stats_draw_contents /* 139BF4 802468B4 26730001 */ addiu $s3, $s3, 1 /* 139BF8 802468B8 3C058011 */ lui $a1, %hi(D_801083B0) /* 139BFC 802468BC 24A583B0 */ addiu $a1, $a1, %lo(D_801083B0) -/* 139C00 802468C0 0C0511FF */ jal set_hud_element_script +/* 139C00 802468C0 0C0511FF */ jal set_hud_element_anim /* 139C04 802468C4 0220202D */ daddu $a0, $s1, $zero /* 139C08 802468C8 0220202D */ daddu $a0, $s1, $zero /* 139C0C 802468CC 27C6004B */ addiu $a2, $fp, 0x4b @@ -1047,7 +1047,7 @@ glabel pause_stats_draw_contents /* 139C5C 8024691C 26730001 */ addiu $s3, $s3, 1 /* 139C60 80246920 3C058011 */ lui $a1, %hi(D_801083B0) /* 139C64 80246924 24A583B0 */ addiu $a1, $a1, %lo(D_801083B0) -/* 139C68 80246928 0C0511FF */ jal set_hud_element_script +/* 139C68 80246928 0C0511FF */ jal set_hud_element_anim /* 139C6C 8024692C 0220202D */ daddu $a0, $s1, $zero /* 139C70 80246930 0220202D */ daddu $a0, $s1, $zero /* 139C74 80246934 27C6004B */ addiu $a2, $fp, 0x4b @@ -1076,7 +1076,7 @@ glabel pause_stats_draw_contents /* 139CC4 80246984 26730001 */ addiu $s3, $s3, 1 /* 139CC8 80246988 3C058011 */ lui $a1, %hi(D_801083B0) /* 139CCC 8024698C 24A583B0 */ addiu $a1, $a1, %lo(D_801083B0) -/* 139CD0 80246990 0C0511FF */ jal set_hud_element_script +/* 139CD0 80246990 0C0511FF */ jal set_hud_element_anim /* 139CD4 80246994 0220202D */ daddu $a0, $s1, $zero /* 139CD8 80246998 0220202D */ daddu $a0, $s1, $zero /* 139CDC 8024699C 27C6004B */ addiu $a2, $fp, 0x4b @@ -1105,7 +1105,7 @@ glabel pause_stats_draw_contents /* 139D2C 802469EC 26730001 */ addiu $s3, $s3, 1 /* 139D30 802469F0 3C058011 */ lui $a1, %hi(D_801084F0) /* 139D34 802469F4 24A584F0 */ addiu $a1, $a1, %lo(D_801084F0) -/* 139D38 802469F8 0C0511FF */ jal set_hud_element_script +/* 139D38 802469F8 0C0511FF */ jal set_hud_element_anim /* 139D3C 802469FC 0220202D */ daddu $a0, $s1, $zero /* 139D40 80246A00 0220202D */ daddu $a0, $s1, $zero /* 139D44 80246A04 8FA80084 */ lw $t0, 0x84($sp) 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 fb3222ec82..d5e2c61068 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 @@ -362,7 +362,7 @@ glabel pause_items_draw_contents /* 13D200 80249EC0 000210C0 */ sll $v0, $v0, 3 /* 13D204 80249EC4 004B1021 */ addu $v0, $v0, $t3 /* 13D208 80249EC8 8C450000 */ lw $a1, ($v0) -/* 13D20C 80249ECC 0C0511FF */ jal set_hud_element_script +/* 13D20C 80249ECC 0C0511FF */ jal set_hud_element_anim /* 13D210 80249ED0 0220202D */ daddu $a0, $s1, $zero /* 13D214 80249ED4 3C053F2B */ lui $a1, 0x3f2b /* 13D218 80249ED8 34A5BA99 */ ori $a1, $a1, 0xba99 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 ed4dcbc380..d89e9c6aad 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 @@ -177,7 +177,7 @@ glabel L80240938_AF8288 /* 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) -/* AF8298 80240948 0C0511FF */ jal set_hud_element_script +/* AF8298 80240948 0C0511FF */ jal set_hud_element_anim /* AF829C 8024094C 00000000 */ nop /* AF82A0 80240950 2402000B */ addiu $v0, $zero, 0xb /* AF82A4 80240954 3C018024 */ lui $at, %hi(dgb_08_npcGroup_80246528) 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 036efd59bd..42cf178ab0 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 @@ -36,7 +36,7 @@ glabel func_80240468_E161E8 /* E16264 802404E4 0C0513BF */ jal set_hud_element_tint /* E16268 802404E8 00A0382D */ daddu $a3, $a1, $zero /* E1626C 802404EC 0200202D */ daddu $a0, $s0, $zero -/* E16270 802404F0 0C0511FF */ jal set_hud_element_script +/* 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) 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 0be00e4fab..72a3d69815 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 @@ -191,7 +191,7 @@ glabel 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) -/* E16BEC 80240E6C 0C0511FF */ jal set_hud_element_script +/* E16BEC 80240E6C 0C0511FF */ jal set_hud_element_anim /* E16BF0 80240E70 00000000 */ nop /* E16BF4 80240E74 8EA4000C */ lw $a0, 0xc($s5) /* E16BF8 80240E78 0C0513AC */ jal set_hud_element_alpha @@ -404,7 +404,7 @@ glabel L80241048_E16DC8 /* E16F30 802411B0 8EA4000C */ lw $a0, 0xc($s5) /* E16F34 802411B4 3C058011 */ lui $a1, %hi(D_80108B80) /* E16F38 802411B8 24A58B80 */ addiu $a1, $a1, %lo(D_80108B80) -/* E16F3C 802411BC 0C0511FF */ jal set_hud_element_script +/* E16F3C 802411BC 0C0511FF */ jal set_hud_element_anim /* E16F40 802411C0 00000000 */ nop /* E16F44 802411C4 8EA4000C */ lw $a0, 0xc($s5) /* E16F48 802411C8 0C0513AC */ jal set_hud_element_alpha @@ -452,7 +452,7 @@ glabel L802411E8_E16F68 /* E16FE8 80241268 8EA4000C */ lw $a0, 0xc($s5) /* E16FEC 8024126C 3C058011 */ lui $a1, %hi(D_80108B28) /* E16FF0 80241270 24A58B28 */ addiu $a1, $a1, %lo(D_80108B28) -/* E16FF4 80241274 0C0511FF */ jal set_hud_element_script +/* E16FF4 80241274 0C0511FF */ jal set_hud_element_anim /* E16FF8 80241278 2694001C */ addiu $s4, $s4, 0x1c /* E16FFC 8024127C 8EA4000C */ lw $a0, 0xc($s5) /* E17000 80241280 0C0513AC */ jal set_hud_element_alpha 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 eb66a75f06..e041c13417 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 @@ -95,7 +95,7 @@ glabel func_80240A6C_BCF65C /* BCF7AC 80240BBC 8E24003C */ lw $a0, 0x3c($s1) /* BCF7B0 80240BC0 3C058011 */ lui $a1, %hi(D_80108C34) /* BCF7B4 80240BC4 24A58C34 */ addiu $a1, $a1, %lo(D_80108C34) -/* BCF7B8 80240BC8 0C0511FF */ jal set_hud_element_script +/* BCF7B8 80240BC8 0C0511FF */ jal set_hud_element_anim /* BCF7BC 80240BCC 00000000 */ nop /* BCF7C0 80240BD0 2402000B */ addiu $v0, $zero, 0xb /* BCF7C4 80240BD4 AE220030 */ sw $v0, 0x30($s1) diff --git a/ver/us/splat.yaml b/ver/us/splat.yaml index 135516daaa..ca3d0d20f3 100644 --- a/ver/us/splat.yaml +++ b/ver/us/splat.yaml @@ -698,7 +698,7 @@ segments: - [0xcd180, c, cd180_len_38f0] - [0xCEE40, c, CEE40] - [0xd0a70, c, d0a70_len_4fe0] - - [0xd5a50, c, d5a50_len_5fd0] + - [0xd5a50, c, hud_element] - [0xdba20, c, dba20_len_350] - [0xdbd70, c, dbd70_len_700] - [0xdc470, c, dc470_len_14c0] @@ -713,7 +713,7 @@ segments: - [0xE2980, .data, msg] - [0xE2CA0, data] - [0xE5510, .data, d0a70_len_4fe0] - - [0xE56C0, .data, d5a50_len_5fd0] + - [0xE56C0, .data, hud_element] - [0xE5820, .data, dc470_len_14c0] - [0xE5840, .data, dd930_len_1c0] - [0xE5850, .data, ddaf0_len_c50] diff --git a/ver/us/symbol_addrs.txt b/ver/us/symbol_addrs.txt index 4594d422d8..f3788af101 100644 --- a/ver/us/symbol_addrs.txt +++ b/ver/us/symbol_addrs.txt @@ -2348,8 +2348,8 @@ draw_hud_element = 0x80144298; // type:func rom:0xDA998 draw_hud_element_clipped = 0x801447A8; // type:func rom:0xDAEA8 draw_hud_element_2 = 0x801447C4; // type:func rom:0xDAEC4 draw_icon_2 = 0x801447E0; // type:func rom:0xDAEE0 -set_hud_element_script = 0x801447FC; // type:func rom:0xDAEFC -get_hud_element_script = 0x801448B0; // type:func rom:0xDAFB0 +set_hud_element_anim = 0x801447FC; // type:func rom:0xDAEFC +get_hud_element_anim = 0x801448B0; // type:func rom:0xDAFB0 get_hud_element = 0x801448D4; // type:func rom:0xDAFD4 free_hud_element = 0x801448F4; // type:func rom:0xDAFF4 set_hud_element_render_pos = 0x80144984; // type:func rom:0xDB084 @@ -2599,7 +2599,7 @@ D_8014EE98 = 0x8014EE98; // type:data rom:0xE5598 D_8014EF64 = 0x8014EF64; // type:data rom:0xE5664 D_8014EFC0 = 0x8014EFC0; // type:data rom:0xE56C0 D_8014EFC4 = 0x8014EFC4; // type:data rom:0xE56C4 -D_8014EFC8 = 0x8014EFC8; // type:data rom:0xE56C8 +hud_element_defaultAnim = 0x8014EFC8; // type:data rom:0xE56C8 D_8014EFCC = 0x8014EFCC; // type:data rom:0xE56CC D_8014F0C8 = 0x8014F0C8; // type:data rom:0xE57C8 D_8014F110 = 0x8014F110; // type:data rom:0xE5810 @@ -19027,7 +19027,7 @@ D_80156980 = 0x80156980; // type:data D_80156F20 = 0x80156F20; // type:data D_80156F60 = 0x80156F60; // type:data D_80157460 = 0x80157460; // type:data -gHudElementList = 0x80157960; // type:data +hudElements = 0x80157960; // type:data D_80157964 = 0x80157964; // type:data D_80157968 = 0x80157968; // type:data D_80157970 = 0x80157970; // type:data diff --git a/ver/us/undefined_syms_auto.txt b/ver/us/undefined_syms_auto.txt index 09d7a1eac9..0aa9c7d41d 100644 --- a/ver/us/undefined_syms_auto.txt +++ b/ver/us/undefined_syms_auto.txt @@ -190,7 +190,7 @@ D_80156980 = 0x80156980; D_80156F20 = 0x80156F20; D_80156F60 = 0x80156F60; D_80157460 = 0x80157460; -gHudElementList = 0x80157960; +hudElements = 0x80157960; D_80157964 = 0x80157964; D_80157968 = 0x80157968; D_80157970 = 0x80157970;