From 12c8605fcf287de004abbf0d9f3bbf6df2e74106 Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Wed, 14 Oct 2020 23:20:51 -0400 Subject: [PATCH] Split files --- .../pause_items_cleanup.s | 0 .../pause_items_comparator.s | 0 .../pause_items_draw_contents.s | 0 .../pause_items_get_column.s | 0 .../pause_items_get_pos_x.s | 0 .../pause_items_get_pos_y.s | 0 .../pause_items_get_row.s | 0 .../pause_items_handle_input.s | 0 .../pause_items_init.s | 0 .../pause_items_is_visible.s | 0 .../pause_items_load_items.s | 0 .../pause_items_scroll_offset_y.s | 0 .../pause_items_update.s | 0 .../pause_partners_cleanup.s | 0 .../pause_partners_draw_contents.s | 0 .../pause_partners_draw_movelist.s | 0 .../pause_partners_draw_movelist_flower.s | 0 .../pause_partners_draw_movelist_title.s | 0 .../pause_partners_draw_title.s | 0 .../pause_partners_handle_input.s | 0 .../pause_partners_init.s | 0 .../pause_partners_load_portrait.s | 0 .../pause_partners_update.s | 0 .../pause_spirits_cleanup.s | 0 .../pause_spirits_draw_contents.s | 0 .../pause_spirits_draw_title.s | 0 .../pause_spirits_handle_input.s | 0 .../pause_spirits_init.s | 0 .../pause_spirits_update.s | 0 .../func_8024D930.s | 0 .../pause_map_cleanup.s | 0 .../pause_map_draw_border_arrows.s | 0 .../pause_map_draw_contents.s | 0 .../pause_map_draw_title.s | 0 .../pause_map_handle_input.s | 0 .../pause_map_init.s | 0 .../pause_map_update.s | 0 .../pause_draw_menu_label.s | 0 .../pause_get_menu_string.s | 0 .../code_163400/pause_set_cursor_opacity.s | 144 ++++++++++++++++++ .../func_80244C30.s | 0 .../func_80244CEC.s | 0 .../func_80244D60.s | 0 .../func_80244DD0.s | 0 .../func_80244E54.s | 0 .../func_80244F44.s | 0 .../func_80244FD4.s | 0 .../func_8024544C.s | 0 .../func_80245588.s | 0 .../func_802455D8.s | 0 .../func_80245628.s | 0 .../func_80245678.s | 0 .../func_802456C8.s | 0 .../func_80245718.s | 0 .../func_80245768.s | 0 .../func_802457B8.s | 0 .../func_80245808.s | 0 .../func_80245A40.s | 0 .../func_80246B2C.s | 0 .../func_80246CBC.s | 0 src/code_135EE0.c | 82 ---------- src/code_13CAF0.c | 51 +++++++ src/code_13FD40.c | 13 ++ src/code_140C70.c | 17 +++ src/code_1421C0.c | 5 + src/code_163400.c | 40 ----- src/code_165490.c | 41 +++++ tools/splat.yaml | 15 +- 68 files changed, 281 insertions(+), 127 deletions(-) rename asm/nonmatchings/{code_135EE0 => code_13CAF0}/pause_items_cleanup.s (100%) rename asm/nonmatchings/{code_135EE0 => code_13CAF0}/pause_items_comparator.s (100%) rename asm/nonmatchings/{code_135EE0 => code_13CAF0}/pause_items_draw_contents.s (100%) rename asm/nonmatchings/{code_135EE0 => code_13CAF0}/pause_items_get_column.s (100%) rename asm/nonmatchings/{code_135EE0 => code_13CAF0}/pause_items_get_pos_x.s (100%) rename asm/nonmatchings/{code_135EE0 => code_13CAF0}/pause_items_get_pos_y.s (100%) rename asm/nonmatchings/{code_135EE0 => code_13CAF0}/pause_items_get_row.s (100%) rename asm/nonmatchings/{code_135EE0 => code_13CAF0}/pause_items_handle_input.s (100%) rename asm/nonmatchings/{code_135EE0 => code_13CAF0}/pause_items_init.s (100%) rename asm/nonmatchings/{code_135EE0 => code_13CAF0}/pause_items_is_visible.s (100%) rename asm/nonmatchings/{code_135EE0 => code_13CAF0}/pause_items_load_items.s (100%) rename asm/nonmatchings/{code_135EE0 => code_13CAF0}/pause_items_scroll_offset_y.s (100%) rename asm/nonmatchings/{code_135EE0 => code_13CAF0}/pause_items_update.s (100%) rename asm/nonmatchings/{code_135EE0 => code_13CAF0}/pause_partners_cleanup.s (100%) rename asm/nonmatchings/{code_135EE0 => code_13CAF0}/pause_partners_draw_contents.s (100%) rename asm/nonmatchings/{code_135EE0 => code_13CAF0}/pause_partners_draw_movelist.s (100%) rename asm/nonmatchings/{code_135EE0 => code_13CAF0}/pause_partners_draw_movelist_flower.s (100%) rename asm/nonmatchings/{code_135EE0 => code_13CAF0}/pause_partners_draw_movelist_title.s (100%) rename asm/nonmatchings/{code_135EE0 => code_13CAF0}/pause_partners_draw_title.s (100%) rename asm/nonmatchings/{code_135EE0 => code_13CAF0}/pause_partners_handle_input.s (100%) rename asm/nonmatchings/{code_135EE0 => code_13CAF0}/pause_partners_init.s (100%) rename asm/nonmatchings/{code_135EE0 => code_13CAF0}/pause_partners_load_portrait.s (100%) rename asm/nonmatchings/{code_135EE0 => code_13CAF0}/pause_partners_update.s (100%) rename asm/nonmatchings/{code_135EE0 => code_13FD40}/pause_spirits_cleanup.s (100%) rename asm/nonmatchings/{code_135EE0 => code_13FD40}/pause_spirits_draw_contents.s (100%) rename asm/nonmatchings/{code_135EE0 => code_13FD40}/pause_spirits_draw_title.s (100%) rename asm/nonmatchings/{code_135EE0 => code_13FD40}/pause_spirits_handle_input.s (100%) rename asm/nonmatchings/{code_135EE0 => code_13FD40}/pause_spirits_init.s (100%) rename asm/nonmatchings/{code_135EE0 => code_13FD40}/pause_spirits_update.s (100%) rename asm/nonmatchings/{code_135EE0 => code_140C70}/func_8024D930.s (100%) rename asm/nonmatchings/{code_135EE0 => code_140C70}/pause_map_cleanup.s (100%) rename asm/nonmatchings/{code_135EE0 => code_140C70}/pause_map_draw_border_arrows.s (100%) rename asm/nonmatchings/{code_135EE0 => code_140C70}/pause_map_draw_contents.s (100%) rename asm/nonmatchings/{code_135EE0 => code_140C70}/pause_map_draw_title.s (100%) rename asm/nonmatchings/{code_135EE0 => code_140C70}/pause_map_handle_input.s (100%) rename asm/nonmatchings/{code_135EE0 => code_140C70}/pause_map_init.s (100%) rename asm/nonmatchings/{code_135EE0 => code_140C70}/pause_map_update.s (100%) rename asm/nonmatchings/{code_135EE0 => code_1421C0}/pause_draw_menu_label.s (100%) rename asm/nonmatchings/{code_135EE0 => code_1421C0}/pause_get_menu_string.s (100%) create mode 100644 asm/nonmatchings/code_163400/pause_set_cursor_opacity.s rename asm/nonmatchings/{code_163400 => code_165490}/func_80244C30.s (100%) rename asm/nonmatchings/{code_163400 => code_165490}/func_80244CEC.s (100%) rename asm/nonmatchings/{code_163400 => code_165490}/func_80244D60.s (100%) rename asm/nonmatchings/{code_163400 => code_165490}/func_80244DD0.s (100%) rename asm/nonmatchings/{code_163400 => code_165490}/func_80244E54.s (100%) rename asm/nonmatchings/{code_163400 => code_165490}/func_80244F44.s (100%) rename asm/nonmatchings/{code_163400 => code_165490}/func_80244FD4.s (100%) rename asm/nonmatchings/{code_163400 => code_165490}/func_8024544C.s (100%) rename asm/nonmatchings/{code_163400 => code_165490}/func_80245588.s (100%) rename asm/nonmatchings/{code_163400 => code_165490}/func_802455D8.s (100%) rename asm/nonmatchings/{code_163400 => code_165490}/func_80245628.s (100%) rename asm/nonmatchings/{code_163400 => code_165490}/func_80245678.s (100%) rename asm/nonmatchings/{code_163400 => code_165490}/func_802456C8.s (100%) rename asm/nonmatchings/{code_163400 => code_165490}/func_80245718.s (100%) rename asm/nonmatchings/{code_163400 => code_165490}/func_80245768.s (100%) rename asm/nonmatchings/{code_163400 => code_165490}/func_802457B8.s (100%) rename asm/nonmatchings/{code_163400 => code_165490}/func_80245808.s (100%) rename asm/nonmatchings/{code_163400 => code_165490}/func_80245A40.s (100%) rename asm/nonmatchings/{code_163400 => code_165490}/func_80246B2C.s (100%) rename asm/nonmatchings/{code_163400 => code_165490}/func_80246CBC.s (100%) create mode 100644 src/code_13CAF0.c create mode 100644 src/code_13FD40.c create mode 100644 src/code_140C70.c create mode 100644 src/code_1421C0.c create mode 100644 src/code_165490.c diff --git a/asm/nonmatchings/code_135EE0/pause_items_cleanup.s b/asm/nonmatchings/code_13CAF0/pause_items_cleanup.s similarity index 100% rename from asm/nonmatchings/code_135EE0/pause_items_cleanup.s rename to asm/nonmatchings/code_13CAF0/pause_items_cleanup.s diff --git a/asm/nonmatchings/code_135EE0/pause_items_comparator.s b/asm/nonmatchings/code_13CAF0/pause_items_comparator.s similarity index 100% rename from asm/nonmatchings/code_135EE0/pause_items_comparator.s rename to asm/nonmatchings/code_13CAF0/pause_items_comparator.s diff --git a/asm/nonmatchings/code_135EE0/pause_items_draw_contents.s b/asm/nonmatchings/code_13CAF0/pause_items_draw_contents.s similarity index 100% rename from asm/nonmatchings/code_135EE0/pause_items_draw_contents.s rename to asm/nonmatchings/code_13CAF0/pause_items_draw_contents.s diff --git a/asm/nonmatchings/code_135EE0/pause_items_get_column.s b/asm/nonmatchings/code_13CAF0/pause_items_get_column.s similarity index 100% rename from asm/nonmatchings/code_135EE0/pause_items_get_column.s rename to asm/nonmatchings/code_13CAF0/pause_items_get_column.s diff --git a/asm/nonmatchings/code_135EE0/pause_items_get_pos_x.s b/asm/nonmatchings/code_13CAF0/pause_items_get_pos_x.s similarity index 100% rename from asm/nonmatchings/code_135EE0/pause_items_get_pos_x.s rename to asm/nonmatchings/code_13CAF0/pause_items_get_pos_x.s diff --git a/asm/nonmatchings/code_135EE0/pause_items_get_pos_y.s b/asm/nonmatchings/code_13CAF0/pause_items_get_pos_y.s similarity index 100% rename from asm/nonmatchings/code_135EE0/pause_items_get_pos_y.s rename to asm/nonmatchings/code_13CAF0/pause_items_get_pos_y.s diff --git a/asm/nonmatchings/code_135EE0/pause_items_get_row.s b/asm/nonmatchings/code_13CAF0/pause_items_get_row.s similarity index 100% rename from asm/nonmatchings/code_135EE0/pause_items_get_row.s rename to asm/nonmatchings/code_13CAF0/pause_items_get_row.s diff --git a/asm/nonmatchings/code_135EE0/pause_items_handle_input.s b/asm/nonmatchings/code_13CAF0/pause_items_handle_input.s similarity index 100% rename from asm/nonmatchings/code_135EE0/pause_items_handle_input.s rename to asm/nonmatchings/code_13CAF0/pause_items_handle_input.s diff --git a/asm/nonmatchings/code_135EE0/pause_items_init.s b/asm/nonmatchings/code_13CAF0/pause_items_init.s similarity index 100% rename from asm/nonmatchings/code_135EE0/pause_items_init.s rename to asm/nonmatchings/code_13CAF0/pause_items_init.s diff --git a/asm/nonmatchings/code_135EE0/pause_items_is_visible.s b/asm/nonmatchings/code_13CAF0/pause_items_is_visible.s similarity index 100% rename from asm/nonmatchings/code_135EE0/pause_items_is_visible.s rename to asm/nonmatchings/code_13CAF0/pause_items_is_visible.s diff --git a/asm/nonmatchings/code_135EE0/pause_items_load_items.s b/asm/nonmatchings/code_13CAF0/pause_items_load_items.s similarity index 100% rename from asm/nonmatchings/code_135EE0/pause_items_load_items.s rename to asm/nonmatchings/code_13CAF0/pause_items_load_items.s diff --git a/asm/nonmatchings/code_135EE0/pause_items_scroll_offset_y.s b/asm/nonmatchings/code_13CAF0/pause_items_scroll_offset_y.s similarity index 100% rename from asm/nonmatchings/code_135EE0/pause_items_scroll_offset_y.s rename to asm/nonmatchings/code_13CAF0/pause_items_scroll_offset_y.s diff --git a/asm/nonmatchings/code_135EE0/pause_items_update.s b/asm/nonmatchings/code_13CAF0/pause_items_update.s similarity index 100% rename from asm/nonmatchings/code_135EE0/pause_items_update.s rename to asm/nonmatchings/code_13CAF0/pause_items_update.s diff --git a/asm/nonmatchings/code_135EE0/pause_partners_cleanup.s b/asm/nonmatchings/code_13CAF0/pause_partners_cleanup.s similarity index 100% rename from asm/nonmatchings/code_135EE0/pause_partners_cleanup.s rename to asm/nonmatchings/code_13CAF0/pause_partners_cleanup.s diff --git a/asm/nonmatchings/code_135EE0/pause_partners_draw_contents.s b/asm/nonmatchings/code_13CAF0/pause_partners_draw_contents.s similarity index 100% rename from asm/nonmatchings/code_135EE0/pause_partners_draw_contents.s rename to asm/nonmatchings/code_13CAF0/pause_partners_draw_contents.s diff --git a/asm/nonmatchings/code_135EE0/pause_partners_draw_movelist.s b/asm/nonmatchings/code_13CAF0/pause_partners_draw_movelist.s similarity index 100% rename from asm/nonmatchings/code_135EE0/pause_partners_draw_movelist.s rename to asm/nonmatchings/code_13CAF0/pause_partners_draw_movelist.s diff --git a/asm/nonmatchings/code_135EE0/pause_partners_draw_movelist_flower.s b/asm/nonmatchings/code_13CAF0/pause_partners_draw_movelist_flower.s similarity index 100% rename from asm/nonmatchings/code_135EE0/pause_partners_draw_movelist_flower.s rename to asm/nonmatchings/code_13CAF0/pause_partners_draw_movelist_flower.s diff --git a/asm/nonmatchings/code_135EE0/pause_partners_draw_movelist_title.s b/asm/nonmatchings/code_13CAF0/pause_partners_draw_movelist_title.s similarity index 100% rename from asm/nonmatchings/code_135EE0/pause_partners_draw_movelist_title.s rename to asm/nonmatchings/code_13CAF0/pause_partners_draw_movelist_title.s diff --git a/asm/nonmatchings/code_135EE0/pause_partners_draw_title.s b/asm/nonmatchings/code_13CAF0/pause_partners_draw_title.s similarity index 100% rename from asm/nonmatchings/code_135EE0/pause_partners_draw_title.s rename to asm/nonmatchings/code_13CAF0/pause_partners_draw_title.s diff --git a/asm/nonmatchings/code_135EE0/pause_partners_handle_input.s b/asm/nonmatchings/code_13CAF0/pause_partners_handle_input.s similarity index 100% rename from asm/nonmatchings/code_135EE0/pause_partners_handle_input.s rename to asm/nonmatchings/code_13CAF0/pause_partners_handle_input.s diff --git a/asm/nonmatchings/code_135EE0/pause_partners_init.s b/asm/nonmatchings/code_13CAF0/pause_partners_init.s similarity index 100% rename from asm/nonmatchings/code_135EE0/pause_partners_init.s rename to asm/nonmatchings/code_13CAF0/pause_partners_init.s diff --git a/asm/nonmatchings/code_135EE0/pause_partners_load_portrait.s b/asm/nonmatchings/code_13CAF0/pause_partners_load_portrait.s similarity index 100% rename from asm/nonmatchings/code_135EE0/pause_partners_load_portrait.s rename to asm/nonmatchings/code_13CAF0/pause_partners_load_portrait.s diff --git a/asm/nonmatchings/code_135EE0/pause_partners_update.s b/asm/nonmatchings/code_13CAF0/pause_partners_update.s similarity index 100% rename from asm/nonmatchings/code_135EE0/pause_partners_update.s rename to asm/nonmatchings/code_13CAF0/pause_partners_update.s diff --git a/asm/nonmatchings/code_135EE0/pause_spirits_cleanup.s b/asm/nonmatchings/code_13FD40/pause_spirits_cleanup.s similarity index 100% rename from asm/nonmatchings/code_135EE0/pause_spirits_cleanup.s rename to asm/nonmatchings/code_13FD40/pause_spirits_cleanup.s diff --git a/asm/nonmatchings/code_135EE0/pause_spirits_draw_contents.s b/asm/nonmatchings/code_13FD40/pause_spirits_draw_contents.s similarity index 100% rename from asm/nonmatchings/code_135EE0/pause_spirits_draw_contents.s rename to asm/nonmatchings/code_13FD40/pause_spirits_draw_contents.s diff --git a/asm/nonmatchings/code_135EE0/pause_spirits_draw_title.s b/asm/nonmatchings/code_13FD40/pause_spirits_draw_title.s similarity index 100% rename from asm/nonmatchings/code_135EE0/pause_spirits_draw_title.s rename to asm/nonmatchings/code_13FD40/pause_spirits_draw_title.s diff --git a/asm/nonmatchings/code_135EE0/pause_spirits_handle_input.s b/asm/nonmatchings/code_13FD40/pause_spirits_handle_input.s similarity index 100% rename from asm/nonmatchings/code_135EE0/pause_spirits_handle_input.s rename to asm/nonmatchings/code_13FD40/pause_spirits_handle_input.s diff --git a/asm/nonmatchings/code_135EE0/pause_spirits_init.s b/asm/nonmatchings/code_13FD40/pause_spirits_init.s similarity index 100% rename from asm/nonmatchings/code_135EE0/pause_spirits_init.s rename to asm/nonmatchings/code_13FD40/pause_spirits_init.s diff --git a/asm/nonmatchings/code_135EE0/pause_spirits_update.s b/asm/nonmatchings/code_13FD40/pause_spirits_update.s similarity index 100% rename from asm/nonmatchings/code_135EE0/pause_spirits_update.s rename to asm/nonmatchings/code_13FD40/pause_spirits_update.s diff --git a/asm/nonmatchings/code_135EE0/func_8024D930.s b/asm/nonmatchings/code_140C70/func_8024D930.s similarity index 100% rename from asm/nonmatchings/code_135EE0/func_8024D930.s rename to asm/nonmatchings/code_140C70/func_8024D930.s diff --git a/asm/nonmatchings/code_135EE0/pause_map_cleanup.s b/asm/nonmatchings/code_140C70/pause_map_cleanup.s similarity index 100% rename from asm/nonmatchings/code_135EE0/pause_map_cleanup.s rename to asm/nonmatchings/code_140C70/pause_map_cleanup.s diff --git a/asm/nonmatchings/code_135EE0/pause_map_draw_border_arrows.s b/asm/nonmatchings/code_140C70/pause_map_draw_border_arrows.s similarity index 100% rename from asm/nonmatchings/code_135EE0/pause_map_draw_border_arrows.s rename to asm/nonmatchings/code_140C70/pause_map_draw_border_arrows.s diff --git a/asm/nonmatchings/code_135EE0/pause_map_draw_contents.s b/asm/nonmatchings/code_140C70/pause_map_draw_contents.s similarity index 100% rename from asm/nonmatchings/code_135EE0/pause_map_draw_contents.s rename to asm/nonmatchings/code_140C70/pause_map_draw_contents.s diff --git a/asm/nonmatchings/code_135EE0/pause_map_draw_title.s b/asm/nonmatchings/code_140C70/pause_map_draw_title.s similarity index 100% rename from asm/nonmatchings/code_135EE0/pause_map_draw_title.s rename to asm/nonmatchings/code_140C70/pause_map_draw_title.s diff --git a/asm/nonmatchings/code_135EE0/pause_map_handle_input.s b/asm/nonmatchings/code_140C70/pause_map_handle_input.s similarity index 100% rename from asm/nonmatchings/code_135EE0/pause_map_handle_input.s rename to asm/nonmatchings/code_140C70/pause_map_handle_input.s diff --git a/asm/nonmatchings/code_135EE0/pause_map_init.s b/asm/nonmatchings/code_140C70/pause_map_init.s similarity index 100% rename from asm/nonmatchings/code_135EE0/pause_map_init.s rename to asm/nonmatchings/code_140C70/pause_map_init.s diff --git a/asm/nonmatchings/code_135EE0/pause_map_update.s b/asm/nonmatchings/code_140C70/pause_map_update.s similarity index 100% rename from asm/nonmatchings/code_135EE0/pause_map_update.s rename to asm/nonmatchings/code_140C70/pause_map_update.s diff --git a/asm/nonmatchings/code_135EE0/pause_draw_menu_label.s b/asm/nonmatchings/code_1421C0/pause_draw_menu_label.s similarity index 100% rename from asm/nonmatchings/code_135EE0/pause_draw_menu_label.s rename to asm/nonmatchings/code_1421C0/pause_draw_menu_label.s diff --git a/asm/nonmatchings/code_135EE0/pause_get_menu_string.s b/asm/nonmatchings/code_1421C0/pause_get_menu_string.s similarity index 100% rename from asm/nonmatchings/code_135EE0/pause_get_menu_string.s rename to asm/nonmatchings/code_1421C0/pause_get_menu_string.s diff --git a/asm/nonmatchings/code_163400/pause_set_cursor_opacity.s b/asm/nonmatchings/code_163400/pause_set_cursor_opacity.s new file mode 100644 index 0000000000..055d931cbd --- /dev/null +++ b/asm/nonmatchings/code_163400/pause_set_cursor_opacity.s @@ -0,0 +1,144 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel pause_set_cursor_opacity +/* 163400 80242BA0 2882F581 */ slti $v0, $a0, -0xa7f +/* 163404 80242BA4 8FA90014 */ lw $t1, 0x14($sp) +/* 163408 80242BA8 8FAA0018 */ lw $t2, 0x18($sp) +/* 16340C 80242BAC 8FAB001C */ lw $t3, 0x1c($sp) +/* 163410 80242BB0 8FAC0020 */ lw $t4, 0x20($sp) +/* 163414 80242BB4 14400075 */ bnez $v0, .L80242D8C +/* 163418 80242BB8 28A2F581 */ slti $v0, $a1, -0xa7f +/* 16341C 80242BBC 14400073 */ bnez $v0, .L80242D8C +/* 163420 80242BC0 00000000 */ nop +/* 163424 80242BC4 18C00071 */ blez $a2, .L80242D8C +/* 163428 80242BC8 00000000 */ nop +/* 16342C 80242BCC 18E0006F */ blez $a3, .L80242D8C +/* 163430 80242BD0 28820500 */ slti $v0, $a0, 0x500 +/* 163434 80242BD4 1040006D */ beqz $v0, .L80242D8C +/* 163438 80242BD8 28A203C0 */ slti $v0, $a1, 0x3c0 +/* 16343C 80242BDC 1040006B */ beqz $v0, .L80242D8C +/* 163440 80242BE0 28C20A80 */ slti $v0, $a2, 0xa80 +/* 163444 80242BE4 10400069 */ beqz $v0, .L80242D8C +/* 163448 80242BE8 28E20A80 */ slti $v0, $a3, 0xa80 +/* 16344C 80242BEC 10400067 */ beqz $v0, .L80242D8C +/* 163450 80242BF0 00000000 */ nop +/* 163454 80242BF4 3C02800A */ lui $v0, 0x800a +/* 163458 80242BF8 2442A66C */ addiu $v0, $v0, -0x5994 +/* 16345C 80242BFC 8C480000 */ lw $t0, ($v0) +/* 163460 80242C00 25030008 */ addiu $v1, $t0, 8 +/* 163464 80242C04 AC430000 */ sw $v1, ($v0) +/* 163468 80242C08 00061400 */ sll $v0, $a2, 0x10 +/* 16346C 80242C0C 00021403 */ sra $v0, $v0, 0x10 +/* 163470 80242C10 18400005 */ blez $v0, .L80242C28 +/* 163474 80242C14 30420FFF */ andi $v0, $v0, 0xfff +/* 163478 80242C18 00021300 */ sll $v0, $v0, 0xc +/* 16347C 80242C1C 3C03E400 */ lui $v1, 0xe400 +/* 163480 80242C20 08090B0B */ j .L80242C2C +/* 163484 80242C24 00431825 */ or $v1, $v0, $v1 +.L80242C28: +/* 163488 80242C28 3C03E400 */ lui $v1, 0xe400 +.L80242C2C: +/* 16348C 80242C2C 00071400 */ sll $v0, $a3, 0x10 +/* 163490 80242C30 00021403 */ sra $v0, $v0, 0x10 +/* 163494 80242C34 18400004 */ blez $v0, .L80242C48 +/* 163498 80242C38 AD030000 */ sw $v1, ($t0) +/* 16349C 80242C3C 30420FFF */ andi $v0, $v0, 0xfff +/* 1634A0 80242C40 00621025 */ or $v0, $v1, $v0 +/* 1634A4 80242C44 AD020000 */ sw $v0, ($t0) +.L80242C48: +/* 1634A8 80242C48 8FA20010 */ lw $v0, 0x10($sp) +/* 1634AC 80242C4C 30420007 */ andi $v0, $v0, 7 +/* 1634B0 80242C50 00021E00 */ sll $v1, $v0, 0x18 +/* 1634B4 80242C54 00041400 */ sll $v0, $a0, 0x10 +/* 1634B8 80242C58 00023403 */ sra $a2, $v0, 0x10 +/* 1634BC 80242C5C 18C00003 */ blez $a2, .L80242C6C +/* 1634C0 80242C60 30C20FFF */ andi $v0, $a2, 0xfff +/* 1634C4 80242C64 00021300 */ sll $v0, $v0, 0xc +/* 1634C8 80242C68 00621825 */ or $v1, $v1, $v0 +.L80242C6C: +/* 1634CC 80242C6C 00051400 */ sll $v0, $a1, 0x10 +/* 1634D0 80242C70 00021403 */ sra $v0, $v0, 0x10 +/* 1634D4 80242C74 18400004 */ blez $v0, .L80242C88 +/* 1634D8 80242C78 AD030004 */ sw $v1, 4($t0) +/* 1634DC 80242C7C 30420FFF */ andi $v0, $v0, 0xfff +/* 1634E0 80242C80 00621025 */ or $v0, $v1, $v0 +/* 1634E4 80242C84 AD020004 */ sw $v0, 4($t0) +.L80242C88: +/* 1634E8 80242C88 3C03800A */ lui $v1, 0x800a +/* 1634EC 80242C8C 2463A66C */ addiu $v1, $v1, -0x5994 +/* 1634F0 80242C90 8C620000 */ lw $v0, ($v1) +/* 1634F4 80242C94 0040202D */ daddu $a0, $v0, $zero +/* 1634F8 80242C98 24420008 */ addiu $v0, $v0, 8 +/* 1634FC 80242C9C AC620000 */ sw $v0, ($v1) +/* 163500 80242CA0 3C02E100 */ lui $v0, 0xe100 +/* 163504 80242CA4 AC820000 */ sw $v0, ($a0) +/* 163508 80242CA8 04C10012 */ bgez $a2, .L80242CF4 +/* 16350C 80242CAC 24840004 */ addiu $a0, $a0, 4 +/* 163510 80242CB0 000B1400 */ sll $v0, $t3, 0x10 +/* 163514 80242CB4 00021403 */ sra $v0, $v0, 0x10 +/* 163518 80242CB8 04410007 */ bgez $v0, .L80242CD8 +/* 16351C 80242CBC 00C20018 */ mult $a2, $v0 +/* 163520 80242CC0 00006812 */ mflo $t5 +/* 163524 80242CC4 000D11C3 */ sra $v0, $t5, 7 +/* 163528 80242CC8 04410008 */ bgez $v0, .L80242CEC +/* 16352C 80242CCC 01221023 */ subu $v0, $t1, $v0 +/* 163530 80242CD0 08090B3A */ j .L80242CE8 +/* 163534 80242CD4 0000102D */ daddu $v0, $zero, $zero +.L80242CD8: +/* 163538 80242CD8 00006812 */ mflo $t5 +/* 16353C 80242CDC 000D11C3 */ sra $v0, $t5, 7 +/* 163540 80242CE0 5C400001 */ bgtzl $v0, .L80242CE8 +/* 163544 80242CE4 0000102D */ daddu $v0, $zero, $zero +.L80242CE8: +/* 163548 80242CE8 01221023 */ subu $v0, $t1, $v0 +.L80242CEC: +/* 16354C 80242CEC 08090B3E */ j .L80242CF8 +/* 163550 80242CF0 00023400 */ sll $a2, $v0, 0x10 +.L80242CF4: +/* 163554 80242CF4 00093400 */ sll $a2, $t1, 0x10 +.L80242CF8: +/* 163558 80242CF8 04A10016 */ bgez $a1, .L80242D54 +/* 16355C 80242CFC 3142FFFF */ andi $v0, $t2, 0xffff +/* 163560 80242D00 000C1400 */ sll $v0, $t4, 0x10 +/* 163564 80242D04 00021C03 */ sra $v1, $v0, 0x10 +/* 163568 80242D08 0461000A */ bgez $v1, .L80242D34 +/* 16356C 80242D0C 00051400 */ sll $v0, $a1, 0x10 +/* 163570 80242D10 00021403 */ sra $v0, $v0, 0x10 +/* 163574 80242D14 00430018 */ mult $v0, $v1 +/* 163578 80242D18 00006812 */ mflo $t5 +/* 16357C 80242D1C 000D11C3 */ sra $v0, $t5, 7 +/* 163580 80242D20 04420001 */ bltzl $v0, .L80242D28 +/* 163584 80242D24 0000102D */ daddu $v0, $zero, $zero +.L80242D28: +/* 163588 80242D28 01421023 */ subu $v0, $t2, $v0 +/* 16358C 80242D2C 08090B55 */ j .L80242D54 +/* 163590 80242D30 3042FFFF */ andi $v0, $v0, 0xffff +.L80242D34: +/* 163594 80242D34 00021403 */ sra $v0, $v0, 0x10 +/* 163598 80242D38 00430018 */ mult $v0, $v1 +/* 16359C 80242D3C 00006812 */ mflo $t5 +/* 1635A0 80242D40 000D11C3 */ sra $v0, $t5, 7 +/* 1635A4 80242D44 5C400001 */ bgtzl $v0, .L80242D4C +/* 1635A8 80242D48 0000102D */ daddu $v0, $zero, $zero +.L80242D4C: +/* 1635AC 80242D4C 01421023 */ subu $v0, $t2, $v0 +/* 1635B0 80242D50 3042FFFF */ andi $v0, $v0, 0xffff +.L80242D54: +/* 1635B4 80242D54 00C21025 */ or $v0, $a2, $v0 +/* 1635B8 80242D58 AC820000 */ sw $v0, ($a0) +/* 1635BC 80242D5C 3C03800A */ lui $v1, 0x800a +/* 1635C0 80242D60 2463A66C */ addiu $v1, $v1, -0x5994 +/* 1635C4 80242D64 8C620000 */ lw $v0, ($v1) +/* 1635C8 80242D68 0040202D */ daddu $a0, $v0, $zero +/* 1635CC 80242D6C 24420008 */ addiu $v0, $v0, 8 +/* 1635D0 80242D70 AC620000 */ sw $v0, ($v1) +/* 1635D4 80242D74 3C02F100 */ lui $v0, 0xf100 +/* 1635D8 80242D78 AC820000 */ sw $v0, ($a0) +/* 1635DC 80242D7C 000B1400 */ sll $v0, $t3, 0x10 +/* 1635E0 80242D80 3183FFFF */ andi $v1, $t4, 0xffff +/* 1635E4 80242D84 00431025 */ or $v0, $v0, $v1 +/* 1635E8 80242D88 AC820004 */ sw $v0, 4($a0) +.L80242D8C: +/* 1635EC 80242D8C 03E00008 */ jr $ra +/* 1635F0 80242D90 00000000 */ nop diff --git a/asm/nonmatchings/code_163400/func_80244C30.s b/asm/nonmatchings/code_165490/func_80244C30.s similarity index 100% rename from asm/nonmatchings/code_163400/func_80244C30.s rename to asm/nonmatchings/code_165490/func_80244C30.s diff --git a/asm/nonmatchings/code_163400/func_80244CEC.s b/asm/nonmatchings/code_165490/func_80244CEC.s similarity index 100% rename from asm/nonmatchings/code_163400/func_80244CEC.s rename to asm/nonmatchings/code_165490/func_80244CEC.s diff --git a/asm/nonmatchings/code_163400/func_80244D60.s b/asm/nonmatchings/code_165490/func_80244D60.s similarity index 100% rename from asm/nonmatchings/code_163400/func_80244D60.s rename to asm/nonmatchings/code_165490/func_80244D60.s diff --git a/asm/nonmatchings/code_163400/func_80244DD0.s b/asm/nonmatchings/code_165490/func_80244DD0.s similarity index 100% rename from asm/nonmatchings/code_163400/func_80244DD0.s rename to asm/nonmatchings/code_165490/func_80244DD0.s diff --git a/asm/nonmatchings/code_163400/func_80244E54.s b/asm/nonmatchings/code_165490/func_80244E54.s similarity index 100% rename from asm/nonmatchings/code_163400/func_80244E54.s rename to asm/nonmatchings/code_165490/func_80244E54.s diff --git a/asm/nonmatchings/code_163400/func_80244F44.s b/asm/nonmatchings/code_165490/func_80244F44.s similarity index 100% rename from asm/nonmatchings/code_163400/func_80244F44.s rename to asm/nonmatchings/code_165490/func_80244F44.s diff --git a/asm/nonmatchings/code_163400/func_80244FD4.s b/asm/nonmatchings/code_165490/func_80244FD4.s similarity index 100% rename from asm/nonmatchings/code_163400/func_80244FD4.s rename to asm/nonmatchings/code_165490/func_80244FD4.s diff --git a/asm/nonmatchings/code_163400/func_8024544C.s b/asm/nonmatchings/code_165490/func_8024544C.s similarity index 100% rename from asm/nonmatchings/code_163400/func_8024544C.s rename to asm/nonmatchings/code_165490/func_8024544C.s diff --git a/asm/nonmatchings/code_163400/func_80245588.s b/asm/nonmatchings/code_165490/func_80245588.s similarity index 100% rename from asm/nonmatchings/code_163400/func_80245588.s rename to asm/nonmatchings/code_165490/func_80245588.s diff --git a/asm/nonmatchings/code_163400/func_802455D8.s b/asm/nonmatchings/code_165490/func_802455D8.s similarity index 100% rename from asm/nonmatchings/code_163400/func_802455D8.s rename to asm/nonmatchings/code_165490/func_802455D8.s diff --git a/asm/nonmatchings/code_163400/func_80245628.s b/asm/nonmatchings/code_165490/func_80245628.s similarity index 100% rename from asm/nonmatchings/code_163400/func_80245628.s rename to asm/nonmatchings/code_165490/func_80245628.s diff --git a/asm/nonmatchings/code_163400/func_80245678.s b/asm/nonmatchings/code_165490/func_80245678.s similarity index 100% rename from asm/nonmatchings/code_163400/func_80245678.s rename to asm/nonmatchings/code_165490/func_80245678.s diff --git a/asm/nonmatchings/code_163400/func_802456C8.s b/asm/nonmatchings/code_165490/func_802456C8.s similarity index 100% rename from asm/nonmatchings/code_163400/func_802456C8.s rename to asm/nonmatchings/code_165490/func_802456C8.s diff --git a/asm/nonmatchings/code_163400/func_80245718.s b/asm/nonmatchings/code_165490/func_80245718.s similarity index 100% rename from asm/nonmatchings/code_163400/func_80245718.s rename to asm/nonmatchings/code_165490/func_80245718.s diff --git a/asm/nonmatchings/code_163400/func_80245768.s b/asm/nonmatchings/code_165490/func_80245768.s similarity index 100% rename from asm/nonmatchings/code_163400/func_80245768.s rename to asm/nonmatchings/code_165490/func_80245768.s diff --git a/asm/nonmatchings/code_163400/func_802457B8.s b/asm/nonmatchings/code_165490/func_802457B8.s similarity index 100% rename from asm/nonmatchings/code_163400/func_802457B8.s rename to asm/nonmatchings/code_165490/func_802457B8.s diff --git a/asm/nonmatchings/code_163400/func_80245808.s b/asm/nonmatchings/code_165490/func_80245808.s similarity index 100% rename from asm/nonmatchings/code_163400/func_80245808.s rename to asm/nonmatchings/code_165490/func_80245808.s diff --git a/asm/nonmatchings/code_163400/func_80245A40.s b/asm/nonmatchings/code_165490/func_80245A40.s similarity index 100% rename from asm/nonmatchings/code_163400/func_80245A40.s rename to asm/nonmatchings/code_165490/func_80245A40.s diff --git a/asm/nonmatchings/code_163400/func_80246B2C.s b/asm/nonmatchings/code_165490/func_80246B2C.s similarity index 100% rename from asm/nonmatchings/code_163400/func_80246B2C.s rename to asm/nonmatchings/code_165490/func_80246B2C.s diff --git a/asm/nonmatchings/code_163400/func_80246CBC.s b/asm/nonmatchings/code_165490/func_80246CBC.s similarity index 100% rename from asm/nonmatchings/code_163400/func_80246CBC.s rename to asm/nonmatchings/code_165490/func_80246CBC.s diff --git a/src/code_135EE0.c b/src/code_135EE0.c index a07973bc6a..3ce4094fd3 100644 --- a/src/code_135EE0.c +++ b/src/code_135EE0.c @@ -125,85 +125,3 @@ INCLUDE_ASM(s32, "code_135EE0", pause_badges_handle_input); INCLUDE_ASM(s32, "code_135EE0", pause_badges_update); INCLUDE_ASM(s32, "code_135EE0", pause_badges_cleanup); - -INCLUDE_ASM(s32, "code_135EE0", pause_items_comparator); - -INCLUDE_ASM(s32, "code_135EE0", pause_items_get_pos_x); - -INCLUDE_ASM(s32, "code_135EE0", pause_items_get_pos_y); - -INCLUDE_ASM(s32, "code_135EE0", pause_items_get_column); - -INCLUDE_ASM(s32, "code_135EE0", pause_items_get_row); - -INCLUDE_ASM(s32, "code_135EE0", pause_items_is_visible); - -INCLUDE_ASM(s32, "code_135EE0", pause_items_scroll_offset_y); - -s32 pause_items_scroll_offset_x(s32 beforeX) { - return beforeX; -} - -INCLUDE_ASM(s32, "code_135EE0", pause_items_draw_contents); - -INCLUDE_ASM(s32, "code_135EE0", pause_items_load_items); - -INCLUDE_ASM(s32, "code_135EE0", pause_items_init); - -INCLUDE_ASM(s32, "code_135EE0", pause_items_handle_input); - -INCLUDE_ASM(s32, "code_135EE0", pause_items_update); - -INCLUDE_ASM(s32, "code_135EE0", pause_items_cleanup); - -INCLUDE_ASM(s32, "code_135EE0", pause_partners_load_portrait); - -INCLUDE_ASM(s32, "code_135EE0", pause_partners_draw_contents); - -INCLUDE_ASM(s32, "code_135EE0", pause_partners_draw_title); - -INCLUDE_ASM(s32, "code_135EE0", pause_partners_draw_movelist); - -INCLUDE_ASM(s32, "code_135EE0", pause_partners_draw_movelist_title); - -INCLUDE_ASM(s32, "code_135EE0", pause_partners_draw_movelist_flower); - -INCLUDE_ASM(s32, "code_135EE0", pause_partners_init); - -INCLUDE_ASM(s32, "code_135EE0", pause_partners_handle_input); - -INCLUDE_ASM(s32, "code_135EE0", pause_partners_update); - -INCLUDE_ASM(s32, "code_135EE0", pause_partners_cleanup); - -INCLUDE_ASM(s32, "code_135EE0", pause_spirits_draw_contents); - -INCLUDE_ASM(s32, "code_135EE0", pause_spirits_draw_title); - -INCLUDE_ASM(s32, "code_135EE0", pause_spirits_init); - -INCLUDE_ASM(s32, "code_135EE0", pause_spirits_handle_input); - -INCLUDE_ASM(s32, "code_135EE0", pause_spirits_update); - -INCLUDE_ASM(s32, "code_135EE0", pause_spirits_cleanup); - -INCLUDE_ASM(s32, "code_135EE0", func_8024D930); - -INCLUDE_ASM(s32, "code_135EE0", pause_map_draw_border_arrows); - -INCLUDE_ASM(s32, "code_135EE0", pause_map_draw_contents); - -INCLUDE_ASM(s32, "code_135EE0", pause_map_draw_title); - -INCLUDE_ASM(s32, "code_135EE0", pause_map_init); - -INCLUDE_ASM(s32, "code_135EE0", pause_map_handle_input); - -INCLUDE_ASM(s32, "code_135EE0", pause_map_update); - -INCLUDE_ASM(s32, "code_135EE0", pause_map_cleanup); - -INCLUDE_ASM(s32, "code_135EE0", pause_get_menu_string); - -INCLUDE_ASM(s32, "code_135EE0", pause_draw_menu_label); diff --git a/src/code_13CAF0.c b/src/code_13CAF0.c new file mode 100644 index 0000000000..d3cb67d706 --- /dev/null +++ b/src/code_13CAF0.c @@ -0,0 +1,51 @@ +#include "common.h" + +INCLUDE_ASM(s32, "code_13CAF0", pause_items_comparator); + +INCLUDE_ASM(s32, "code_13CAF0", pause_items_get_pos_x); + +INCLUDE_ASM(s32, "code_13CAF0", pause_items_get_pos_y); + +INCLUDE_ASM(s32, "code_13CAF0", pause_items_get_column); + +INCLUDE_ASM(s32, "code_13CAF0", pause_items_get_row); + +INCLUDE_ASM(s32, "code_13CAF0", pause_items_is_visible); + +INCLUDE_ASM(s32, "code_13CAF0", pause_items_scroll_offset_y); + +s32 pause_items_scroll_offset_x(s32 beforeX) { + return beforeX; +} + +INCLUDE_ASM(s32, "code_13CAF0", pause_items_draw_contents); + +INCLUDE_ASM(s32, "code_13CAF0", pause_items_load_items); + +INCLUDE_ASM(s32, "code_13CAF0", pause_items_init); + +INCLUDE_ASM(s32, "code_13CAF0", pause_items_handle_input); + +INCLUDE_ASM(s32, "code_13CAF0", pause_items_update); + +INCLUDE_ASM(s32, "code_13CAF0", pause_items_cleanup); + +INCLUDE_ASM(s32, "code_13CAF0", pause_partners_load_portrait); + +INCLUDE_ASM(s32, "code_13CAF0", pause_partners_draw_contents); + +INCLUDE_ASM(s32, "code_13CAF0", pause_partners_draw_title); + +INCLUDE_ASM(s32, "code_13CAF0", pause_partners_draw_movelist); + +INCLUDE_ASM(s32, "code_13CAF0", pause_partners_draw_movelist_title); + +INCLUDE_ASM(s32, "code_13CAF0", pause_partners_draw_movelist_flower); + +INCLUDE_ASM(s32, "code_13CAF0", pause_partners_init); + +INCLUDE_ASM(s32, "code_13CAF0", pause_partners_handle_input); + +INCLUDE_ASM(s32, "code_13CAF0", pause_partners_update); + +INCLUDE_ASM(s32, "code_13CAF0", pause_partners_cleanup); diff --git a/src/code_13FD40.c b/src/code_13FD40.c new file mode 100644 index 0000000000..7236b71867 --- /dev/null +++ b/src/code_13FD40.c @@ -0,0 +1,13 @@ +#include "common.h" + +INCLUDE_ASM(s32, "code_13FD40", pause_spirits_draw_contents); + +INCLUDE_ASM(s32, "code_13FD40", pause_spirits_draw_title); + +INCLUDE_ASM(s32, "code_13FD40", pause_spirits_init); + +INCLUDE_ASM(s32, "code_13FD40", pause_spirits_handle_input); + +INCLUDE_ASM(s32, "code_13FD40", pause_spirits_update); + +INCLUDE_ASM(s32, "code_13FD40", pause_spirits_cleanup); diff --git a/src/code_140C70.c b/src/code_140C70.c new file mode 100644 index 0000000000..9a563af08c --- /dev/null +++ b/src/code_140C70.c @@ -0,0 +1,17 @@ +#include "common.h" + +INCLUDE_ASM(s32, "code_140C70", func_8024D930); + +INCLUDE_ASM(s32, "code_140C70", pause_map_draw_border_arrows); + +INCLUDE_ASM(s32, "code_140C70", pause_map_draw_contents); + +INCLUDE_ASM(s32, "code_140C70", pause_map_draw_title); + +INCLUDE_ASM(s32, "code_140C70", pause_map_init); + +INCLUDE_ASM(s32, "code_140C70", pause_map_handle_input); + +INCLUDE_ASM(s32, "code_140C70", pause_map_update); + +INCLUDE_ASM(s32, "code_140C70", pause_map_cleanup); diff --git a/src/code_1421C0.c b/src/code_1421C0.c new file mode 100644 index 0000000000..7b7b7870f2 --- /dev/null +++ b/src/code_1421C0.c @@ -0,0 +1,5 @@ +#include "common.h" + +INCLUDE_ASM(s32, "code_1421C0", pause_get_menu_string); + +INCLUDE_ASM(s32, "code_1421C0", pause_draw_menu_label); diff --git a/src/code_163400.c b/src/code_163400.c index f65f205101..a7e62caa97 100644 --- a/src/code_163400.c +++ b/src/code_163400.c @@ -57,43 +57,3 @@ INCLUDE_ASM(s32, "code_163400", func_802448E0); INCLUDE_ASM(s32, "code_163400", func_80244B00); INCLUDE_ASM(s32, "code_163400", func_80244BC4); - -INCLUDE_ASM(s32, "code_163400", func_80244C30); - -INCLUDE_ASM(s32, "code_163400", func_80244CEC); - -INCLUDE_ASM(s32, "code_163400", func_80244D60); - -INCLUDE_ASM(s32, "code_163400", func_80244DD0); - -INCLUDE_ASM(s32, "code_163400", func_80244E54); - -INCLUDE_ASM(s32, "code_163400", func_80244F44); - -INCLUDE_ASM(s32, "code_163400", func_80244FD4); - -INCLUDE_ASM(s32, "code_163400", func_8024544C); - -INCLUDE_ASM(s32, "code_163400", func_80245588); - -INCLUDE_ASM(s32, "code_163400", func_802455D8); - -INCLUDE_ASM(s32, "code_163400", func_80245628); - -INCLUDE_ASM(s32, "code_163400", func_80245678); - -INCLUDE_ASM(s32, "code_163400", func_802456C8); - -INCLUDE_ASM(s32, "code_163400", func_80245718); - -INCLUDE_ASM(s32, "code_163400", func_80245768); - -INCLUDE_ASM(s32, "code_163400", func_802457B8); - -INCLUDE_ASM(s32, "code_163400", func_80245808); - -INCLUDE_ASM(s32, "code_163400", func_80245A40); - -INCLUDE_ASM(s32, "code_163400", func_80246B2C); - -INCLUDE_ASM(s32, "code_163400", func_80246CBC); diff --git a/src/code_165490.c b/src/code_165490.c new file mode 100644 index 0000000000..fb8cba3afa --- /dev/null +++ b/src/code_165490.c @@ -0,0 +1,41 @@ +#include "common.h" + +INCLUDE_ASM(s32, "code_165490", func_80244C30); + +INCLUDE_ASM(s32, "code_165490", func_80244CEC); + +INCLUDE_ASM(s32, "code_165490", func_80244D60); + +INCLUDE_ASM(s32, "code_165490", func_80244DD0); + +INCLUDE_ASM(s32, "code_165490", func_80244E54); + +INCLUDE_ASM(s32, "code_165490", func_80244F44); + +INCLUDE_ASM(s32, "code_165490", func_80244FD4); + +INCLUDE_ASM(s32, "code_165490", func_8024544C); + +INCLUDE_ASM(s32, "code_165490", func_80245588); + +INCLUDE_ASM(s32, "code_165490", func_802455D8); + +INCLUDE_ASM(s32, "code_165490", func_80245628); + +INCLUDE_ASM(s32, "code_165490", func_80245678); + +INCLUDE_ASM(s32, "code_165490", func_802456C8); + +INCLUDE_ASM(s32, "code_165490", func_80245718); + +INCLUDE_ASM(s32, "code_165490", func_80245768); + +INCLUDE_ASM(s32, "code_165490", func_802457B8); + +INCLUDE_ASM(s32, "code_165490", func_80245808); + +INCLUDE_ASM(s32, "code_165490", func_80245A40); + +INCLUDE_ASM(s32, "code_165490", func_80246B2C); + +INCLUDE_ASM(s32, "code_165490", func_80246CBC); diff --git a/tools/splat.yaml b/tools/splat.yaml index 397a6cbea1..3527fc8cb5 100644 --- a/tools/splat.yaml +++ b/tools/splat.yaml @@ -277,17 +277,22 @@ segments: start: 0x135EE0 vram: 0x80242BA0 files: - - [0x135EE0, "c", "code_135EE0"] + - [0x135EE0, "c"] + - [0x13CAF0, "c"] + - [0x13FD40, "c"] + - [0x140C70, "c"] + - [0x1421C0, "c"] - [0x1422A0, "bin"] - name: code type: code start: 0x163400 vram: 0x80242BA0 files: - - [0x163400, "c", "code_163400"] - - [0x167570, "c", "code_167570"] - - [0x168590, "c", "code_168590"] - - [0x169BE0, "c", "code_169BE0"] + - [0x163400, "c"] + - [0x165490, "c"] + - [0x167570, "c"] + - [0x168590, "c"] + - [0x169BE0, "c"] - [0x16A3E0, "bin"] - name: code type: code