mirror of
https://github.com/pmret/papermario.git
synced 2024-11-08 12:02:30 +01:00
Fix a bunch of warnings (#388)
* git subrepo pull (merge) --force tools/splat subrepo: subdir: "tools/splat" merged: "5d7a6c0813" upstream: origin: "https://github.com/ethteck/splat.git" branch: "master" commit: "5d7a6c0813" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" * configure: add --no-warn * clean up hud_element.h * fix some warnings
This commit is contained in:
alex
GitHub
parent
9103d9b35a
commit
d0be37641b
@ -30,7 +30,7 @@ s32 get_area_flag(s32 index);
|
||||
|
||||
Shadow* get_shadow_by_index(s32 index);
|
||||
s32 get_time_freeze_mode(void);
|
||||
void render_player_model();
|
||||
void render_player_model(void);
|
||||
s16 get_game_mode(void);
|
||||
s32 is_picking_up_item(void);
|
||||
|
||||
@ -145,9 +145,9 @@ void get_dpad_input_radial(f32* angle, f32* magnitude);
|
||||
void transform_point(Matrix4f mtx, f32 inX, f32 inY, f32 inZ, f32 inS, f32* outX, f32* outY, f32* outZ, f32* outS);
|
||||
void try_player_footstep_sounds(s32 arg0);
|
||||
void phys_update_interact_collider(void);
|
||||
void phys_adjust_cam_on_landing();
|
||||
void phys_init_integrator_for_current_state();
|
||||
void phys_player_land();
|
||||
void phys_adjust_cam_on_landing(void);
|
||||
void phys_init_integrator_for_current_state(void);
|
||||
void phys_player_land(void);
|
||||
|
||||
void create_popup_menu(void*);
|
||||
s32 npc_test_move_simple_without_slipping(s32, f32*, f32*, f32*, f32, f32, f32, f32);
|
||||
@ -184,7 +184,6 @@ s32 sign(s32 value);
|
||||
s32 func_80055448(s32);
|
||||
s32 func_80055464(s32, s32);
|
||||
void func_800561A4(s32);
|
||||
s32 osGetId();
|
||||
|
||||
s32 battle_heap_create(void);
|
||||
void filemenu_init(s32);
|
||||
@ -286,8 +285,8 @@ void set_cam_viewport(s16 id, s16 x, s16 y, s16 width, s16 height);
|
||||
void disable_player_shadow(void);
|
||||
void move_player(s32 duration, f32 heading, f32 speed);
|
||||
s32 enable_player_input(void);
|
||||
s32 check_input_jump();
|
||||
s32 check_input_hammer();
|
||||
s32 check_input_jump(void);
|
||||
s32 check_input_hammer(void);
|
||||
|
||||
Npc* get_npc_safe(NpcID npcId);
|
||||
Npc* get_npc_unsafe(NpcID npcId);
|
||||
@ -364,7 +363,6 @@ void state_step_title_screen(void);
|
||||
void state_drawUI_title_screen(void);
|
||||
void state_init_enter_demo(void);
|
||||
void state_step_enter_world(void);
|
||||
void state_drawUI_enter_world(void);
|
||||
void state_init_change_map(void);
|
||||
void state_step_change_map(void);
|
||||
void state_drawUI_change_map(void);
|
||||
@ -450,7 +448,6 @@ s32* spr_get_npc_palettes(u16 arg0);
|
||||
void spr_draw_player_sprite(s32 arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4);
|
||||
void spr_draw_npc_sprite(s32 arg0, s32 arg1, s32 arg2, s32 arg3, Matrix4f* arg4);
|
||||
s32 spr_update_sprite(s32 arg0, s32 arg1, f32 arg2);
|
||||
s32 npc_raycast_down_ahead(s32, f32*, f32*, f32*, f32*, f32, f32);
|
||||
void sin_cos_rad(f32 rad, f32* outSinTheta, f32* outCosTheta);
|
||||
|
||||
|
||||
|
||||
@ -161,7 +161,7 @@ ApiStatus SwitchMessage(Evt* script, s32 isInitialCall);
|
||||
ApiStatus ShowChoice(Evt* script, s32 isInitialCall);
|
||||
ApiStatus CloseChoice(Evt* script, s32 isInitialCall);
|
||||
ApiStatus CancelMessage(Evt* script, s32 isInitialCall);
|
||||
ApiStatus CancelMessageAndBlock(); // ???
|
||||
ApiStatus CancelMessageAndBlock(void); // ???
|
||||
ApiStatus SetMessageImages(Evt* script, s32 isInitialCall);
|
||||
ApiStatus SetMessageString(Evt* script, s32 isInitialCall);
|
||||
ApiStatus SetMessageValue(Evt* script, s32 isInitialCall);
|
||||
|
||||
@ -10,7 +10,6 @@
|
||||
#define UNK_FUN_PTR(name) void(*name)(void)
|
||||
#define UNK_ARGS
|
||||
|
||||
typedef void (*UnkFunc)();
|
||||
typedef void (*StateFunc)(void);
|
||||
|
||||
/// Linker symbol address, as in `ld_addrs.h`.
|
||||
|
||||
@ -373,7 +373,6 @@ extern s32 D_80292020[];
|
||||
extern s32 D_80292048[];
|
||||
extern s32 D_80292070[];
|
||||
extern s32 D_80292098[];
|
||||
extern s32 D_80292098[];
|
||||
extern s32 D_802920C0[];
|
||||
extern s32 D_802920E8[];
|
||||
extern s32 D_80292110[];
|
||||
|
||||
@ -602,7 +602,7 @@ void func_802A5290(s32 arg0, s32 x, s32 y) {
|
||||
|
||||
set_hud_element_render_pos(iconIndex, xTemp, phi_s1_2);
|
||||
set_hud_element_alpha(iconIndex, D_802AD624);
|
||||
draw_icon_2(iconIndex);
|
||||
draw_hud_element_3(iconIndex);
|
||||
}
|
||||
|
||||
temp_s1_3 = (D_802AD605 - D_802AD608) * 13;
|
||||
|
||||
@ -4,7 +4,7 @@ PlayerStatus* gPlayerStatusPtr = &gPlayerStatus; // maybe wPlayerStatus
|
||||
|
||||
INCLUDE_ASM(s32, "759b0_len_61b0", npc_raycast_down);
|
||||
|
||||
INCLUDE_ASM(s32, "759b0_len_61b0", npc_raycast_down_ahead);
|
||||
INCLUDE_ASM(s32, "759b0_len_61b0", npc_raycast_down_ahead, s32, f32*, f32*, f32*, f32*, f32, f32);
|
||||
|
||||
INCLUDE_ASM(s32, "759b0_len_61b0", npc_raycast_down_sides, s32 arg0, f32* arg1, f32* arg2, f32* arg3, f32* arg4);
|
||||
|
||||
@ -147,4 +147,4 @@ s32 npc_test_move_simple_without_slipping(s32 ignoreFlags, f32* x, f32* y, f32*
|
||||
}
|
||||
|
||||
|
||||
INCLUDE_ASM(s32, "759b0_len_61b0", npc_test_move_complex_with_slipping);
|
||||
INCLUDE_ASM(s32, "759b0_len_61b0", npc_test_move_complex_with_slipping, s32, f32*, f32*, f32*, f32, f32, f32, f32);
|
||||
|
||||
@ -19,7 +19,7 @@ void func_800E5520(void) {
|
||||
D_8010C9B0 = 0;
|
||||
}
|
||||
|
||||
INCLUDE_ASM(void, "7bb60_len_41b0", phys_adjust_cam_on_landing);
|
||||
INCLUDE_ASM(void, "7bb60_len_41b0", phys_adjust_cam_on_landing, void);
|
||||
|
||||
void phys_clear_spin_history(void) {
|
||||
s32 i;
|
||||
@ -211,7 +211,7 @@ s32 check_input_hammer(void) {
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
INCLUDE_ASM(s32, "7bb60_len_41b0", check_input_jump);
|
||||
INCLUDE_ASM(s32, "7bb60_len_41b0", check_input_jump, void);
|
||||
|
||||
void check_input_spin(void) {
|
||||
PlayerStatus* playerStatus = &gPlayerStatus;
|
||||
|
||||
@ -102,7 +102,7 @@ void phys_init_integrator_for_current_state(void) {
|
||||
}
|
||||
}
|
||||
#else
|
||||
INCLUDE_ASM(void, "7bb60_len_41b0", phys_init_integrator_for_current_state);
|
||||
INCLUDE_ASM(void, "7bb60_len_41b0", phys_init_integrator_for_current_state, void);
|
||||
#endif // NON_MATCHING
|
||||
|
||||
// This function is wack. This weird stuff is needed to match
|
||||
@ -184,7 +184,7 @@ void func_800E315C(s32 colliderID) {
|
||||
INCLUDE_ASM(s32, "7bb60_len_41b0", func_800E315C);
|
||||
#endif
|
||||
|
||||
INCLUDE_ASM(void, "7bb60_len_41b0", phys_player_land);
|
||||
INCLUDE_ASM(void, "7bb60_len_41b0", phys_player_land, void);
|
||||
|
||||
f32 integrate_gravity(void) {
|
||||
PlayerStatus* playerStatus = &gPlayerStatus;
|
||||
|
||||
@ -80,13 +80,13 @@ void N(func_802A123C_72C7EC)(void) {
|
||||
var = (D_802A25EC / 100) - 0x68;
|
||||
ptr++;
|
||||
set_hud_element_render_pos(var2, 0x7C, (i * 0x1A) - var);
|
||||
draw_icon_2(var2);
|
||||
draw_hud_element_3(var2);
|
||||
}
|
||||
|
||||
var2 = D_802A25C8;
|
||||
var = (D_802A25EC / 100) - 0x68;
|
||||
set_hud_element_render_pos(var2, 0x7C, (i * 0x1A) - var);
|
||||
draw_icon_2(var2);
|
||||
draw_hud_element_3(var2);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -81,13 +81,13 @@ ApiStatus N(func_802A123C_73153C)(Evt* script, s32 isInitialCall) {
|
||||
var = (D_802A2DD8 / 100) - 0x68;
|
||||
ptr++;
|
||||
set_hud_element_render_pos(var2, 0x7C, (i * 0x1A) - var);
|
||||
draw_icon_2(var2);
|
||||
draw_hud_element_3(var2);
|
||||
}
|
||||
|
||||
var2 = D_802A2DF4;
|
||||
var = (D_802A2DD8 / 100) - 0x68;
|
||||
set_hud_element_render_pos(var2, 0x7C, (i * 0x1A) - var);
|
||||
draw_icon_2(var2);
|
||||
draw_hud_element_3(var2);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -143,6 +143,7 @@ ApiStatus CancelMessage(Evt* script, s32 isInitialCall) {
|
||||
return ApiStatus_DONE2;
|
||||
}
|
||||
|
||||
// XXX: possibly not an api function and should be renamed accordingly
|
||||
ApiStatus CancelMessageAndBlock(void) {
|
||||
cancel_message(gCurrentPrintContext);
|
||||
return ApiStatus_BLOCK;
|
||||
|
||||
@ -43,11 +43,21 @@ extern void* D_80157964;
|
||||
extern void* D_80158570;
|
||||
extern void* D_80151314;
|
||||
|
||||
INCLUDE_ASM(s32, "hud_element", load_hud_element);
|
||||
INCLUDE_ASM(void, "hud_element", load_hud_element, HudElement* hudElement, const HudElementAnim* anim);
|
||||
|
||||
INCLUDE_ASM(s32, "hud_element", draw_rect_hud_element);
|
||||
INCLUDE_ASM(void, "hud_element", draw_rect_hud_element,
|
||||
HudElement* hudElement,
|
||||
s32 texSizeX,
|
||||
s32 texSizeY,
|
||||
s32 drawSizeX,
|
||||
s32 drawSizeY,
|
||||
s32 offsetX,
|
||||
s32 offsetY,
|
||||
s32 clamp,
|
||||
s32 dropShadow
|
||||
)
|
||||
|
||||
INCLUDE_ASM(s32, "hud_element", clear_hud_element_cache);
|
||||
INCLUDE_ASM(void, "hud_element", clear_hud_element_cache, void);
|
||||
|
||||
void init_hud_element_list(void) {
|
||||
if (!gGameStatusPtr->isBattle) {
|
||||
@ -132,17 +142,17 @@ s32 create_hud_element(const HudElementAnim* anim) {
|
||||
INCLUDE_ASM(s32, "hud_element", create_hud_element, const HudElementAnim* anim);
|
||||
#endif
|
||||
|
||||
INCLUDE_ASM(s32, "hud_element", update_hud_elements);
|
||||
INCLUDE_ASM(void, "hud_element", update_hud_elements, void);
|
||||
|
||||
INCLUDE_ASM(s32, "hud_element", hud_element_update);
|
||||
INCLUDE_ASM(s32, "hud_element", hud_element_update, HudElement* hudElement);
|
||||
|
||||
INCLUDE_ASM(s32, "hud_element", render_hud_elements_backUI);
|
||||
INCLUDE_ASM(void, "hud_element", render_hud_elements_backUI, void);
|
||||
|
||||
INCLUDE_ASM(s32, "hud_element", render_hud_elements_frontUI);
|
||||
INCLUDE_ASM(void, "hud_element", render_hud_elements_frontUI, void);
|
||||
|
||||
INCLUDE_ASM(s32, "hud_element", render_hud_element);
|
||||
INCLUDE_ASM(void, "hud_element", render_hud_element, HudElement* hudElement);
|
||||
|
||||
INCLUDE_ASM(s32, "hud_element", render_hud_elements_world);
|
||||
INCLUDE_ASM(void, "hud_element", render_hud_elements_world, void);
|
||||
|
||||
INCLUDE_ASM(void, "hud_element", func_80143C48, s32 arg0, s32 arg1, s32 arg2);
|
||||
|
||||
@ -162,7 +172,7 @@ void func_80144278(s32 arg0) {
|
||||
func_80143C48(arg0, 0, 1);
|
||||
}
|
||||
|
||||
INCLUDE_ASM(s32, "hud_element", draw_hud_element);
|
||||
INCLUDE_ASM(void, "hud_element", draw_hud_element, s32 id, s32 clipMode);
|
||||
|
||||
void draw_hud_element_clipped(s32 id) {
|
||||
draw_hud_element(id, 0);
|
||||
@ -172,7 +182,7 @@ void draw_hud_element_2(s32 id) {
|
||||
draw_hud_element(id, 1);
|
||||
}
|
||||
|
||||
void draw_icon_2(s32 id) {
|
||||
void draw_hud_element_3(s32 id) {
|
||||
draw_hud_element(id, 2);
|
||||
}
|
||||
|
||||
@ -233,7 +243,7 @@ void get_hud_element_render_pos(s32 id, s32* x, s32* y) {
|
||||
*y = hudElement->renderPosY;
|
||||
}
|
||||
|
||||
INCLUDE_ASM(s32, "hud_element", set_hud_element_render_depth);
|
||||
INCLUDE_ASM(void, "hud_element", set_hud_element_render_depth, s32 id, s32 z);
|
||||
|
||||
void set_hud_element_flags(s32 id, s32 flags) {
|
||||
hudElements[id & ~0x800]->flags |= flags;
|
||||
@ -243,7 +253,7 @@ 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", ALT_clear_hud_element_cache, void);
|
||||
|
||||
INCLUDE_ASM(void, "hud_element", set_hud_element_scale, s32 index, f32 scale);
|
||||
|
||||
@ -287,11 +297,11 @@ void set_hud_element_tint(s32 id, s32 r, s32 g, s32 b) {
|
||||
hudElement->tint.b = b;
|
||||
}
|
||||
|
||||
INCLUDE_ASM(s32, "hud_element", create_hud_element_transform_A);
|
||||
INCLUDE_ASM(void, "hud_element", create_hud_element_transform_A, s32 id);
|
||||
|
||||
INCLUDE_ASM(s32, "hud_element", create_hud_element_transform_B);
|
||||
INCLUDE_ASM(void, "hud_element", create_hud_element_transform_B, s32 id);
|
||||
|
||||
INCLUDE_ASM(s32, "hud_element", create_hud_element_transform_C);
|
||||
INCLUDE_ASM(void, "hud_element", create_hud_element_transform_C, s32 id);
|
||||
|
||||
void free_hud_element_transform(s32 id) {
|
||||
HudElement* hudElement = hudElements[id & ~0x800];
|
||||
@ -306,14 +316,14 @@ void free_hud_element_transform(s32 id) {
|
||||
hudElement->flags &= ~0x40030000;
|
||||
}
|
||||
|
||||
INCLUDE_ASM(s32, "hud_element", set_hud_element_transform_pos);
|
||||
INCLUDE_ASM(void, "hud_element", set_hud_element_transform_pos, s32 id, f32 x, f32 y, f32 z);
|
||||
|
||||
INCLUDE_ASM(s32, "hud_element", set_hud_element_transform_scale);
|
||||
INCLUDE_ASM(void, "hud_element", set_hud_element_transform_scale, s32 id, f32 x, f32 y, f32 z);
|
||||
|
||||
INCLUDE_ASM(s32, "hud_element", set_hud_element_transform_rotation);
|
||||
INCLUDE_ASM(void, "hud_element", set_hud_element_transform_rotation, s32 id, f32 x, f32 y, f32 z);
|
||||
|
||||
INCLUDE_ASM(s32, "hud_element", set_hud_element_transform_rotation_pivot);
|
||||
INCLUDE_ASM(void, "hud_element", set_hud_element_transform_rotation_pivot, s32 id, s32 dx, s32 dy);
|
||||
|
||||
INCLUDE_ASM(s32, "hud_element", copy_world_hud_element_ref_to_battle);
|
||||
INCLUDE_ASM(void, "hud_element", copy_world_hud_element_ref_to_battle, s32 worldID, s32 battleID);
|
||||
|
||||
INCLUDE_ASM(s32, "hud_element", set_hud_element_nonworld_cache);
|
||||
INCLUDE_ASM(void, "hud_element", set_hud_element_nonworld_cache, void* base, size_t size);
|
||||
|
||||
@ -123,53 +123,106 @@ typedef struct HudElement {
|
||||
#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 load_hud_element(HudElement* hudElement, const HudElementAnim* anim);
|
||||
|
||||
/// @param clamp 0 = repeat; 1 = clamp
|
||||
/// @param dropShadow Whether to render a drop shadow or not
|
||||
void draw_rect_hud_element(
|
||||
HudElement* hudElement,
|
||||
s32 texSizeX,
|
||||
s32 texSizeY,
|
||||
s32 drawSizeX,
|
||||
s32 drawSizeY,
|
||||
s32 offsetX,
|
||||
s32 offsetY,
|
||||
s32 clamp,
|
||||
s32 dropShadow
|
||||
);
|
||||
|
||||
void clear_hud_element_cache(void);
|
||||
|
||||
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 update_hud_elements(void);
|
||||
|
||||
/// @returns 0 if frame is completed
|
||||
s32 hud_element_update(HudElement* hudElement);
|
||||
|
||||
void render_hud_elements_backUI(void);
|
||||
|
||||
void render_hud_elements_frontUI(void);
|
||||
|
||||
void render_hud_element(HudElement* hudElement);
|
||||
|
||||
void render_hud_elements_world(void);
|
||||
|
||||
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(s32 id, s32 clipMode);
|
||||
void draw_hud_element_clipped(s32 id);
|
||||
void draw_hud_element_2(s32 id);
|
||||
void draw_icon_2(s32 id);
|
||||
void draw_hud_element_3(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 set_hud_element_render_pos(s32 id, s32 x, s32 y);
|
||||
|
||||
void get_hud_element_render_pos(s32 id, s32* x, s32* y);
|
||||
s32 set_hud_element_render_depth();
|
||||
|
||||
void set_hud_element_render_depth(s32 id, s32 z);
|
||||
|
||||
/// Turns on the given flags.
|
||||
void set_hud_element_flags(s32 id, s32 flags);
|
||||
|
||||
/// Turns off the given flags.
|
||||
void clear_hud_element_flags(s32 id, s32 flags);
|
||||
s32 ALT_clear_hud_element_cache();
|
||||
|
||||
/// @see clear_hud_element_cache
|
||||
void ALT_clear_hud_element_cache(void);
|
||||
|
||||
void set_hud_element_scale(s32 index, f32 scale);
|
||||
void set_hud_element_size(s32 arg0, s8 arg1);
|
||||
|
||||
void set_hud_element_size(s32 id, s8 size);
|
||||
|
||||
s32 func_80144E4C();
|
||||
|
||||
void func_80144E74(s32 id, s32 arg1);
|
||||
|
||||
/// @param opacity 0 = invisible; 255 = opaque
|
||||
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();
|
||||
|
||||
void set_hud_element_tint(s32 id, s32 r, s32 g, s32 b);
|
||||
|
||||
void create_hud_element_transform_A(s32 id);
|
||||
|
||||
void create_hud_element_transform_B(s32 id);
|
||||
|
||||
void create_hud_element_transform_C(s32 id);
|
||||
|
||||
void free_hud_element_transform(s32 id);
|
||||
|
||||
void set_hud_element_transform_pos(s32 id, f32 x, f32 y, f32 z);
|
||||
|
||||
void set_hud_element_transform_scale(s32 id, f32 x, f32 y, f32 z);
|
||||
|
||||
void set_hud_element_transform_rotation(s32 id, f32 x, f32 y, f32 z);
|
||||
|
||||
void set_hud_element_transform_rotation_pivot(s32 id, s32 dx, s32 dy);
|
||||
|
||||
void copy_world_hud_element_ref_to_battle(s32 worldID, s32 battleID);
|
||||
|
||||
void set_hud_element_nonworld_cache(void* base, size_t size);
|
||||
|
||||
#endif
|
||||
|
||||
@ -129,7 +129,7 @@ void pause_update_cursor(s32 arg0, s32 offsetX, s32 offsetY) {
|
||||
}
|
||||
set_hud_element_alpha(gPauseMenuCommonIconIDs[0], opacity);
|
||||
set_hud_element_render_pos(gPauseMenuCommonIconIDs[0], offsetX + gPauseMenuCursorPosX, offsetY + gPauseMenuCursorPosY);
|
||||
draw_icon_2(gPauseMenuCommonIconIDs[0]);
|
||||
draw_hud_element_3(gPauseMenuCommonIconIDs[0]);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -55,7 +55,7 @@ def write_ninja_rules(ninja: ninja_syntax.Writer, cpp: str, cppflags: str, extra
|
||||
CPPFLAGS = "-w -Iver/$version/build/include -Iinclude -Isrc -Iassets/$version -D_LANGUAGE_C -D_FINALROM -DVERSION=$version " \
|
||||
"-ffreestanding -DF3DEX_GBI_2 -D_MIPS_SZLONG=32"
|
||||
|
||||
cflags = f"-c -G0 -O2 -fno-common -Wuninitialized -Wmissing-braces -Wimplicit -Wredundant-decls -Wstrict-prototypes -B {BUILD_TOOLS}/cc/gcc/ {extra_cflags}"
|
||||
cflags = f"-c -G0 -O2 -fno-common -B {BUILD_TOOLS}/cc/gcc/ {extra_cflags}"
|
||||
|
||||
ninja.variable("python", sys.executable)
|
||||
|
||||
@ -629,12 +629,13 @@ if __name__ == "__main__":
|
||||
parser = ArgumentParser(description="Paper Mario build.ninja generator")
|
||||
parser.add_argument("version", nargs="*", default=[], help="Version(s) to configure for. Most tools will operate on the first-provided only. Supported versions: " + ','.join(VERSIONS))
|
||||
parser.add_argument("--cpp", help="GNU C preprocessor command")
|
||||
parser.add_argument("--clean", action="store_true", help="Delete assets and previously-built files")
|
||||
parser.add_argument("-c", "--clean", action="store_true", help="Delete assets and previously-built files")
|
||||
parser.add_argument("--splat", default="tools/splat", help="Path to splat tool to use")
|
||||
parser.add_argument("--split-code", action="store_true", help="Re-split code segments to asm files")
|
||||
parser.add_argument("--no-split-assets", action="store_true", help="Don't split assets from the baserom(s)")
|
||||
parser.add_argument("-d", "--debug", action="store_true", help="Generate debugging information")
|
||||
parser.add_argument("-n", "--non-matching", action="store_true", help="Compile nonmatching code. Combine with --debug for more detailed debug info")
|
||||
parser.add_argument("-w", "--no-warn", action="store_true", help="Inhibit compiler warnings")
|
||||
args = parser.parse_args()
|
||||
|
||||
exec_shell(["make", "-C", str(ROOT / args.splat)])
|
||||
@ -694,6 +695,9 @@ if __name__ == "__main__":
|
||||
# g1 doesn't affect codegen
|
||||
cflags += " -g1"
|
||||
|
||||
if not args.no_warn:
|
||||
cflags += "-Wuninitialized -Wmissing-braces -Wimplicit -Wredundant-decls -Wstrict-prototypes"
|
||||
|
||||
# add splat to python import path
|
||||
sys.path.append(str((ROOT / args.splat).resolve()))
|
||||
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
[subrepo]
|
||||
remote = https://github.com/ethteck/splat.git
|
||||
branch = master
|
||||
commit = 09a5715405e8eaedad8923b9b7ae80d73d4e7c41
|
||||
parent = 5d055900eb9f590595b5628e665f419b8bde8508
|
||||
commit = 5d7a6c0813c5045876718d0c61a153e90bf16d2b
|
||||
parent = 015151cbfbe09820d5f71aeae7a255ede7cbe4c6
|
||||
method = merge
|
||||
cmdver = 0.4.3
|
||||
|
||||
@ -184,7 +184,9 @@ class LinkerWriter():
|
||||
value = f"0x{value:X}"
|
||||
|
||||
self._writeln(f"{symbol} = {value};")
|
||||
self.symbols.append(symbol)
|
||||
|
||||
if symbol not in self.symbols:
|
||||
self.symbols.append(symbol)
|
||||
|
||||
def _begin_segment(self, segment: Segment, mid_segment=False):
|
||||
# force location if not shiftable/auto
|
||||
|
||||
@ -30,7 +30,7 @@ glabel filemenu_draw_cursor
|
||||
/* 1648F0 80244090 0C051261 */ jal set_hud_element_render_pos
|
||||
/* 1648F4 80244094 02463021 */ addu $a2, $s2, $a2
|
||||
/* 1648F8 80244098 8E040000 */ lw $a0, ($s0)
|
||||
/* 1648FC 8024409C 0C0511F8 */ jal draw_icon_2
|
||||
/* 1648FC 8024409C 0C0511F8 */ jal draw_hud_element_3
|
||||
/* 164900 802440A0 00000000 */ nop
|
||||
.L802440A4:
|
||||
/* 164904 802440A4 8FBF001C */ lw $ra, 0x1c($sp)
|
||||
|
||||
@ -271,7 +271,7 @@ glabel filemenu_draw_contents_file_info
|
||||
/* 165C40 802453E0 2506002C */ addiu $a2, $t0, 0x2c
|
||||
/* 165C44 802453E4 16800005 */ bnez $s4, .L802453FC
|
||||
/* 165C48 802453E8 00000000 */ nop
|
||||
/* 165C4C 802453EC 0C0511F8 */ jal draw_icon_2
|
||||
/* 165C4C 802453EC 0C0511F8 */ jal draw_hud_element_3
|
||||
/* 165C50 802453F0 0200202D */ daddu $a0, $s0, $zero
|
||||
/* 165C54 802453F4 08091502 */ j .L80245408
|
||||
/* 165C58 802453F8 26F70010 */ addiu $s7, $s7, 0x10
|
||||
|
||||
@ -26,7 +26,7 @@ glabel filemenu_draw_contents_mono
|
||||
/* 165610 80244DB0 24C6000A */ addiu $a2, $a2, 0xa
|
||||
/* 165614 80244DB4 8E040044 */ lw $a0, 0x44($s0)
|
||||
.L80244DB8:
|
||||
/* 165618 80244DB8 0C0511F8 */ jal draw_icon_2
|
||||
/* 165618 80244DB8 0C0511F8 */ jal draw_hud_element_3
|
||||
/* 16561C 80244DBC 00000000 */ nop
|
||||
/* 165620 80244DC0 8FBF0014 */ lw $ra, 0x14($sp)
|
||||
/* 165624 80244DC4 8FB00010 */ lw $s0, 0x10($sp)
|
||||
|
||||
@ -27,7 +27,7 @@ glabel filemenu_draw_contents_stereo
|
||||
/* 1655A0 80244D40 24C6000A */ addiu $a2, $a2, 0xa
|
||||
/* 1655A4 80244D44 8E04004C */ lw $a0, 0x4c($s0)
|
||||
.L80244D48:
|
||||
/* 1655A8 80244D48 0C0511F8 */ jal draw_icon_2
|
||||
/* 1655A8 80244D48 0C0511F8 */ jal draw_hud_element_3
|
||||
/* 1655AC 80244D4C 00000000 */ nop
|
||||
/* 1655B0 80244D50 8FBF0014 */ lw $ra, 0x14($sp)
|
||||
/* 1655B4 80244D54 8FB00010 */ lw $s0, 0x10($sp)
|
||||
|
||||
@ -219,7 +219,7 @@ glabel filemenu_draw_contents_choose_name
|
||||
/* 168EA4 80248644 24C60008 */ addiu $a2, $a2, 8
|
||||
/* 168EA8 80248648 3C048025 */ lui $a0, %hi(D_8024C108)
|
||||
/* 168EAC 8024864C 8C84C108 */ lw $a0, %lo(D_8024C108)($a0)
|
||||
/* 168EB0 80248650 0C0511F8 */ jal draw_icon_2
|
||||
/* 168EB0 80248650 0C0511F8 */ jal draw_hud_element_3
|
||||
/* 168EB4 80248654 00000000 */ nop
|
||||
/* 168EB8 80248658 0000182D */ daddu $v1, $zero, $zero
|
||||
/* 168EBC 8024865C 8FAA0050 */ lw $t2, 0x50($sp)
|
||||
@ -411,7 +411,7 @@ glabel filemenu_draw_contents_choose_name
|
||||
/* 169168 80248908 24C60008 */ addiu $a2, $a2, 8
|
||||
/* 16916C 8024890C 3C048025 */ lui $a0, %hi(D_8024C108)
|
||||
/* 169170 80248910 8C84C108 */ lw $a0, %lo(D_8024C108)($a0)
|
||||
/* 169174 80248914 0C0511F8 */ jal draw_icon_2
|
||||
/* 169174 80248914 0C0511F8 */ jal draw_hud_element_3
|
||||
/* 169178 80248918 00000000 */ nop
|
||||
/* 16917C 8024891C 0000182D */ daddu $v1, $zero, $zero
|
||||
/* 169180 80248920 8FA9004C */ lw $t1, 0x4c($sp)
|
||||
|
||||
@ -46,7 +46,7 @@ glabel filemenu_draw_contents_file_create_header
|
||||
/* 168AB8 80248258 16000006 */ bnez $s0, .L80248274
|
||||
/* 168ABC 8024825C 00000000 */ nop
|
||||
/* 168AC0 80248260 8E440004 */ lw $a0, 4($s2)
|
||||
/* 168AC4 80248264 0C0511F8 */ jal draw_icon_2
|
||||
/* 168AC4 80248264 0C0511F8 */ jal draw_hud_element_3
|
||||
/* 168AC8 80248268 2631000B */ addiu $s1, $s1, 0xb
|
||||
/* 168ACC 8024826C 080920A1 */ j .L80248284
|
||||
/* 168AD0 80248270 26100001 */ addiu $s0, $s0, 1
|
||||
|
||||
@ -334,7 +334,7 @@ glabel L802A3D00_418A90
|
||||
/* 418EE0 802A4150 84A5D116 */ lh $a1, %lo(battle_menu_moveTextOpacity)($a1)
|
||||
/* 418EE4 802A4154 0C0513AC */ jal set_hud_element_alpha
|
||||
/* 418EE8 802A4158 0200202D */ daddu $a0, $s0, $zero
|
||||
/* 418EEC 802A415C 0C0511F8 */ jal draw_icon_2
|
||||
/* 418EEC 802A415C 0C0511F8 */ jal draw_hud_element_3
|
||||
/* 418EF0 802A4160 0200202D */ daddu $a0, $s0, $zero
|
||||
/* 418EF4 802A4164 2631000D */ addiu $s1, $s1, 0xd
|
||||
.L802A4168:
|
||||
@ -384,7 +384,7 @@ glabel L802A3D00_418A90
|
||||
/* 418F98 802A4208 84A5D116 */ lh $a1, %lo(battle_menu_moveTextOpacity)($a1)
|
||||
/* 418F9C 802A420C 0C0513AC */ jal set_hud_element_alpha
|
||||
/* 418FA0 802A4210 0200202D */ daddu $a0, $s0, $zero
|
||||
/* 418FA4 802A4214 0C0511F8 */ jal draw_icon_2
|
||||
/* 418FA4 802A4214 0C0511F8 */ jal draw_hud_element_3
|
||||
/* 418FA8 802A4218 0200202D */ daddu $a0, $s0, $zero
|
||||
.L802A421C:
|
||||
/* 418FAC 802A421C 26730001 */ addiu $s3, $s3, 1
|
||||
@ -435,7 +435,7 @@ glabel L802A3D00_418A90
|
||||
/* 419058 802A42C8 86250000 */ lh $a1, ($s1)
|
||||
/* 41905C 802A42CC 0C0513AC */ jal set_hud_element_alpha
|
||||
/* 419060 802A42D0 0200202D */ daddu $a0, $s0, $zero
|
||||
/* 419064 802A42D4 0C0511F8 */ jal draw_icon_2
|
||||
/* 419064 802A42D4 0C0511F8 */ jal draw_hud_element_3
|
||||
/* 419068 802A42D8 0200202D */ daddu $a0, $s0, $zero
|
||||
/* 41906C 802A42DC 3C02802B */ lui $v0, %hi(battle_menu_moveScrollLine)
|
||||
/* 419070 802A42E0 8042D10C */ lb $v0, %lo(battle_menu_moveScrollLine)($v0)
|
||||
|
||||
@ -204,7 +204,7 @@ glabel L802A52F8_41A088
|
||||
/* 41A304 802A5574 8CA5D624 */ lw $a1, %lo(D_802AD624)($a1)
|
||||
/* 41A308 802A5578 0C0513AC */ jal set_hud_element_alpha
|
||||
/* 41A30C 802A557C 0200202D */ daddu $a0, $s0, $zero
|
||||
/* 41A310 802A5580 0C0511F8 */ jal draw_icon_2
|
||||
/* 41A310 802A5580 0C0511F8 */ jal draw_hud_element_3
|
||||
/* 41A314 802A5584 0200202D */ daddu $a0, $s0, $zero
|
||||
/* 41A318 802A5588 3C02802B */ lui $v0, %hi(D_802AD66C)
|
||||
/* 41A31C 802A558C 8C42D66C */ lw $v0, %lo(D_802AD66C)($v0)
|
||||
|
||||
@ -284,7 +284,7 @@ glabel L800F3918_8CDC8
|
||||
/* 8CF08 800F3A58 0062182A */ slt $v1, $v1, $v0
|
||||
/* 8CF0C 800F3A5C 10600003 */ beqz $v1, .L800F3A6C
|
||||
/* 8CF10 800F3A60 00000000 */ nop
|
||||
/* 8CF14 800F3A64 0C0511F8 */ jal draw_icon_2
|
||||
/* 8CF14 800F3A64 0C0511F8 */ jal draw_hud_element_3
|
||||
/* 8CF18 800F3A68 0200202D */ daddu $a0, $s0, $zero
|
||||
.L800F3A6C:
|
||||
/* 8CF1C 800F3A6C 8FAB005C */ lw $t3, 0x5c($sp)
|
||||
@ -725,7 +725,7 @@ glabel L800F4000_8D4B0
|
||||
/* 8D550 800F40A0 34A56666 */ ori $a1, $a1, 0x6666
|
||||
/* 8D554 800F40A4 0C051308 */ jal set_hud_element_scale
|
||||
/* 8D558 800F40A8 0200202D */ daddu $a0, $s0, $zero
|
||||
/* 8D55C 800F40AC 0C0511F8 */ jal draw_icon_2
|
||||
/* 8D55C 800F40AC 0C0511F8 */ jal draw_hud_element_3
|
||||
/* 8D560 800F40B0 0200202D */ daddu $a0, $s0, $zero
|
||||
/* 8D564 800F40B4 16400003 */ bnez $s2, .L800F40C4
|
||||
/* 8D568 800F40B8 00000000 */ nop
|
||||
@ -788,7 +788,7 @@ glabel L800F40E8_8D598
|
||||
/* 8D638 800F4188 34A56666 */ ori $a1, $a1, 0x6666
|
||||
/* 8D63C 800F418C 0C051308 */ jal set_hud_element_scale
|
||||
/* 8D640 800F4190 0200202D */ daddu $a0, $s0, $zero
|
||||
/* 8D644 800F4194 0C0511F8 */ jal draw_icon_2
|
||||
/* 8D644 800F4194 0C0511F8 */ jal draw_hud_element_3
|
||||
/* 8D648 800F4198 0200202D */ daddu $a0, $s0, $zero
|
||||
/* 8D64C 800F419C 16400003 */ bnez $s2, .L800F41AC
|
||||
/* 8D650 800F41A0 00000000 */ nop
|
||||
@ -851,7 +851,7 @@ glabel L800F41D0_8D680
|
||||
/* 8D720 800F4270 34A56666 */ ori $a1, $a1, 0x6666
|
||||
/* 8D724 800F4274 0C051308 */ jal set_hud_element_scale
|
||||
/* 8D728 800F4278 0200202D */ daddu $a0, $s0, $zero
|
||||
/* 8D72C 800F427C 0C0511F8 */ jal draw_icon_2
|
||||
/* 8D72C 800F427C 0C0511F8 */ jal draw_hud_element_3
|
||||
/* 8D730 800F4280 0200202D */ daddu $a0, $s0, $zero
|
||||
/* 8D734 800F4284 16400003 */ bnez $s2, .L800F4294
|
||||
/* 8D738 800F4288 00000000 */ nop
|
||||
@ -901,7 +901,7 @@ glabel L800F41D0_8D680
|
||||
/* 8D7D8 800F4328 8CA5D650 */ lw $a1, %lo(D_8010D650)($a1)
|
||||
/* 8D7DC 800F432C 0C0513AC */ jal set_hud_element_alpha
|
||||
/* 8D7E0 800F4330 0200202D */ daddu $a0, $s0, $zero
|
||||
/* 8D7E4 800F4334 0C0511F8 */ jal draw_icon_2
|
||||
/* 8D7E4 800F4334 0C0511F8 */ jal draw_hud_element_3
|
||||
/* 8D7E8 800F4338 0200202D */ daddu $a0, $s0, $zero
|
||||
/* 8D7EC 800F433C 8FAB005C */ lw $t3, 0x5c($sp)
|
||||
/* 8D7F0 800F4340 8FAA0060 */ lw $t2, 0x60($sp)
|
||||
@ -1067,7 +1067,7 @@ glabel L800F453C_8D9EC
|
||||
/* 8DA34 800F4584 8CA5D650 */ lw $a1, %lo(D_8010D650)($a1)
|
||||
/* 8DA38 800F4588 0C0513AC */ jal set_hud_element_alpha
|
||||
/* 8DA3C 800F458C 0200202D */ daddu $a0, $s0, $zero
|
||||
/* 8DA40 800F4590 0C0511F8 */ jal draw_icon_2
|
||||
/* 8DA40 800F4590 0C0511F8 */ jal draw_hud_element_3
|
||||
/* 8DA44 800F4594 0200202D */ daddu $a0, $s0, $zero
|
||||
.L800F4598:
|
||||
/* 8DA48 800F4598 3C028011 */ lui $v0, %hi(D_8010D69C)
|
||||
@ -1100,7 +1100,7 @@ glabel L800F453C_8D9EC
|
||||
/* 8DAB4 800F4604 8CA5D650 */ lw $a1, %lo(D_8010D650)($a1)
|
||||
/* 8DAB8 800F4608 0C0513AC */ jal set_hud_element_alpha
|
||||
/* 8DABC 800F460C 0200202D */ daddu $a0, $s0, $zero
|
||||
/* 8DAC0 800F4610 0C0511F8 */ jal draw_icon_2
|
||||
/* 8DAC0 800F4610 0C0511F8 */ jal draw_hud_element_3
|
||||
/* 8DAC4 800F4614 0200202D */ daddu $a0, $s0, $zero
|
||||
.L800F4618:
|
||||
/* 8DAC8 800F4618 8FBF0054 */ lw $ra, 0x54($sp)
|
||||
|
||||
@ -73,7 +73,7 @@ glabel battle_item_mystery_func_802A123C_72C7EC
|
||||
/* 72C8F8 802A1348 24C6FF98 */ addiu $a2, $a2, -0x68
|
||||
/* 72C8FC 802A134C 0C051261 */ jal set_hud_element_render_pos
|
||||
/* 72C900 802A1350 02663023 */ subu $a2, $s3, $a2
|
||||
/* 72C904 802A1354 0C0511F8 */ jal draw_icon_2
|
||||
/* 72C904 802A1354 0C0511F8 */ jal draw_hud_element_3
|
||||
/* 72C908 802A1358 0200202D */ daddu $a0, $s0, $zero
|
||||
/* 72C90C 802A135C 2A220007 */ slti $v0, $s1, 7
|
||||
/* 72C910 802A1360 1440FFED */ bnez $v0, .L802A1318
|
||||
@ -99,7 +99,7 @@ glabel battle_item_mystery_func_802A123C_72C7EC
|
||||
/* 72C960 802A13B0 2442FF98 */ addiu $v0, $v0, -0x68
|
||||
/* 72C964 802A13B4 0C051261 */ jal set_hud_element_render_pos
|
||||
/* 72C968 802A13B8 00C23023 */ subu $a2, $a2, $v0
|
||||
/* 72C96C 802A13BC 0C0511F8 */ jal draw_icon_2
|
||||
/* 72C96C 802A13BC 0C0511F8 */ jal draw_hud_element_3
|
||||
/* 72C970 802A13C0 0200202D */ daddu $a0, $s0, $zero
|
||||
.L802A13C4:
|
||||
/* 72C974 802A13C4 8FBF0064 */ lw $ra, 0x64($sp)
|
||||
|
||||
@ -73,7 +73,7 @@ glabel battle_item_strange_cake_func_802A123C_73153C
|
||||
/* 731648 802A1348 24C6FF98 */ addiu $a2, $a2, -0x68
|
||||
/* 73164C 802A134C 0C051261 */ jal set_hud_element_render_pos
|
||||
/* 731650 802A1350 02663023 */ subu $a2, $s3, $a2
|
||||
/* 731654 802A1354 0C0511F8 */ jal draw_icon_2
|
||||
/* 731654 802A1354 0C0511F8 */ jal draw_hud_element_3
|
||||
/* 731658 802A1358 0200202D */ daddu $a0, $s0, $zero
|
||||
/* 73165C 802A135C 2A220005 */ slti $v0, $s1, 5
|
||||
/* 731660 802A1360 1440FFED */ bnez $v0, .L802A1318
|
||||
@ -99,7 +99,7 @@ glabel battle_item_strange_cake_func_802A123C_73153C
|
||||
/* 7316B0 802A13B0 2442FF98 */ addiu $v0, $v0, -0x68
|
||||
/* 7316B4 802A13B4 0C051261 */ jal set_hud_element_render_pos
|
||||
/* 7316B8 802A13B8 00C23023 */ subu $a2, $a2, $v0
|
||||
/* 7316BC 802A13BC 0C0511F8 */ jal draw_icon_2
|
||||
/* 7316BC 802A13BC 0C0511F8 */ jal draw_hud_element_3
|
||||
/* 7316C0 802A13C0 0200202D */ daddu $a0, $s0, $zero
|
||||
.L802A13C4:
|
||||
/* 7316C4 802A13C4 8FBF0064 */ lw $ra, 0x64($sp)
|
||||
|
||||
@ -30,7 +30,7 @@ glabel pause_textbox_draw_contents
|
||||
/* 136914 802435D4 0C051261 */ jal set_hud_element_render_pos
|
||||
/* 136918 802435D8 26860004 */ addiu $a2, $s4, 4
|
||||
/* 13691C 802435DC 8E040004 */ lw $a0, 4($s0)
|
||||
/* 136920 802435E0 0C0511F8 */ jal draw_icon_2
|
||||
/* 136920 802435E0 0C0511F8 */ jal draw_hud_element_3
|
||||
/* 136924 802435E4 00000000 */ nop
|
||||
/* 136928 802435E8 8E220000 */ lw $v0, ($s1)
|
||||
.L802435EC:
|
||||
@ -47,7 +47,7 @@ glabel pause_textbox_draw_contents
|
||||
/* 136954 80243614 0C051261 */ jal set_hud_element_render_pos
|
||||
/* 136958 80243618 24C6FFFC */ addiu $a2, $a2, -4
|
||||
/* 13695C 8024361C 8E040008 */ lw $a0, 8($s0)
|
||||
/* 136960 80243620 0C0511F8 */ jal draw_icon_2
|
||||
/* 136960 80243620 0C0511F8 */ jal draw_hud_element_3
|
||||
/* 136964 80243624 00000000 */ nop
|
||||
.L80243628:
|
||||
/* 136968 80243628 0240202D */ daddu $a0, $s2, $zero
|
||||
@ -153,7 +153,7 @@ glabel pause_textbox_draw_contents
|
||||
/* 136AF8 802437B8 8E04000C */ lw $a0, 0xc($s0)
|
||||
/* 136AFC 802437BC 0C051308 */ jal set_hud_element_scale
|
||||
/* 136B00 802437C0 3C053F80 */ lui $a1, 0x3f80
|
||||
/* 136B04 802437C4 0C0511F8 */ jal draw_icon_2
|
||||
/* 136B04 802437C4 0C0511F8 */ jal draw_hud_element_3
|
||||
/* 136B08 802437C8 8E04000C */ lw $a0, 0xc($s0)
|
||||
.L802437CC:
|
||||
/* 136B0C 802437CC 8FBF0034 */ lw $ra, 0x34($sp)
|
||||
|
||||
@ -497,7 +497,7 @@ glabel pause_tutorial_draw_contents
|
||||
/* 1372D0 80243F90 3C048027 */ lui $a0, %hi(gPauseMenuCommonIconIDs)
|
||||
/* 1372D4 80243F94 00822021 */ addu $a0, $a0, $v0
|
||||
/* 1372D8 80243F98 8C8400E8 */ lw $a0, %lo(gPauseMenuCommonIconIDs)($a0)
|
||||
/* 1372DC 80243F9C 0C0511F8 */ jal draw_icon_2
|
||||
/* 1372DC 80243F9C 0C0511F8 */ jal draw_hud_element_3
|
||||
/* 1372E0 80243FA0 00000000 */ nop
|
||||
/* 1372E4 80243FA4 8EA20000 */ lw $v0, ($s5)
|
||||
/* 1372E8 80243FA8 3C108027 */ lui $s0, %hi(gPauseMenuCommonIconIDs)
|
||||
@ -514,7 +514,7 @@ glabel pause_tutorial_draw_contents
|
||||
/* 137314 80243FD4 0C051261 */ jal set_hud_element_render_pos
|
||||
/* 137318 80243FD8 25E60032 */ addiu $a2, $t7, 0x32
|
||||
/* 13731C 80243FDC 8E04001C */ lw $a0, 0x1c($s0)
|
||||
/* 137320 80243FE0 0C0511F8 */ jal draw_icon_2
|
||||
/* 137320 80243FE0 0C0511F8 */ jal draw_hud_element_3
|
||||
/* 137324 80243FE4 00000000 */ nop
|
||||
.L80243FE8:
|
||||
/* 137328 80243FE8 8EA20000 */ lw $v0, ($s5)
|
||||
|
||||
@ -53,7 +53,7 @@ glabel pause_tabs_draw_badges
|
||||
/* 1380B8 80244D78 0C051261 */ jal set_hud_element_render_pos
|
||||
/* 1380BC 80244D7C 26660007 */ addiu $a2, $s3, 7
|
||||
/* 1380C0 80244D80 8E040004 */ lw $a0, 4($s0)
|
||||
/* 1380C4 80244D84 0C0511F8 */ jal draw_icon_2
|
||||
/* 1380C4 80244D84 0C0511F8 */ jal draw_hud_element_3
|
||||
/* 1380C8 80244D88 00000000 */ nop
|
||||
/* 1380CC 80244D8C 3C028027 */ lui $v0, %hi(gPauseMenuCurrentTab)
|
||||
/* 1380D0 80244D90 804200D4 */ lb $v0, %lo(gPauseMenuCurrentTab)($v0)
|
||||
|
||||
@ -53,7 +53,7 @@ glabel pause_tabs_draw_items
|
||||
/* 1381E0 80244EA0 0C051261 */ jal set_hud_element_render_pos
|
||||
/* 1381E4 80244EA4 26660007 */ addiu $a2, $s3, 7
|
||||
/* 1381E8 80244EA8 8E040008 */ lw $a0, 8($s0)
|
||||
/* 1381EC 80244EAC 0C0511F8 */ jal draw_icon_2
|
||||
/* 1381EC 80244EAC 0C0511F8 */ jal draw_hud_element_3
|
||||
/* 1381F0 80244EB0 00000000 */ nop
|
||||
/* 1381F4 80244EB4 3C028027 */ lui $v0, %hi(gPauseMenuCurrentTab)
|
||||
/* 1381F8 80244EB8 804200D4 */ lb $v0, %lo(gPauseMenuCurrentTab)($v0)
|
||||
|
||||
@ -53,7 +53,7 @@ glabel pause_tabs_draw_map
|
||||
/* 138558 80245218 0C051261 */ jal set_hud_element_render_pos
|
||||
/* 13855C 8024521C 26660007 */ addiu $a2, $s3, 7
|
||||
/* 138560 80245220 8E040014 */ lw $a0, 0x14($s0)
|
||||
/* 138564 80245224 0C0511F8 */ jal draw_icon_2
|
||||
/* 138564 80245224 0C0511F8 */ jal draw_hud_element_3
|
||||
/* 138568 80245228 00000000 */ nop
|
||||
/* 13856C 8024522C 3C028027 */ lui $v0, %hi(gPauseMenuCurrentTab)
|
||||
/* 138570 80245230 804200D4 */ lb $v0, %lo(gPauseMenuCurrentTab)($v0)
|
||||
|
||||
@ -53,7 +53,7 @@ glabel pause_tabs_draw_party
|
||||
/* 138308 80244FC8 0C051261 */ jal set_hud_element_render_pos
|
||||
/* 13830C 80244FCC 26660007 */ addiu $a2, $s3, 7
|
||||
/* 138310 80244FD0 8E04000C */ lw $a0, 0xc($s0)
|
||||
/* 138314 80244FD4 0C0511F8 */ jal draw_icon_2
|
||||
/* 138314 80244FD4 0C0511F8 */ jal draw_hud_element_3
|
||||
/* 138318 80244FD8 00000000 */ nop
|
||||
/* 13831C 80244FDC 3C028027 */ lui $v0, %hi(gPauseMenuCurrentTab)
|
||||
/* 138320 80244FE0 804200D4 */ lb $v0, %lo(gPauseMenuCurrentTab)($v0)
|
||||
|
||||
@ -53,7 +53,7 @@ glabel pause_tabs_draw_spirits
|
||||
/* 138430 802450F0 0C051261 */ jal set_hud_element_render_pos
|
||||
/* 138434 802450F4 26660007 */ addiu $a2, $s3, 7
|
||||
/* 138438 802450F8 8E040010 */ lw $a0, 0x10($s0)
|
||||
/* 13843C 802450FC 0C0511F8 */ jal draw_icon_2
|
||||
/* 13843C 802450FC 0C0511F8 */ jal draw_hud_element_3
|
||||
/* 138440 80245100 00000000 */ nop
|
||||
/* 138444 80245104 3C028027 */ lui $v0, %hi(gPauseMenuCurrentTab)
|
||||
/* 138448 80245108 804200D4 */ lb $v0, %lo(gPauseMenuCurrentTab)($v0)
|
||||
|
||||
@ -53,7 +53,7 @@ glabel pause_tabs_draw_stats
|
||||
/* 137F90 80244C50 0C051261 */ jal set_hud_element_render_pos
|
||||
/* 137F94 80244C54 26660007 */ addiu $a2, $s3, 7
|
||||
/* 137F98 80244C58 8E040000 */ lw $a0, ($s0)
|
||||
/* 137F9C 80244C5C 0C0511F8 */ jal draw_icon_2
|
||||
/* 137F9C 80244C5C 0C0511F8 */ jal draw_hud_element_3
|
||||
/* 137FA0 80244C60 00000000 */ nop
|
||||
/* 137FA4 80244C64 3C028027 */ lui $v0, %hi(gPauseMenuCurrentTab)
|
||||
/* 137FA8 80244C68 804200D4 */ lb $v0, %lo(gPauseMenuCurrentTab)($v0)
|
||||
|
||||
@ -90,7 +90,7 @@ glabel pause_badges_draw_contents
|
||||
/* 13A994 80247654 2566000B */ addiu $a2, $t3, 0xb
|
||||
/* 13A998 80247658 8E040050 */ lw $a0, 0x50($s0)
|
||||
/* 13A99C 8024765C 240A000A */ addiu $t2, $zero, 0xa
|
||||
/* 13A9A0 80247660 0C0511F8 */ jal draw_icon_2
|
||||
/* 13A9A0 80247660 0C0511F8 */ jal draw_hud_element_3
|
||||
/* 13A9A4 80247664 AFAA0068 */ sw $t2, 0x68($sp)
|
||||
/* 13A9A8 80247668 8FAA00C8 */ lw $t2, 0xc8($sp)
|
||||
/* 13A9AC 8024766C 8FAB00C4 */ lw $t3, 0xc4($sp)
|
||||
@ -576,7 +576,7 @@ glabel pause_badges_draw_contents
|
||||
/* 13B0C0 80247D80 8FAB0058 */ lw $t3, 0x58($sp)
|
||||
/* 13B0C4 80247D84 15600005 */ bnez $t3, .L80247D9C
|
||||
/* 13B0C8 80247D88 00000000 */ nop
|
||||
/* 13B0CC 80247D8C 0C0511F8 */ jal draw_icon_2
|
||||
/* 13B0CC 80247D8C 0C0511F8 */ jal draw_hud_element_3
|
||||
/* 13B0D0 80247D90 0220202D */ daddu $a0, $s1, $zero
|
||||
/* 13B0D4 80247D94 08091F69 */ j .L80247DA4
|
||||
/* 13B0D8 80247D98 00000000 */ nop
|
||||
@ -959,7 +959,7 @@ glabel pause_badges_draw_contents
|
||||
/* 13B668 80248328 0C051261 */ jal set_hud_element_render_pos
|
||||
/* 13B66C 8024832C 2546000E */ addiu $a2, $t2, 0xe
|
||||
/* 13B670 80248330 8E040044 */ lw $a0, 0x44($s0)
|
||||
/* 13B674 80248334 0C0511F8 */ jal draw_icon_2
|
||||
/* 13B674 80248334 0C0511F8 */ jal draw_hud_element_3
|
||||
/* 13B678 80248338 00000000 */ nop
|
||||
/* 13B67C 8024833C 8E220000 */ lw $v0, ($s1)
|
||||
/* 13B680 80248340 24420001 */ addiu $v0, $v0, 1
|
||||
@ -981,7 +981,7 @@ glabel pause_badges_draw_contents
|
||||
/* 13B6BC 8024837C 0C051261 */ jal set_hud_element_render_pos
|
||||
/* 13B6C0 80248380 25460092 */ addiu $a2, $t2, 0x92
|
||||
/* 13B6C4 80248384 8E040048 */ lw $a0, 0x48($s0)
|
||||
/* 13B6C8 80248388 0C0511F8 */ jal draw_icon_2
|
||||
/* 13B6C8 80248388 0C0511F8 */ jal draw_hud_element_3
|
||||
/* 13B6CC 8024838C 00000000 */ nop
|
||||
.L80248390:
|
||||
/* 13B6D0 80248390 3C108027 */ lui $s0, %hi(D_802703A8)
|
||||
@ -993,7 +993,7 @@ glabel pause_badges_draw_contents
|
||||
/* 13B6E8 802483A8 0C051261 */ jal set_hud_element_render_pos
|
||||
/* 13B6EC 802483AC 25460051 */ addiu $a2, $t2, 0x51
|
||||
/* 13B6F0 802483B0 8E040040 */ lw $a0, 0x40($s0)
|
||||
/* 13B6F4 802483B4 0C0511F8 */ jal draw_icon_2
|
||||
/* 13B6F4 802483B4 0C0511F8 */ jal draw_hud_element_3
|
||||
/* 13B6F8 802483B8 2413000A */ addiu $s3, $zero, 0xa
|
||||
/* 13B6FC 802483BC 0C093BA0 */ jal pause_get_menu_string
|
||||
/* 13B700 802483C0 24040046 */ addiu $a0, $zero, 0x46
|
||||
|
||||
@ -25,7 +25,7 @@ glabel pause_stats_draw_contents
|
||||
/* 138D10 802459D0 0C051261 */ jal set_hud_element_render_pos
|
||||
/* 138D14 802459D4 27C6006D */ addiu $a2, $fp, 0x6d
|
||||
/* 138D18 802459D8 8E24000C */ lw $a0, 0xc($s1)
|
||||
/* 138D1C 802459DC 0C0511F8 */ jal draw_icon_2
|
||||
/* 138D1C 802459DC 0C0511F8 */ jal draw_hud_element_3
|
||||
/* 138D20 802459E0 27D00065 */ addiu $s0, $fp, 0x65
|
||||
/* 138D24 802459E4 0C093BA0 */ jal pause_get_menu_string
|
||||
/* 138D28 802459E8 24040032 */ addiu $a0, $zero, 0x32
|
||||
@ -62,14 +62,14 @@ glabel pause_stats_draw_contents
|
||||
/* 138DA4 80245A64 0C051261 */ jal set_hud_element_render_pos
|
||||
/* 138DA8 80245A68 0260282D */ daddu $a1, $s3, $zero
|
||||
/* 138DAC 80245A6C 8E24002C */ lw $a0, 0x2c($s1)
|
||||
/* 138DB0 80245A70 0C0511F8 */ jal draw_icon_2
|
||||
/* 138DB0 80245A70 0C0511F8 */ jal draw_hud_element_3
|
||||
/* 138DB4 80245A74 27D00056 */ addiu $s0, $fp, 0x56
|
||||
/* 138DB8 80245A78 8FA50050 */ lw $a1, 0x50($sp)
|
||||
/* 138DBC 80245A7C 8E240010 */ lw $a0, 0x10($s1)
|
||||
/* 138DC0 80245A80 0C051261 */ jal set_hud_element_render_pos
|
||||
/* 138DC4 80245A84 27C6005E */ addiu $a2, $fp, 0x5e
|
||||
/* 138DC8 80245A88 8E240010 */ lw $a0, 0x10($s1)
|
||||
/* 138DCC 80245A8C 0C0511F8 */ jal draw_icon_2
|
||||
/* 138DCC 80245A8C 0C0511F8 */ jal draw_hud_element_3
|
||||
/* 138DD0 80245A90 27D5007B */ addiu $s5, $fp, 0x7b
|
||||
/* 138DD4 80245A94 0C093BA0 */ jal pause_get_menu_string
|
||||
/* 138DD8 80245A98 24040033 */ addiu $a0, $zero, 0x33
|
||||
@ -98,14 +98,14 @@ glabel pause_stats_draw_contents
|
||||
/* 138E34 80245AF4 0C051261 */ jal set_hud_element_render_pos
|
||||
/* 138E38 80245AF8 27C6005D */ addiu $a2, $fp, 0x5d
|
||||
/* 138E3C 80245AFC 8E24002C */ lw $a0, 0x2c($s1)
|
||||
/* 138E40 80245B00 0C0511F8 */ jal draw_icon_2
|
||||
/* 138E40 80245B00 0C0511F8 */ jal draw_hud_element_3
|
||||
/* 138E44 80245B04 27D00074 */ addiu $s0, $fp, 0x74
|
||||
/* 138E48 80245B08 8FA50050 */ lw $a1, 0x50($sp)
|
||||
/* 138E4C 80245B0C 8E240014 */ lw $a0, 0x14($s1)
|
||||
/* 138E50 80245B10 0C051261 */ jal set_hud_element_render_pos
|
||||
/* 138E54 80245B14 02A0302D */ daddu $a2, $s5, $zero
|
||||
/* 138E58 80245B18 8E240014 */ lw $a0, 0x14($s1)
|
||||
/* 138E5C 80245B1C 0C0511F8 */ jal draw_icon_2
|
||||
/* 138E5C 80245B1C 0C0511F8 */ jal draw_hud_element_3
|
||||
/* 138E60 80245B20 00000000 */ nop
|
||||
/* 138E64 80245B24 0C093BA0 */ jal pause_get_menu_string
|
||||
/* 138E68 80245B28 24040034 */ addiu $a0, $zero, 0x34
|
||||
@ -134,7 +134,7 @@ glabel pause_stats_draw_contents
|
||||
/* 138EC4 80245B84 0C051261 */ jal set_hud_element_render_pos
|
||||
/* 138EC8 80245B88 02A0302D */ daddu $a2, $s5, $zero
|
||||
/* 138ECC 80245B8C 8E24002C */ lw $a0, 0x2c($s1)
|
||||
/* 138ED0 80245B90 0C0511F8 */ jal draw_icon_2
|
||||
/* 138ED0 80245B90 0C0511F8 */ jal draw_hud_element_3
|
||||
/* 138ED4 80245B94 27D00033 */ addiu $s0, $fp, 0x33
|
||||
/* 138ED8 80245B98 0000202D */ daddu $a0, $zero, $zero
|
||||
/* 138EDC 80245B9C 8FA80084 */ lw $t0, 0x84($sp)
|
||||
@ -149,7 +149,7 @@ glabel pause_stats_draw_contents
|
||||
/* 138F00 80245BC0 0C051261 */ jal set_hud_element_render_pos
|
||||
/* 138F04 80245BC4 02A0282D */ daddu $a1, $s5, $zero
|
||||
/* 138F08 80245BC8 8E24001C */ lw $a0, 0x1c($s1)
|
||||
/* 138F0C 80245BCC 0C0511F8 */ jal draw_icon_2
|
||||
/* 138F0C 80245BCC 0C0511F8 */ jal draw_hud_element_3
|
||||
/* 138F10 80245BD0 00000000 */ nop
|
||||
/* 138F14 80245BD4 0C093BA0 */ jal pause_get_menu_string
|
||||
/* 138F18 80245BD8 24040036 */ addiu $a0, $zero, 0x36
|
||||
@ -206,7 +206,7 @@ glabel pause_stats_draw_contents
|
||||
/* 138FE4 80245CA4 0C051261 */ jal set_hud_element_render_pos
|
||||
/* 138FE8 80245CA8 27C6005C */ addiu $a2, $fp, 0x5c
|
||||
/* 138FEC 80245CAC 8E240020 */ lw $a0, 0x20($s1)
|
||||
/* 138FF0 80245CB0 0C0511F8 */ jal draw_icon_2
|
||||
/* 138FF0 80245CB0 0C0511F8 */ jal draw_hud_element_3
|
||||
/* 138FF4 80245CB4 27D00055 */ addiu $s0, $fp, 0x55
|
||||
/* 138FF8 80245CB8 0C093BA0 */ jal pause_get_menu_string
|
||||
/* 138FFC 80245CBC 24040037 */ addiu $a0, $zero, 0x37
|
||||
@ -257,7 +257,7 @@ glabel pause_stats_draw_contents
|
||||
/* 1390B0 80245D70 0C051261 */ jal set_hud_element_render_pos
|
||||
/* 1390B4 80245D74 27C6007E */ addiu $a2, $fp, 0x7e
|
||||
/* 1390B8 80245D78 8E240024 */ lw $a0, 0x24($s1)
|
||||
/* 1390BC 80245D7C 0C0511F8 */ jal draw_icon_2
|
||||
/* 1390BC 80245D7C 0C0511F8 */ jal draw_hud_element_3
|
||||
/* 1390C0 80245D80 27D00077 */ addiu $s0, $fp, 0x77
|
||||
/* 1390C4 80245D84 0C093BA0 */ jal pause_get_menu_string
|
||||
/* 1390C8 80245D88 24040038 */ addiu $a0, $zero, 0x38
|
||||
@ -284,7 +284,7 @@ glabel pause_stats_draw_contents
|
||||
/* 13911C 80245DDC 0C051261 */ jal set_hud_element_render_pos
|
||||
/* 139120 80245DE0 27C6008C */ addiu $a2, $fp, 0x8c
|
||||
/* 139124 80245DE4 8E240018 */ lw $a0, 0x18($s1)
|
||||
/* 139128 80245DE8 0C0511F8 */ jal draw_icon_2
|
||||
/* 139128 80245DE8 0C0511F8 */ jal draw_hud_element_3
|
||||
/* 13912C 80245DEC 27D50085 */ addiu $s5, $fp, 0x85
|
||||
/* 139130 80245DF0 0C093BA0 */ jal pause_get_menu_string
|
||||
/* 139134 80245DF4 24040035 */ addiu $a0, $zero, 0x35
|
||||
@ -476,7 +476,7 @@ glabel pause_stats_draw_contents
|
||||
/* 139410 802460D0 0C051261 */ jal set_hud_element_render_pos
|
||||
/* 139414 802460D4 2505003D */ addiu $a1, $t0, 0x3d
|
||||
/* 139418 802460D8 8EC40000 */ lw $a0, ($s6)
|
||||
/* 13941C 802460DC 0C0511F8 */ jal draw_icon_2
|
||||
/* 13941C 802460DC 0C0511F8 */ jal draw_hud_element_3
|
||||
/* 139420 802460E0 27D0000E */ addiu $s0, $fp, 0xe
|
||||
/* 139424 802460E4 0C093BA0 */ jal pause_get_menu_string
|
||||
/* 139428 802460E8 24040043 */ addiu $a0, $zero, 0x43
|
||||
@ -559,7 +559,7 @@ glabel pause_stats_draw_contents
|
||||
/* 13954C 8024620C 0C051261 */ jal set_hud_element_render_pos
|
||||
/* 139550 80246210 0220282D */ daddu $a1, $s1, $zero
|
||||
/* 139554 80246214 8EC40004 */ lw $a0, 4($s6)
|
||||
/* 139558 80246218 0C0511F8 */ jal draw_icon_2
|
||||
/* 139558 80246218 0C0511F8 */ jal draw_hud_element_3
|
||||
/* 13955C 8024621C 00000000 */ nop
|
||||
/* 139560 80246220 3C048025 */ lui $a0, %hi(D_8024F380)
|
||||
/* 139564 80246224 00902021 */ addu $a0, $a0, $s0
|
||||
@ -587,7 +587,7 @@ glabel pause_stats_draw_contents
|
||||
/* 1395BC 8024627C 0C051261 */ jal set_hud_element_render_pos
|
||||
/* 1395C0 80246280 27C60036 */ addiu $a2, $fp, 0x36
|
||||
/* 1395C4 80246284 8EC40008 */ lw $a0, 8($s6)
|
||||
/* 1395C8 80246288 0C0511F8 */ jal draw_icon_2
|
||||
/* 1395C8 80246288 0C0511F8 */ jal draw_hud_element_3
|
||||
/* 1395CC 8024628C 0260A82D */ daddu $s5, $s3, $zero
|
||||
/* 1395D0 80246290 3C048025 */ lui $a0, %hi(D_8024F390)
|
||||
/* 1395D4 80246294 00902021 */ addu $a0, $a0, $s0
|
||||
@ -656,7 +656,7 @@ glabel pause_stats_draw_contents
|
||||
/* 1396C4 80246384 02052821 */ addu $a1, $s0, $a1
|
||||
/* 1396C8 80246388 12800005 */ beqz $s4, .L802463A0
|
||||
/* 1396CC 8024638C 00000000 */ nop
|
||||
/* 1396D0 80246390 0C0511F8 */ jal draw_icon_2
|
||||
/* 1396D0 80246390 0C0511F8 */ jal draw_hud_element_3
|
||||
/* 1396D4 80246394 0220202D */ daddu $a0, $s1, $zero
|
||||
/* 1396D8 80246398 080918EA */ j .L802463A8
|
||||
/* 1396DC 8024639C 0000A02D */ daddu $s4, $zero, $zero
|
||||
@ -687,7 +687,7 @@ glabel pause_stats_draw_contents
|
||||
/* 139738 802463F8 02052821 */ addu $a1, $s0, $a1
|
||||
/* 13973C 802463FC 12800005 */ beqz $s4, .L80246414
|
||||
/* 139740 80246400 00000000 */ nop
|
||||
/* 139744 80246404 0C0511F8 */ jal draw_icon_2
|
||||
/* 139744 80246404 0C0511F8 */ jal draw_hud_element_3
|
||||
/* 139748 80246408 0220202D */ daddu $a0, $s1, $zero
|
||||
/* 13974C 8024640C 08091907 */ j .L8024641C
|
||||
/* 139750 80246410 0000A02D */ daddu $s4, $zero, $zero
|
||||
@ -718,7 +718,7 @@ glabel pause_stats_draw_contents
|
||||
/* 1397AC 8024646C 02052821 */ addu $a1, $s0, $a1
|
||||
/* 1397B0 80246470 12800005 */ beqz $s4, .L80246488
|
||||
/* 1397B4 80246474 00000000 */ nop
|
||||
/* 1397B8 80246478 0C0511F8 */ jal draw_icon_2
|
||||
/* 1397B8 80246478 0C0511F8 */ jal draw_hud_element_3
|
||||
/* 1397BC 8024647C 0220202D */ daddu $a0, $s1, $zero
|
||||
/* 1397C0 80246480 08091924 */ j .L80246490
|
||||
/* 1397C4 80246484 0000A02D */ daddu $s4, $zero, $zero
|
||||
@ -749,7 +749,7 @@ glabel pause_stats_draw_contents
|
||||
/* 139820 802464E0 02052821 */ addu $a1, $s0, $a1
|
||||
/* 139824 802464E4 12800005 */ beqz $s4, .L802464FC
|
||||
/* 139828 802464E8 00000000 */ nop
|
||||
/* 13982C 802464EC 0C0511F8 */ jal draw_icon_2
|
||||
/* 13982C 802464EC 0C0511F8 */ jal draw_hud_element_3
|
||||
/* 139830 802464F0 0220202D */ daddu $a0, $s1, $zero
|
||||
/* 139834 802464F4 08091941 */ j .L80246504
|
||||
/* 139838 802464F8 0000A02D */ daddu $s4, $zero, $zero
|
||||
@ -780,7 +780,7 @@ glabel pause_stats_draw_contents
|
||||
/* 139894 80246554 02052821 */ addu $a1, $s0, $a1
|
||||
/* 139898 80246558 12800005 */ beqz $s4, .L80246570
|
||||
/* 13989C 8024655C 00000000 */ nop
|
||||
/* 1398A0 80246560 0C0511F8 */ jal draw_icon_2
|
||||
/* 1398A0 80246560 0C0511F8 */ jal draw_hud_element_3
|
||||
/* 1398A4 80246564 0220202D */ daddu $a0, $s1, $zero
|
||||
/* 1398A8 80246568 0809195E */ j .L80246578
|
||||
/* 1398AC 8024656C 0000A02D */ daddu $s4, $zero, $zero
|
||||
@ -811,7 +811,7 @@ glabel pause_stats_draw_contents
|
||||
/* 139908 802465C8 02052821 */ addu $a1, $s0, $a1
|
||||
/* 13990C 802465CC 12800005 */ beqz $s4, .L802465E4
|
||||
/* 139910 802465D0 00000000 */ nop
|
||||
/* 139914 802465D4 0C0511F8 */ jal draw_icon_2
|
||||
/* 139914 802465D4 0C0511F8 */ jal draw_hud_element_3
|
||||
/* 139918 802465D8 0220202D */ daddu $a0, $s1, $zero
|
||||
/* 13991C 802465DC 0809197B */ j .L802465EC
|
||||
/* 139920 802465E0 0000A02D */ daddu $s4, $zero, $zero
|
||||
@ -842,7 +842,7 @@ glabel pause_stats_draw_contents
|
||||
/* 13997C 8024663C 02052821 */ addu $a1, $s0, $a1
|
||||
/* 139980 80246640 12800005 */ beqz $s4, .L80246658
|
||||
/* 139984 80246644 00000000 */ nop
|
||||
/* 139988 80246648 0C0511F8 */ jal draw_icon_2
|
||||
/* 139988 80246648 0C0511F8 */ jal draw_hud_element_3
|
||||
/* 13998C 8024664C 0220202D */ daddu $a0, $s1, $zero
|
||||
/* 139990 80246650 08091998 */ j .L80246660
|
||||
/* 139994 80246654 0000A02D */ daddu $s4, $zero, $zero
|
||||
@ -870,7 +870,7 @@ glabel pause_stats_draw_contents
|
||||
/* 1399E4 802466A4 01102821 */ addu $a1, $t0, $s0
|
||||
/* 1399E8 802466A8 12800005 */ beqz $s4, .L802466C0
|
||||
/* 1399EC 802466AC 00000000 */ nop
|
||||
/* 1399F0 802466B0 0C0511F8 */ jal draw_icon_2
|
||||
/* 1399F0 802466B0 0C0511F8 */ jal draw_hud_element_3
|
||||
/* 1399F4 802466B4 0220202D */ daddu $a0, $s1, $zero
|
||||
/* 1399F8 802466B8 080919B2 */ j .L802466C8
|
||||
/* 1399FC 802466BC 0000A02D */ daddu $s4, $zero, $zero
|
||||
@ -913,7 +913,7 @@ glabel pause_stats_draw_contents
|
||||
/* 139A80 80246740 00A22821 */ addu $a1, $a1, $v0
|
||||
/* 139A84 80246744 12800005 */ beqz $s4, .L8024675C
|
||||
/* 139A88 80246748 00000000 */ nop
|
||||
/* 139A8C 8024674C 0C0511F8 */ jal draw_icon_2
|
||||
/* 139A8C 8024674C 0C0511F8 */ jal draw_hud_element_3
|
||||
/* 139A90 80246750 0220202D */ daddu $a0, $s1, $zero
|
||||
/* 139A94 80246754 080919D9 */ j .L80246764
|
||||
/* 139A98 80246758 0000A02D */ daddu $s4, $zero, $zero
|
||||
@ -942,7 +942,7 @@ glabel pause_stats_draw_contents
|
||||
/* 139AE8 802467A8 00A22821 */ addu $a1, $a1, $v0
|
||||
/* 139AEC 802467AC 12800005 */ beqz $s4, .L802467C4
|
||||
/* 139AF0 802467B0 00000000 */ nop
|
||||
/* 139AF4 802467B4 0C0511F8 */ jal draw_icon_2
|
||||
/* 139AF4 802467B4 0C0511F8 */ jal draw_hud_element_3
|
||||
/* 139AF8 802467B8 0220202D */ daddu $a0, $s1, $zero
|
||||
/* 139AFC 802467BC 080919F3 */ j .L802467CC
|
||||
/* 139B00 802467C0 0000A02D */ daddu $s4, $zero, $zero
|
||||
@ -971,7 +971,7 @@ glabel pause_stats_draw_contents
|
||||
/* 139B50 80246810 00A22821 */ addu $a1, $a1, $v0
|
||||
/* 139B54 80246814 12800005 */ beqz $s4, .L8024682C
|
||||
/* 139B58 80246818 00000000 */ nop
|
||||
/* 139B5C 8024681C 0C0511F8 */ jal draw_icon_2
|
||||
/* 139B5C 8024681C 0C0511F8 */ jal draw_hud_element_3
|
||||
/* 139B60 80246820 0220202D */ daddu $a0, $s1, $zero
|
||||
/* 139B64 80246824 08091A0D */ j .L80246834
|
||||
/* 139B68 80246828 0000A02D */ daddu $s4, $zero, $zero
|
||||
@ -1000,7 +1000,7 @@ glabel pause_stats_draw_contents
|
||||
/* 139BB8 80246878 00A22821 */ addu $a1, $a1, $v0
|
||||
/* 139BBC 8024687C 12800005 */ beqz $s4, .L80246894
|
||||
/* 139BC0 80246880 00000000 */ nop
|
||||
/* 139BC4 80246884 0C0511F8 */ jal draw_icon_2
|
||||
/* 139BC4 80246884 0C0511F8 */ jal draw_hud_element_3
|
||||
/* 139BC8 80246888 0220202D */ daddu $a0, $s1, $zero
|
||||
/* 139BCC 8024688C 08091A27 */ j .L8024689C
|
||||
/* 139BD0 80246890 0000A02D */ daddu $s4, $zero, $zero
|
||||
@ -1029,7 +1029,7 @@ glabel pause_stats_draw_contents
|
||||
/* 139C20 802468E0 00A22821 */ addu $a1, $a1, $v0
|
||||
/* 139C24 802468E4 12800005 */ beqz $s4, .L802468FC
|
||||
/* 139C28 802468E8 00000000 */ nop
|
||||
/* 139C2C 802468EC 0C0511F8 */ jal draw_icon_2
|
||||
/* 139C2C 802468EC 0C0511F8 */ jal draw_hud_element_3
|
||||
/* 139C30 802468F0 0220202D */ daddu $a0, $s1, $zero
|
||||
/* 139C34 802468F4 08091A41 */ j .L80246904
|
||||
/* 139C38 802468F8 0000A02D */ daddu $s4, $zero, $zero
|
||||
@ -1058,7 +1058,7 @@ glabel pause_stats_draw_contents
|
||||
/* 139C88 80246948 00A22821 */ addu $a1, $a1, $v0
|
||||
/* 139C8C 8024694C 12800005 */ beqz $s4, .L80246964
|
||||
/* 139C90 80246950 00000000 */ nop
|
||||
/* 139C94 80246954 0C0511F8 */ jal draw_icon_2
|
||||
/* 139C94 80246954 0C0511F8 */ jal draw_hud_element_3
|
||||
/* 139C98 80246958 0220202D */ daddu $a0, $s1, $zero
|
||||
/* 139C9C 8024695C 08091A5B */ j .L8024696C
|
||||
/* 139CA0 80246960 0000A02D */ daddu $s4, $zero, $zero
|
||||
@ -1087,7 +1087,7 @@ glabel pause_stats_draw_contents
|
||||
/* 139CF0 802469B0 00A22821 */ addu $a1, $a1, $v0
|
||||
/* 139CF4 802469B4 12800005 */ beqz $s4, .L802469CC
|
||||
/* 139CF8 802469B8 00000000 */ nop
|
||||
/* 139CFC 802469BC 0C0511F8 */ jal draw_icon_2
|
||||
/* 139CFC 802469BC 0C0511F8 */ jal draw_hud_element_3
|
||||
/* 139D00 802469C0 0220202D */ daddu $a0, $s1, $zero
|
||||
/* 139D04 802469C4 08091A75 */ j .L802469D4
|
||||
/* 139D08 802469C8 0000A02D */ daddu $s4, $zero, $zero
|
||||
@ -1114,7 +1114,7 @@ glabel pause_stats_draw_contents
|
||||
/* 139D50 80246A10 01152821 */ addu $a1, $t0, $s5
|
||||
/* 139D54 80246A14 12800005 */ beqz $s4, .L80246A2C
|
||||
/* 139D58 80246A18 00000000 */ nop
|
||||
/* 139D5C 80246A1C 0C0511F8 */ jal draw_icon_2
|
||||
/* 139D5C 80246A1C 0C0511F8 */ jal draw_hud_element_3
|
||||
/* 139D60 80246A20 0220202D */ daddu $a0, $s1, $zero
|
||||
/* 139D64 80246A24 08091A8D */ j .L80246A34
|
||||
/* 139D68 80246A28 0000A02D */ daddu $s4, $zero, $zero
|
||||
|
||||
@ -141,7 +141,7 @@ glabel pause_partners_draw_movelist
|
||||
/* 13F278 8024BF38 0C051261 */ jal set_hud_element_render_pos
|
||||
/* 13F27C 8024BF3C 2505000C */ addiu $a1, $t0, 0xc
|
||||
/* 13F280 8024BF40 8E040000 */ lw $a0, ($s0)
|
||||
/* 13F284 8024BF44 0C0511F8 */ jal draw_icon_2
|
||||
/* 13F284 8024BF44 0C0511F8 */ jal draw_hud_element_3
|
||||
/* 13F288 8024BF48 00000000 */ nop
|
||||
/* 13F28C 8024BF4C 12200017 */ beqz $s1, .L8024BFAC
|
||||
/* 13F290 8024BF50 0220202D */ daddu $a0, $s1, $zero
|
||||
@ -165,7 +165,7 @@ glabel pause_partners_draw_movelist
|
||||
/* 13F2D8 8024BF98 25050086 */ addiu $a1, $t0, 0x86
|
||||
/* 13F2DC 8024BF9C 3C048027 */ lui $a0, %hi(D_80270640)
|
||||
/* 13F2E0 8024BFA0 8C840640 */ lw $a0, %lo(D_80270640)($a0)
|
||||
/* 13F2E4 8024BFA4 0C0511F8 */ jal draw_icon_2
|
||||
/* 13F2E4 8024BFA4 0C0511F8 */ jal draw_hud_element_3
|
||||
/* 13F2E8 8024BFA8 00000000 */ nop
|
||||
.L8024BFAC:
|
||||
/* 13F2EC 8024BFAC 26F7000D */ addiu $s7, $s7, 0xd
|
||||
|
||||
@ -12,7 +12,7 @@ glabel pause_partners_draw_movelist_flower
|
||||
/* 13F3FC 8024C0BC 0C051261 */ jal set_hud_element_render_pos
|
||||
/* 13F400 8024C0C0 24C60010 */ addiu $a2, $a2, 0x10
|
||||
/* 13F404 8024C0C4 8E040004 */ lw $a0, 4($s0)
|
||||
/* 13F408 8024C0C8 0C0511F8 */ jal draw_icon_2
|
||||
/* 13F408 8024C0C8 0C0511F8 */ jal draw_hud_element_3
|
||||
/* 13F40C 8024C0CC 00000000 */ nop
|
||||
/* 13F410 8024C0D0 8FBF0014 */ lw $ra, 0x14($sp)
|
||||
/* 13F414 8024C0D4 8FB00010 */ lw $s0, 0x10($sp)
|
||||
|
||||
@ -87,7 +87,7 @@ glabel pause_partners_draw_title
|
||||
/* 13F028 8024BCE8 0C051261 */ jal set_hud_element_render_pos
|
||||
/* 13F02C 8024BCEC 0220302D */ daddu $a2, $s1, $zero
|
||||
/* 13F030 8024BCF0 8E040008 */ lw $a0, 8($s0)
|
||||
/* 13F034 8024BCF4 0C0511F8 */ jal draw_icon_2
|
||||
/* 13F034 8024BCF4 0C0511F8 */ jal draw_hud_element_3
|
||||
/* 13F038 8024BCF8 00000000 */ nop
|
||||
/* 13F03C 8024BCFC 26450065 */ addiu $a1, $s2, 0x65
|
||||
/* 13F040 8024BD00 8E04000C */ lw $a0, 0xc($s0)
|
||||
@ -95,7 +95,7 @@ glabel pause_partners_draw_title
|
||||
/* 13F048 8024BD08 0220302D */ daddu $a2, $s1, $zero
|
||||
/* 13F04C 8024BD0C 8E04000C */ lw $a0, 0xc($s0)
|
||||
.L8024BD10:
|
||||
/* 13F050 8024BD10 0C0511F8 */ jal draw_icon_2
|
||||
/* 13F050 8024BD10 0C0511F8 */ jal draw_hud_element_3
|
||||
/* 13F054 8024BD14 00000000 */ nop
|
||||
.L8024BD18:
|
||||
/* 13F058 8024BD18 8FBF002C */ lw $ra, 0x2c($sp)
|
||||
|
||||
@ -412,7 +412,7 @@ glabel pause_map_draw_contents
|
||||
/* 141484 8024E144 0C051261 */ jal set_hud_element_render_pos
|
||||
/* 141488 8024E148 24C6FFF9 */ addiu $a2, $a2, -7
|
||||
/* 14148C 8024E14C 8E040000 */ lw $a0, ($s0)
|
||||
/* 141490 8024E150 0C0511F8 */ jal draw_icon_2
|
||||
/* 141490 8024E150 0C0511F8 */ jal draw_hud_element_3
|
||||
/* 141494 8024E154 00000000 */ nop
|
||||
/* 141498 8024E158 3C138027 */ lui $s3, %hi(gPauseMenuCurrentTab)
|
||||
/* 14149C 8024E15C 267300D4 */ addiu $s3, $s3, %lo(gPauseMenuCurrentTab)
|
||||
|
||||
@ -388,7 +388,7 @@ glabel pause_items_draw_contents
|
||||
/* 13D264 80249F24 8FAA0054 */ lw $t2, 0x54($sp)
|
||||
/* 13D268 80249F28 15400005 */ bnez $t2, .L80249F40
|
||||
/* 13D26C 80249F2C 00000000 */ nop
|
||||
/* 13D270 80249F30 0C0511F8 */ jal draw_icon_2
|
||||
/* 13D270 80249F30 0C0511F8 */ jal draw_hud_element_3
|
||||
/* 13D274 80249F34 0220202D */ daddu $a0, $s1, $zero
|
||||
/* 13D278 80249F38 080927D2 */ j .L80249F48
|
||||
/* 13D27C 80249F3C 00000000 */ nop
|
||||
@ -533,7 +533,7 @@ glabel pause_items_draw_contents
|
||||
/* 13D484 8024A144 0C051261 */ jal set_hud_element_render_pos
|
||||
/* 13D488 8024A148 2546000E */ addiu $a2, $t2, 0xe
|
||||
/* 13D48C 8024A14C 8E040040 */ lw $a0, 0x40($s0)
|
||||
/* 13D490 8024A150 0C0511F8 */ jal draw_icon_2
|
||||
/* 13D490 8024A150 0C0511F8 */ jal draw_hud_element_3
|
||||
/* 13D494 8024A154 00000000 */ nop
|
||||
/* 13D498 8024A158 8E220000 */ lw $v0, ($s1)
|
||||
/* 13D49C 8024A15C 24420001 */ addiu $v0, $v0, 1
|
||||
@ -555,7 +555,7 @@ glabel pause_items_draw_contents
|
||||
/* 13D4D8 8024A198 0C051261 */ jal set_hud_element_render_pos
|
||||
/* 13D4DC 8024A19C 25460092 */ addiu $a2, $t2, 0x92
|
||||
/* 13D4E0 8024A1A0 8E040044 */ lw $a0, 0x44($s0)
|
||||
/* 13D4E4 8024A1A4 0C0511F8 */ jal draw_icon_2
|
||||
/* 13D4E4 8024A1A4 0C0511F8 */ jal draw_hud_element_3
|
||||
/* 13D4E8 8024A1A8 00000000 */ nop
|
||||
.L8024A1AC:
|
||||
/* 13D4EC 8024A1AC 3C038027 */ lui $v1, %hi(gItemMenuCurrentTab)
|
||||
|
||||
@ -2347,7 +2347,7 @@ func_80144278 = 0x80144278; // type:func rom:0xDA978
|
||||
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
|
||||
draw_hud_element_3 = 0x801447E0; // type:func rom:0xDAEE0
|
||||
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
|
||||
|
||||
Loading…
Reference in New Issue
Block a user