diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/_draw_message_box.s b/asm/nonmatchings/code_B9D60/_draw_message_box.s similarity index 100% rename from asm/nonmatchings/code_b72b0_len_15ed0/_draw_message_box.s rename to asm/nonmatchings/code_B9D60/_draw_message_box.s diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/_load_string.s b/asm/nonmatchings/code_B9D60/_load_string.s similarity index 100% rename from asm/nonmatchings/code_b72b0_len_15ed0/_load_string.s rename to asm/nonmatchings/code_B9D60/_load_string.s diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/_update_message.s b/asm/nonmatchings/code_B9D60/_update_message.s similarity index 100% rename from asm/nonmatchings/code_b72b0_len_15ed0/_update_message.s rename to asm/nonmatchings/code_B9D60/_update_message.s diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/appendGfx_item_entity.s b/asm/nonmatchings/code_B9D60/appendGfx_item_entity.s similarity index 100% rename from asm/nonmatchings/code_b72b0_len_15ed0/appendGfx_item_entity.s rename to asm/nonmatchings/code_B9D60/appendGfx_item_entity.s diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/clamp_printer_coords.s b/asm/nonmatchings/code_B9D60/clamp_printer_coords.s similarity index 100% rename from asm/nonmatchings/code_b72b0_len_15ed0/clamp_printer_coords.s rename to asm/nonmatchings/code_B9D60/clamp_printer_coords.s diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/clear_item_entity_data.s b/asm/nonmatchings/code_B9D60/clear_item_entity_data.s similarity index 100% rename from asm/nonmatchings/code_b72b0_len_15ed0/clear_item_entity_data.s rename to asm/nonmatchings/code_B9D60/clear_item_entity_data.s diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/clear_item_entity_flags.s b/asm/nonmatchings/code_B9D60/clear_item_entity_flags.s similarity index 100% rename from asm/nonmatchings/code_b72b0_len_15ed0/clear_item_entity_flags.s rename to asm/nonmatchings/code_B9D60/clear_item_entity_flags.s diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/clear_printers.s b/asm/nonmatchings/code_B9D60/clear_printers.s similarity index 100% rename from asm/nonmatchings/code_b72b0_len_15ed0/clear_printers.s rename to asm/nonmatchings/code_B9D60/clear_printers.s diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/dma_load_string.s b/asm/nonmatchings/code_B9D60/dma_load_string.s similarity index 100% rename from asm/nonmatchings/code_b72b0_len_15ed0/dma_load_string.s rename to asm/nonmatchings/code_B9D60/dma_load_string.s diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/draw_coin_sparkles.s b/asm/nonmatchings/code_B9D60/draw_coin_sparkles.s similarity index 100% rename from asm/nonmatchings/code_b72b0_len_15ed0/draw_coin_sparkles.s rename to asm/nonmatchings/code_B9D60/draw_coin_sparkles.s diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/draw_digit.s b/asm/nonmatchings/code_B9D60/draw_digit.s similarity index 100% rename from asm/nonmatchings/code_b72b0_len_15ed0/draw_digit.s rename to asm/nonmatchings/code_B9D60/draw_digit.s diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/draw_item_entities.s b/asm/nonmatchings/code_B9D60/draw_item_entities.s similarity index 100% rename from asm/nonmatchings/code_b72b0_len_15ed0/draw_item_entities.s rename to asm/nonmatchings/code_B9D60/draw_item_entities.s diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/draw_number.s b/asm/nonmatchings/code_B9D60/draw_number.s similarity index 100% rename from asm/nonmatchings/code_b72b0_len_15ed0/draw_number.s rename to asm/nonmatchings/code_B9D60/draw_number.s diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/draw_string.s b/asm/nonmatchings/code_B9D60/draw_string.s similarity index 100% rename from asm/nonmatchings/code_b72b0_len_15ed0/draw_string.s rename to asm/nonmatchings/code_B9D60/draw_string.s diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/func_80124434.s b/asm/nonmatchings/code_B9D60/func_80124434.s similarity index 100% rename from asm/nonmatchings/code_b72b0_len_15ed0/func_80124434.s rename to asm/nonmatchings/code_B9D60/func_80124434.s diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/func_80124570.s b/asm/nonmatchings/code_B9D60/func_80124570.s similarity index 100% rename from asm/nonmatchings/code_b72b0_len_15ed0/func_80124570.s rename to asm/nonmatchings/code_B9D60/func_80124570.s diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/func_80125C84.s b/asm/nonmatchings/code_B9D60/func_80125C84.s similarity index 100% rename from asm/nonmatchings/code_b72b0_len_15ed0/func_80125C84.s rename to asm/nonmatchings/code_B9D60/func_80125C84.s diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/func_801264B0.s b/asm/nonmatchings/code_B9D60/func_801264B0.s similarity index 100% rename from asm/nonmatchings/code_b72b0_len_15ed0/func_801264B0.s rename to asm/nonmatchings/code_B9D60/func_801264B0.s diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/func_80126790.s b/asm/nonmatchings/code_B9D60/func_80126790.s similarity index 100% rename from asm/nonmatchings/code_b72b0_len_15ed0/func_80126790.s rename to asm/nonmatchings/code_B9D60/func_80126790.s diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/func_80126EAC.s b/asm/nonmatchings/code_B9D60/func_80126EAC.s similarity index 100% rename from asm/nonmatchings/code_b72b0_len_15ed0/func_80126EAC.s rename to asm/nonmatchings/code_B9D60/func_80126EAC.s diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/func_80126F78.s b/asm/nonmatchings/code_B9D60/func_80126F78.s similarity index 100% rename from asm/nonmatchings/code_b72b0_len_15ed0/func_80126F78.s rename to asm/nonmatchings/code_B9D60/func_80126F78.s diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/func_80127B70.s b/asm/nonmatchings/code_B9D60/func_80127B70.s similarity index 100% rename from asm/nonmatchings/code_b72b0_len_15ed0/func_80127B70.s rename to asm/nonmatchings/code_B9D60/func_80127B70.s diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/func_80127BA4.s b/asm/nonmatchings/code_B9D60/func_80127BA4.s similarity index 100% rename from asm/nonmatchings/code_b72b0_len_15ed0/func_80127BA4.s rename to asm/nonmatchings/code_B9D60/func_80127BA4.s diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/func_80127D90.s b/asm/nonmatchings/code_B9D60/func_80127D90.s similarity index 100% rename from asm/nonmatchings/code_b72b0_len_15ed0/func_80127D90.s rename to asm/nonmatchings/code_B9D60/func_80127D90.s diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/func_8012C2E0.s b/asm/nonmatchings/code_B9D60/func_8012C2E0.s similarity index 100% rename from asm/nonmatchings/code_b72b0_len_15ed0/func_8012C2E0.s rename to asm/nonmatchings/code_B9D60/func_8012C2E0.s diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/func_8012C324.s b/asm/nonmatchings/code_B9D60/func_8012C324.s similarity index 100% rename from asm/nonmatchings/code_b72b0_len_15ed0/func_8012C324.s rename to asm/nonmatchings/code_B9D60/func_8012C324.s diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/func_8012C9A8.s b/asm/nonmatchings/code_B9D60/func_8012C9A8.s similarity index 100% rename from asm/nonmatchings/code_b72b0_len_15ed0/func_8012C9A8.s rename to asm/nonmatchings/code_B9D60/func_8012C9A8.s diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/func_8012CA08.s b/asm/nonmatchings/code_B9D60/func_8012CA08.s similarity index 100% rename from asm/nonmatchings/code_b72b0_len_15ed0/func_8012CA08.s rename to asm/nonmatchings/code_B9D60/func_8012CA08.s diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/func_8012D3DC.s b/asm/nonmatchings/code_B9D60/func_8012D3DC.s similarity index 100% rename from asm/nonmatchings/code_b72b0_len_15ed0/func_8012D3DC.s rename to asm/nonmatchings/code_B9D60/func_8012D3DC.s diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/func_8012DB58.s b/asm/nonmatchings/code_B9D60/func_8012DB58.s similarity index 100% rename from asm/nonmatchings/code_b72b0_len_15ed0/func_8012DB58.s rename to asm/nonmatchings/code_B9D60/func_8012DB58.s diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/func_8012E8E0.s b/asm/nonmatchings/code_B9D60/func_8012E8E0.s similarity index 100% rename from asm/nonmatchings/code_b72b0_len_15ed0/func_8012E8E0.s rename to asm/nonmatchings/code_B9D60/func_8012E8E0.s diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/func_8012E9A0.s b/asm/nonmatchings/code_B9D60/func_8012E9A0.s similarity index 100% rename from asm/nonmatchings/code_b72b0_len_15ed0/func_8012E9A0.s rename to asm/nonmatchings/code_B9D60/func_8012E9A0.s diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/func_8012EC94.s b/asm/nonmatchings/code_B9D60/func_8012EC94.s similarity index 100% rename from asm/nonmatchings/code_b72b0_len_15ed0/func_8012EC94.s rename to asm/nonmatchings/code_B9D60/func_8012EC94.s diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/func_8012F500.s b/asm/nonmatchings/code_B9D60/func_8012F500.s similarity index 100% rename from asm/nonmatchings/code_b72b0_len_15ed0/func_8012F500.s rename to asm/nonmatchings/code_B9D60/func_8012F500.s diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/func_8012FE10.s b/asm/nonmatchings/code_B9D60/func_8012FE10.s similarity index 100% rename from asm/nonmatchings/code_b72b0_len_15ed0/func_8012FE10.s rename to asm/nonmatchings/code_B9D60/func_8012FE10.s diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/func_8012FE78.s b/asm/nonmatchings/code_B9D60/func_8012FE78.s similarity index 100% rename from asm/nonmatchings/code_b72b0_len_15ed0/func_8012FE78.s rename to asm/nonmatchings/code_B9D60/func_8012FE78.s diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/func_801309F0.s b/asm/nonmatchings/code_B9D60/func_801309F0.s similarity index 100% rename from asm/nonmatchings/code_b72b0_len_15ed0/func_801309F0.s rename to asm/nonmatchings/code_B9D60/func_801309F0.s diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/func_80130A04.s b/asm/nonmatchings/code_B9D60/func_80130A04.s similarity index 100% rename from asm/nonmatchings/code_b72b0_len_15ed0/func_80130A04.s rename to asm/nonmatchings/code_B9D60/func_80130A04.s diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/func_80130ACC.s b/asm/nonmatchings/code_B9D60/func_80130ACC.s similarity index 100% rename from asm/nonmatchings/code_b72b0_len_15ed0/func_80130ACC.s rename to asm/nonmatchings/code_B9D60/func_80130ACC.s diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/func_80130F70.s b/asm/nonmatchings/code_B9D60/func_80130F70.s similarity index 100% rename from asm/nonmatchings/code_b72b0_len_15ed0/func_80130F70.s rename to asm/nonmatchings/code_B9D60/func_80130F70.s diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/func_80130FAC.s b/asm/nonmatchings/code_B9D60/func_80130FAC.s similarity index 100% rename from asm/nonmatchings/code_b72b0_len_15ed0/func_80130FAC.s rename to asm/nonmatchings/code_B9D60/func_80130FAC.s diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/func_80131128.s b/asm/nonmatchings/code_B9D60/func_80131128.s similarity index 100% rename from asm/nonmatchings/code_b72b0_len_15ed0/func_80131128.s rename to asm/nonmatchings/code_B9D60/func_80131128.s diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/func_80131DD4.s b/asm/nonmatchings/code_B9D60/func_80131DD4.s similarity index 100% rename from asm/nonmatchings/code_b72b0_len_15ed0/func_80131DD4.s rename to asm/nonmatchings/code_B9D60/func_80131DD4.s diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/func_80132D94.s b/asm/nonmatchings/code_B9D60/func_80132D94.s similarity index 100% rename from asm/nonmatchings/code_b72b0_len_15ed0/func_80132D94.s rename to asm/nonmatchings/code_B9D60/func_80132D94.s diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/func_80133A94.s b/asm/nonmatchings/code_B9D60/func_80133A94.s similarity index 100% rename from asm/nonmatchings/code_b72b0_len_15ed0/func_80133A94.s rename to asm/nonmatchings/code_B9D60/func_80133A94.s diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/func_80133FC8.s b/asm/nonmatchings/code_B9D60/func_80133FC8.s similarity index 100% rename from asm/nonmatchings/code_b72b0_len_15ed0/func_80133FC8.s rename to asm/nonmatchings/code_B9D60/func_80133FC8.s diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/func_801341B0.s b/asm/nonmatchings/code_B9D60/func_801341B0.s similarity index 100% rename from asm/nonmatchings/code_b72b0_len_15ed0/func_801341B0.s rename to asm/nonmatchings/code_B9D60/func_801341B0.s diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/func_8013559C.s b/asm/nonmatchings/code_B9D60/func_8013559C.s similarity index 100% rename from asm/nonmatchings/code_b72b0_len_15ed0/func_8013559C.s rename to asm/nonmatchings/code_B9D60/func_8013559C.s diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/func_801363A0.s b/asm/nonmatchings/code_B9D60/func_801363A0.s similarity index 100% rename from asm/nonmatchings/code_b72b0_len_15ed0/func_801363A0.s rename to asm/nonmatchings/code_B9D60/func_801363A0.s diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/func_8013673C.s b/asm/nonmatchings/code_B9D60/func_8013673C.s similarity index 100% rename from asm/nonmatchings/code_b72b0_len_15ed0/func_8013673C.s rename to asm/nonmatchings/code_B9D60/func_8013673C.s diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/func_801369D0.s b/asm/nonmatchings/code_B9D60/func_801369D0.s similarity index 100% rename from asm/nonmatchings/code_b72b0_len_15ed0/func_801369D0.s rename to asm/nonmatchings/code_B9D60/func_801369D0.s diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/func_80136A08.s b/asm/nonmatchings/code_B9D60/func_80136A08.s similarity index 100% rename from asm/nonmatchings/code_b72b0_len_15ed0/func_80136A08.s rename to asm/nonmatchings/code_B9D60/func_80136A08.s diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/get_char_width.s b/asm/nonmatchings/code_B9D60/get_char_width.s similarity index 100% rename from asm/nonmatchings/code_b72b0_len_15ed0/get_char_width.s rename to asm/nonmatchings/code_B9D60/get_char_width.s diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/get_string_properties.s b/asm/nonmatchings/code_B9D60/get_string_properties.s similarity index 100% rename from asm/nonmatchings/code_b72b0_len_15ed0/get_string_properties.s rename to asm/nonmatchings/code_B9D60/get_string_properties.s diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/get_string_width.s b/asm/nonmatchings/code_B9D60/get_string_width.s similarity index 100% rename from asm/nonmatchings/code_b72b0_len_15ed0/get_string_width.s rename to asm/nonmatchings/code_B9D60/get_string_width.s diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/init_got_item.s b/asm/nonmatchings/code_B9D60/init_got_item.s similarity index 100% rename from asm/nonmatchings/code_b72b0_len_15ed0/init_got_item.s rename to asm/nonmatchings/code_B9D60/init_got_item.s diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/init_item_entity_list.s b/asm/nonmatchings/code_B9D60/init_item_entity_list.s similarity index 100% rename from asm/nonmatchings/code_b72b0_len_15ed0/init_item_entity_list.s rename to asm/nonmatchings/code_B9D60/init_item_entity_list.s diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/initialize_printer.s b/asm/nonmatchings/code_B9D60/initialize_printer.s similarity index 100% rename from asm/nonmatchings/code_b72b0_len_15ed0/initialize_printer.s rename to asm/nonmatchings/code_B9D60/initialize_printer.s diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/load_font.s b/asm/nonmatchings/code_B9D60/load_font.s similarity index 100% rename from asm/nonmatchings/code_b72b0_len_15ed0/load_font.s rename to asm/nonmatchings/code_B9D60/load_font.s diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/load_font_data.s b/asm/nonmatchings/code_B9D60/load_font_data.s similarity index 100% rename from asm/nonmatchings/code_b72b0_len_15ed0/load_font_data.s rename to asm/nonmatchings/code_B9D60/load_font_data.s diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/load_message_to_buffer.s b/asm/nonmatchings/code_B9D60/load_message_to_buffer.s similarity index 100% rename from asm/nonmatchings/code_b72b0_len_15ed0/load_message_to_buffer.s rename to asm/nonmatchings/code_B9D60/load_message_to_buffer.s diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/load_message_to_printer.s b/asm/nonmatchings/code_B9D60/load_message_to_printer.s similarity index 96% rename from asm/nonmatchings/code_b72b0_len_15ed0/load_message_to_printer.s rename to asm/nonmatchings/code_B9D60/load_message_to_printer.s index cdf8e1f14e..e759310f10 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/load_message_to_printer.s +++ b/asm/nonmatchings/code_B9D60/load_message_to_printer.s @@ -9,7 +9,7 @@ glabel load_message_to_printer /* BC178 80125A78 04400003 */ bltz $v0, .L80125A88 /* BC17C 80125A7C AFBF0014 */ sw $ra, 0x14($sp) /* BC180 80125A80 0C049623 */ jal load_message_to_buffer -/* BC184 80125A84 00000000 */ nop +/* BC184 80125A84 00000000 */ nop .L80125A88: /* BC188 80125A88 0040202D */ daddu $a0, $v0, $zero /* BC18C 80125A8C 8E0304FC */ lw $v1, 0x4fc($s0) diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/make_item_entity.s b/asm/nonmatchings/code_B9D60/make_item_entity.s similarity index 100% rename from asm/nonmatchings/code_b72b0_len_15ed0/make_item_entity.s rename to asm/nonmatchings/code_B9D60/make_item_entity.s diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/make_item_entity_delayed.s b/asm/nonmatchings/code_B9D60/make_item_entity_delayed.s similarity index 100% rename from asm/nonmatchings/code_b72b0_len_15ed0/make_item_entity_delayed.s rename to asm/nonmatchings/code_B9D60/make_item_entity_delayed.s diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/make_item_entity_nodelay.s b/asm/nonmatchings/code_B9D60/make_item_entity_nodelay.s similarity index 100% rename from asm/nonmatchings/code_b72b0_len_15ed0/make_item_entity_nodelay.s rename to asm/nonmatchings/code_B9D60/make_item_entity_nodelay.s diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/remove_item_entity_by_index.s b/asm/nonmatchings/code_B9D60/remove_item_entity_by_index.s similarity index 100% rename from asm/nonmatchings/code_b72b0_len_15ed0/remove_item_entity_by_index.s rename to asm/nonmatchings/code_B9D60/remove_item_entity_by_index.s diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/remove_item_entity_by_reference.s b/asm/nonmatchings/code_B9D60/remove_item_entity_by_reference.s similarity index 100% rename from asm/nonmatchings/code_b72b0_len_15ed0/remove_item_entity_by_reference.s rename to asm/nonmatchings/code_B9D60/remove_item_entity_by_reference.s diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/render_item_entities.s b/asm/nonmatchings/code_B9D60/render_item_entities.s similarity index 100% rename from asm/nonmatchings/code_b72b0_len_15ed0/render_item_entities.s rename to asm/nonmatchings/code_B9D60/render_item_entities.s diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/render_messages.s b/asm/nonmatchings/code_B9D60/render_messages.s similarity index 100% rename from asm/nonmatchings/code_b72b0_len_15ed0/render_messages.s rename to asm/nonmatchings/code_B9D60/render_messages.s diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/set_item_entity_flags.s b/asm/nonmatchings/code_B9D60/set_item_entity_flags.s similarity index 100% rename from asm/nonmatchings/code_b72b0_len_15ed0/set_item_entity_flags.s rename to asm/nonmatchings/code_B9D60/set_item_entity_flags.s diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/set_message_string.s b/asm/nonmatchings/code_B9D60/set_message_string.s similarity index 100% rename from asm/nonmatchings/code_b72b0_len_15ed0/set_message_string.s rename to asm/nonmatchings/code_B9D60/set_message_string.s diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/set_message_value.s b/asm/nonmatchings/code_B9D60/set_message_value.s similarity index 100% rename from asm/nonmatchings/code_b72b0_len_15ed0/set_message_value.s rename to asm/nonmatchings/code_B9D60/set_message_value.s diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/test_item_player_collision.s b/asm/nonmatchings/code_B9D60/test_item_player_collision.s similarity index 100% rename from asm/nonmatchings/code_b72b0_len_15ed0/test_item_player_collision.s rename to asm/nonmatchings/code_B9D60/test_item_player_collision.s diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/update_item_entities.s b/asm/nonmatchings/code_B9D60/update_item_entities.s similarity index 100% rename from asm/nonmatchings/code_b72b0_len_15ed0/update_item_entities.s rename to asm/nonmatchings/code_B9D60/update_item_entities.s diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/update_item_entity_collectable.s b/asm/nonmatchings/code_B9D60/update_item_entity_collectable.s similarity index 100% rename from asm/nonmatchings/code_b72b0_len_15ed0/update_item_entity_collectable.s rename to asm/nonmatchings/code_B9D60/update_item_entity_collectable.s diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/update_item_entity_static.s b/asm/nonmatchings/code_B9D60/update_item_entity_static.s similarity index 100% rename from asm/nonmatchings/code_b72b0_len_15ed0/update_item_entity_static.s rename to asm/nonmatchings/code_B9D60/update_item_entity_static.s diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/update_item_entity_temp.s b/asm/nonmatchings/code_B9D60/update_item_entity_temp.s similarity index 100% rename from asm/nonmatchings/code_b72b0_len_15ed0/update_item_entity_temp.s rename to asm/nonmatchings/code_B9D60/update_item_entity_temp.s diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/update_messages.s b/asm/nonmatchings/code_B9D60/update_messages.s similarity index 100% rename from asm/nonmatchings/code_b72b0_len_15ed0/update_messages.s rename to asm/nonmatchings/code_B9D60/update_messages.s diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/cancel_message.s b/asm/nonmatchings/code_b72b0_len_15ed0/cancel_message.s deleted file mode 100644 index dfc05892a2..0000000000 --- a/asm/nonmatchings/code_b72b0_len_15ed0/cancel_message.s +++ /dev/null @@ -1,14 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel cancel_message -/* BC208 80125B08 8C8304FC */ lw $v1, 0x4fc($a0) -/* BC20C 80125B0C 30620002 */ andi $v0, $v1, 2 -/* BC210 80125B10 10400004 */ beqz $v0, .L80125B24 -/* BC214 80125B14 34620001 */ ori $v0, $v1, 1 -/* BC218 80125B18 AC8204FC */ sw $v0, 0x4fc($a0) -/* BC21C 80125B1C 03E00008 */ jr $ra -/* BC220 80125B20 24020001 */ addiu $v0, $zero, 1 -.L80125B24: -/* BC224 80125B24 03E00008 */ jr $ra -/* BC228 80125B28 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/clear_character_set.s b/asm/nonmatchings/code_b72b0_len_15ed0/clear_character_set.s deleted file mode 100644 index f03bc98e91..0000000000 --- a/asm/nonmatchings/code_b72b0_len_15ed0/clear_character_set.s +++ /dev/null @@ -1,9 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel clear_character_set -/* B9D60 80123660 2402FFFF */ addiu $v0, $zero, -1 -/* B9D64 80123664 3C018015 */ lui $at, %hi(D_80155C98) -/* B9D68 80123668 A4225C98 */ sh $v0, %lo(D_80155C98)($at) -/* B9D6C 8012366C 03E00008 */ jr $ra -/* B9D70 80123670 00000000 */ nop diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/close_message.s b/asm/nonmatchings/code_b72b0_len_15ed0/close_message.s deleted file mode 100644 index 88db3e8019..0000000000 --- a/asm/nonmatchings/code_b72b0_len_15ed0/close_message.s +++ /dev/null @@ -1,9 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel close_message -/* BC370 80125C70 8C8204FC */ lw $v0, 0x4fc($a0) -/* BC374 80125C74 2403FFBF */ addiu $v1, $zero, -0x41 -/* BC378 80125C78 00431024 */ and $v0, $v0, $v1 -/* BC37C 80125C7C 03E00008 */ jr $ra -/* BC380 80125C80 AC8204FC */ sw $v0, 0x4fc($a0) diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/disable_entity_fog.s b/asm/nonmatchings/code_b72b0_len_15ed0/disable_entity_fog.s deleted file mode 100644 index b6d2cb6f21..0000000000 --- a/asm/nonmatchings/code_b72b0_len_15ed0/disable_entity_fog.s +++ /dev/null @@ -1,8 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel disable_entity_fog -/* B9700 80123000 3C018015 */ lui $at, %hi(D_80154378) -/* B9704 80123004 AC204378 */ sw $zero, %lo(D_80154378)($at) -/* B9708 80123008 03E00008 */ jr $ra -/* B970C 8012300C 00000000 */ nop diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/enable_entity_fog.s b/asm/nonmatchings/code_b72b0_len_15ed0/enable_entity_fog.s deleted file mode 100644 index a637eb94ca..0000000000 --- a/asm/nonmatchings/code_b72b0_len_15ed0/enable_entity_fog.s +++ /dev/null @@ -1,9 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel enable_entity_fog -/* B96EC 80122FEC 24020001 */ addiu $v0, $zero, 1 -/* B96F0 80122FF0 3C018015 */ lui $at, %hi(D_80154378) -/* B96F4 80122FF4 AC224378 */ sw $v0, %lo(D_80154378)($at) -/* B96F8 80122FF8 03E00008 */ jr $ra -/* B96FC 80122FFC 00000000 */ nop diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/func_80121140.s b/asm/nonmatchings/code_b72b0_len_15ed0/func_80121140.s deleted file mode 100644 index 8707811e13..0000000000 --- a/asm/nonmatchings/code_b72b0_len_15ed0/func_80121140.s +++ /dev/null @@ -1,21 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80121140 -/* B7840 80121140 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B7844 80121144 AFB00010 */ sw $s0, 0x10($sp) -/* B7848 80121148 AFBF0014 */ sw $ra, 0x14($sp) -/* B784C 8012114C 0C019D28 */ jal guMtxIdentF -/* B7850 80121150 0080802D */ daddu $s0, $a0, $zero -/* B7854 80121154 3C013F80 */ lui $at, 0x3f80 -/* B7858 80121158 44810000 */ mtc1 $at, $f0 -/* B785C 8012115C 3C01BF80 */ lui $at, 0xbf80 -/* B7860 80121160 44811000 */ mtc1 $at, $f2 -/* B7864 80121164 E6000000 */ swc1 $f0, ($s0) -/* B7868 80121168 E6000014 */ swc1 $f0, 0x14($s0) -/* B786C 8012116C E6020028 */ swc1 $f2, 0x28($s0) -/* B7870 80121170 E600003C */ swc1 $f0, 0x3c($s0) -/* B7874 80121174 8FBF0014 */ lw $ra, 0x14($sp) -/* B7878 80121178 8FB00010 */ lw $s0, 0x10($sp) -/* B787C 8012117C 03E00008 */ jr $ra -/* B7880 80121180 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/func_80122DDC.s b/asm/nonmatchings/code_b72b0_len_15ed0/func_80122DDC.s deleted file mode 100644 index 66c664dfb6..0000000000 --- a/asm/nonmatchings/code_b72b0_len_15ed0/func_80122DDC.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80122DDC -/* B94DC 80122DDC 2402F7FF */ addiu $v0, $zero, -0x801 -/* B94E0 80122DE0 00822024 */ and $a0, $a0, $v0 -/* B94E4 80122DE4 3C028015 */ lui $v0, %hi(D_80154370) -/* B94E8 80122DE8 8C424370 */ lw $v0, %lo(D_80154370)($v0) -/* B94EC 80122DEC 00042080 */ sll $a0, $a0, 2 -/* B94F0 80122DF0 00822021 */ addu $a0, $a0, $v0 -/* B94F4 80122DF4 03E00008 */ jr $ra -/* B94F8 80122DF8 8C820000 */ lw $v0, ($a0) diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/func_801341E8.s b/asm/nonmatchings/code_b72b0_len_15ed0/func_801341E8.s deleted file mode 100644 index 09aeee275d..0000000000 --- a/asm/nonmatchings/code_b72b0_len_15ed0/func_801341E8.s +++ /dev/null @@ -1,14 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_801341E8 -/* CA8E8 801341E8 3C028015 */ lui $v0, %hi(D_801565A8) -/* CA8EC 801341EC 844265A8 */ lh $v0, %lo(D_801565A8)($v0) -/* CA8F0 801341F0 3C038015 */ lui $v1, %hi(D_801565A4) -/* CA8F4 801341F4 846365A4 */ lh $v1, %lo(D_801565A4)($v1) -/* CA8F8 801341F8 10600002 */ beqz $v1, .L80134204 -/* CA8FC 801341FC 0002102B */ sltu $v0, $zero, $v0 -/* CA900 80134200 24020001 */ addiu $v0, $zero, 1 -.L80134204: -/* CA904 80134204 03E00008 */ jr $ra -/* CA908 80134208 00000000 */ nop diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/func_80134230.s b/asm/nonmatchings/code_b72b0_len_15ed0/func_80134230.s deleted file mode 100644 index d383a0004a..0000000000 --- a/asm/nonmatchings/code_b72b0_len_15ed0/func_80134230.s +++ /dev/null @@ -1,8 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80134230 -/* CA930 80134230 3C018015 */ lui $at, %hi(D_80155D88) -/* CA934 80134234 AC245D88 */ sw $a0, %lo(D_80155D88)($at) -/* CA938 80134238 03E00008 */ jr $ra -/* CA93C 8013423C 00000000 */ nop diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/func_80134240.s b/asm/nonmatchings/code_b72b0_len_15ed0/func_80134240.s deleted file mode 100644 index 3d2a2ed98a..0000000000 --- a/asm/nonmatchings/code_b72b0_len_15ed0/func_80134240.s +++ /dev/null @@ -1,8 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80134240 -/* CA940 80134240 3C028015 */ lui $v0, %hi(D_80155D88) -/* CA944 80134244 8C425D88 */ lw $v0, %lo(D_80155D88)($v0) -/* CA948 80134248 03E00008 */ jr $ra -/* CA94C 8013424C 00000000 */ nop diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/get_dynamic_entity.s b/asm/nonmatchings/code_b72b0_len_15ed0/get_dynamic_entity.s deleted file mode 100644 index 20aca906a3..0000000000 --- a/asm/nonmatchings/code_b72b0_len_15ed0/get_dynamic_entity.s +++ /dev/null @@ -1,13 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel get_dynamic_entity -/* B9D3C 8012363C 2402F7FF */ addiu $v0, $zero, -0x801 -/* B9D40 80123640 00822024 */ and $a0, $a0, $v0 -/* B9D44 80123644 3C028015 */ lui $v0, %hi(gCurrentDynamicEntityListPtr) -/* B9D48 80123648 8C424420 */ lw $v0, %lo(gCurrentDynamicEntityListPtr)($v0) -/* B9D4C 8012364C 00042080 */ sll $a0, $a0, 2 -/* B9D50 80123650 00822021 */ addu $a0, $a0, $v0 -/* B9D54 80123654 03E00008 */ jr $ra -/* B9D58 80123658 8C820000 */ lw $v0, ($a0) -/* B9D5C 8012365C 00000000 */ nop diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/get_entity_fog_color.s b/asm/nonmatchings/code_b72b0_len_15ed0/get_entity_fog_color.s deleted file mode 100644 index 1bb791722a..0000000000 --- a/asm/nonmatchings/code_b72b0_len_15ed0/get_entity_fog_color.s +++ /dev/null @@ -1,17 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel get_entity_fog_color -/* B977C 8012307C 3C028015 */ lui $v0, %hi(D_8015437C) -/* B9780 80123080 8C42437C */ lw $v0, %lo(D_8015437C)($v0) -/* B9784 80123084 AC820000 */ sw $v0, ($a0) -/* B9788 80123088 3C028015 */ lui $v0, %hi(D_80154380) -/* B978C 8012308C 8C424380 */ lw $v0, %lo(D_80154380)($v0) -/* B9790 80123090 ACA20000 */ sw $v0, ($a1) -/* B9794 80123094 3C028015 */ lui $v0, %hi(D_80154384) -/* B9798 80123098 8C424384 */ lw $v0, %lo(D_80154384)($v0) -/* B979C 8012309C ACC20000 */ sw $v0, ($a2) -/* B97A0 801230A0 3C028015 */ lui $v0, %hi(D_80154388) -/* B97A4 801230A4 8C424388 */ lw $v0, %lo(D_80154388)($v0) -/* B97A8 801230A8 03E00008 */ jr $ra -/* B97AC 801230AC ACE20000 */ sw $v0, ($a3) diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/get_entity_fog_distance.s b/asm/nonmatchings/code_b72b0_len_15ed0/get_entity_fog_distance.s deleted file mode 100644 index 23e691baea..0000000000 --- a/asm/nonmatchings/code_b72b0_len_15ed0/get_entity_fog_distance.s +++ /dev/null @@ -1,11 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel get_entity_fog_distance -/* B9760 80123060 3C028015 */ lui $v0, %hi(D_8015438C) -/* B9764 80123064 8C42438C */ lw $v0, %lo(D_8015438C)($v0) -/* B9768 80123068 AC820000 */ sw $v0, ($a0) -/* B976C 8012306C 3C028015 */ lui $v0, %hi(D_80154390) -/* B9770 80123070 8C424390 */ lw $v0, %lo(D_80154390)($v0) -/* B9774 80123074 03E00008 */ jr $ra -/* B9778 80123078 ACA20000 */ sw $v0, ($a1) diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/get_item_entity.s b/asm/nonmatchings/code_b72b0_len_15ed0/get_item_entity.s deleted file mode 100644 index 74dbaf702e..0000000000 --- a/asm/nonmatchings/code_b72b0_len_15ed0/get_item_entity.s +++ /dev/null @@ -1,10 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel get_item_entity -/* C7658 80130F58 3C028015 */ lui $v0, %hi(D_801565A0) -/* C765C 80130F5C 8C4265A0 */ lw $v0, %lo(D_801565A0)($v0) -/* C7660 80130F60 00042080 */ sll $a0, $a0, 2 -/* C7664 80130F64 00822021 */ addu $a0, $a0, $v0 -/* C7668 80130F68 03E00008 */ jr $ra -/* C766C 80130F6C 8C820000 */ lw $v0, ($a0) diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/init_dynamic_entity_list.s b/asm/nonmatchings/code_b72b0_len_15ed0/init_dynamic_entity_list.s deleted file mode 100644 index 72cd44df0e..0000000000 --- a/asm/nonmatchings/code_b72b0_len_15ed0/init_dynamic_entity_list.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel init_dynamic_entity_list -/* B9814 80123114 3C028007 */ lui $v0, %hi(gGameStatusPtr) -/* B9818 80123118 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) -/* B981C 8012311C 80420070 */ lb $v0, 0x70($v0) -/* B9820 80123120 14400007 */ bnez $v0, .L80123140 -/* B9824 80123124 00000000 */ nop -/* B9828 80123128 3C028015 */ lui $v0, %hi(gWorldDynamicEntityList) -/* B982C 8012312C 244243A0 */ addiu $v0, $v0, %lo(gWorldDynamicEntityList) -/* B9830 80123130 3C018015 */ lui $at, %hi(gCurrentDynamicEntityListPtr) -/* B9834 80123134 AC224420 */ sw $v0, %lo(gCurrentDynamicEntityListPtr)($at) -/* B9838 80123138 03E00008 */ jr $ra -/* B983C 8012313C 00000000 */ nop -.L80123140: -/* B9840 80123140 3C028015 */ lui $v0, %hi(gBattleDynamicEntityList) -/* B9844 80123144 244243E0 */ addiu $v0, $v0, %lo(gBattleDynamicEntityList) -/* B9848 80123148 3C018015 */ lui $at, %hi(gCurrentDynamicEntityListPtr) -/* B984C 8012314C AC224420 */ sw $v0, %lo(gCurrentDynamicEntityListPtr)($at) -/* B9850 80123150 03E00008 */ jr $ra -/* B9854 80123154 00000000 */ nop diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/is_entity_fog_enabled.s b/asm/nonmatchings/code_b72b0_len_15ed0/is_entity_fog_enabled.s deleted file mode 100644 index e6371f0bf3..0000000000 --- a/asm/nonmatchings/code_b72b0_len_15ed0/is_entity_fog_enabled.s +++ /dev/null @@ -1,8 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel is_entity_fog_enabled -/* B9750 80123050 3C028015 */ lui $v0, %hi(D_80154378) -/* B9754 80123054 8C424378 */ lw $v0, %lo(D_80154378)($v0) -/* B9758 80123058 03E00008 */ jr $ra -/* B975C 8012305C 00000000 */ nop diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/load_string.s b/asm/nonmatchings/code_b72b0_len_15ed0/load_string.s deleted file mode 100644 index 1a3d5fa8f1..0000000000 --- a/asm/nonmatchings/code_b72b0_len_15ed0/load_string.s +++ /dev/null @@ -1,11 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel load_string -/* BC000 80125900 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* BC004 80125904 AFBF0010 */ sw $ra, 0x10($sp) -/* BC008 80125908 0C049647 */ jal _load_string -/* BC00C 8012590C 0000302D */ daddu $a2, $zero, $zero -/* BC010 80125910 8FBF0010 */ lw $ra, 0x10($sp) -/* BC014 80125914 03E00008 */ jr $ra -/* BC018 80125918 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/set_entity_fog_color.s b/asm/nonmatchings/code_b72b0_len_15ed0/set_entity_fog_color.s deleted file mode 100644 index b73c888818..0000000000 --- a/asm/nonmatchings/code_b72b0_len_15ed0/set_entity_fog_color.s +++ /dev/null @@ -1,14 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel set_entity_fog_color -/* B9728 80123028 3C018015 */ lui $at, %hi(D_8015437C) -/* B972C 8012302C AC24437C */ sw $a0, %lo(D_8015437C)($at) -/* B9730 80123030 3C018015 */ lui $at, %hi(D_80154380) -/* B9734 80123034 AC254380 */ sw $a1, %lo(D_80154380)($at) -/* B9738 80123038 3C018015 */ lui $at, %hi(D_80154384) -/* B973C 8012303C AC264384 */ sw $a2, %lo(D_80154384)($at) -/* B9740 80123040 3C018015 */ lui $at, %hi(D_80154388) -/* B9744 80123044 AC274388 */ sw $a3, %lo(D_80154388)($at) -/* B9748 80123048 03E00008 */ jr $ra -/* B974C 8012304C 00000000 */ nop diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/set_entity_fog_dist.s b/asm/nonmatchings/code_b72b0_len_15ed0/set_entity_fog_dist.s deleted file mode 100644 index 024d8202f3..0000000000 --- a/asm/nonmatchings/code_b72b0_len_15ed0/set_entity_fog_dist.s +++ /dev/null @@ -1,10 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel set_entity_fog_dist -/* B9710 80123010 3C018015 */ lui $at, %hi(D_8015438C) -/* B9714 80123014 AC24438C */ sw $a0, %lo(D_8015438C)($at) -/* B9718 80123018 3C018015 */ lui $at, %hi(D_80154390) -/* B971C 8012301C AC254390 */ sw $a1, %lo(D_80154390)($at) -/* B9720 80123020 03E00008 */ jr $ra -/* B9724 80123024 00000000 */ nop diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/set_item_entity_position.s b/asm/nonmatchings/code_b72b0_len_15ed0/set_item_entity_position.s deleted file mode 100644 index 18cc55c840..0000000000 --- a/asm/nonmatchings/code_b72b0_len_15ed0/set_item_entity_position.s +++ /dev/null @@ -1,13 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel set_item_entity_position -/* CA90C 8013420C 3C028015 */ lui $v0, %hi(D_801565A0) -/* CA910 80134210 8C4265A0 */ lw $v0, %lo(D_801565A0)($v0) -/* CA914 80134214 00042080 */ sll $a0, $a0, 2 -/* CA918 80134218 00822021 */ addu $a0, $a0, $v0 -/* CA91C 8013421C 8C820000 */ lw $v0, ($a0) -/* CA920 80134220 AC450008 */ sw $a1, 8($v0) -/* CA924 80134224 AC46000C */ sw $a2, 0xc($v0) -/* CA928 80134228 03E00008 */ jr $ra -/* CA92C 8013422C AC470010 */ sw $a3, 0x10($v0) diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/set_message_images.s b/asm/nonmatchings/code_b72b0_len_15ed0/set_message_images.s deleted file mode 100644 index 3dd1f08152..0000000000 --- a/asm/nonmatchings/code_b72b0_len_15ed0/set_message_images.s +++ /dev/null @@ -1,8 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel set_message_images -/* BC22C 80125B2C 3C018015 */ lui $at, %hi(D_801512F4) -/* BC230 80125B30 AC2412F4 */ sw $a0, %lo(D_801512F4)($at) -/* BC234 80125B34 03E00008 */ jr $ra -/* BC238 80125B38 00000000 */ nop diff --git a/src/code_759b0_len_61b0.c b/src/code_759b0_len_61b0.c index dd2fc16f2d..8c51800204 100644 --- a/src/code_759b0_len_61b0.c +++ b/src/code_759b0_len_61b0.c @@ -33,7 +33,8 @@ INCLUDE_ASM(s32, "code_759b0_len_61b0", func_800DD8FC); INCLUDE_ASM(s32, "code_759b0_len_61b0", func_800DDAE4); -INCLUDE_ASM(s32, "code_759b0_len_61b0", func_800DDC44, s32 arg0, f32* arg1, f32* arg2, f32* arg3, f32 arg4, f32 arg5, f32 arg6, f32 arg7); +INCLUDE_ASM(s32, "code_759b0_len_61b0", func_800DDC44, s32 arg0, f32* arg1, f32* arg2, f32* arg3, f32 arg4, f32 arg5, + f32 arg6, f32 arg7); INCLUDE_ASM(s32, "code_759b0_len_61b0", func_800DDCEC); @@ -94,7 +95,8 @@ void func_800DFC74(void) { mem_clear(playerStatus, sizeof(PlayerStatus)); playerStatus->flags = 1; func_800E205C(); - playerStatus->shadowID = create_shadow_type(0, playerStatus->position.x, playerStatus->position.y, playerStatus->position.z); + playerStatus->shadowID = create_shadow_type(0, playerStatus->position.x, playerStatus->position.y, + playerStatus->position.z); func_800E6B68(); func_800E0B14(); func_800E069C(); @@ -104,7 +106,8 @@ void func_800DFC74(void) { } s32 func_800DFCF4(void) { - if (D_8010EBB0[0] == 1 && (D_8010EBB0[3] == 6 || D_8010EBB0[3] == 9 || D_8010EBB0[3] == 7 || D_8010EBB0[3] == 4 || D_8010EBB0[3] == 8)) { + if (D_8010EBB0[0] == 1 && (D_8010EBB0[3] == 6 || D_8010EBB0[3] == 9 || D_8010EBB0[3] == 7 || D_8010EBB0[3] == 4 + || D_8010EBB0[3] == 8)) { return 0; } return 1; diff --git a/src/code_B9D60.c b/src/code_B9D60.c new file mode 100644 index 0000000000..10d1f45995 --- /dev/null +++ b/src/code_B9D60.c @@ -0,0 +1,230 @@ +#include "common.h" + +extern s32 D_801512F4; +extern s16 D_80155C98; +extern s32 D_80155D88; +ItemEntity** D_801565A0; +extern s16 D_801565A4; +extern s16 D_801565A8; + +void clear_character_set(void) { + D_80155C98 = -1; +} + +INCLUDE_ASM(s32, "code_B9D60", clear_printers); + +INCLUDE_ASM(s32, "code_B9D60", load_font_data); + +INCLUDE_ASM(s32, "code_B9D60", load_font); + +INCLUDE_ASM(s32, "code_B9D60", update_messages); + +INCLUDE_ASM(s32, "code_B9D60", _update_message); + +INCLUDE_ASM(s32, "code_B9D60", render_messages); + +INCLUDE_ASM(s32, "code_B9D60", func_80124434); + +INCLUDE_ASM(s32, "code_B9D60", func_80124570); + +INCLUDE_ASM(s32, "code_B9D60", initialize_printer); + +INCLUDE_ASM(s32, "code_B9D60", dma_load_string); + +INCLUDE_ASM(s32, "code_B9D60", load_message_to_buffer); + +PrintContext* load_string(s32 stringID, s32* a1) { + return _load_string(stringID, a1, 0); +} + +INCLUDE_ASM(s32, "code_B9D60", _load_string); + +INCLUDE_ASM(s32, "code_B9D60", load_message_to_printer); + +INCLUDE_ASM(s32, "code_B9D60", clamp_printer_coords); + +s32 cancel_message(PrintContext* printContext) { + if ((printContext->stateFlags & 2) == 0) { + return 0; + } + + printContext->stateFlags |= 1; + return 1; +} + +void set_message_images(s32* images) { + D_801512F4 = images; +} + +INCLUDE_ASM(s32, "code_B9D60", set_message_string); + +INCLUDE_ASM(s32, "code_B9D60", set_message_value); + +void close_message(PrintContext* printContext) { + printContext->stateFlags &= ~0x40; +} + +INCLUDE_ASM(s32, "code_B9D60", func_80125C84); + +INCLUDE_ASM(s32, "code_B9D60", get_char_width); + +INCLUDE_ASM(s32, "code_B9D60", get_string_properties); + +INCLUDE_ASM(s32, "code_B9D60", get_string_width); + +INCLUDE_ASM(s32, "code_B9D60", func_801264B0); + +INCLUDE_ASM(s32, "code_B9D60", draw_string); + +INCLUDE_ASM(s32, "code_B9D60", func_80126790); + +INCLUDE_ASM(s32, "code_B9D60", func_80126EAC); + +INCLUDE_ASM(s32, "code_B9D60", func_80126F78); + +INCLUDE_ASM(s32, "code_B9D60", draw_digit); + +INCLUDE_ASM(s32, "code_B9D60", draw_number); + +INCLUDE_ASM(s32, "code_B9D60", func_80127B70); + +INCLUDE_ASM(s32, "code_B9D60", func_80127BA4); + +INCLUDE_ASM(s32, "code_B9D60", func_80127D90); + +INCLUDE_ASM(s32, "code_B9D60", func_8012C2E0); + +INCLUDE_ASM(s32, "code_B9D60", func_8012C324); + +INCLUDE_ASM(s32, "code_B9D60", func_8012C9A8); + +INCLUDE_ASM(s32, "code_B9D60", func_8012CA08); + +INCLUDE_ASM(s32, "code_B9D60", _draw_message_box); + +INCLUDE_ASM(s32, "code_B9D60", func_8012D3DC); + +INCLUDE_ASM(s32, "code_B9D60", func_8012DB58); + +INCLUDE_ASM(s32, "code_B9D60", func_8012E8E0); + +INCLUDE_ASM(s32, "code_B9D60", func_8012E9A0); + +INCLUDE_ASM(s32, "code_B9D60", func_8012EC94); + +INCLUDE_ASM(s32, "code_B9D60", func_8012F500); + +INCLUDE_ASM(s32, "code_B9D60", func_8012FE10); + +INCLUDE_ASM(s32, "code_B9D60", func_8012FE78); + +INCLUDE_ASM(s32, "code_B9D60", func_801309F0); + +INCLUDE_ASM(s32, "code_B9D60", func_80130A04); + +INCLUDE_ASM(s32, "code_B9D60", func_80130ACC); + +INCLUDE_ASM(s32, "code_B9D60", draw_coin_sparkles); + +ItemEntity* get_item_entity(s32 itemEntityIndex) { + return D_801565A0[itemEntityIndex]; +} + +INCLUDE_ASM(s32, "code_B9D60", func_80130F70); + +INCLUDE_ASM(s32, "code_B9D60", func_80130FAC); + +INCLUDE_ASM(s32, "code_B9D60", clear_item_entity_data); + +INCLUDE_ASM(s32, "code_B9D60", init_item_entity_list); + +INCLUDE_ASM(s32, "code_B9D60", func_80131128); + +INCLUDE_ASM(s32, "code_B9D60", make_item_entity); + +INCLUDE_ASM(s32, "code_B9D60", make_item_entity_nodelay, s32 itemID, f32 x, f32 y, f32 z, + ItemSpawnMode itemSpawnMode, s32 pickupVar); + +INCLUDE_ASM(void, "code_B9D60", make_item_entity_delayed, s32 itemID, f32 x, f32 y, f32 z, s32 unk1, + s32 unk2, + s32 unk3); + +INCLUDE_ASM(s32, "code_B9D60", init_got_item); + +INCLUDE_ASM(s32, "code_B9D60", func_80131DD4); + +INCLUDE_ASM(s32, "code_B9D60", update_item_entities); + +INCLUDE_ASM(s32, "code_B9D60", appendGfx_item_entity); + +INCLUDE_ASM(s32, "code_B9D60", draw_item_entities); + +INCLUDE_ASM(s32, "code_B9D60", func_80132D94); + +INCLUDE_ASM(s32, "code_B9D60", render_item_entities); + +INCLUDE_ASM(s32, "code_B9D60", remove_item_entity_by_reference); + +INCLUDE_ASM(s32, "code_B9D60", remove_item_entity_by_index); + +INCLUDE_ASM(s32, "code_B9D60", func_80133A94); + +INCLUDE_ASM(s32, "code_B9D60", test_item_player_collision); + +INCLUDE_ASM(s32, "code_B9D60", func_80133FC8); + +INCLUDE_ASM(void, "code_B9D60", set_item_entity_flags, s32 itemEntityIndex, s32 flag); + +INCLUDE_ASM(s32, "code_B9D60", clear_item_entity_flags); + +INCLUDE_ASM(s32, "code_B9D60", func_801341B0); + +s32 func_801341E8(void) { + s32 ret = D_801565A8 != 0; + + if (D_801565A4 != 0) { + ret = 1; + } + return ret; +} + +void set_item_entity_position(s32 itemEntityIndex, f32 x, f32 y, f32 z) { + ItemEntity* itemEntity = D_801565A0[itemEntityIndex]; + + itemEntity->position.x = x; + itemEntity->position.y = y; + itemEntity->position.z = z; +} + +void func_80134230(s32 arg0) { + D_80155D88 = arg0; +} + +s32 func_80134240(void) { + return D_80155D88; +} + +INCLUDE_ASM(s32, "code_B9D60", update_item_entity_collectable); + +INCLUDE_ASM(s32, "code_B9D60", func_8013559C); + +INCLUDE_ASM(s32, "code_B9D60", update_item_entity_static); + +void func_801356C4(void) { +} + +void func_801356CC(void) { +} + +void func_801356D4(void) { +} + +INCLUDE_ASM(s32, "code_B9D60", update_item_entity_temp); + +INCLUDE_ASM(s32, "code_B9D60", func_801363A0); + +INCLUDE_ASM(s32, "code_B9D60", func_8013673C); + +INCLUDE_ASM(s32, "code_B9D60", func_801369D0); + +INCLUDE_ASM(s32, "code_B9D60", func_80136A08); diff --git a/src/code_b72b0_len_15ed0.c b/src/code_b72b0_len_15ed0.c index 32148743d3..1d1665756d 100644 --- a/src/code_b72b0_len_15ed0.c +++ b/src/code_b72b0_len_15ed0.c @@ -1,5 +1,14 @@ #include "common.h" +extern s32** D_80154370; // probably entities of some sort +extern s32 D_80154378; // entity fog enabled +extern s32 D_8015437C; // entity fog red +extern s32 D_80154380; // entity fog green +extern s32 D_80154384; // entity fog blue +extern s32 D_80154388; // entity fog alpha +extern s32 D_8015438C; // entity fog dist min +extern s32 D_80154390; // entity fog dist max + INCLUDE_ASM(s32, "code_b72b0_len_15ed0", clear_virtual_models); INCLUDE_ASM(s32, "code_b72b0_len_15ed0", init_virtual_models); @@ -12,7 +21,13 @@ INCLUDE_ASM(s32, "code_b72b0_len_15ed0", func_80120F04); INCLUDE_ASM(s32, "code_b72b0_len_15ed0", func_80120FB8); -INCLUDE_ASM(s32, "code_b72b0_len_15ed0", func_80121140); +void func_80121140(Matrix4f* arg0) { + guMtxIdentF(arg0->mtx); + arg0->mtx[0][0] = 1.0f; + arg0->mtx[1][1] = 1.0f; + arg0->mtx[2][2] = -1.0f; + arg0->mtx[3][3] = 1.0f; +} INCLUDE_ASM(s32, "code_b72b0_len_15ed0", func_80121184); @@ -28,7 +43,9 @@ INCLUDE_ASM(s32, "code_b72b0_len_15ed0", func_80122288); INCLUDE_ASM(s32, "code_b72b0_len_15ed0", func_80122D7C); -INCLUDE_ASM(s32, "code_b72b0_len_15ed0", func_80122DDC); +s32 func_80122DDC(s32 arg0) { + return D_80154370[arg0 & ~0x800]; +} INCLUDE_ASM(s32, "code_b72b0_len_15ed0", func_80122DFC); @@ -44,26 +61,54 @@ INCLUDE_ASM(s32, "code_b72b0_len_15ed0", func_80122F8C); INCLUDE_ASM(s32, "code_b72b0_len_15ed0", func_80122FB8); -INCLUDE_ASM(s32, "code_b72b0_len_15ed0", enable_entity_fog); +void enable_entity_fog(void) { + D_80154378 = 1; +} -INCLUDE_ASM(s32, "code_b72b0_len_15ed0", disable_entity_fog); +void disable_entity_fog(void) { + D_80154378 = 0; +} -INCLUDE_ASM(s32, "code_b72b0_len_15ed0", set_entity_fog_dist); +void set_entity_fog_dist(s32 min, s32 max) { + D_8015438C = min; + D_80154390 = max; +} -INCLUDE_ASM(s32, "code_b72b0_len_15ed0", set_entity_fog_color); +void set_entity_fog_color(s32 r, s32 g, s32 b, s32 a) { + D_8015437C = r; + D_80154380 = g; + D_80154384 = b; + D_80154388 = a; +} -INCLUDE_ASM(s32, "code_b72b0_len_15ed0", is_entity_fog_enabled); +s32 is_entity_fog_enabled(void) { + return D_80154378; +} -INCLUDE_ASM(s32, "code_b72b0_len_15ed0", get_entity_fog_distance); +void get_entity_fog_distance(s32* start, s32* end) { + *start = D_8015438C; + *end = D_80154390; +} -INCLUDE_ASM(s32, "code_b72b0_len_15ed0", get_entity_fog_color); +void get_entity_fog_color(s32* r, s32* g, s32* b, s32* a) { + *r = D_8015437C; + *g = D_80154380; + *b = D_80154384; + *a = D_80154388; +} void stub_dynamic_entity_delegate(void) { } INCLUDE_ASM(s32, "code_b72b0_len_15ed0", clear_dynamic_entity_list); -INCLUDE_ASM(s32, "code_b72b0_len_15ed0", init_dynamic_entity_list); +void init_dynamic_entity_list(void) { + if (!GAME_STATUS->isBattle) { + gCurrentDynamicEntityListPtr = gWorldDynamicEntityList; + } else { + gCurrentDynamicEntityListPtr = gBattleDynamicEntityList; + } +} INCLUDE_ASM(s32, "code_b72b0_len_15ed0", bind_dynamic_entity_3); @@ -81,192 +126,6 @@ INCLUDE_ASM(s32, "code_b72b0_len_15ed0", func_80123550); INCLUDE_ASM(s32, "code_b72b0_len_15ed0", func_801235C0); -INCLUDE_ASM(s32, "code_b72b0_len_15ed0", get_dynamic_entity); - -INCLUDE_ASM(s32, "code_b72b0_len_15ed0", clear_character_set); - -INCLUDE_ASM(s32, "code_b72b0_len_15ed0", clear_printers); - -INCLUDE_ASM(s32, "code_b72b0_len_15ed0", load_font_data); - -INCLUDE_ASM(s32, "code_b72b0_len_15ed0", load_font); - -INCLUDE_ASM(s32, "code_b72b0_len_15ed0", update_messages); - -INCLUDE_ASM(s32, "code_b72b0_len_15ed0", _update_message); - -INCLUDE_ASM(s32, "code_b72b0_len_15ed0", render_messages); - -INCLUDE_ASM(s32, "code_b72b0_len_15ed0", func_80124434); - -INCLUDE_ASM(s32, "code_b72b0_len_15ed0", func_80124570); - -INCLUDE_ASM(s32, "code_b72b0_len_15ed0", initialize_printer); - -INCLUDE_ASM(s32, "code_b72b0_len_15ed0", dma_load_string); - -INCLUDE_ASM(s32, "code_b72b0_len_15ed0", load_message_to_buffer); - -INCLUDE_ASM(PrintContext*, "code_b72b0_len_15ed0", load_string, s32 stringId, s32* a1); - -INCLUDE_ASM(s32, "code_b72b0_len_15ed0", _load_string); - -INCLUDE_ASM(s32, "code_b72b0_len_15ed0", load_message_to_printer); - -INCLUDE_ASM(s32, "code_b72b0_len_15ed0", clamp_printer_coords); - -INCLUDE_ASM(s32, "code_b72b0_len_15ed0", cancel_message); - -INCLUDE_ASM(s32, "code_b72b0_len_15ed0", set_message_images); - -INCLUDE_ASM(s32, "code_b72b0_len_15ed0", set_message_string); - -INCLUDE_ASM(s32, "code_b72b0_len_15ed0", set_message_value); - -INCLUDE_ASM(s32, "code_b72b0_len_15ed0", close_message); - -INCLUDE_ASM(s32, "code_b72b0_len_15ed0", func_80125C84); - -INCLUDE_ASM(s32, "code_b72b0_len_15ed0", get_char_width); - -INCLUDE_ASM(s32, "code_b72b0_len_15ed0", get_string_properties); - -INCLUDE_ASM(s32, "code_b72b0_len_15ed0", get_string_width); - -INCLUDE_ASM(s32, "code_b72b0_len_15ed0", func_801264B0); - -INCLUDE_ASM(s32, "code_b72b0_len_15ed0", draw_string); - -INCLUDE_ASM(s32, "code_b72b0_len_15ed0", func_80126790); - -INCLUDE_ASM(s32, "code_b72b0_len_15ed0", func_80126EAC); - -INCLUDE_ASM(s32, "code_b72b0_len_15ed0", func_80126F78); - -INCLUDE_ASM(s32, "code_b72b0_len_15ed0", draw_digit); - -INCLUDE_ASM(s32, "code_b72b0_len_15ed0", draw_number); - -INCLUDE_ASM(s32, "code_b72b0_len_15ed0", func_80127B70); - -INCLUDE_ASM(s32, "code_b72b0_len_15ed0", func_80127BA4); - -INCLUDE_ASM(s32, "code_b72b0_len_15ed0", func_80127D90); - -INCLUDE_ASM(s32, "code_b72b0_len_15ed0", func_8012C2E0); - -INCLUDE_ASM(s32, "code_b72b0_len_15ed0", func_8012C324); - -INCLUDE_ASM(s32, "code_b72b0_len_15ed0", func_8012C9A8); - -INCLUDE_ASM(s32, "code_b72b0_len_15ed0", func_8012CA08); - -INCLUDE_ASM(s32, "code_b72b0_len_15ed0", _draw_message_box); - -INCLUDE_ASM(s32, "code_b72b0_len_15ed0", func_8012D3DC); - -INCLUDE_ASM(s32, "code_b72b0_len_15ed0", func_8012DB58); - -INCLUDE_ASM(s32, "code_b72b0_len_15ed0", func_8012E8E0); - -INCLUDE_ASM(s32, "code_b72b0_len_15ed0", func_8012E9A0); - -INCLUDE_ASM(s32, "code_b72b0_len_15ed0", func_8012EC94); - -INCLUDE_ASM(s32, "code_b72b0_len_15ed0", func_8012F500); - -INCLUDE_ASM(s32, "code_b72b0_len_15ed0", func_8012FE10); - -INCLUDE_ASM(s32, "code_b72b0_len_15ed0", func_8012FE78); - -INCLUDE_ASM(s32, "code_b72b0_len_15ed0", func_801309F0); - -INCLUDE_ASM(s32, "code_b72b0_len_15ed0", func_80130A04); - -INCLUDE_ASM(s32, "code_b72b0_len_15ed0", func_80130ACC); - -INCLUDE_ASM(s32, "code_b72b0_len_15ed0", draw_coin_sparkles); - -INCLUDE_ASM(ItemEntity*, "code_b72b0_len_15ed0", get_item_entity, s32 itemEntityIndex); - -INCLUDE_ASM(s32, "code_b72b0_len_15ed0", func_80130F70); - -INCLUDE_ASM(s32, "code_b72b0_len_15ed0", func_80130FAC); - -INCLUDE_ASM(s32, "code_b72b0_len_15ed0", clear_item_entity_data); - -INCLUDE_ASM(s32, "code_b72b0_len_15ed0", init_item_entity_list); - -INCLUDE_ASM(s32, "code_b72b0_len_15ed0", func_80131128); - -INCLUDE_ASM(s32, "code_b72b0_len_15ed0", make_item_entity); - -INCLUDE_ASM(s32, "code_b72b0_len_15ed0", make_item_entity_nodelay, s32 itemID, f32 x, f32 y, f32 z, - ItemSpawnMode itemSpawnMode, s32 pickupVar); - -INCLUDE_ASM(void, "code_b72b0_len_15ed0", make_item_entity_delayed, s32 itemID, f32 x, f32 y, f32 z, s32 unk1, - s32 unk2, - s32 unk3); - -INCLUDE_ASM(s32, "code_b72b0_len_15ed0", init_got_item); - -INCLUDE_ASM(s32, "code_b72b0_len_15ed0", func_80131DD4); - -INCLUDE_ASM(s32, "code_b72b0_len_15ed0", update_item_entities); - -INCLUDE_ASM(s32, "code_b72b0_len_15ed0", appendGfx_item_entity); - -INCLUDE_ASM(s32, "code_b72b0_len_15ed0", draw_item_entities); - -INCLUDE_ASM(s32, "code_b72b0_len_15ed0", func_80132D94); - -INCLUDE_ASM(s32, "code_b72b0_len_15ed0", render_item_entities); - -INCLUDE_ASM(s32, "code_b72b0_len_15ed0", remove_item_entity_by_reference); - -INCLUDE_ASM(s32, "code_b72b0_len_15ed0", remove_item_entity_by_index); - -INCLUDE_ASM(s32, "code_b72b0_len_15ed0", func_80133A94); - -INCLUDE_ASM(s32, "code_b72b0_len_15ed0", test_item_player_collision); - -INCLUDE_ASM(s32, "code_b72b0_len_15ed0", func_80133FC8); - -INCLUDE_ASM(void, "code_b72b0_len_15ed0", set_item_entity_flags, s32 itemEntityIndex, s32 flag); - -INCLUDE_ASM(s32, "code_b72b0_len_15ed0", clear_item_entity_flags); - -INCLUDE_ASM(s32, "code_b72b0_len_15ed0", func_801341B0); - -INCLUDE_ASM(s32, "code_b72b0_len_15ed0", func_801341E8); - -INCLUDE_ASM(void, "code_b72b0_len_15ed0", set_item_entity_position, s32 itemEntityIndex, f32 x, f32 y, f32 z); - -INCLUDE_ASM(s32, "code_b72b0_len_15ed0", func_80134230); - -INCLUDE_ASM(s32, "code_b72b0_len_15ed0", func_80134240); - -INCLUDE_ASM(s32, "code_b72b0_len_15ed0", update_item_entity_collectable); - -INCLUDE_ASM(s32, "code_b72b0_len_15ed0", func_8013559C); - -INCLUDE_ASM(s32, "code_b72b0_len_15ed0", update_item_entity_static); - -void func_801356C4(void) { +s32 get_dynamic_entity(s32 arg0) { + return (*gCurrentDynamicEntityListPtr)[arg0 & ~0x800]; } - -void func_801356CC(void) { -} - -void func_801356D4(void) { -} - -INCLUDE_ASM(s32, "code_b72b0_len_15ed0", update_item_entity_temp); - -INCLUDE_ASM(s32, "code_b72b0_len_15ed0", func_801363A0); - -INCLUDE_ASM(s32, "code_b72b0_len_15ed0", func_8013673C); - -INCLUDE_ASM(s32, "code_b72b0_len_15ed0", func_801369D0); - -INCLUDE_ASM(s32, "code_b72b0_len_15ed0", func_80136A08); diff --git a/src/common/UnkBattleFunc1.inc.c b/src/common/UnkBattleFunc1.inc.c index 0e6879c47c..2f71ff3cb8 100644 --- a/src/common/UnkBattleFunc1.inc.c +++ b/src/common/UnkBattleFunc1.inc.c @@ -8,10 +8,10 @@ ApiStatus N(UnkBattleFunc1)(ScriptInstance* script, s32 isInitialCall) { s32 var3 = get_variable(script, *args++); Actor* actor = get_actor(script->owner1.actorID); - actor->unk_194 = (s8) (var0 - actor->staticActorData->statusIconOffset.x); - actor->unk_195 = (s8) (var1 - actor->staticActorData->statusIconOffset.y); - actor->unk_196 = (s8) (var2 - actor->staticActorData->statusMessageOffset.x); - actor->unk_197 = (s8) (var3 - actor->staticActorData->statusMessageOffset.y); + actor->unk_194 = (s8)(var0 - actor->staticActorData->statusIconOffset.x); + actor->unk_195 = (s8)(var1 - actor->staticActorData->statusIconOffset.y); + actor->unk_196 = (s8)(var2 - actor->staticActorData->statusMessageOffset.x); + actor->unk_197 = (s8)(var3 - actor->staticActorData->statusMessageOffset.y); return ApiStatus_DONE2; } diff --git a/tools/splat.yaml b/tools/splat.yaml index db854ea3cd..9c6aea6805 100644 --- a/tools/splat.yaml +++ b/tools/splat.yaml @@ -252,6 +252,7 @@ segments: files: - [0xa5dd0, c, code_a5dd0_len_114e0] - [0xb72b0, c, code_b72b0_len_15ed0] + - [0xB9D60, c, code_B9D60] - [0xcd180, c, code_cd180_len_38f0] - [0xd0a70, c, code_d0a70_len_4fe0] - [0xd5a50, c, code_d5a50_len_5fd0]