From 734f17730702a50758b2f2e3753f27d2d101686f Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Thu, 14 Jan 2021 17:06:56 +0900 Subject: [PATCH] new file splits, one decomp or two --- .../{5B16A0 => 5B1A10}/func_80218560_5B1A10.s | 0 .../{5B16A0 => 5B1A10}/func_802186B8_5B1B68.s | 0 .../{5B16A0 => 5B1A10}/func_80218808_5B1CB8.s | 0 .../{5B16A0 => 5B1D80}/func_802188D0_5B1D80.s | 0 .../{5B16A0 => 5B1D80}/func_80218A28_5B1ED8.s | 0 .../{5B16A0 => 5B1D80}/func_80218B78_5B2028.s | 0 .../{5B16A0 => 5B20F0}/func_80218C40_5B20F0.s | 0 .../{5B16A0 => 5B20F0}/func_80218D98_5B2248.s | 0 .../{5B16A0 => 5B20F0}/func_80218EE8_5B2398.s | 0 .../{5B16A0 => 5B20F0}/func_80218FAC_5B245C.s | 0 .../{5B16A0 => 5B20F0}/func_8021900C_5B24BC.s | 0 .../{5B16A0 => 5B20F0}/func_802190B0_5B2560.s | 0 .../{5B16A0 => 5B20F0}/func_80219208_5B26B8.s | 0 .../{5B16A0 => 5B20F0}/func_80219358_5B2808.s | 0 .../{5B16A0 => 5B28D0}/func_80219420_5B28D0.s | 0 .../{5B16A0 => 5B28D0}/func_802194E0_5B2990.s | 0 .../{5B16A0 => 5B28D0}/func_802195A0_5B2A50.s | 0 .../{5B16A0 => 5B28D0}/func_80219660_5B2B10.s | 0 .../{5B16A0 => 5B28D0}/func_80219720_5B2BD0.s | 0 .../{5B16A0 => 5B28D0}/func_802197E0_5B2C90.s | 0 .../{5B16A0 => 5B28D0}/func_802198A0_5B2D50.s | 0 .../{5B16A0 => 5B28D0}/func_80219C80_5B3130.s | 0 .../{5B16A0 => 5B28D0}/func_80219D40_5B31F0.s | 0 .../{5B16A0 => 5B28D0}/func_80219E00_5B32B0.s | 0 .../{47F0D0 => 47F570}/func_802184C0_47F570.s | 0 .../{47F0D0 => 47F570}/func_802186B8_47F768.s | 0 .../{47F0D0 => 47F570}/func_802189D0_47FA80.s | 0 .../{47F0D0 => 47F570}/func_80218CEC_47FD9C.s | 0 .../{4E29B0 => 4E30C0}/func_80218980_4E30C0.s | 0 .../{4E29B0 => 4E30C0}/func_80218A10_4E3150.s | 0 .../{4EFCF0 => 4EFDC0}/func_80218920_4EFDC0.s | 0 .../{4EFCF0 => 4EFDC0}/func_802189B0_4EFE50.s | 0 .../{447D50 => 448420}/func_80218FE0_448420.s | 0 .../{448E20 => 448E80}/func_80219A40_448E80.s | 0 .../{448E20 => 448E80}/func_80219C38_449078.s | 0 .../{448E20 => 448E80}/func_80219C5C_44909C.s | 0 .../{448E20 => 448E80}/func_80219D60_4491A0.s | 0 .../{684C30 => 685130}/func_80218700_685130.s | 0 .../{58C740 => 58C920}/func_80218630_58C920.s | 0 .../{58C740 => 58C920}/func_80218788_58CA78.s | 0 .../{58C740 => 58C920}/func_802188D8_58CBC8.s | 0 .../{58C740 => 58CC90}/func_802189A0_58CC90.s | 0 .../{58C740 => 58CC90}/func_80218AF8_58CDE8.s | 0 .../{58C740 => 58CC90}/func_80218C48_58CF38.s | 0 .../{58C740 => 58CC90}/func_80218D0C_58CFFC.s | 0 .../{58C740 => 58CC90}/func_80218D6C_58D05C.s | 0 .../{59F420 => 59F4D0}/func_80218DF0_59F4D0.s | 0 .../{512AB0 => 512C90}/func_8021878C_512D5C.s | 0 .../{512AB0 => 512E50}/func_80218880_512E50.s | 0 .../{512AB0 => 512E50}/func_80218A98_513068.s | 0 .../{512AB0 => 512E50}/func_80218B38_513108.s | 0 .../{512AB0 => 512E50}/func_80218CF4_5132C4.s | 0 .../{649050 => 649480}/func_80218670_649480.s | 0 .../{649050 => 649480}/func_802187C8_6495D8.s | 0 .../{649050 => 649480}/func_80218918_649728.s | 0 .../{649050 => 6497F0}/func_802189E0_6497F0.s | 0 .../{649050 => 6497F0}/func_80218B38_649948.s | 0 .../{649050 => 6497F0}/func_80218C88_649A98.s | 0 .../{649050 => 649B60}/func_80218D50_649B60.s | 0 .../{649050 => 649B60}/func_80218EA8_649CB8.s | 0 .../{649050 => 649B60}/func_80218FF8_649E08.s | 0 .../{649050 => 649ED0}/func_802190C0_649ED0.s | 0 .../{649050 => 649ED0}/func_80219218_64A028.s | 0 .../{649050 => 649ED0}/func_80219368_64A178.s | 0 .../{649050 => 649ED0}/func_8021942C_64A23C.s | 0 .../{649050 => 649ED0}/func_8021948C_64A29C.s | 0 .../{660750 => 660D20}/func_802185D0_660D20.s | 0 .../{660750 => 660E10}/func_802186C0_660E10.s | 0 .../{660750 => 660E10}/func_802188B8_661008.s | 0 .../{660750 => 660E10}/func_802188DC_66102C.s | 0 .../{660750 => 660E10}/func_802189E0_661130.s | 0 .../{66B5B0 => 66B920}/func_80219BA0_66B920.s | 0 .../{66B5B0 => 66B920}/func_80219CF8_66BA78.s | 0 .../{66B5B0 => 66B920}/func_80219E48_66BBC8.s | 0 .../{6253E0 => 625750}/func_80219BB0_625750.s | 0 .../{6253E0 => 625750}/func_80219DA8_625948.s | 0 .../{6253E0 => 625750}/func_80219DCC_62596C.s | 0 .../{6253E0 => 625750}/func_80219ED0_625A70.s | 0 .../{6253E0 => 625750}/func_8021A0C8_625C68.s | 0 .../{6253E0 => 625750}/func_8021A0EC_625C8C.s | 0 .../{6253E0 => 625750}/func_8021A1F0_625D90.s | 0 .../{6253E0 => 625750}/func_8021A3E8_625F88.s | 0 .../{6253E0 => 625750}/func_8021A40C_625FAC.s | 0 .../{6253E0 => 625750}/func_8021A510_6260B0.s | 0 .../{6253E0 => 625750}/func_8021A708_6262A8.s | 0 .../{6253E0 => 625750}/func_8021A72C_6262CC.s | 0 .../{6253E0 => 625750}/func_8021A830_6263D0.s | 0 .../{6253E0 => 625750}/func_8021AA28_6265C8.s | 0 .../{6253E0 => 625750}/func_8021AA4C_6265EC.s | 0 .../{6253E0 => 625750}/func_8021AB50_6266F0.s | 0 .../{6253E0 => 625750}/func_8021AD48_6268E8.s | 0 .../{6253E0 => 625750}/func_8021AD6C_62690C.s | 0 .../{6253E0 => 625750}/func_8021AE70_626A10.s | 0 .../{63D9F0 => 63DD60}/func_80218B80_63DD60.s | 0 .../{63D9F0 => 63DD60}/func_80218D78_63DF58.s | 0 .../{63D9F0 => 63DD60}/func_80218D9C_63DF7C.s | 0 .../{63D9F0 => 63DD60}/func_80218EA0_63E080.s | 0 .../{63D9F0 => 63DD60}/func_80219098_63E278.s | 0 .../{63D9F0 => 63DD60}/func_802190BC_63E29C.s | 0 .../{63D9F0 => 63DD60}/func_802191C0_63E3A0.s | 0 .../{63D9F0 => 63DD60}/func_802193B8_63E598.s | 0 .../{63D9F0 => 63DD60}/func_802193DC_63E5BC.s | 0 .../{63D9F0 => 63DD60}/func_802194E0_63E6C0.s | 0 .../{63D9F0 => 63DD60}/func_802196D8_63E8B8.s | 0 .../{63D9F0 => 63DD60}/func_802196FC_63E8DC.s | 0 .../{63D9F0 => 63DD60}/func_80219800_63E9E0.s | 0 .../{63D9F0 => 63DD60}/func_802199F8_63EBD8.s | 0 .../{63D9F0 => 63DD60}/func_80219A1C_63EBFC.s | 0 .../{63D9F0 => 63DD60}/func_80219B20_63ED00.s | 0 .../{63D9F0 => 63DD60}/func_80219D18_63EEF8.s | 0 .../{63D9F0 => 63DD60}/func_80219D3C_63EF1C.s | 0 .../{63D9F0 => 63DD60}/func_80219E40_63F020.s | 0 .../entity_init_BlueSwitch.s | 0 .../entity_init_HugeBlueSwitch.s | 0 .../func_802E1400.s | 0 .../func_802E1460.s | 0 .../func_802E14D8.s | 0 .../func_802E153C.s | 0 .../func_802E1614.s | 0 .../func_802E1660.s | 0 .../func_802E1740.s | 0 .../func_802E176C.s | 0 .../func_802E17A8.s | 0 .../func_802E1EA8.s | 0 .../func_802E1EDC.s | 0 .../func_802E234C.s | 0 .../func_802E2450.s | 0 .../func_802E246C.s | 0 .../func_802E263C.s | 0 .../func_802E2BA4.s | 0 .../func_802E2EB0.s | 0 .../func_802E2FD0.s | 0 .../func_802E4710.s | 0 .../func_802E4730.s | 0 .../func_802E4AEC.s | 0 .../func_802E4B10.s | 0 .../func_802E4B60.s | 0 .../func_802E4C10.s | 0 .../func_802E4DE0.s | 0 .../func_802E4E04.s | 0 .../func_802E5308.s | 0 .../func_802E5324.s | 0 .../func_802E540C.s | 0 .../func_802E5428.s | 0 .../func_802E545C.s | 0 .../func_802E548C.s | 0 .../func_802E54A8.s | 0 .../func_802E54CC.s | 0 .../func_802E555C.s | 0 .../func_802E55A8.s | 0 .../func_802E5648.s | 0 .../func_802E5670.s | 0 .../func_802E5690.s | 0 .../func_802E56D0.s | 0 .../func_802E56EC.s | 0 .../func_802E578C.s | 0 .../func_802E57E4.s | 0 .../func_802E5800.s | 0 .../func_802E581C.s | 0 .../func_802E586C.s | 0 .../func_802E5E50.s | 0 .../func_802E5F50.s | 0 .../func_802E5F7C.s | 0 .../pause_tabs_draw_badges.s | 0 .../pause_tabs_draw_items.s | 0 .../pause_tabs_draw_map.s | 0 .../pause_tabs_draw_party.s | 0 .../pause_tabs_draw_spirits.s | 0 .../pause_tabs_draw_stats.s | 0 .../pause_tabs_handle_input.s | 0 .../pause_tabs_init.s | 0 .../pause_tabs_update.s | 0 .../func_80262130.s | 0 .../func_8026220C.s | 0 .../CancelablePlayerRunToGoal.s | 0 .../DidActionSucceed.s | 0 .../DispatchDamagePlayerEvent.s | 0 .../EnablePlayerBlur.s | 0 .../GetMenuSelection.s | 0 .../PlayerDamageEnemy.s | 0 .../PlayerFallToGoal.s | 0 .../PlayerLandJump.s | 0 .../PlayerPowerBounceEnemy.s | 0 .../PlayerRunToGoal.s | 0 .../PlayerTestEnemy.s | 0 .../calc_player_damage_enemy.s | 0 .../calc_player_test_enemy.s | 0 .../dispatch_damage_event_player.s | 0 .../dispatch_event_player.s | 0 .../dispatch_event_player_continue_turn.s | 0 .../func_802712A0.s | 0 .../func_80271328.s | 0 .../func_802713B0.s | 0 .../func_80271484.s | 0 .../func_80271588.s | 0 .../func_80273444.s | 0 .../func_80274A18.s | 0 .../func_802752AC.s | 0 .../func_80275F00.s | 0 .../appendGfx_player.s | 0 .../appendGfx_player_spin.s | 0 .../check_input_use_partner.s | 0 .../collision_check_above.s | 0 .../do_lateral_collision.s | 0 .../func_800DE46C.s | 0 .../func_800DEE5C.s | 0 .../func_800DF15C.s | 0 .../func_800DFAAC.s | 0 .../func_800DFD48.s | 0 .../func_800DFFCC.s | 0 .../func_800E0294.s | 0 .../func_800E0398.s | 0 .../func_800E0580.s | 0 .../func_800E06D8.s | 0 .../func_800E0818.s | 0 .../func_800E0B90.s | 0 .../func_800E0FEC.s | 0 .../render_player_model.s | 0 .../test_below_player.s | 0 .../test_player_lateral.s | 0 .../trace_above_player.s | 0 .../trace_below_player.s | 0 .../update_player.s | 0 .../update_player_shadow.s | 0 .../func_800E205C.s | 0 .../func_800E23FC.s | 0 .../func_800E24F8.s | 0 .../input_to_move_vector.s | 0 .../update_player_input.s | 0 .../func_8011DE80.s | 0 .../func_8011DFD0.s | 0 .../func_8011E014.s | 0 .../func_8011E058.s | 0 .../func_8011E09C.s | 0 .../func_8011E0DC.s | 0 .../func_8011E150.s | 0 .../func_8011E1C4.s | 0 .../func_8011E224.s | 0 .../func_8011E310.s | 0 .../func_8011E398.s | 0 .../func_8011E400.s | 0 .../func_8011E438.s | 0 .../func_8011E4B8.s | 0 .../func_8011E5E0.s | 0 .../func_8011E718.s | 0 .../func_8011E8BC.s | 0 .../func_8011EA54.s | 0 .../func_8011EBF0.s | 0 .../func_8011F058.s | 0 .../func_8011F118.s | 0 .../func_8011F304.s | 0 .../func_8011F3E8.s | 0 .../func_8011F4D4.s | 0 .../func_8011FA54.s | 0 .../func_8011FF74.s | 0 .../func_8011FF98.s | 0 .../func_8011FFB4.s | 0 .../func_80120028.s | 0 .../func_8012003C.s | 0 .../func_8012004C.s | 0 .../func_80120064.s | 0 .../func_8012008C.s | 0 .../func_8012009C.s | 0 .../func_801200B8.s | 0 .../func_801200EC.s | 0 .../func_80120118.s | 0 .../func_80120198.s | 0 .../func_80120234.s | 0 .../func_801203AC.s | 0 .../func_80120420.s | 0 .../func_80120474.s | 0 .../func_80120530.s | 0 .../func_80120678.s | 0 .../func_801206F8.s | 0 .../play_model_animation.s | 0 .../code_B9D60/make_item_entity.s | 75 +-- .../appendGfx_item_entity.s | 0 .../clear_item_entity_data.s | 0 .../draw_coin_sparkles.s | 0 .../draw_item_entities.s | 0 .../func_8012E9A0.s | 0 .../func_8012EC94.s | 0 .../func_8012F500.s | 0 .../func_8012FE10.s | 0 .../func_8012FE78.s | 0 .../func_801309F0.s | 0 .../func_80130A04.s | 0 .../func_80130ACC.s | 0 .../func_80130F70.s | 0 .../func_80130FAC.s | 0 .../func_80131128.s | 0 .../func_80131DD4.s | 0 .../func_80132D94.s | 0 .../func_80133A94.s | 0 .../func_80133FC8.s | 0 .../func_8013559C.s | 0 .../func_801363A0.s | 0 .../func_8013673C.s | 0 .../func_801369D0.s | 0 .../func_80136A08.s | 0 .../init_got_item.s | 0 .../init_item_entity_list.s | 0 .../code_C50A0/make_item_entity.s | 483 ++++++++++++++++++ .../remove_item_entity_by_index.s | 0 .../remove_item_entity_by_reference.s | 0 .../render_item_entities.s | 0 .../test_item_player_collision.s | 0 .../update_item_entities.s | 0 .../update_item_entity_collectable.s | 0 .../update_item_entity_static.s | 0 .../update_item_entity_temp.s | 0 .../func_80138740.s | 0 .../func_80138D88.s | 0 .../func_80138E54.s | 0 .../func_80139F10.s | 0 .../_play_sound.s | 0 .../func_80149250.s | 0 .../func_80149618.s | 0 .../func_80149670.s | 0 .../func_80149734.s | 0 .../func_801497FC.s | 0 .../func_80149828.s | 0 .../func_80149838.s | 0 .../func_801498C4.s | 0 .../func_80149908.s | 0 .../func_80149974.s | 0 .../func_801499EC.s | 0 .../func_80149A6C.s | 0 .../func_80149BE4.s | 0 .../func_80149E04.s | 0 .../func_80149F58.s | 0 .../func_8014A1B4.s | 0 .../play_sound_at_position.s | 0 .../stop_sound.s | 0 .../func_802BBE70_E307C0.s | 0 .../func_802BC2BC_E30C0C.s | 0 .../func_802BC4B8_E30E08.s | 0 .../func_802BC514_E30E64.s | 0 .../func_802BC558_E30EA8.s | 0 .../func_802BC570_E30EC0.s | 0 .../func_802BC99C_E312EC.s | 0 .../func_802BC9CC_E3131C.s | 0 .../func_802BC9FC_E3134C.s | 0 .../code_de740_len_23f0/func_801491E4.s | 33 -- .../{A16220 => A171F0}/func_80240FD0_A171F0.s | 0 .../{8B30E0 => 8B33E0}/func_80243370_8B33E0.s | 0 .../{8B30E0 => 8B33E0}/func_802433AC_8B341C.s | 0 .../{8B30E0 => 8B33E0}/func_80243514_8B3584.s | 0 .../{7E3700 => 7E4690}/func_80283908.s | 14 +- .../{7E3700 => 7E4690}/func_80283A50.s | 0 .../{7E3700 => 7E4690}/func_80283C34.s | 0 .../{7E3700 => 7E4690}/func_80283D00.s | 0 .../{7E3700 => 7E4690}/func_80283D6C.s | 0 .../{7E3700 => 7E4690}/func_80283DF0.s | 0 .../{7E3700 => 7E4690}/func_80283E2C.s | 0 src/battle/area_flo/5B16A0.c | 86 ---- src/battle/area_flo/5B1A10.c | 15 + src/battle/area_flo/5B1D80.c | 17 + src/battle/area_flo/5B20F0.c | 35 ++ src/battle/area_flo/5B28D0.c | 31 ++ src/battle/area_hos/47F0D0.c | 8 - src/battle/area_hos/47F570.c | 9 + src/battle/area_isk_part_1/4E29B0.c | 4 - src/battle/area_isk_part_1/4E30C0.c | 7 + src/battle/area_isk_part_2/4EFCF0.c | 4 - src/battle/area_isk_part_2/4EFDC0.c | 7 + src/battle/area_jan/573C30.c | 4 - src/battle/area_jan/573E10.c | 7 + src/battle/area_kmr_part_3/447D50.c | 2 - src/battle/area_kmr_part_3/448420.c | 3 + src/battle/area_kmr_part_3/448E20.c | 8 - src/battle/area_kmr_part_3/448E80.c | 9 + src/battle/area_kpa/684C30.c | 2 - src/battle/area_kpa/685130.c | 3 + src/battle/area_kzn/58C740.c | 30 -- src/battle/area_kzn/58C920.c | 15 + src/battle/area_kzn/58CC90.c | 21 + src/battle/area_kzn2/59F420.c | 2 - src/battle/area_kzn2/59F4D0.c | 3 + src/battle/area_omo/512AB0.c | 16 - src/battle/area_omo/512C90.c | 9 + src/battle/area_omo/512E50.c | 13 + src/battle/area_pra/649050.c | 60 --- src/battle/area_pra/649480.c | 17 + src/battle/area_pra/6497F0.c | 17 + src/battle/area_pra/649B60.c | 17 + src/battle/area_pra/649ED0.c | 21 + src/battle/area_pra2/660750.c | 10 - src/battle/area_pra2/660D20.c | 3 + src/battle/area_pra2/660E10.c | 9 + src/battle/area_pra3/66B5B0.c | 14 - src/battle/area_pra3/66B920.c | 17 + src/battle/area_sam/6253E0.c | 38 -- src/battle/area_sam/625750.c | 39 ++ src/battle/area_sam2/63D9F0.c | 38 -- src/battle/area_sam2/63DD60.c | 39 ++ src/code_102610_len_2330.c | 40 -- src/code_102C80.c | 37 ++ src/code_104730.c | 5 + src/code_105700_len_2130.c | 62 --- src/code_105F90.c | 39 ++ src/code_106EF0.c | 25 + src/code_135EE0.c | 30 -- src/code_137ED0.c | 31 ++ src/code_18F340.c | 4 - src/code_190A10.c | 5 + src/code_197F40.c | 102 ---- src/code_19FAF0.c | 104 ++++ src/code_759b0_len_61b0.c | 311 ----------- src/code_77480.c | 296 +++++++++++ src/code_7B440.c | 17 + src/code_B4580.c | 105 ++++ src/code_B9D60.c | 146 ------ src/code_C50A0.c | 148 ++++++ src/code_CEE40.c | 9 + src/code_DF950.c | 63 +++ src/code_E2F750.c | 18 - src/code_E307C0.c | 19 + src/code_a5dd0_len_114e0.c | 104 ---- src/code_cd180_len_38f0.c | 8 - src/code_de740_len_23f0.c | 66 +-- src/world/area_hos/hos_02/A16220.c | 2 - src/world/area_hos/hos_02/A171F0.c | 3 + src/world/area_kmr/kmr_02/8B30E0.c | 8 - src/world/area_kmr/kmr_02/8B33E0.c | 9 + src/world/script_api/7E3700.c | 104 ---- src/world/script_api/7E4690.c | 105 ++++ tools/duplicate_renames.txt | 2 + tools/n64splat | 2 +- tools/smallest_with_symbol.py | 2 +- tools/splat.yaml | 42 ++ 431 files changed, 1967 insertions(+), 1420 deletions(-) rename asm/nonmatchings/battle/area_flo/{5B16A0 => 5B1A10}/func_80218560_5B1A10.s (100%) rename asm/nonmatchings/battle/area_flo/{5B16A0 => 5B1A10}/func_802186B8_5B1B68.s (100%) rename asm/nonmatchings/battle/area_flo/{5B16A0 => 5B1A10}/func_80218808_5B1CB8.s (100%) rename asm/nonmatchings/battle/area_flo/{5B16A0 => 5B1D80}/func_802188D0_5B1D80.s (100%) rename asm/nonmatchings/battle/area_flo/{5B16A0 => 5B1D80}/func_80218A28_5B1ED8.s (100%) rename asm/nonmatchings/battle/area_flo/{5B16A0 => 5B1D80}/func_80218B78_5B2028.s (100%) rename asm/nonmatchings/battle/area_flo/{5B16A0 => 5B20F0}/func_80218C40_5B20F0.s (100%) rename asm/nonmatchings/battle/area_flo/{5B16A0 => 5B20F0}/func_80218D98_5B2248.s (100%) rename asm/nonmatchings/battle/area_flo/{5B16A0 => 5B20F0}/func_80218EE8_5B2398.s (100%) rename asm/nonmatchings/battle/area_flo/{5B16A0 => 5B20F0}/func_80218FAC_5B245C.s (100%) rename asm/nonmatchings/battle/area_flo/{5B16A0 => 5B20F0}/func_8021900C_5B24BC.s (100%) rename asm/nonmatchings/battle/area_flo/{5B16A0 => 5B20F0}/func_802190B0_5B2560.s (100%) rename asm/nonmatchings/battle/area_flo/{5B16A0 => 5B20F0}/func_80219208_5B26B8.s (100%) rename asm/nonmatchings/battle/area_flo/{5B16A0 => 5B20F0}/func_80219358_5B2808.s (100%) rename asm/nonmatchings/battle/area_flo/{5B16A0 => 5B28D0}/func_80219420_5B28D0.s (100%) rename asm/nonmatchings/battle/area_flo/{5B16A0 => 5B28D0}/func_802194E0_5B2990.s (100%) rename asm/nonmatchings/battle/area_flo/{5B16A0 => 5B28D0}/func_802195A0_5B2A50.s (100%) rename asm/nonmatchings/battle/area_flo/{5B16A0 => 5B28D0}/func_80219660_5B2B10.s (100%) rename asm/nonmatchings/battle/area_flo/{5B16A0 => 5B28D0}/func_80219720_5B2BD0.s (100%) rename asm/nonmatchings/battle/area_flo/{5B16A0 => 5B28D0}/func_802197E0_5B2C90.s (100%) rename asm/nonmatchings/battle/area_flo/{5B16A0 => 5B28D0}/func_802198A0_5B2D50.s (100%) rename asm/nonmatchings/battle/area_flo/{5B16A0 => 5B28D0}/func_80219C80_5B3130.s (100%) rename asm/nonmatchings/battle/area_flo/{5B16A0 => 5B28D0}/func_80219D40_5B31F0.s (100%) rename asm/nonmatchings/battle/area_flo/{5B16A0 => 5B28D0}/func_80219E00_5B32B0.s (100%) rename asm/nonmatchings/battle/area_hos/{47F0D0 => 47F570}/func_802184C0_47F570.s (100%) rename asm/nonmatchings/battle/area_hos/{47F0D0 => 47F570}/func_802186B8_47F768.s (100%) rename asm/nonmatchings/battle/area_hos/{47F0D0 => 47F570}/func_802189D0_47FA80.s (100%) rename asm/nonmatchings/battle/area_hos/{47F0D0 => 47F570}/func_80218CEC_47FD9C.s (100%) rename asm/nonmatchings/battle/area_isk_part_1/{4E29B0 => 4E30C0}/func_80218980_4E30C0.s (100%) rename asm/nonmatchings/battle/area_isk_part_1/{4E29B0 => 4E30C0}/func_80218A10_4E3150.s (100%) rename asm/nonmatchings/battle/area_isk_part_2/{4EFCF0 => 4EFDC0}/func_80218920_4EFDC0.s (100%) rename asm/nonmatchings/battle/area_isk_part_2/{4EFCF0 => 4EFDC0}/func_802189B0_4EFE50.s (100%) rename asm/nonmatchings/battle/area_kmr_part_3/{447D50 => 448420}/func_80218FE0_448420.s (100%) rename asm/nonmatchings/battle/area_kmr_part_3/{448E20 => 448E80}/func_80219A40_448E80.s (100%) rename asm/nonmatchings/battle/area_kmr_part_3/{448E20 => 448E80}/func_80219C38_449078.s (100%) rename asm/nonmatchings/battle/area_kmr_part_3/{448E20 => 448E80}/func_80219C5C_44909C.s (100%) rename asm/nonmatchings/battle/area_kmr_part_3/{448E20 => 448E80}/func_80219D60_4491A0.s (100%) rename asm/nonmatchings/battle/area_kpa/{684C30 => 685130}/func_80218700_685130.s (100%) rename asm/nonmatchings/battle/area_kzn/{58C740 => 58C920}/func_80218630_58C920.s (100%) rename asm/nonmatchings/battle/area_kzn/{58C740 => 58C920}/func_80218788_58CA78.s (100%) rename asm/nonmatchings/battle/area_kzn/{58C740 => 58C920}/func_802188D8_58CBC8.s (100%) rename asm/nonmatchings/battle/area_kzn/{58C740 => 58CC90}/func_802189A0_58CC90.s (100%) rename asm/nonmatchings/battle/area_kzn/{58C740 => 58CC90}/func_80218AF8_58CDE8.s (100%) rename asm/nonmatchings/battle/area_kzn/{58C740 => 58CC90}/func_80218C48_58CF38.s (100%) rename asm/nonmatchings/battle/area_kzn/{58C740 => 58CC90}/func_80218D0C_58CFFC.s (100%) rename asm/nonmatchings/battle/area_kzn/{58C740 => 58CC90}/func_80218D6C_58D05C.s (100%) rename asm/nonmatchings/battle/area_kzn2/{59F420 => 59F4D0}/func_80218DF0_59F4D0.s (100%) rename asm/nonmatchings/battle/area_omo/{512AB0 => 512C90}/func_8021878C_512D5C.s (100%) rename asm/nonmatchings/battle/area_omo/{512AB0 => 512E50}/func_80218880_512E50.s (100%) rename asm/nonmatchings/battle/area_omo/{512AB0 => 512E50}/func_80218A98_513068.s (100%) rename asm/nonmatchings/battle/area_omo/{512AB0 => 512E50}/func_80218B38_513108.s (100%) rename asm/nonmatchings/battle/area_omo/{512AB0 => 512E50}/func_80218CF4_5132C4.s (100%) rename asm/nonmatchings/battle/area_pra/{649050 => 649480}/func_80218670_649480.s (100%) rename asm/nonmatchings/battle/area_pra/{649050 => 649480}/func_802187C8_6495D8.s (100%) rename asm/nonmatchings/battle/area_pra/{649050 => 649480}/func_80218918_649728.s (100%) rename asm/nonmatchings/battle/area_pra/{649050 => 6497F0}/func_802189E0_6497F0.s (100%) rename asm/nonmatchings/battle/area_pra/{649050 => 6497F0}/func_80218B38_649948.s (100%) rename asm/nonmatchings/battle/area_pra/{649050 => 6497F0}/func_80218C88_649A98.s (100%) rename asm/nonmatchings/battle/area_pra/{649050 => 649B60}/func_80218D50_649B60.s (100%) rename asm/nonmatchings/battle/area_pra/{649050 => 649B60}/func_80218EA8_649CB8.s (100%) rename asm/nonmatchings/battle/area_pra/{649050 => 649B60}/func_80218FF8_649E08.s (100%) rename asm/nonmatchings/battle/area_pra/{649050 => 649ED0}/func_802190C0_649ED0.s (100%) rename asm/nonmatchings/battle/area_pra/{649050 => 649ED0}/func_80219218_64A028.s (100%) rename asm/nonmatchings/battle/area_pra/{649050 => 649ED0}/func_80219368_64A178.s (100%) rename asm/nonmatchings/battle/area_pra/{649050 => 649ED0}/func_8021942C_64A23C.s (100%) rename asm/nonmatchings/battle/area_pra/{649050 => 649ED0}/func_8021948C_64A29C.s (100%) rename asm/nonmatchings/battle/area_pra2/{660750 => 660D20}/func_802185D0_660D20.s (100%) rename asm/nonmatchings/battle/area_pra2/{660750 => 660E10}/func_802186C0_660E10.s (100%) rename asm/nonmatchings/battle/area_pra2/{660750 => 660E10}/func_802188B8_661008.s (100%) rename asm/nonmatchings/battle/area_pra2/{660750 => 660E10}/func_802188DC_66102C.s (100%) rename asm/nonmatchings/battle/area_pra2/{660750 => 660E10}/func_802189E0_661130.s (100%) rename asm/nonmatchings/battle/area_pra3/{66B5B0 => 66B920}/func_80219BA0_66B920.s (100%) rename asm/nonmatchings/battle/area_pra3/{66B5B0 => 66B920}/func_80219CF8_66BA78.s (100%) rename asm/nonmatchings/battle/area_pra3/{66B5B0 => 66B920}/func_80219E48_66BBC8.s (100%) rename asm/nonmatchings/battle/area_sam/{6253E0 => 625750}/func_80219BB0_625750.s (100%) rename asm/nonmatchings/battle/area_sam/{6253E0 => 625750}/func_80219DA8_625948.s (100%) rename asm/nonmatchings/battle/area_sam/{6253E0 => 625750}/func_80219DCC_62596C.s (100%) rename asm/nonmatchings/battle/area_sam/{6253E0 => 625750}/func_80219ED0_625A70.s (100%) rename asm/nonmatchings/battle/area_sam/{6253E0 => 625750}/func_8021A0C8_625C68.s (100%) rename asm/nonmatchings/battle/area_sam/{6253E0 => 625750}/func_8021A0EC_625C8C.s (100%) rename asm/nonmatchings/battle/area_sam/{6253E0 => 625750}/func_8021A1F0_625D90.s (100%) rename asm/nonmatchings/battle/area_sam/{6253E0 => 625750}/func_8021A3E8_625F88.s (100%) rename asm/nonmatchings/battle/area_sam/{6253E0 => 625750}/func_8021A40C_625FAC.s (100%) rename asm/nonmatchings/battle/area_sam/{6253E0 => 625750}/func_8021A510_6260B0.s (100%) rename asm/nonmatchings/battle/area_sam/{6253E0 => 625750}/func_8021A708_6262A8.s (100%) rename asm/nonmatchings/battle/area_sam/{6253E0 => 625750}/func_8021A72C_6262CC.s (100%) rename asm/nonmatchings/battle/area_sam/{6253E0 => 625750}/func_8021A830_6263D0.s (100%) rename asm/nonmatchings/battle/area_sam/{6253E0 => 625750}/func_8021AA28_6265C8.s (100%) rename asm/nonmatchings/battle/area_sam/{6253E0 => 625750}/func_8021AA4C_6265EC.s (100%) rename asm/nonmatchings/battle/area_sam/{6253E0 => 625750}/func_8021AB50_6266F0.s (100%) rename asm/nonmatchings/battle/area_sam/{6253E0 => 625750}/func_8021AD48_6268E8.s (100%) rename asm/nonmatchings/battle/area_sam/{6253E0 => 625750}/func_8021AD6C_62690C.s (100%) rename asm/nonmatchings/battle/area_sam/{6253E0 => 625750}/func_8021AE70_626A10.s (100%) rename asm/nonmatchings/battle/area_sam2/{63D9F0 => 63DD60}/func_80218B80_63DD60.s (100%) rename asm/nonmatchings/battle/area_sam2/{63D9F0 => 63DD60}/func_80218D78_63DF58.s (100%) rename asm/nonmatchings/battle/area_sam2/{63D9F0 => 63DD60}/func_80218D9C_63DF7C.s (100%) rename asm/nonmatchings/battle/area_sam2/{63D9F0 => 63DD60}/func_80218EA0_63E080.s (100%) rename asm/nonmatchings/battle/area_sam2/{63D9F0 => 63DD60}/func_80219098_63E278.s (100%) rename asm/nonmatchings/battle/area_sam2/{63D9F0 => 63DD60}/func_802190BC_63E29C.s (100%) rename asm/nonmatchings/battle/area_sam2/{63D9F0 => 63DD60}/func_802191C0_63E3A0.s (100%) rename asm/nonmatchings/battle/area_sam2/{63D9F0 => 63DD60}/func_802193B8_63E598.s (100%) rename asm/nonmatchings/battle/area_sam2/{63D9F0 => 63DD60}/func_802193DC_63E5BC.s (100%) rename asm/nonmatchings/battle/area_sam2/{63D9F0 => 63DD60}/func_802194E0_63E6C0.s (100%) rename asm/nonmatchings/battle/area_sam2/{63D9F0 => 63DD60}/func_802196D8_63E8B8.s (100%) rename asm/nonmatchings/battle/area_sam2/{63D9F0 => 63DD60}/func_802196FC_63E8DC.s (100%) rename asm/nonmatchings/battle/area_sam2/{63D9F0 => 63DD60}/func_80219800_63E9E0.s (100%) rename asm/nonmatchings/battle/area_sam2/{63D9F0 => 63DD60}/func_802199F8_63EBD8.s (100%) rename asm/nonmatchings/battle/area_sam2/{63D9F0 => 63DD60}/func_80219A1C_63EBFC.s (100%) rename asm/nonmatchings/battle/area_sam2/{63D9F0 => 63DD60}/func_80219B20_63ED00.s (100%) rename asm/nonmatchings/battle/area_sam2/{63D9F0 => 63DD60}/func_80219D18_63EEF8.s (100%) rename asm/nonmatchings/battle/area_sam2/{63D9F0 => 63DD60}/func_80219D3C_63EF1C.s (100%) rename asm/nonmatchings/battle/area_sam2/{63D9F0 => 63DD60}/func_80219E40_63F020.s (100%) rename asm/nonmatchings/{code_102610_len_2330 => code_102C80}/entity_init_BlueSwitch.s (100%) rename asm/nonmatchings/{code_102610_len_2330 => code_102C80}/entity_init_HugeBlueSwitch.s (100%) rename asm/nonmatchings/{code_102610_len_2330 => code_102C80}/func_802E1400.s (100%) rename asm/nonmatchings/{code_102610_len_2330 => code_102C80}/func_802E1460.s (100%) rename asm/nonmatchings/{code_102610_len_2330 => code_102C80}/func_802E14D8.s (100%) rename asm/nonmatchings/{code_102610_len_2330 => code_102C80}/func_802E153C.s (100%) rename asm/nonmatchings/{code_102610_len_2330 => code_102C80}/func_802E1614.s (100%) rename asm/nonmatchings/{code_102610_len_2330 => code_102C80}/func_802E1660.s (100%) rename asm/nonmatchings/{code_102610_len_2330 => code_102C80}/func_802E1740.s (100%) rename asm/nonmatchings/{code_102610_len_2330 => code_102C80}/func_802E176C.s (100%) rename asm/nonmatchings/{code_102610_len_2330 => code_102C80}/func_802E17A8.s (100%) rename asm/nonmatchings/{code_102610_len_2330 => code_102C80}/func_802E1EA8.s (100%) rename asm/nonmatchings/{code_102610_len_2330 => code_102C80}/func_802E1EDC.s (100%) rename asm/nonmatchings/{code_102610_len_2330 => code_102C80}/func_802E234C.s (100%) rename asm/nonmatchings/{code_102610_len_2330 => code_102C80}/func_802E2450.s (100%) rename asm/nonmatchings/{code_102610_len_2330 => code_102C80}/func_802E246C.s (100%) rename asm/nonmatchings/{code_102610_len_2330 => code_102C80}/func_802E263C.s (100%) rename asm/nonmatchings/{code_102610_len_2330 => code_102C80}/func_802E2BA4.s (100%) rename asm/nonmatchings/{code_102610_len_2330 => code_104730}/func_802E2EB0.s (100%) rename asm/nonmatchings/{code_102610_len_2330 => code_104730}/func_802E2FD0.s (100%) rename asm/nonmatchings/{code_105700_len_2130 => code_105F90}/func_802E4710.s (100%) rename asm/nonmatchings/{code_105700_len_2130 => code_105F90}/func_802E4730.s (100%) rename asm/nonmatchings/{code_105700_len_2130 => code_105F90}/func_802E4AEC.s (100%) rename asm/nonmatchings/{code_105700_len_2130 => code_105F90}/func_802E4B10.s (100%) rename asm/nonmatchings/{code_105700_len_2130 => code_105F90}/func_802E4B60.s (100%) rename asm/nonmatchings/{code_105700_len_2130 => code_105F90}/func_802E4C10.s (100%) rename asm/nonmatchings/{code_105700_len_2130 => code_105F90}/func_802E4DE0.s (100%) rename asm/nonmatchings/{code_105700_len_2130 => code_105F90}/func_802E4E04.s (100%) rename asm/nonmatchings/{code_105700_len_2130 => code_105F90}/func_802E5308.s (100%) rename asm/nonmatchings/{code_105700_len_2130 => code_105F90}/func_802E5324.s (100%) rename asm/nonmatchings/{code_105700_len_2130 => code_105F90}/func_802E540C.s (100%) rename asm/nonmatchings/{code_105700_len_2130 => code_105F90}/func_802E5428.s (100%) rename asm/nonmatchings/{code_105700_len_2130 => code_105F90}/func_802E545C.s (100%) rename asm/nonmatchings/{code_105700_len_2130 => code_105F90}/func_802E548C.s (100%) rename asm/nonmatchings/{code_105700_len_2130 => code_105F90}/func_802E54A8.s (100%) rename asm/nonmatchings/{code_105700_len_2130 => code_105F90}/func_802E54CC.s (100%) rename asm/nonmatchings/{code_105700_len_2130 => code_105F90}/func_802E555C.s (100%) rename asm/nonmatchings/{code_105700_len_2130 => code_105F90}/func_802E55A8.s (100%) rename asm/nonmatchings/{code_105700_len_2130 => code_105F90}/func_802E5648.s (100%) rename asm/nonmatchings/{code_105700_len_2130 => code_106EF0}/func_802E5670.s (100%) rename asm/nonmatchings/{code_105700_len_2130 => code_106EF0}/func_802E5690.s (100%) rename asm/nonmatchings/{code_105700_len_2130 => code_106EF0}/func_802E56D0.s (100%) rename asm/nonmatchings/{code_105700_len_2130 => code_106EF0}/func_802E56EC.s (100%) rename asm/nonmatchings/{code_105700_len_2130 => code_106EF0}/func_802E578C.s (100%) rename asm/nonmatchings/{code_105700_len_2130 => code_106EF0}/func_802E57E4.s (100%) rename asm/nonmatchings/{code_105700_len_2130 => code_106EF0}/func_802E5800.s (100%) rename asm/nonmatchings/{code_105700_len_2130 => code_106EF0}/func_802E581C.s (100%) rename asm/nonmatchings/{code_105700_len_2130 => code_106EF0}/func_802E586C.s (100%) rename asm/nonmatchings/{code_105700_len_2130 => code_106EF0}/func_802E5E50.s (100%) rename asm/nonmatchings/{code_105700_len_2130 => code_106EF0}/func_802E5F50.s (100%) rename asm/nonmatchings/{code_105700_len_2130 => code_106EF0}/func_802E5F7C.s (100%) rename asm/nonmatchings/{code_135EE0 => code_137ED0}/pause_tabs_draw_badges.s (100%) rename asm/nonmatchings/{code_135EE0 => code_137ED0}/pause_tabs_draw_items.s (100%) rename asm/nonmatchings/{code_135EE0 => code_137ED0}/pause_tabs_draw_map.s (100%) rename asm/nonmatchings/{code_135EE0 => code_137ED0}/pause_tabs_draw_party.s (100%) rename asm/nonmatchings/{code_135EE0 => code_137ED0}/pause_tabs_draw_spirits.s (100%) rename asm/nonmatchings/{code_135EE0 => code_137ED0}/pause_tabs_draw_stats.s (100%) rename asm/nonmatchings/{code_135EE0 => code_137ED0}/pause_tabs_handle_input.s (100%) rename asm/nonmatchings/{code_135EE0 => code_137ED0}/pause_tabs_init.s (100%) rename asm/nonmatchings/{code_135EE0 => code_137ED0}/pause_tabs_update.s (100%) rename asm/nonmatchings/{code_18F340 => code_190A10}/func_80262130.s (100%) rename asm/nonmatchings/{code_18F340 => code_190A10}/func_8026220C.s (100%) rename asm/nonmatchings/{code_197F40 => code_19FAF0}/CancelablePlayerRunToGoal.s (100%) rename asm/nonmatchings/{code_197F40 => code_19FAF0}/DidActionSucceed.s (100%) rename asm/nonmatchings/{code_197F40 => code_19FAF0}/DispatchDamagePlayerEvent.s (100%) rename asm/nonmatchings/{code_197F40 => code_19FAF0}/EnablePlayerBlur.s (100%) rename asm/nonmatchings/{code_197F40 => code_19FAF0}/GetMenuSelection.s (100%) rename asm/nonmatchings/{code_197F40 => code_19FAF0}/PlayerDamageEnemy.s (100%) rename asm/nonmatchings/{code_197F40 => code_19FAF0}/PlayerFallToGoal.s (100%) rename asm/nonmatchings/{code_197F40 => code_19FAF0}/PlayerLandJump.s (100%) rename asm/nonmatchings/{code_197F40 => code_19FAF0}/PlayerPowerBounceEnemy.s (100%) rename asm/nonmatchings/{code_197F40 => code_19FAF0}/PlayerRunToGoal.s (100%) rename asm/nonmatchings/{code_197F40 => code_19FAF0}/PlayerTestEnemy.s (100%) rename asm/nonmatchings/{code_197F40 => code_19FAF0}/calc_player_damage_enemy.s (100%) rename asm/nonmatchings/{code_197F40 => code_19FAF0}/calc_player_test_enemy.s (100%) rename asm/nonmatchings/{code_197F40 => code_19FAF0}/dispatch_damage_event_player.s (100%) rename asm/nonmatchings/{code_197F40 => code_19FAF0}/dispatch_event_player.s (100%) rename asm/nonmatchings/{code_197F40 => code_19FAF0}/dispatch_event_player_continue_turn.s (100%) rename asm/nonmatchings/{code_197F40 => code_19FAF0}/func_802712A0.s (100%) rename asm/nonmatchings/{code_197F40 => code_19FAF0}/func_80271328.s (100%) rename asm/nonmatchings/{code_197F40 => code_19FAF0}/func_802713B0.s (100%) rename asm/nonmatchings/{code_197F40 => code_19FAF0}/func_80271484.s (100%) rename asm/nonmatchings/{code_197F40 => code_19FAF0}/func_80271588.s (100%) rename asm/nonmatchings/{code_197F40 => code_19FAF0}/func_80273444.s (100%) rename asm/nonmatchings/{code_197F40 => code_19FAF0}/func_80274A18.s (100%) rename asm/nonmatchings/{code_197F40 => code_19FAF0}/func_802752AC.s (100%) rename asm/nonmatchings/{code_197F40 => code_19FAF0}/func_80275F00.s (100%) rename asm/nonmatchings/{code_759b0_len_61b0 => code_77480}/appendGfx_player.s (100%) rename asm/nonmatchings/{code_759b0_len_61b0 => code_77480}/appendGfx_player_spin.s (100%) rename asm/nonmatchings/{code_759b0_len_61b0 => code_77480}/check_input_use_partner.s (100%) rename asm/nonmatchings/{code_759b0_len_61b0 => code_77480}/collision_check_above.s (100%) rename asm/nonmatchings/{code_759b0_len_61b0 => code_77480}/do_lateral_collision.s (100%) rename asm/nonmatchings/{code_759b0_len_61b0 => code_77480}/func_800DE46C.s (100%) rename asm/nonmatchings/{code_759b0_len_61b0 => code_77480}/func_800DEE5C.s (100%) rename asm/nonmatchings/{code_759b0_len_61b0 => code_77480}/func_800DF15C.s (100%) rename asm/nonmatchings/{code_759b0_len_61b0 => code_77480}/func_800DFAAC.s (100%) rename asm/nonmatchings/{code_759b0_len_61b0 => code_77480}/func_800DFD48.s (100%) rename asm/nonmatchings/{code_759b0_len_61b0 => code_77480}/func_800DFFCC.s (100%) rename asm/nonmatchings/{code_759b0_len_61b0 => code_77480}/func_800E0294.s (100%) rename asm/nonmatchings/{code_759b0_len_61b0 => code_77480}/func_800E0398.s (100%) rename asm/nonmatchings/{code_759b0_len_61b0 => code_77480}/func_800E0580.s (100%) rename asm/nonmatchings/{code_759b0_len_61b0 => code_77480}/func_800E06D8.s (100%) rename asm/nonmatchings/{code_759b0_len_61b0 => code_77480}/func_800E0818.s (100%) rename asm/nonmatchings/{code_759b0_len_61b0 => code_77480}/func_800E0B90.s (100%) rename asm/nonmatchings/{code_759b0_len_61b0 => code_77480}/func_800E0FEC.s (100%) rename asm/nonmatchings/{code_759b0_len_61b0 => code_77480}/render_player_model.s (100%) rename asm/nonmatchings/{code_759b0_len_61b0 => code_77480}/test_below_player.s (100%) rename asm/nonmatchings/{code_759b0_len_61b0 => code_77480}/test_player_lateral.s (100%) rename asm/nonmatchings/{code_759b0_len_61b0 => code_77480}/trace_above_player.s (100%) rename asm/nonmatchings/{code_759b0_len_61b0 => code_77480}/trace_below_player.s (100%) rename asm/nonmatchings/{code_759b0_len_61b0 => code_77480}/update_player.s (100%) rename asm/nonmatchings/{code_759b0_len_61b0 => code_77480}/update_player_shadow.s (100%) rename asm/nonmatchings/{code_759b0_len_61b0 => code_7B440}/func_800E205C.s (100%) rename asm/nonmatchings/{code_759b0_len_61b0 => code_7B440}/func_800E23FC.s (100%) rename asm/nonmatchings/{code_759b0_len_61b0 => code_7B440}/func_800E24F8.s (100%) rename asm/nonmatchings/{code_759b0_len_61b0 => code_7B440}/input_to_move_vector.s (100%) rename asm/nonmatchings/{code_759b0_len_61b0 => code_7B440}/update_player_input.s (100%) rename asm/nonmatchings/{code_a5dd0_len_114e0 => code_B4580}/func_8011DE80.s (100%) rename asm/nonmatchings/{code_a5dd0_len_114e0 => code_B4580}/func_8011DFD0.s (100%) rename asm/nonmatchings/{code_a5dd0_len_114e0 => code_B4580}/func_8011E014.s (100%) rename asm/nonmatchings/{code_a5dd0_len_114e0 => code_B4580}/func_8011E058.s (100%) rename asm/nonmatchings/{code_a5dd0_len_114e0 => code_B4580}/func_8011E09C.s (100%) rename asm/nonmatchings/{code_a5dd0_len_114e0 => code_B4580}/func_8011E0DC.s (100%) rename asm/nonmatchings/{code_a5dd0_len_114e0 => code_B4580}/func_8011E150.s (100%) rename asm/nonmatchings/{code_a5dd0_len_114e0 => code_B4580}/func_8011E1C4.s (100%) rename asm/nonmatchings/{code_a5dd0_len_114e0 => code_B4580}/func_8011E224.s (100%) rename asm/nonmatchings/{code_a5dd0_len_114e0 => code_B4580}/func_8011E310.s (100%) rename asm/nonmatchings/{code_a5dd0_len_114e0 => code_B4580}/func_8011E398.s (100%) rename asm/nonmatchings/{code_a5dd0_len_114e0 => code_B4580}/func_8011E400.s (100%) rename asm/nonmatchings/{code_a5dd0_len_114e0 => code_B4580}/func_8011E438.s (100%) rename asm/nonmatchings/{code_a5dd0_len_114e0 => code_B4580}/func_8011E4B8.s (100%) rename asm/nonmatchings/{code_a5dd0_len_114e0 => code_B4580}/func_8011E5E0.s (100%) rename asm/nonmatchings/{code_a5dd0_len_114e0 => code_B4580}/func_8011E718.s (100%) rename asm/nonmatchings/{code_a5dd0_len_114e0 => code_B4580}/func_8011E8BC.s (100%) rename asm/nonmatchings/{code_a5dd0_len_114e0 => code_B4580}/func_8011EA54.s (100%) rename asm/nonmatchings/{code_a5dd0_len_114e0 => code_B4580}/func_8011EBF0.s (100%) rename asm/nonmatchings/{code_a5dd0_len_114e0 => code_B4580}/func_8011F058.s (100%) rename asm/nonmatchings/{code_a5dd0_len_114e0 => code_B4580}/func_8011F118.s (100%) rename asm/nonmatchings/{code_a5dd0_len_114e0 => code_B4580}/func_8011F304.s (100%) rename asm/nonmatchings/{code_a5dd0_len_114e0 => code_B4580}/func_8011F3E8.s (100%) rename asm/nonmatchings/{code_a5dd0_len_114e0 => code_B4580}/func_8011F4D4.s (100%) rename asm/nonmatchings/{code_a5dd0_len_114e0 => code_B4580}/func_8011FA54.s (100%) rename asm/nonmatchings/{code_a5dd0_len_114e0 => code_B4580}/func_8011FF74.s (100%) rename asm/nonmatchings/{code_a5dd0_len_114e0 => code_B4580}/func_8011FF98.s (100%) rename asm/nonmatchings/{code_a5dd0_len_114e0 => code_B4580}/func_8011FFB4.s (100%) rename asm/nonmatchings/{code_a5dd0_len_114e0 => code_B4580}/func_80120028.s (100%) rename asm/nonmatchings/{code_a5dd0_len_114e0 => code_B4580}/func_8012003C.s (100%) rename asm/nonmatchings/{code_a5dd0_len_114e0 => code_B4580}/func_8012004C.s (100%) rename asm/nonmatchings/{code_a5dd0_len_114e0 => code_B4580}/func_80120064.s (100%) rename asm/nonmatchings/{code_a5dd0_len_114e0 => code_B4580}/func_8012008C.s (100%) rename asm/nonmatchings/{code_a5dd0_len_114e0 => code_B4580}/func_8012009C.s (100%) rename asm/nonmatchings/{code_a5dd0_len_114e0 => code_B4580}/func_801200B8.s (100%) rename asm/nonmatchings/{code_a5dd0_len_114e0 => code_B4580}/func_801200EC.s (100%) rename asm/nonmatchings/{code_a5dd0_len_114e0 => code_B4580}/func_80120118.s (100%) rename asm/nonmatchings/{code_a5dd0_len_114e0 => code_B4580}/func_80120198.s (100%) rename asm/nonmatchings/{code_a5dd0_len_114e0 => code_B4580}/func_80120234.s (100%) rename asm/nonmatchings/{code_a5dd0_len_114e0 => code_B4580}/func_801203AC.s (100%) rename asm/nonmatchings/{code_a5dd0_len_114e0 => code_B4580}/func_80120420.s (100%) rename asm/nonmatchings/{code_a5dd0_len_114e0 => code_B4580}/func_80120474.s (100%) rename asm/nonmatchings/{code_a5dd0_len_114e0 => code_B4580}/func_80120530.s (100%) rename asm/nonmatchings/{code_a5dd0_len_114e0 => code_B4580}/func_80120678.s (100%) rename asm/nonmatchings/{code_a5dd0_len_114e0 => code_B4580}/func_801206F8.s (100%) rename asm/nonmatchings/{code_a5dd0_len_114e0 => code_B4580}/play_model_animation.s (100%) rename asm/nonmatchings/{code_B9D60 => code_C50A0}/appendGfx_item_entity.s (100%) rename asm/nonmatchings/{code_B9D60 => code_C50A0}/clear_item_entity_data.s (100%) rename asm/nonmatchings/{code_B9D60 => code_C50A0}/draw_coin_sparkles.s (100%) rename asm/nonmatchings/{code_B9D60 => code_C50A0}/draw_item_entities.s (100%) rename asm/nonmatchings/{code_B9D60 => code_C50A0}/func_8012E9A0.s (100%) rename asm/nonmatchings/{code_B9D60 => code_C50A0}/func_8012EC94.s (100%) rename asm/nonmatchings/{code_B9D60 => code_C50A0}/func_8012F500.s (100%) rename asm/nonmatchings/{code_B9D60 => code_C50A0}/func_8012FE10.s (100%) rename asm/nonmatchings/{code_B9D60 => code_C50A0}/func_8012FE78.s (100%) rename asm/nonmatchings/{code_B9D60 => code_C50A0}/func_801309F0.s (100%) rename asm/nonmatchings/{code_B9D60 => code_C50A0}/func_80130A04.s (100%) rename asm/nonmatchings/{code_B9D60 => code_C50A0}/func_80130ACC.s (100%) rename asm/nonmatchings/{code_B9D60 => code_C50A0}/func_80130F70.s (100%) rename asm/nonmatchings/{code_B9D60 => code_C50A0}/func_80130FAC.s (100%) rename asm/nonmatchings/{code_B9D60 => code_C50A0}/func_80131128.s (100%) rename asm/nonmatchings/{code_B9D60 => code_C50A0}/func_80131DD4.s (100%) rename asm/nonmatchings/{code_B9D60 => code_C50A0}/func_80132D94.s (100%) rename asm/nonmatchings/{code_B9D60 => code_C50A0}/func_80133A94.s (100%) rename asm/nonmatchings/{code_B9D60 => code_C50A0}/func_80133FC8.s (100%) rename asm/nonmatchings/{code_B9D60 => code_C50A0}/func_8013559C.s (100%) rename asm/nonmatchings/{code_B9D60 => code_C50A0}/func_801363A0.s (100%) rename asm/nonmatchings/{code_B9D60 => code_C50A0}/func_8013673C.s (100%) rename asm/nonmatchings/{code_B9D60 => code_C50A0}/func_801369D0.s (100%) rename asm/nonmatchings/{code_B9D60 => code_C50A0}/func_80136A08.s (100%) rename asm/nonmatchings/{code_B9D60 => code_C50A0}/init_got_item.s (100%) rename asm/nonmatchings/{code_B9D60 => code_C50A0}/init_item_entity_list.s (100%) create mode 100644 asm/nonmatchings/code_C50A0/make_item_entity.s rename asm/nonmatchings/{code_B9D60 => code_C50A0}/remove_item_entity_by_index.s (100%) rename asm/nonmatchings/{code_B9D60 => code_C50A0}/remove_item_entity_by_reference.s (100%) rename asm/nonmatchings/{code_B9D60 => code_C50A0}/render_item_entities.s (100%) rename asm/nonmatchings/{code_B9D60 => code_C50A0}/test_item_player_collision.s (100%) rename asm/nonmatchings/{code_B9D60 => code_C50A0}/update_item_entities.s (100%) rename asm/nonmatchings/{code_B9D60 => code_C50A0}/update_item_entity_collectable.s (100%) rename asm/nonmatchings/{code_B9D60 => code_C50A0}/update_item_entity_static.s (100%) rename asm/nonmatchings/{code_B9D60 => code_C50A0}/update_item_entity_temp.s (100%) rename asm/nonmatchings/{code_cd180_len_38f0 => code_CEE40}/func_80138740.s (100%) rename asm/nonmatchings/{code_cd180_len_38f0 => code_CEE40}/func_80138D88.s (100%) rename asm/nonmatchings/{code_cd180_len_38f0 => code_CEE40}/func_80138E54.s (100%) rename asm/nonmatchings/{code_cd180_len_38f0 => code_CEE40}/func_80139F10.s (100%) rename asm/nonmatchings/{code_de740_len_23f0 => code_DF950}/_play_sound.s (100%) rename asm/nonmatchings/{code_de740_len_23f0 => code_DF950}/func_80149250.s (100%) rename asm/nonmatchings/{code_de740_len_23f0 => code_DF950}/func_80149618.s (100%) rename asm/nonmatchings/{code_de740_len_23f0 => code_DF950}/func_80149670.s (100%) rename asm/nonmatchings/{code_de740_len_23f0 => code_DF950}/func_80149734.s (100%) rename asm/nonmatchings/{code_de740_len_23f0 => code_DF950}/func_801497FC.s (100%) rename asm/nonmatchings/{code_de740_len_23f0 => code_DF950}/func_80149828.s (100%) rename asm/nonmatchings/{code_de740_len_23f0 => code_DF950}/func_80149838.s (100%) rename asm/nonmatchings/{code_de740_len_23f0 => code_DF950}/func_801498C4.s (100%) rename asm/nonmatchings/{code_de740_len_23f0 => code_DF950}/func_80149908.s (100%) rename asm/nonmatchings/{code_de740_len_23f0 => code_DF950}/func_80149974.s (100%) rename asm/nonmatchings/{code_de740_len_23f0 => code_DF950}/func_801499EC.s (100%) rename asm/nonmatchings/{code_de740_len_23f0 => code_DF950}/func_80149A6C.s (100%) rename asm/nonmatchings/{code_de740_len_23f0 => code_DF950}/func_80149BE4.s (100%) rename asm/nonmatchings/{code_de740_len_23f0 => code_DF950}/func_80149E04.s (100%) rename asm/nonmatchings/{code_de740_len_23f0 => code_DF950}/func_80149F58.s (100%) rename asm/nonmatchings/{code_de740_len_23f0 => code_DF950}/func_8014A1B4.s (100%) rename asm/nonmatchings/{code_de740_len_23f0 => code_DF950}/play_sound_at_position.s (100%) rename asm/nonmatchings/{code_de740_len_23f0 => code_DF950}/stop_sound.s (100%) rename asm/nonmatchings/{code_E2F750 => code_E307C0}/func_802BBE70_E307C0.s (100%) rename asm/nonmatchings/{code_E2F750 => code_E307C0}/func_802BC2BC_E30C0C.s (100%) rename asm/nonmatchings/{code_E2F750 => code_E307C0}/func_802BC4B8_E30E08.s (100%) rename asm/nonmatchings/{code_E2F750 => code_E307C0}/func_802BC514_E30E64.s (100%) rename asm/nonmatchings/{code_E2F750 => code_E307C0}/func_802BC558_E30EA8.s (100%) rename asm/nonmatchings/{code_E2F750 => code_E307C0}/func_802BC570_E30EC0.s (100%) rename asm/nonmatchings/{code_E2F750 => code_E307C0}/func_802BC99C_E312EC.s (100%) rename asm/nonmatchings/{code_E2F750 => code_E307C0}/func_802BC9CC_E3131C.s (100%) rename asm/nonmatchings/{code_E2F750 => code_E307C0}/func_802BC9FC_E3134C.s (100%) delete mode 100644 asm/nonmatchings/code_de740_len_23f0/func_801491E4.s rename asm/nonmatchings/world/area_hos/hos_02/{A16220 => A171F0}/func_80240FD0_A171F0.s (100%) rename asm/nonmatchings/world/area_kmr/kmr_02/{8B30E0 => 8B33E0}/func_80243370_8B33E0.s (100%) rename asm/nonmatchings/world/area_kmr/kmr_02/{8B30E0 => 8B33E0}/func_802433AC_8B341C.s (100%) rename asm/nonmatchings/world/area_kmr/kmr_02/{8B30E0 => 8B33E0}/func_80243514_8B3584.s (100%) rename asm/nonmatchings/world/script_api/{7E3700 => 7E4690}/func_80283908.s (93%) rename asm/nonmatchings/world/script_api/{7E3700 => 7E4690}/func_80283A50.s (100%) rename asm/nonmatchings/world/script_api/{7E3700 => 7E4690}/func_80283C34.s (100%) rename asm/nonmatchings/world/script_api/{7E3700 => 7E4690}/func_80283D00.s (100%) rename asm/nonmatchings/world/script_api/{7E3700 => 7E4690}/func_80283D6C.s (100%) rename asm/nonmatchings/world/script_api/{7E3700 => 7E4690}/func_80283DF0.s (100%) rename asm/nonmatchings/world/script_api/{7E3700 => 7E4690}/func_80283E2C.s (100%) create mode 100644 src/battle/area_flo/5B1A10.c create mode 100644 src/battle/area_flo/5B1D80.c create mode 100644 src/battle/area_flo/5B20F0.c create mode 100644 src/battle/area_flo/5B28D0.c create mode 100644 src/battle/area_hos/47F570.c create mode 100644 src/battle/area_isk_part_1/4E30C0.c create mode 100644 src/battle/area_isk_part_2/4EFDC0.c create mode 100644 src/battle/area_jan/573E10.c create mode 100644 src/battle/area_kmr_part_3/448420.c create mode 100644 src/battle/area_kmr_part_3/448E80.c create mode 100644 src/battle/area_kpa/685130.c create mode 100644 src/battle/area_kzn/58C920.c create mode 100644 src/battle/area_kzn/58CC90.c create mode 100644 src/battle/area_kzn2/59F4D0.c create mode 100644 src/battle/area_omo/512C90.c create mode 100644 src/battle/area_omo/512E50.c create mode 100644 src/battle/area_pra/649480.c create mode 100644 src/battle/area_pra/6497F0.c create mode 100644 src/battle/area_pra/649B60.c create mode 100644 src/battle/area_pra/649ED0.c create mode 100644 src/battle/area_pra2/660D20.c create mode 100644 src/battle/area_pra2/660E10.c create mode 100644 src/battle/area_pra3/66B920.c create mode 100644 src/battle/area_sam/625750.c create mode 100644 src/battle/area_sam2/63DD60.c create mode 100644 src/code_102C80.c create mode 100644 src/code_104730.c create mode 100644 src/code_105F90.c create mode 100644 src/code_106EF0.c create mode 100644 src/code_137ED0.c create mode 100644 src/code_190A10.c create mode 100644 src/code_19FAF0.c create mode 100644 src/code_77480.c create mode 100644 src/code_7B440.c create mode 100644 src/code_B4580.c create mode 100644 src/code_C50A0.c create mode 100644 src/code_CEE40.c create mode 100644 src/code_DF950.c create mode 100644 src/code_E307C0.c create mode 100644 src/world/area_hos/hos_02/A171F0.c create mode 100644 src/world/area_kmr/kmr_02/8B33E0.c create mode 100644 src/world/script_api/7E4690.c diff --git a/asm/nonmatchings/battle/area_flo/5B16A0/func_80218560_5B1A10.s b/asm/nonmatchings/battle/area_flo/5B1A10/func_80218560_5B1A10.s similarity index 100% rename from asm/nonmatchings/battle/area_flo/5B16A0/func_80218560_5B1A10.s rename to asm/nonmatchings/battle/area_flo/5B1A10/func_80218560_5B1A10.s diff --git a/asm/nonmatchings/battle/area_flo/5B16A0/func_802186B8_5B1B68.s b/asm/nonmatchings/battle/area_flo/5B1A10/func_802186B8_5B1B68.s similarity index 100% rename from asm/nonmatchings/battle/area_flo/5B16A0/func_802186B8_5B1B68.s rename to asm/nonmatchings/battle/area_flo/5B1A10/func_802186B8_5B1B68.s diff --git a/asm/nonmatchings/battle/area_flo/5B16A0/func_80218808_5B1CB8.s b/asm/nonmatchings/battle/area_flo/5B1A10/func_80218808_5B1CB8.s similarity index 100% rename from asm/nonmatchings/battle/area_flo/5B16A0/func_80218808_5B1CB8.s rename to asm/nonmatchings/battle/area_flo/5B1A10/func_80218808_5B1CB8.s diff --git a/asm/nonmatchings/battle/area_flo/5B16A0/func_802188D0_5B1D80.s b/asm/nonmatchings/battle/area_flo/5B1D80/func_802188D0_5B1D80.s similarity index 100% rename from asm/nonmatchings/battle/area_flo/5B16A0/func_802188D0_5B1D80.s rename to asm/nonmatchings/battle/area_flo/5B1D80/func_802188D0_5B1D80.s diff --git a/asm/nonmatchings/battle/area_flo/5B16A0/func_80218A28_5B1ED8.s b/asm/nonmatchings/battle/area_flo/5B1D80/func_80218A28_5B1ED8.s similarity index 100% rename from asm/nonmatchings/battle/area_flo/5B16A0/func_80218A28_5B1ED8.s rename to asm/nonmatchings/battle/area_flo/5B1D80/func_80218A28_5B1ED8.s diff --git a/asm/nonmatchings/battle/area_flo/5B16A0/func_80218B78_5B2028.s b/asm/nonmatchings/battle/area_flo/5B1D80/func_80218B78_5B2028.s similarity index 100% rename from asm/nonmatchings/battle/area_flo/5B16A0/func_80218B78_5B2028.s rename to asm/nonmatchings/battle/area_flo/5B1D80/func_80218B78_5B2028.s diff --git a/asm/nonmatchings/battle/area_flo/5B16A0/func_80218C40_5B20F0.s b/asm/nonmatchings/battle/area_flo/5B20F0/func_80218C40_5B20F0.s similarity index 100% rename from asm/nonmatchings/battle/area_flo/5B16A0/func_80218C40_5B20F0.s rename to asm/nonmatchings/battle/area_flo/5B20F0/func_80218C40_5B20F0.s diff --git a/asm/nonmatchings/battle/area_flo/5B16A0/func_80218D98_5B2248.s b/asm/nonmatchings/battle/area_flo/5B20F0/func_80218D98_5B2248.s similarity index 100% rename from asm/nonmatchings/battle/area_flo/5B16A0/func_80218D98_5B2248.s rename to asm/nonmatchings/battle/area_flo/5B20F0/func_80218D98_5B2248.s diff --git a/asm/nonmatchings/battle/area_flo/5B16A0/func_80218EE8_5B2398.s b/asm/nonmatchings/battle/area_flo/5B20F0/func_80218EE8_5B2398.s similarity index 100% rename from asm/nonmatchings/battle/area_flo/5B16A0/func_80218EE8_5B2398.s rename to asm/nonmatchings/battle/area_flo/5B20F0/func_80218EE8_5B2398.s diff --git a/asm/nonmatchings/battle/area_flo/5B16A0/func_80218FAC_5B245C.s b/asm/nonmatchings/battle/area_flo/5B20F0/func_80218FAC_5B245C.s similarity index 100% rename from asm/nonmatchings/battle/area_flo/5B16A0/func_80218FAC_5B245C.s rename to asm/nonmatchings/battle/area_flo/5B20F0/func_80218FAC_5B245C.s diff --git a/asm/nonmatchings/battle/area_flo/5B16A0/func_8021900C_5B24BC.s b/asm/nonmatchings/battle/area_flo/5B20F0/func_8021900C_5B24BC.s similarity index 100% rename from asm/nonmatchings/battle/area_flo/5B16A0/func_8021900C_5B24BC.s rename to asm/nonmatchings/battle/area_flo/5B20F0/func_8021900C_5B24BC.s diff --git a/asm/nonmatchings/battle/area_flo/5B16A0/func_802190B0_5B2560.s b/asm/nonmatchings/battle/area_flo/5B20F0/func_802190B0_5B2560.s similarity index 100% rename from asm/nonmatchings/battle/area_flo/5B16A0/func_802190B0_5B2560.s rename to asm/nonmatchings/battle/area_flo/5B20F0/func_802190B0_5B2560.s diff --git a/asm/nonmatchings/battle/area_flo/5B16A0/func_80219208_5B26B8.s b/asm/nonmatchings/battle/area_flo/5B20F0/func_80219208_5B26B8.s similarity index 100% rename from asm/nonmatchings/battle/area_flo/5B16A0/func_80219208_5B26B8.s rename to asm/nonmatchings/battle/area_flo/5B20F0/func_80219208_5B26B8.s diff --git a/asm/nonmatchings/battle/area_flo/5B16A0/func_80219358_5B2808.s b/asm/nonmatchings/battle/area_flo/5B20F0/func_80219358_5B2808.s similarity index 100% rename from asm/nonmatchings/battle/area_flo/5B16A0/func_80219358_5B2808.s rename to asm/nonmatchings/battle/area_flo/5B20F0/func_80219358_5B2808.s diff --git a/asm/nonmatchings/battle/area_flo/5B16A0/func_80219420_5B28D0.s b/asm/nonmatchings/battle/area_flo/5B28D0/func_80219420_5B28D0.s similarity index 100% rename from asm/nonmatchings/battle/area_flo/5B16A0/func_80219420_5B28D0.s rename to asm/nonmatchings/battle/area_flo/5B28D0/func_80219420_5B28D0.s diff --git a/asm/nonmatchings/battle/area_flo/5B16A0/func_802194E0_5B2990.s b/asm/nonmatchings/battle/area_flo/5B28D0/func_802194E0_5B2990.s similarity index 100% rename from asm/nonmatchings/battle/area_flo/5B16A0/func_802194E0_5B2990.s rename to asm/nonmatchings/battle/area_flo/5B28D0/func_802194E0_5B2990.s diff --git a/asm/nonmatchings/battle/area_flo/5B16A0/func_802195A0_5B2A50.s b/asm/nonmatchings/battle/area_flo/5B28D0/func_802195A0_5B2A50.s similarity index 100% rename from asm/nonmatchings/battle/area_flo/5B16A0/func_802195A0_5B2A50.s rename to asm/nonmatchings/battle/area_flo/5B28D0/func_802195A0_5B2A50.s diff --git a/asm/nonmatchings/battle/area_flo/5B16A0/func_80219660_5B2B10.s b/asm/nonmatchings/battle/area_flo/5B28D0/func_80219660_5B2B10.s similarity index 100% rename from asm/nonmatchings/battle/area_flo/5B16A0/func_80219660_5B2B10.s rename to asm/nonmatchings/battle/area_flo/5B28D0/func_80219660_5B2B10.s diff --git a/asm/nonmatchings/battle/area_flo/5B16A0/func_80219720_5B2BD0.s b/asm/nonmatchings/battle/area_flo/5B28D0/func_80219720_5B2BD0.s similarity index 100% rename from asm/nonmatchings/battle/area_flo/5B16A0/func_80219720_5B2BD0.s rename to asm/nonmatchings/battle/area_flo/5B28D0/func_80219720_5B2BD0.s diff --git a/asm/nonmatchings/battle/area_flo/5B16A0/func_802197E0_5B2C90.s b/asm/nonmatchings/battle/area_flo/5B28D0/func_802197E0_5B2C90.s similarity index 100% rename from asm/nonmatchings/battle/area_flo/5B16A0/func_802197E0_5B2C90.s rename to asm/nonmatchings/battle/area_flo/5B28D0/func_802197E0_5B2C90.s diff --git a/asm/nonmatchings/battle/area_flo/5B16A0/func_802198A0_5B2D50.s b/asm/nonmatchings/battle/area_flo/5B28D0/func_802198A0_5B2D50.s similarity index 100% rename from asm/nonmatchings/battle/area_flo/5B16A0/func_802198A0_5B2D50.s rename to asm/nonmatchings/battle/area_flo/5B28D0/func_802198A0_5B2D50.s diff --git a/asm/nonmatchings/battle/area_flo/5B16A0/func_80219C80_5B3130.s b/asm/nonmatchings/battle/area_flo/5B28D0/func_80219C80_5B3130.s similarity index 100% rename from asm/nonmatchings/battle/area_flo/5B16A0/func_80219C80_5B3130.s rename to asm/nonmatchings/battle/area_flo/5B28D0/func_80219C80_5B3130.s diff --git a/asm/nonmatchings/battle/area_flo/5B16A0/func_80219D40_5B31F0.s b/asm/nonmatchings/battle/area_flo/5B28D0/func_80219D40_5B31F0.s similarity index 100% rename from asm/nonmatchings/battle/area_flo/5B16A0/func_80219D40_5B31F0.s rename to asm/nonmatchings/battle/area_flo/5B28D0/func_80219D40_5B31F0.s diff --git a/asm/nonmatchings/battle/area_flo/5B16A0/func_80219E00_5B32B0.s b/asm/nonmatchings/battle/area_flo/5B28D0/func_80219E00_5B32B0.s similarity index 100% rename from asm/nonmatchings/battle/area_flo/5B16A0/func_80219E00_5B32B0.s rename to asm/nonmatchings/battle/area_flo/5B28D0/func_80219E00_5B32B0.s diff --git a/asm/nonmatchings/battle/area_hos/47F0D0/func_802184C0_47F570.s b/asm/nonmatchings/battle/area_hos/47F570/func_802184C0_47F570.s similarity index 100% rename from asm/nonmatchings/battle/area_hos/47F0D0/func_802184C0_47F570.s rename to asm/nonmatchings/battle/area_hos/47F570/func_802184C0_47F570.s diff --git a/asm/nonmatchings/battle/area_hos/47F0D0/func_802186B8_47F768.s b/asm/nonmatchings/battle/area_hos/47F570/func_802186B8_47F768.s similarity index 100% rename from asm/nonmatchings/battle/area_hos/47F0D0/func_802186B8_47F768.s rename to asm/nonmatchings/battle/area_hos/47F570/func_802186B8_47F768.s diff --git a/asm/nonmatchings/battle/area_hos/47F0D0/func_802189D0_47FA80.s b/asm/nonmatchings/battle/area_hos/47F570/func_802189D0_47FA80.s similarity index 100% rename from asm/nonmatchings/battle/area_hos/47F0D0/func_802189D0_47FA80.s rename to asm/nonmatchings/battle/area_hos/47F570/func_802189D0_47FA80.s diff --git a/asm/nonmatchings/battle/area_hos/47F0D0/func_80218CEC_47FD9C.s b/asm/nonmatchings/battle/area_hos/47F570/func_80218CEC_47FD9C.s similarity index 100% rename from asm/nonmatchings/battle/area_hos/47F0D0/func_80218CEC_47FD9C.s rename to asm/nonmatchings/battle/area_hos/47F570/func_80218CEC_47FD9C.s diff --git a/asm/nonmatchings/battle/area_isk_part_1/4E29B0/func_80218980_4E30C0.s b/asm/nonmatchings/battle/area_isk_part_1/4E30C0/func_80218980_4E30C0.s similarity index 100% rename from asm/nonmatchings/battle/area_isk_part_1/4E29B0/func_80218980_4E30C0.s rename to asm/nonmatchings/battle/area_isk_part_1/4E30C0/func_80218980_4E30C0.s diff --git a/asm/nonmatchings/battle/area_isk_part_1/4E29B0/func_80218A10_4E3150.s b/asm/nonmatchings/battle/area_isk_part_1/4E30C0/func_80218A10_4E3150.s similarity index 100% rename from asm/nonmatchings/battle/area_isk_part_1/4E29B0/func_80218A10_4E3150.s rename to asm/nonmatchings/battle/area_isk_part_1/4E30C0/func_80218A10_4E3150.s diff --git a/asm/nonmatchings/battle/area_isk_part_2/4EFCF0/func_80218920_4EFDC0.s b/asm/nonmatchings/battle/area_isk_part_2/4EFDC0/func_80218920_4EFDC0.s similarity index 100% rename from asm/nonmatchings/battle/area_isk_part_2/4EFCF0/func_80218920_4EFDC0.s rename to asm/nonmatchings/battle/area_isk_part_2/4EFDC0/func_80218920_4EFDC0.s diff --git a/asm/nonmatchings/battle/area_isk_part_2/4EFCF0/func_802189B0_4EFE50.s b/asm/nonmatchings/battle/area_isk_part_2/4EFDC0/func_802189B0_4EFE50.s similarity index 100% rename from asm/nonmatchings/battle/area_isk_part_2/4EFCF0/func_802189B0_4EFE50.s rename to asm/nonmatchings/battle/area_isk_part_2/4EFDC0/func_802189B0_4EFE50.s diff --git a/asm/nonmatchings/battle/area_kmr_part_3/447D50/func_80218FE0_448420.s b/asm/nonmatchings/battle/area_kmr_part_3/448420/func_80218FE0_448420.s similarity index 100% rename from asm/nonmatchings/battle/area_kmr_part_3/447D50/func_80218FE0_448420.s rename to asm/nonmatchings/battle/area_kmr_part_3/448420/func_80218FE0_448420.s diff --git a/asm/nonmatchings/battle/area_kmr_part_3/448E20/func_80219A40_448E80.s b/asm/nonmatchings/battle/area_kmr_part_3/448E80/func_80219A40_448E80.s similarity index 100% rename from asm/nonmatchings/battle/area_kmr_part_3/448E20/func_80219A40_448E80.s rename to asm/nonmatchings/battle/area_kmr_part_3/448E80/func_80219A40_448E80.s diff --git a/asm/nonmatchings/battle/area_kmr_part_3/448E20/func_80219C38_449078.s b/asm/nonmatchings/battle/area_kmr_part_3/448E80/func_80219C38_449078.s similarity index 100% rename from asm/nonmatchings/battle/area_kmr_part_3/448E20/func_80219C38_449078.s rename to asm/nonmatchings/battle/area_kmr_part_3/448E80/func_80219C38_449078.s diff --git a/asm/nonmatchings/battle/area_kmr_part_3/448E20/func_80219C5C_44909C.s b/asm/nonmatchings/battle/area_kmr_part_3/448E80/func_80219C5C_44909C.s similarity index 100% rename from asm/nonmatchings/battle/area_kmr_part_3/448E20/func_80219C5C_44909C.s rename to asm/nonmatchings/battle/area_kmr_part_3/448E80/func_80219C5C_44909C.s diff --git a/asm/nonmatchings/battle/area_kmr_part_3/448E20/func_80219D60_4491A0.s b/asm/nonmatchings/battle/area_kmr_part_3/448E80/func_80219D60_4491A0.s similarity index 100% rename from asm/nonmatchings/battle/area_kmr_part_3/448E20/func_80219D60_4491A0.s rename to asm/nonmatchings/battle/area_kmr_part_3/448E80/func_80219D60_4491A0.s diff --git a/asm/nonmatchings/battle/area_kpa/684C30/func_80218700_685130.s b/asm/nonmatchings/battle/area_kpa/685130/func_80218700_685130.s similarity index 100% rename from asm/nonmatchings/battle/area_kpa/684C30/func_80218700_685130.s rename to asm/nonmatchings/battle/area_kpa/685130/func_80218700_685130.s diff --git a/asm/nonmatchings/battle/area_kzn/58C740/func_80218630_58C920.s b/asm/nonmatchings/battle/area_kzn/58C920/func_80218630_58C920.s similarity index 100% rename from asm/nonmatchings/battle/area_kzn/58C740/func_80218630_58C920.s rename to asm/nonmatchings/battle/area_kzn/58C920/func_80218630_58C920.s diff --git a/asm/nonmatchings/battle/area_kzn/58C740/func_80218788_58CA78.s b/asm/nonmatchings/battle/area_kzn/58C920/func_80218788_58CA78.s similarity index 100% rename from asm/nonmatchings/battle/area_kzn/58C740/func_80218788_58CA78.s rename to asm/nonmatchings/battle/area_kzn/58C920/func_80218788_58CA78.s diff --git a/asm/nonmatchings/battle/area_kzn/58C740/func_802188D8_58CBC8.s b/asm/nonmatchings/battle/area_kzn/58C920/func_802188D8_58CBC8.s similarity index 100% rename from asm/nonmatchings/battle/area_kzn/58C740/func_802188D8_58CBC8.s rename to asm/nonmatchings/battle/area_kzn/58C920/func_802188D8_58CBC8.s diff --git a/asm/nonmatchings/battle/area_kzn/58C740/func_802189A0_58CC90.s b/asm/nonmatchings/battle/area_kzn/58CC90/func_802189A0_58CC90.s similarity index 100% rename from asm/nonmatchings/battle/area_kzn/58C740/func_802189A0_58CC90.s rename to asm/nonmatchings/battle/area_kzn/58CC90/func_802189A0_58CC90.s diff --git a/asm/nonmatchings/battle/area_kzn/58C740/func_80218AF8_58CDE8.s b/asm/nonmatchings/battle/area_kzn/58CC90/func_80218AF8_58CDE8.s similarity index 100% rename from asm/nonmatchings/battle/area_kzn/58C740/func_80218AF8_58CDE8.s rename to asm/nonmatchings/battle/area_kzn/58CC90/func_80218AF8_58CDE8.s diff --git a/asm/nonmatchings/battle/area_kzn/58C740/func_80218C48_58CF38.s b/asm/nonmatchings/battle/area_kzn/58CC90/func_80218C48_58CF38.s similarity index 100% rename from asm/nonmatchings/battle/area_kzn/58C740/func_80218C48_58CF38.s rename to asm/nonmatchings/battle/area_kzn/58CC90/func_80218C48_58CF38.s diff --git a/asm/nonmatchings/battle/area_kzn/58C740/func_80218D0C_58CFFC.s b/asm/nonmatchings/battle/area_kzn/58CC90/func_80218D0C_58CFFC.s similarity index 100% rename from asm/nonmatchings/battle/area_kzn/58C740/func_80218D0C_58CFFC.s rename to asm/nonmatchings/battle/area_kzn/58CC90/func_80218D0C_58CFFC.s diff --git a/asm/nonmatchings/battle/area_kzn/58C740/func_80218D6C_58D05C.s b/asm/nonmatchings/battle/area_kzn/58CC90/func_80218D6C_58D05C.s similarity index 100% rename from asm/nonmatchings/battle/area_kzn/58C740/func_80218D6C_58D05C.s rename to asm/nonmatchings/battle/area_kzn/58CC90/func_80218D6C_58D05C.s diff --git a/asm/nonmatchings/battle/area_kzn2/59F420/func_80218DF0_59F4D0.s b/asm/nonmatchings/battle/area_kzn2/59F4D0/func_80218DF0_59F4D0.s similarity index 100% rename from asm/nonmatchings/battle/area_kzn2/59F420/func_80218DF0_59F4D0.s rename to asm/nonmatchings/battle/area_kzn2/59F4D0/func_80218DF0_59F4D0.s diff --git a/asm/nonmatchings/battle/area_omo/512AB0/func_8021878C_512D5C.s b/asm/nonmatchings/battle/area_omo/512C90/func_8021878C_512D5C.s similarity index 100% rename from asm/nonmatchings/battle/area_omo/512AB0/func_8021878C_512D5C.s rename to asm/nonmatchings/battle/area_omo/512C90/func_8021878C_512D5C.s diff --git a/asm/nonmatchings/battle/area_omo/512AB0/func_80218880_512E50.s b/asm/nonmatchings/battle/area_omo/512E50/func_80218880_512E50.s similarity index 100% rename from asm/nonmatchings/battle/area_omo/512AB0/func_80218880_512E50.s rename to asm/nonmatchings/battle/area_omo/512E50/func_80218880_512E50.s diff --git a/asm/nonmatchings/battle/area_omo/512AB0/func_80218A98_513068.s b/asm/nonmatchings/battle/area_omo/512E50/func_80218A98_513068.s similarity index 100% rename from asm/nonmatchings/battle/area_omo/512AB0/func_80218A98_513068.s rename to asm/nonmatchings/battle/area_omo/512E50/func_80218A98_513068.s diff --git a/asm/nonmatchings/battle/area_omo/512AB0/func_80218B38_513108.s b/asm/nonmatchings/battle/area_omo/512E50/func_80218B38_513108.s similarity index 100% rename from asm/nonmatchings/battle/area_omo/512AB0/func_80218B38_513108.s rename to asm/nonmatchings/battle/area_omo/512E50/func_80218B38_513108.s diff --git a/asm/nonmatchings/battle/area_omo/512AB0/func_80218CF4_5132C4.s b/asm/nonmatchings/battle/area_omo/512E50/func_80218CF4_5132C4.s similarity index 100% rename from asm/nonmatchings/battle/area_omo/512AB0/func_80218CF4_5132C4.s rename to asm/nonmatchings/battle/area_omo/512E50/func_80218CF4_5132C4.s diff --git a/asm/nonmatchings/battle/area_pra/649050/func_80218670_649480.s b/asm/nonmatchings/battle/area_pra/649480/func_80218670_649480.s similarity index 100% rename from asm/nonmatchings/battle/area_pra/649050/func_80218670_649480.s rename to asm/nonmatchings/battle/area_pra/649480/func_80218670_649480.s diff --git a/asm/nonmatchings/battle/area_pra/649050/func_802187C8_6495D8.s b/asm/nonmatchings/battle/area_pra/649480/func_802187C8_6495D8.s similarity index 100% rename from asm/nonmatchings/battle/area_pra/649050/func_802187C8_6495D8.s rename to asm/nonmatchings/battle/area_pra/649480/func_802187C8_6495D8.s diff --git a/asm/nonmatchings/battle/area_pra/649050/func_80218918_649728.s b/asm/nonmatchings/battle/area_pra/649480/func_80218918_649728.s similarity index 100% rename from asm/nonmatchings/battle/area_pra/649050/func_80218918_649728.s rename to asm/nonmatchings/battle/area_pra/649480/func_80218918_649728.s diff --git a/asm/nonmatchings/battle/area_pra/649050/func_802189E0_6497F0.s b/asm/nonmatchings/battle/area_pra/6497F0/func_802189E0_6497F0.s similarity index 100% rename from asm/nonmatchings/battle/area_pra/649050/func_802189E0_6497F0.s rename to asm/nonmatchings/battle/area_pra/6497F0/func_802189E0_6497F0.s diff --git a/asm/nonmatchings/battle/area_pra/649050/func_80218B38_649948.s b/asm/nonmatchings/battle/area_pra/6497F0/func_80218B38_649948.s similarity index 100% rename from asm/nonmatchings/battle/area_pra/649050/func_80218B38_649948.s rename to asm/nonmatchings/battle/area_pra/6497F0/func_80218B38_649948.s diff --git a/asm/nonmatchings/battle/area_pra/649050/func_80218C88_649A98.s b/asm/nonmatchings/battle/area_pra/6497F0/func_80218C88_649A98.s similarity index 100% rename from asm/nonmatchings/battle/area_pra/649050/func_80218C88_649A98.s rename to asm/nonmatchings/battle/area_pra/6497F0/func_80218C88_649A98.s diff --git a/asm/nonmatchings/battle/area_pra/649050/func_80218D50_649B60.s b/asm/nonmatchings/battle/area_pra/649B60/func_80218D50_649B60.s similarity index 100% rename from asm/nonmatchings/battle/area_pra/649050/func_80218D50_649B60.s rename to asm/nonmatchings/battle/area_pra/649B60/func_80218D50_649B60.s diff --git a/asm/nonmatchings/battle/area_pra/649050/func_80218EA8_649CB8.s b/asm/nonmatchings/battle/area_pra/649B60/func_80218EA8_649CB8.s similarity index 100% rename from asm/nonmatchings/battle/area_pra/649050/func_80218EA8_649CB8.s rename to asm/nonmatchings/battle/area_pra/649B60/func_80218EA8_649CB8.s diff --git a/asm/nonmatchings/battle/area_pra/649050/func_80218FF8_649E08.s b/asm/nonmatchings/battle/area_pra/649B60/func_80218FF8_649E08.s similarity index 100% rename from asm/nonmatchings/battle/area_pra/649050/func_80218FF8_649E08.s rename to asm/nonmatchings/battle/area_pra/649B60/func_80218FF8_649E08.s diff --git a/asm/nonmatchings/battle/area_pra/649050/func_802190C0_649ED0.s b/asm/nonmatchings/battle/area_pra/649ED0/func_802190C0_649ED0.s similarity index 100% rename from asm/nonmatchings/battle/area_pra/649050/func_802190C0_649ED0.s rename to asm/nonmatchings/battle/area_pra/649ED0/func_802190C0_649ED0.s diff --git a/asm/nonmatchings/battle/area_pra/649050/func_80219218_64A028.s b/asm/nonmatchings/battle/area_pra/649ED0/func_80219218_64A028.s similarity index 100% rename from asm/nonmatchings/battle/area_pra/649050/func_80219218_64A028.s rename to asm/nonmatchings/battle/area_pra/649ED0/func_80219218_64A028.s diff --git a/asm/nonmatchings/battle/area_pra/649050/func_80219368_64A178.s b/asm/nonmatchings/battle/area_pra/649ED0/func_80219368_64A178.s similarity index 100% rename from asm/nonmatchings/battle/area_pra/649050/func_80219368_64A178.s rename to asm/nonmatchings/battle/area_pra/649ED0/func_80219368_64A178.s diff --git a/asm/nonmatchings/battle/area_pra/649050/func_8021942C_64A23C.s b/asm/nonmatchings/battle/area_pra/649ED0/func_8021942C_64A23C.s similarity index 100% rename from asm/nonmatchings/battle/area_pra/649050/func_8021942C_64A23C.s rename to asm/nonmatchings/battle/area_pra/649ED0/func_8021942C_64A23C.s diff --git a/asm/nonmatchings/battle/area_pra/649050/func_8021948C_64A29C.s b/asm/nonmatchings/battle/area_pra/649ED0/func_8021948C_64A29C.s similarity index 100% rename from asm/nonmatchings/battle/area_pra/649050/func_8021948C_64A29C.s rename to asm/nonmatchings/battle/area_pra/649ED0/func_8021948C_64A29C.s diff --git a/asm/nonmatchings/battle/area_pra2/660750/func_802185D0_660D20.s b/asm/nonmatchings/battle/area_pra2/660D20/func_802185D0_660D20.s similarity index 100% rename from asm/nonmatchings/battle/area_pra2/660750/func_802185D0_660D20.s rename to asm/nonmatchings/battle/area_pra2/660D20/func_802185D0_660D20.s diff --git a/asm/nonmatchings/battle/area_pra2/660750/func_802186C0_660E10.s b/asm/nonmatchings/battle/area_pra2/660E10/func_802186C0_660E10.s similarity index 100% rename from asm/nonmatchings/battle/area_pra2/660750/func_802186C0_660E10.s rename to asm/nonmatchings/battle/area_pra2/660E10/func_802186C0_660E10.s diff --git a/asm/nonmatchings/battle/area_pra2/660750/func_802188B8_661008.s b/asm/nonmatchings/battle/area_pra2/660E10/func_802188B8_661008.s similarity index 100% rename from asm/nonmatchings/battle/area_pra2/660750/func_802188B8_661008.s rename to asm/nonmatchings/battle/area_pra2/660E10/func_802188B8_661008.s diff --git a/asm/nonmatchings/battle/area_pra2/660750/func_802188DC_66102C.s b/asm/nonmatchings/battle/area_pra2/660E10/func_802188DC_66102C.s similarity index 100% rename from asm/nonmatchings/battle/area_pra2/660750/func_802188DC_66102C.s rename to asm/nonmatchings/battle/area_pra2/660E10/func_802188DC_66102C.s diff --git a/asm/nonmatchings/battle/area_pra2/660750/func_802189E0_661130.s b/asm/nonmatchings/battle/area_pra2/660E10/func_802189E0_661130.s similarity index 100% rename from asm/nonmatchings/battle/area_pra2/660750/func_802189E0_661130.s rename to asm/nonmatchings/battle/area_pra2/660E10/func_802189E0_661130.s diff --git a/asm/nonmatchings/battle/area_pra3/66B5B0/func_80219BA0_66B920.s b/asm/nonmatchings/battle/area_pra3/66B920/func_80219BA0_66B920.s similarity index 100% rename from asm/nonmatchings/battle/area_pra3/66B5B0/func_80219BA0_66B920.s rename to asm/nonmatchings/battle/area_pra3/66B920/func_80219BA0_66B920.s diff --git a/asm/nonmatchings/battle/area_pra3/66B5B0/func_80219CF8_66BA78.s b/asm/nonmatchings/battle/area_pra3/66B920/func_80219CF8_66BA78.s similarity index 100% rename from asm/nonmatchings/battle/area_pra3/66B5B0/func_80219CF8_66BA78.s rename to asm/nonmatchings/battle/area_pra3/66B920/func_80219CF8_66BA78.s diff --git a/asm/nonmatchings/battle/area_pra3/66B5B0/func_80219E48_66BBC8.s b/asm/nonmatchings/battle/area_pra3/66B920/func_80219E48_66BBC8.s similarity index 100% rename from asm/nonmatchings/battle/area_pra3/66B5B0/func_80219E48_66BBC8.s rename to asm/nonmatchings/battle/area_pra3/66B920/func_80219E48_66BBC8.s diff --git a/asm/nonmatchings/battle/area_sam/6253E0/func_80219BB0_625750.s b/asm/nonmatchings/battle/area_sam/625750/func_80219BB0_625750.s similarity index 100% rename from asm/nonmatchings/battle/area_sam/6253E0/func_80219BB0_625750.s rename to asm/nonmatchings/battle/area_sam/625750/func_80219BB0_625750.s diff --git a/asm/nonmatchings/battle/area_sam/6253E0/func_80219DA8_625948.s b/asm/nonmatchings/battle/area_sam/625750/func_80219DA8_625948.s similarity index 100% rename from asm/nonmatchings/battle/area_sam/6253E0/func_80219DA8_625948.s rename to asm/nonmatchings/battle/area_sam/625750/func_80219DA8_625948.s diff --git a/asm/nonmatchings/battle/area_sam/6253E0/func_80219DCC_62596C.s b/asm/nonmatchings/battle/area_sam/625750/func_80219DCC_62596C.s similarity index 100% rename from asm/nonmatchings/battle/area_sam/6253E0/func_80219DCC_62596C.s rename to asm/nonmatchings/battle/area_sam/625750/func_80219DCC_62596C.s diff --git a/asm/nonmatchings/battle/area_sam/6253E0/func_80219ED0_625A70.s b/asm/nonmatchings/battle/area_sam/625750/func_80219ED0_625A70.s similarity index 100% rename from asm/nonmatchings/battle/area_sam/6253E0/func_80219ED0_625A70.s rename to asm/nonmatchings/battle/area_sam/625750/func_80219ED0_625A70.s diff --git a/asm/nonmatchings/battle/area_sam/6253E0/func_8021A0C8_625C68.s b/asm/nonmatchings/battle/area_sam/625750/func_8021A0C8_625C68.s similarity index 100% rename from asm/nonmatchings/battle/area_sam/6253E0/func_8021A0C8_625C68.s rename to asm/nonmatchings/battle/area_sam/625750/func_8021A0C8_625C68.s diff --git a/asm/nonmatchings/battle/area_sam/6253E0/func_8021A0EC_625C8C.s b/asm/nonmatchings/battle/area_sam/625750/func_8021A0EC_625C8C.s similarity index 100% rename from asm/nonmatchings/battle/area_sam/6253E0/func_8021A0EC_625C8C.s rename to asm/nonmatchings/battle/area_sam/625750/func_8021A0EC_625C8C.s diff --git a/asm/nonmatchings/battle/area_sam/6253E0/func_8021A1F0_625D90.s b/asm/nonmatchings/battle/area_sam/625750/func_8021A1F0_625D90.s similarity index 100% rename from asm/nonmatchings/battle/area_sam/6253E0/func_8021A1F0_625D90.s rename to asm/nonmatchings/battle/area_sam/625750/func_8021A1F0_625D90.s diff --git a/asm/nonmatchings/battle/area_sam/6253E0/func_8021A3E8_625F88.s b/asm/nonmatchings/battle/area_sam/625750/func_8021A3E8_625F88.s similarity index 100% rename from asm/nonmatchings/battle/area_sam/6253E0/func_8021A3E8_625F88.s rename to asm/nonmatchings/battle/area_sam/625750/func_8021A3E8_625F88.s diff --git a/asm/nonmatchings/battle/area_sam/6253E0/func_8021A40C_625FAC.s b/asm/nonmatchings/battle/area_sam/625750/func_8021A40C_625FAC.s similarity index 100% rename from asm/nonmatchings/battle/area_sam/6253E0/func_8021A40C_625FAC.s rename to asm/nonmatchings/battle/area_sam/625750/func_8021A40C_625FAC.s diff --git a/asm/nonmatchings/battle/area_sam/6253E0/func_8021A510_6260B0.s b/asm/nonmatchings/battle/area_sam/625750/func_8021A510_6260B0.s similarity index 100% rename from asm/nonmatchings/battle/area_sam/6253E0/func_8021A510_6260B0.s rename to asm/nonmatchings/battle/area_sam/625750/func_8021A510_6260B0.s diff --git a/asm/nonmatchings/battle/area_sam/6253E0/func_8021A708_6262A8.s b/asm/nonmatchings/battle/area_sam/625750/func_8021A708_6262A8.s similarity index 100% rename from asm/nonmatchings/battle/area_sam/6253E0/func_8021A708_6262A8.s rename to asm/nonmatchings/battle/area_sam/625750/func_8021A708_6262A8.s diff --git a/asm/nonmatchings/battle/area_sam/6253E0/func_8021A72C_6262CC.s b/asm/nonmatchings/battle/area_sam/625750/func_8021A72C_6262CC.s similarity index 100% rename from asm/nonmatchings/battle/area_sam/6253E0/func_8021A72C_6262CC.s rename to asm/nonmatchings/battle/area_sam/625750/func_8021A72C_6262CC.s diff --git a/asm/nonmatchings/battle/area_sam/6253E0/func_8021A830_6263D0.s b/asm/nonmatchings/battle/area_sam/625750/func_8021A830_6263D0.s similarity index 100% rename from asm/nonmatchings/battle/area_sam/6253E0/func_8021A830_6263D0.s rename to asm/nonmatchings/battle/area_sam/625750/func_8021A830_6263D0.s diff --git a/asm/nonmatchings/battle/area_sam/6253E0/func_8021AA28_6265C8.s b/asm/nonmatchings/battle/area_sam/625750/func_8021AA28_6265C8.s similarity index 100% rename from asm/nonmatchings/battle/area_sam/6253E0/func_8021AA28_6265C8.s rename to asm/nonmatchings/battle/area_sam/625750/func_8021AA28_6265C8.s diff --git a/asm/nonmatchings/battle/area_sam/6253E0/func_8021AA4C_6265EC.s b/asm/nonmatchings/battle/area_sam/625750/func_8021AA4C_6265EC.s similarity index 100% rename from asm/nonmatchings/battle/area_sam/6253E0/func_8021AA4C_6265EC.s rename to asm/nonmatchings/battle/area_sam/625750/func_8021AA4C_6265EC.s diff --git a/asm/nonmatchings/battle/area_sam/6253E0/func_8021AB50_6266F0.s b/asm/nonmatchings/battle/area_sam/625750/func_8021AB50_6266F0.s similarity index 100% rename from asm/nonmatchings/battle/area_sam/6253E0/func_8021AB50_6266F0.s rename to asm/nonmatchings/battle/area_sam/625750/func_8021AB50_6266F0.s diff --git a/asm/nonmatchings/battle/area_sam/6253E0/func_8021AD48_6268E8.s b/asm/nonmatchings/battle/area_sam/625750/func_8021AD48_6268E8.s similarity index 100% rename from asm/nonmatchings/battle/area_sam/6253E0/func_8021AD48_6268E8.s rename to asm/nonmatchings/battle/area_sam/625750/func_8021AD48_6268E8.s diff --git a/asm/nonmatchings/battle/area_sam/6253E0/func_8021AD6C_62690C.s b/asm/nonmatchings/battle/area_sam/625750/func_8021AD6C_62690C.s similarity index 100% rename from asm/nonmatchings/battle/area_sam/6253E0/func_8021AD6C_62690C.s rename to asm/nonmatchings/battle/area_sam/625750/func_8021AD6C_62690C.s diff --git a/asm/nonmatchings/battle/area_sam/6253E0/func_8021AE70_626A10.s b/asm/nonmatchings/battle/area_sam/625750/func_8021AE70_626A10.s similarity index 100% rename from asm/nonmatchings/battle/area_sam/6253E0/func_8021AE70_626A10.s rename to asm/nonmatchings/battle/area_sam/625750/func_8021AE70_626A10.s diff --git a/asm/nonmatchings/battle/area_sam2/63D9F0/func_80218B80_63DD60.s b/asm/nonmatchings/battle/area_sam2/63DD60/func_80218B80_63DD60.s similarity index 100% rename from asm/nonmatchings/battle/area_sam2/63D9F0/func_80218B80_63DD60.s rename to asm/nonmatchings/battle/area_sam2/63DD60/func_80218B80_63DD60.s diff --git a/asm/nonmatchings/battle/area_sam2/63D9F0/func_80218D78_63DF58.s b/asm/nonmatchings/battle/area_sam2/63DD60/func_80218D78_63DF58.s similarity index 100% rename from asm/nonmatchings/battle/area_sam2/63D9F0/func_80218D78_63DF58.s rename to asm/nonmatchings/battle/area_sam2/63DD60/func_80218D78_63DF58.s diff --git a/asm/nonmatchings/battle/area_sam2/63D9F0/func_80218D9C_63DF7C.s b/asm/nonmatchings/battle/area_sam2/63DD60/func_80218D9C_63DF7C.s similarity index 100% rename from asm/nonmatchings/battle/area_sam2/63D9F0/func_80218D9C_63DF7C.s rename to asm/nonmatchings/battle/area_sam2/63DD60/func_80218D9C_63DF7C.s diff --git a/asm/nonmatchings/battle/area_sam2/63D9F0/func_80218EA0_63E080.s b/asm/nonmatchings/battle/area_sam2/63DD60/func_80218EA0_63E080.s similarity index 100% rename from asm/nonmatchings/battle/area_sam2/63D9F0/func_80218EA0_63E080.s rename to asm/nonmatchings/battle/area_sam2/63DD60/func_80218EA0_63E080.s diff --git a/asm/nonmatchings/battle/area_sam2/63D9F0/func_80219098_63E278.s b/asm/nonmatchings/battle/area_sam2/63DD60/func_80219098_63E278.s similarity index 100% rename from asm/nonmatchings/battle/area_sam2/63D9F0/func_80219098_63E278.s rename to asm/nonmatchings/battle/area_sam2/63DD60/func_80219098_63E278.s diff --git a/asm/nonmatchings/battle/area_sam2/63D9F0/func_802190BC_63E29C.s b/asm/nonmatchings/battle/area_sam2/63DD60/func_802190BC_63E29C.s similarity index 100% rename from asm/nonmatchings/battle/area_sam2/63D9F0/func_802190BC_63E29C.s rename to asm/nonmatchings/battle/area_sam2/63DD60/func_802190BC_63E29C.s diff --git a/asm/nonmatchings/battle/area_sam2/63D9F0/func_802191C0_63E3A0.s b/asm/nonmatchings/battle/area_sam2/63DD60/func_802191C0_63E3A0.s similarity index 100% rename from asm/nonmatchings/battle/area_sam2/63D9F0/func_802191C0_63E3A0.s rename to asm/nonmatchings/battle/area_sam2/63DD60/func_802191C0_63E3A0.s diff --git a/asm/nonmatchings/battle/area_sam2/63D9F0/func_802193B8_63E598.s b/asm/nonmatchings/battle/area_sam2/63DD60/func_802193B8_63E598.s similarity index 100% rename from asm/nonmatchings/battle/area_sam2/63D9F0/func_802193B8_63E598.s rename to asm/nonmatchings/battle/area_sam2/63DD60/func_802193B8_63E598.s diff --git a/asm/nonmatchings/battle/area_sam2/63D9F0/func_802193DC_63E5BC.s b/asm/nonmatchings/battle/area_sam2/63DD60/func_802193DC_63E5BC.s similarity index 100% rename from asm/nonmatchings/battle/area_sam2/63D9F0/func_802193DC_63E5BC.s rename to asm/nonmatchings/battle/area_sam2/63DD60/func_802193DC_63E5BC.s diff --git a/asm/nonmatchings/battle/area_sam2/63D9F0/func_802194E0_63E6C0.s b/asm/nonmatchings/battle/area_sam2/63DD60/func_802194E0_63E6C0.s similarity index 100% rename from asm/nonmatchings/battle/area_sam2/63D9F0/func_802194E0_63E6C0.s rename to asm/nonmatchings/battle/area_sam2/63DD60/func_802194E0_63E6C0.s diff --git a/asm/nonmatchings/battle/area_sam2/63D9F0/func_802196D8_63E8B8.s b/asm/nonmatchings/battle/area_sam2/63DD60/func_802196D8_63E8B8.s similarity index 100% rename from asm/nonmatchings/battle/area_sam2/63D9F0/func_802196D8_63E8B8.s rename to asm/nonmatchings/battle/area_sam2/63DD60/func_802196D8_63E8B8.s diff --git a/asm/nonmatchings/battle/area_sam2/63D9F0/func_802196FC_63E8DC.s b/asm/nonmatchings/battle/area_sam2/63DD60/func_802196FC_63E8DC.s similarity index 100% rename from asm/nonmatchings/battle/area_sam2/63D9F0/func_802196FC_63E8DC.s rename to asm/nonmatchings/battle/area_sam2/63DD60/func_802196FC_63E8DC.s diff --git a/asm/nonmatchings/battle/area_sam2/63D9F0/func_80219800_63E9E0.s b/asm/nonmatchings/battle/area_sam2/63DD60/func_80219800_63E9E0.s similarity index 100% rename from asm/nonmatchings/battle/area_sam2/63D9F0/func_80219800_63E9E0.s rename to asm/nonmatchings/battle/area_sam2/63DD60/func_80219800_63E9E0.s diff --git a/asm/nonmatchings/battle/area_sam2/63D9F0/func_802199F8_63EBD8.s b/asm/nonmatchings/battle/area_sam2/63DD60/func_802199F8_63EBD8.s similarity index 100% rename from asm/nonmatchings/battle/area_sam2/63D9F0/func_802199F8_63EBD8.s rename to asm/nonmatchings/battle/area_sam2/63DD60/func_802199F8_63EBD8.s diff --git a/asm/nonmatchings/battle/area_sam2/63D9F0/func_80219A1C_63EBFC.s b/asm/nonmatchings/battle/area_sam2/63DD60/func_80219A1C_63EBFC.s similarity index 100% rename from asm/nonmatchings/battle/area_sam2/63D9F0/func_80219A1C_63EBFC.s rename to asm/nonmatchings/battle/area_sam2/63DD60/func_80219A1C_63EBFC.s diff --git a/asm/nonmatchings/battle/area_sam2/63D9F0/func_80219B20_63ED00.s b/asm/nonmatchings/battle/area_sam2/63DD60/func_80219B20_63ED00.s similarity index 100% rename from asm/nonmatchings/battle/area_sam2/63D9F0/func_80219B20_63ED00.s rename to asm/nonmatchings/battle/area_sam2/63DD60/func_80219B20_63ED00.s diff --git a/asm/nonmatchings/battle/area_sam2/63D9F0/func_80219D18_63EEF8.s b/asm/nonmatchings/battle/area_sam2/63DD60/func_80219D18_63EEF8.s similarity index 100% rename from asm/nonmatchings/battle/area_sam2/63D9F0/func_80219D18_63EEF8.s rename to asm/nonmatchings/battle/area_sam2/63DD60/func_80219D18_63EEF8.s diff --git a/asm/nonmatchings/battle/area_sam2/63D9F0/func_80219D3C_63EF1C.s b/asm/nonmatchings/battle/area_sam2/63DD60/func_80219D3C_63EF1C.s similarity index 100% rename from asm/nonmatchings/battle/area_sam2/63D9F0/func_80219D3C_63EF1C.s rename to asm/nonmatchings/battle/area_sam2/63DD60/func_80219D3C_63EF1C.s diff --git a/asm/nonmatchings/battle/area_sam2/63D9F0/func_80219E40_63F020.s b/asm/nonmatchings/battle/area_sam2/63DD60/func_80219E40_63F020.s similarity index 100% rename from asm/nonmatchings/battle/area_sam2/63D9F0/func_80219E40_63F020.s rename to asm/nonmatchings/battle/area_sam2/63DD60/func_80219E40_63F020.s diff --git a/asm/nonmatchings/code_102610_len_2330/entity_init_BlueSwitch.s b/asm/nonmatchings/code_102C80/entity_init_BlueSwitch.s similarity index 100% rename from asm/nonmatchings/code_102610_len_2330/entity_init_BlueSwitch.s rename to asm/nonmatchings/code_102C80/entity_init_BlueSwitch.s diff --git a/asm/nonmatchings/code_102610_len_2330/entity_init_HugeBlueSwitch.s b/asm/nonmatchings/code_102C80/entity_init_HugeBlueSwitch.s similarity index 100% rename from asm/nonmatchings/code_102610_len_2330/entity_init_HugeBlueSwitch.s rename to asm/nonmatchings/code_102C80/entity_init_HugeBlueSwitch.s diff --git a/asm/nonmatchings/code_102610_len_2330/func_802E1400.s b/asm/nonmatchings/code_102C80/func_802E1400.s similarity index 100% rename from asm/nonmatchings/code_102610_len_2330/func_802E1400.s rename to asm/nonmatchings/code_102C80/func_802E1400.s diff --git a/asm/nonmatchings/code_102610_len_2330/func_802E1460.s b/asm/nonmatchings/code_102C80/func_802E1460.s similarity index 100% rename from asm/nonmatchings/code_102610_len_2330/func_802E1460.s rename to asm/nonmatchings/code_102C80/func_802E1460.s diff --git a/asm/nonmatchings/code_102610_len_2330/func_802E14D8.s b/asm/nonmatchings/code_102C80/func_802E14D8.s similarity index 100% rename from asm/nonmatchings/code_102610_len_2330/func_802E14D8.s rename to asm/nonmatchings/code_102C80/func_802E14D8.s diff --git a/asm/nonmatchings/code_102610_len_2330/func_802E153C.s b/asm/nonmatchings/code_102C80/func_802E153C.s similarity index 100% rename from asm/nonmatchings/code_102610_len_2330/func_802E153C.s rename to asm/nonmatchings/code_102C80/func_802E153C.s diff --git a/asm/nonmatchings/code_102610_len_2330/func_802E1614.s b/asm/nonmatchings/code_102C80/func_802E1614.s similarity index 100% rename from asm/nonmatchings/code_102610_len_2330/func_802E1614.s rename to asm/nonmatchings/code_102C80/func_802E1614.s diff --git a/asm/nonmatchings/code_102610_len_2330/func_802E1660.s b/asm/nonmatchings/code_102C80/func_802E1660.s similarity index 100% rename from asm/nonmatchings/code_102610_len_2330/func_802E1660.s rename to asm/nonmatchings/code_102C80/func_802E1660.s diff --git a/asm/nonmatchings/code_102610_len_2330/func_802E1740.s b/asm/nonmatchings/code_102C80/func_802E1740.s similarity index 100% rename from asm/nonmatchings/code_102610_len_2330/func_802E1740.s rename to asm/nonmatchings/code_102C80/func_802E1740.s diff --git a/asm/nonmatchings/code_102610_len_2330/func_802E176C.s b/asm/nonmatchings/code_102C80/func_802E176C.s similarity index 100% rename from asm/nonmatchings/code_102610_len_2330/func_802E176C.s rename to asm/nonmatchings/code_102C80/func_802E176C.s diff --git a/asm/nonmatchings/code_102610_len_2330/func_802E17A8.s b/asm/nonmatchings/code_102C80/func_802E17A8.s similarity index 100% rename from asm/nonmatchings/code_102610_len_2330/func_802E17A8.s rename to asm/nonmatchings/code_102C80/func_802E17A8.s diff --git a/asm/nonmatchings/code_102610_len_2330/func_802E1EA8.s b/asm/nonmatchings/code_102C80/func_802E1EA8.s similarity index 100% rename from asm/nonmatchings/code_102610_len_2330/func_802E1EA8.s rename to asm/nonmatchings/code_102C80/func_802E1EA8.s diff --git a/asm/nonmatchings/code_102610_len_2330/func_802E1EDC.s b/asm/nonmatchings/code_102C80/func_802E1EDC.s similarity index 100% rename from asm/nonmatchings/code_102610_len_2330/func_802E1EDC.s rename to asm/nonmatchings/code_102C80/func_802E1EDC.s diff --git a/asm/nonmatchings/code_102610_len_2330/func_802E234C.s b/asm/nonmatchings/code_102C80/func_802E234C.s similarity index 100% rename from asm/nonmatchings/code_102610_len_2330/func_802E234C.s rename to asm/nonmatchings/code_102C80/func_802E234C.s diff --git a/asm/nonmatchings/code_102610_len_2330/func_802E2450.s b/asm/nonmatchings/code_102C80/func_802E2450.s similarity index 100% rename from asm/nonmatchings/code_102610_len_2330/func_802E2450.s rename to asm/nonmatchings/code_102C80/func_802E2450.s diff --git a/asm/nonmatchings/code_102610_len_2330/func_802E246C.s b/asm/nonmatchings/code_102C80/func_802E246C.s similarity index 100% rename from asm/nonmatchings/code_102610_len_2330/func_802E246C.s rename to asm/nonmatchings/code_102C80/func_802E246C.s diff --git a/asm/nonmatchings/code_102610_len_2330/func_802E263C.s b/asm/nonmatchings/code_102C80/func_802E263C.s similarity index 100% rename from asm/nonmatchings/code_102610_len_2330/func_802E263C.s rename to asm/nonmatchings/code_102C80/func_802E263C.s diff --git a/asm/nonmatchings/code_102610_len_2330/func_802E2BA4.s b/asm/nonmatchings/code_102C80/func_802E2BA4.s similarity index 100% rename from asm/nonmatchings/code_102610_len_2330/func_802E2BA4.s rename to asm/nonmatchings/code_102C80/func_802E2BA4.s diff --git a/asm/nonmatchings/code_102610_len_2330/func_802E2EB0.s b/asm/nonmatchings/code_104730/func_802E2EB0.s similarity index 100% rename from asm/nonmatchings/code_102610_len_2330/func_802E2EB0.s rename to asm/nonmatchings/code_104730/func_802E2EB0.s diff --git a/asm/nonmatchings/code_102610_len_2330/func_802E2FD0.s b/asm/nonmatchings/code_104730/func_802E2FD0.s similarity index 100% rename from asm/nonmatchings/code_102610_len_2330/func_802E2FD0.s rename to asm/nonmatchings/code_104730/func_802E2FD0.s diff --git a/asm/nonmatchings/code_105700_len_2130/func_802E4710.s b/asm/nonmatchings/code_105F90/func_802E4710.s similarity index 100% rename from asm/nonmatchings/code_105700_len_2130/func_802E4710.s rename to asm/nonmatchings/code_105F90/func_802E4710.s diff --git a/asm/nonmatchings/code_105700_len_2130/func_802E4730.s b/asm/nonmatchings/code_105F90/func_802E4730.s similarity index 100% rename from asm/nonmatchings/code_105700_len_2130/func_802E4730.s rename to asm/nonmatchings/code_105F90/func_802E4730.s diff --git a/asm/nonmatchings/code_105700_len_2130/func_802E4AEC.s b/asm/nonmatchings/code_105F90/func_802E4AEC.s similarity index 100% rename from asm/nonmatchings/code_105700_len_2130/func_802E4AEC.s rename to asm/nonmatchings/code_105F90/func_802E4AEC.s diff --git a/asm/nonmatchings/code_105700_len_2130/func_802E4B10.s b/asm/nonmatchings/code_105F90/func_802E4B10.s similarity index 100% rename from asm/nonmatchings/code_105700_len_2130/func_802E4B10.s rename to asm/nonmatchings/code_105F90/func_802E4B10.s diff --git a/asm/nonmatchings/code_105700_len_2130/func_802E4B60.s b/asm/nonmatchings/code_105F90/func_802E4B60.s similarity index 100% rename from asm/nonmatchings/code_105700_len_2130/func_802E4B60.s rename to asm/nonmatchings/code_105F90/func_802E4B60.s diff --git a/asm/nonmatchings/code_105700_len_2130/func_802E4C10.s b/asm/nonmatchings/code_105F90/func_802E4C10.s similarity index 100% rename from asm/nonmatchings/code_105700_len_2130/func_802E4C10.s rename to asm/nonmatchings/code_105F90/func_802E4C10.s diff --git a/asm/nonmatchings/code_105700_len_2130/func_802E4DE0.s b/asm/nonmatchings/code_105F90/func_802E4DE0.s similarity index 100% rename from asm/nonmatchings/code_105700_len_2130/func_802E4DE0.s rename to asm/nonmatchings/code_105F90/func_802E4DE0.s diff --git a/asm/nonmatchings/code_105700_len_2130/func_802E4E04.s b/asm/nonmatchings/code_105F90/func_802E4E04.s similarity index 100% rename from asm/nonmatchings/code_105700_len_2130/func_802E4E04.s rename to asm/nonmatchings/code_105F90/func_802E4E04.s diff --git a/asm/nonmatchings/code_105700_len_2130/func_802E5308.s b/asm/nonmatchings/code_105F90/func_802E5308.s similarity index 100% rename from asm/nonmatchings/code_105700_len_2130/func_802E5308.s rename to asm/nonmatchings/code_105F90/func_802E5308.s diff --git a/asm/nonmatchings/code_105700_len_2130/func_802E5324.s b/asm/nonmatchings/code_105F90/func_802E5324.s similarity index 100% rename from asm/nonmatchings/code_105700_len_2130/func_802E5324.s rename to asm/nonmatchings/code_105F90/func_802E5324.s diff --git a/asm/nonmatchings/code_105700_len_2130/func_802E540C.s b/asm/nonmatchings/code_105F90/func_802E540C.s similarity index 100% rename from asm/nonmatchings/code_105700_len_2130/func_802E540C.s rename to asm/nonmatchings/code_105F90/func_802E540C.s diff --git a/asm/nonmatchings/code_105700_len_2130/func_802E5428.s b/asm/nonmatchings/code_105F90/func_802E5428.s similarity index 100% rename from asm/nonmatchings/code_105700_len_2130/func_802E5428.s rename to asm/nonmatchings/code_105F90/func_802E5428.s diff --git a/asm/nonmatchings/code_105700_len_2130/func_802E545C.s b/asm/nonmatchings/code_105F90/func_802E545C.s similarity index 100% rename from asm/nonmatchings/code_105700_len_2130/func_802E545C.s rename to asm/nonmatchings/code_105F90/func_802E545C.s diff --git a/asm/nonmatchings/code_105700_len_2130/func_802E548C.s b/asm/nonmatchings/code_105F90/func_802E548C.s similarity index 100% rename from asm/nonmatchings/code_105700_len_2130/func_802E548C.s rename to asm/nonmatchings/code_105F90/func_802E548C.s diff --git a/asm/nonmatchings/code_105700_len_2130/func_802E54A8.s b/asm/nonmatchings/code_105F90/func_802E54A8.s similarity index 100% rename from asm/nonmatchings/code_105700_len_2130/func_802E54A8.s rename to asm/nonmatchings/code_105F90/func_802E54A8.s diff --git a/asm/nonmatchings/code_105700_len_2130/func_802E54CC.s b/asm/nonmatchings/code_105F90/func_802E54CC.s similarity index 100% rename from asm/nonmatchings/code_105700_len_2130/func_802E54CC.s rename to asm/nonmatchings/code_105F90/func_802E54CC.s diff --git a/asm/nonmatchings/code_105700_len_2130/func_802E555C.s b/asm/nonmatchings/code_105F90/func_802E555C.s similarity index 100% rename from asm/nonmatchings/code_105700_len_2130/func_802E555C.s rename to asm/nonmatchings/code_105F90/func_802E555C.s diff --git a/asm/nonmatchings/code_105700_len_2130/func_802E55A8.s b/asm/nonmatchings/code_105F90/func_802E55A8.s similarity index 100% rename from asm/nonmatchings/code_105700_len_2130/func_802E55A8.s rename to asm/nonmatchings/code_105F90/func_802E55A8.s diff --git a/asm/nonmatchings/code_105700_len_2130/func_802E5648.s b/asm/nonmatchings/code_105F90/func_802E5648.s similarity index 100% rename from asm/nonmatchings/code_105700_len_2130/func_802E5648.s rename to asm/nonmatchings/code_105F90/func_802E5648.s diff --git a/asm/nonmatchings/code_105700_len_2130/func_802E5670.s b/asm/nonmatchings/code_106EF0/func_802E5670.s similarity index 100% rename from asm/nonmatchings/code_105700_len_2130/func_802E5670.s rename to asm/nonmatchings/code_106EF0/func_802E5670.s diff --git a/asm/nonmatchings/code_105700_len_2130/func_802E5690.s b/asm/nonmatchings/code_106EF0/func_802E5690.s similarity index 100% rename from asm/nonmatchings/code_105700_len_2130/func_802E5690.s rename to asm/nonmatchings/code_106EF0/func_802E5690.s diff --git a/asm/nonmatchings/code_105700_len_2130/func_802E56D0.s b/asm/nonmatchings/code_106EF0/func_802E56D0.s similarity index 100% rename from asm/nonmatchings/code_105700_len_2130/func_802E56D0.s rename to asm/nonmatchings/code_106EF0/func_802E56D0.s diff --git a/asm/nonmatchings/code_105700_len_2130/func_802E56EC.s b/asm/nonmatchings/code_106EF0/func_802E56EC.s similarity index 100% rename from asm/nonmatchings/code_105700_len_2130/func_802E56EC.s rename to asm/nonmatchings/code_106EF0/func_802E56EC.s diff --git a/asm/nonmatchings/code_105700_len_2130/func_802E578C.s b/asm/nonmatchings/code_106EF0/func_802E578C.s similarity index 100% rename from asm/nonmatchings/code_105700_len_2130/func_802E578C.s rename to asm/nonmatchings/code_106EF0/func_802E578C.s diff --git a/asm/nonmatchings/code_105700_len_2130/func_802E57E4.s b/asm/nonmatchings/code_106EF0/func_802E57E4.s similarity index 100% rename from asm/nonmatchings/code_105700_len_2130/func_802E57E4.s rename to asm/nonmatchings/code_106EF0/func_802E57E4.s diff --git a/asm/nonmatchings/code_105700_len_2130/func_802E5800.s b/asm/nonmatchings/code_106EF0/func_802E5800.s similarity index 100% rename from asm/nonmatchings/code_105700_len_2130/func_802E5800.s rename to asm/nonmatchings/code_106EF0/func_802E5800.s diff --git a/asm/nonmatchings/code_105700_len_2130/func_802E581C.s b/asm/nonmatchings/code_106EF0/func_802E581C.s similarity index 100% rename from asm/nonmatchings/code_105700_len_2130/func_802E581C.s rename to asm/nonmatchings/code_106EF0/func_802E581C.s diff --git a/asm/nonmatchings/code_105700_len_2130/func_802E586C.s b/asm/nonmatchings/code_106EF0/func_802E586C.s similarity index 100% rename from asm/nonmatchings/code_105700_len_2130/func_802E586C.s rename to asm/nonmatchings/code_106EF0/func_802E586C.s diff --git a/asm/nonmatchings/code_105700_len_2130/func_802E5E50.s b/asm/nonmatchings/code_106EF0/func_802E5E50.s similarity index 100% rename from asm/nonmatchings/code_105700_len_2130/func_802E5E50.s rename to asm/nonmatchings/code_106EF0/func_802E5E50.s diff --git a/asm/nonmatchings/code_105700_len_2130/func_802E5F50.s b/asm/nonmatchings/code_106EF0/func_802E5F50.s similarity index 100% rename from asm/nonmatchings/code_105700_len_2130/func_802E5F50.s rename to asm/nonmatchings/code_106EF0/func_802E5F50.s diff --git a/asm/nonmatchings/code_105700_len_2130/func_802E5F7C.s b/asm/nonmatchings/code_106EF0/func_802E5F7C.s similarity index 100% rename from asm/nonmatchings/code_105700_len_2130/func_802E5F7C.s rename to asm/nonmatchings/code_106EF0/func_802E5F7C.s diff --git a/asm/nonmatchings/code_135EE0/pause_tabs_draw_badges.s b/asm/nonmatchings/code_137ED0/pause_tabs_draw_badges.s similarity index 100% rename from asm/nonmatchings/code_135EE0/pause_tabs_draw_badges.s rename to asm/nonmatchings/code_137ED0/pause_tabs_draw_badges.s diff --git a/asm/nonmatchings/code_135EE0/pause_tabs_draw_items.s b/asm/nonmatchings/code_137ED0/pause_tabs_draw_items.s similarity index 100% rename from asm/nonmatchings/code_135EE0/pause_tabs_draw_items.s rename to asm/nonmatchings/code_137ED0/pause_tabs_draw_items.s diff --git a/asm/nonmatchings/code_135EE0/pause_tabs_draw_map.s b/asm/nonmatchings/code_137ED0/pause_tabs_draw_map.s similarity index 100% rename from asm/nonmatchings/code_135EE0/pause_tabs_draw_map.s rename to asm/nonmatchings/code_137ED0/pause_tabs_draw_map.s diff --git a/asm/nonmatchings/code_135EE0/pause_tabs_draw_party.s b/asm/nonmatchings/code_137ED0/pause_tabs_draw_party.s similarity index 100% rename from asm/nonmatchings/code_135EE0/pause_tabs_draw_party.s rename to asm/nonmatchings/code_137ED0/pause_tabs_draw_party.s diff --git a/asm/nonmatchings/code_135EE0/pause_tabs_draw_spirits.s b/asm/nonmatchings/code_137ED0/pause_tabs_draw_spirits.s similarity index 100% rename from asm/nonmatchings/code_135EE0/pause_tabs_draw_spirits.s rename to asm/nonmatchings/code_137ED0/pause_tabs_draw_spirits.s diff --git a/asm/nonmatchings/code_135EE0/pause_tabs_draw_stats.s b/asm/nonmatchings/code_137ED0/pause_tabs_draw_stats.s similarity index 100% rename from asm/nonmatchings/code_135EE0/pause_tabs_draw_stats.s rename to asm/nonmatchings/code_137ED0/pause_tabs_draw_stats.s diff --git a/asm/nonmatchings/code_135EE0/pause_tabs_handle_input.s b/asm/nonmatchings/code_137ED0/pause_tabs_handle_input.s similarity index 100% rename from asm/nonmatchings/code_135EE0/pause_tabs_handle_input.s rename to asm/nonmatchings/code_137ED0/pause_tabs_handle_input.s diff --git a/asm/nonmatchings/code_135EE0/pause_tabs_init.s b/asm/nonmatchings/code_137ED0/pause_tabs_init.s similarity index 100% rename from asm/nonmatchings/code_135EE0/pause_tabs_init.s rename to asm/nonmatchings/code_137ED0/pause_tabs_init.s diff --git a/asm/nonmatchings/code_135EE0/pause_tabs_update.s b/asm/nonmatchings/code_137ED0/pause_tabs_update.s similarity index 100% rename from asm/nonmatchings/code_135EE0/pause_tabs_update.s rename to asm/nonmatchings/code_137ED0/pause_tabs_update.s diff --git a/asm/nonmatchings/code_18F340/func_80262130.s b/asm/nonmatchings/code_190A10/func_80262130.s similarity index 100% rename from asm/nonmatchings/code_18F340/func_80262130.s rename to asm/nonmatchings/code_190A10/func_80262130.s diff --git a/asm/nonmatchings/code_18F340/func_8026220C.s b/asm/nonmatchings/code_190A10/func_8026220C.s similarity index 100% rename from asm/nonmatchings/code_18F340/func_8026220C.s rename to asm/nonmatchings/code_190A10/func_8026220C.s diff --git a/asm/nonmatchings/code_197F40/CancelablePlayerRunToGoal.s b/asm/nonmatchings/code_19FAF0/CancelablePlayerRunToGoal.s similarity index 100% rename from asm/nonmatchings/code_197F40/CancelablePlayerRunToGoal.s rename to asm/nonmatchings/code_19FAF0/CancelablePlayerRunToGoal.s diff --git a/asm/nonmatchings/code_197F40/DidActionSucceed.s b/asm/nonmatchings/code_19FAF0/DidActionSucceed.s similarity index 100% rename from asm/nonmatchings/code_197F40/DidActionSucceed.s rename to asm/nonmatchings/code_19FAF0/DidActionSucceed.s diff --git a/asm/nonmatchings/code_197F40/DispatchDamagePlayerEvent.s b/asm/nonmatchings/code_19FAF0/DispatchDamagePlayerEvent.s similarity index 100% rename from asm/nonmatchings/code_197F40/DispatchDamagePlayerEvent.s rename to asm/nonmatchings/code_19FAF0/DispatchDamagePlayerEvent.s diff --git a/asm/nonmatchings/code_197F40/EnablePlayerBlur.s b/asm/nonmatchings/code_19FAF0/EnablePlayerBlur.s similarity index 100% rename from asm/nonmatchings/code_197F40/EnablePlayerBlur.s rename to asm/nonmatchings/code_19FAF0/EnablePlayerBlur.s diff --git a/asm/nonmatchings/code_197F40/GetMenuSelection.s b/asm/nonmatchings/code_19FAF0/GetMenuSelection.s similarity index 100% rename from asm/nonmatchings/code_197F40/GetMenuSelection.s rename to asm/nonmatchings/code_19FAF0/GetMenuSelection.s diff --git a/asm/nonmatchings/code_197F40/PlayerDamageEnemy.s b/asm/nonmatchings/code_19FAF0/PlayerDamageEnemy.s similarity index 100% rename from asm/nonmatchings/code_197F40/PlayerDamageEnemy.s rename to asm/nonmatchings/code_19FAF0/PlayerDamageEnemy.s diff --git a/asm/nonmatchings/code_197F40/PlayerFallToGoal.s b/asm/nonmatchings/code_19FAF0/PlayerFallToGoal.s similarity index 100% rename from asm/nonmatchings/code_197F40/PlayerFallToGoal.s rename to asm/nonmatchings/code_19FAF0/PlayerFallToGoal.s diff --git a/asm/nonmatchings/code_197F40/PlayerLandJump.s b/asm/nonmatchings/code_19FAF0/PlayerLandJump.s similarity index 100% rename from asm/nonmatchings/code_197F40/PlayerLandJump.s rename to asm/nonmatchings/code_19FAF0/PlayerLandJump.s diff --git a/asm/nonmatchings/code_197F40/PlayerPowerBounceEnemy.s b/asm/nonmatchings/code_19FAF0/PlayerPowerBounceEnemy.s similarity index 100% rename from asm/nonmatchings/code_197F40/PlayerPowerBounceEnemy.s rename to asm/nonmatchings/code_19FAF0/PlayerPowerBounceEnemy.s diff --git a/asm/nonmatchings/code_197F40/PlayerRunToGoal.s b/asm/nonmatchings/code_19FAF0/PlayerRunToGoal.s similarity index 100% rename from asm/nonmatchings/code_197F40/PlayerRunToGoal.s rename to asm/nonmatchings/code_19FAF0/PlayerRunToGoal.s diff --git a/asm/nonmatchings/code_197F40/PlayerTestEnemy.s b/asm/nonmatchings/code_19FAF0/PlayerTestEnemy.s similarity index 100% rename from asm/nonmatchings/code_197F40/PlayerTestEnemy.s rename to asm/nonmatchings/code_19FAF0/PlayerTestEnemy.s diff --git a/asm/nonmatchings/code_197F40/calc_player_damage_enemy.s b/asm/nonmatchings/code_19FAF0/calc_player_damage_enemy.s similarity index 100% rename from asm/nonmatchings/code_197F40/calc_player_damage_enemy.s rename to asm/nonmatchings/code_19FAF0/calc_player_damage_enemy.s diff --git a/asm/nonmatchings/code_197F40/calc_player_test_enemy.s b/asm/nonmatchings/code_19FAF0/calc_player_test_enemy.s similarity index 100% rename from asm/nonmatchings/code_197F40/calc_player_test_enemy.s rename to asm/nonmatchings/code_19FAF0/calc_player_test_enemy.s diff --git a/asm/nonmatchings/code_197F40/dispatch_damage_event_player.s b/asm/nonmatchings/code_19FAF0/dispatch_damage_event_player.s similarity index 100% rename from asm/nonmatchings/code_197F40/dispatch_damage_event_player.s rename to asm/nonmatchings/code_19FAF0/dispatch_damage_event_player.s diff --git a/asm/nonmatchings/code_197F40/dispatch_event_player.s b/asm/nonmatchings/code_19FAF0/dispatch_event_player.s similarity index 100% rename from asm/nonmatchings/code_197F40/dispatch_event_player.s rename to asm/nonmatchings/code_19FAF0/dispatch_event_player.s diff --git a/asm/nonmatchings/code_197F40/dispatch_event_player_continue_turn.s b/asm/nonmatchings/code_19FAF0/dispatch_event_player_continue_turn.s similarity index 100% rename from asm/nonmatchings/code_197F40/dispatch_event_player_continue_turn.s rename to asm/nonmatchings/code_19FAF0/dispatch_event_player_continue_turn.s diff --git a/asm/nonmatchings/code_197F40/func_802712A0.s b/asm/nonmatchings/code_19FAF0/func_802712A0.s similarity index 100% rename from asm/nonmatchings/code_197F40/func_802712A0.s rename to asm/nonmatchings/code_19FAF0/func_802712A0.s diff --git a/asm/nonmatchings/code_197F40/func_80271328.s b/asm/nonmatchings/code_19FAF0/func_80271328.s similarity index 100% rename from asm/nonmatchings/code_197F40/func_80271328.s rename to asm/nonmatchings/code_19FAF0/func_80271328.s diff --git a/asm/nonmatchings/code_197F40/func_802713B0.s b/asm/nonmatchings/code_19FAF0/func_802713B0.s similarity index 100% rename from asm/nonmatchings/code_197F40/func_802713B0.s rename to asm/nonmatchings/code_19FAF0/func_802713B0.s diff --git a/asm/nonmatchings/code_197F40/func_80271484.s b/asm/nonmatchings/code_19FAF0/func_80271484.s similarity index 100% rename from asm/nonmatchings/code_197F40/func_80271484.s rename to asm/nonmatchings/code_19FAF0/func_80271484.s diff --git a/asm/nonmatchings/code_197F40/func_80271588.s b/asm/nonmatchings/code_19FAF0/func_80271588.s similarity index 100% rename from asm/nonmatchings/code_197F40/func_80271588.s rename to asm/nonmatchings/code_19FAF0/func_80271588.s diff --git a/asm/nonmatchings/code_197F40/func_80273444.s b/asm/nonmatchings/code_19FAF0/func_80273444.s similarity index 100% rename from asm/nonmatchings/code_197F40/func_80273444.s rename to asm/nonmatchings/code_19FAF0/func_80273444.s diff --git a/asm/nonmatchings/code_197F40/func_80274A18.s b/asm/nonmatchings/code_19FAF0/func_80274A18.s similarity index 100% rename from asm/nonmatchings/code_197F40/func_80274A18.s rename to asm/nonmatchings/code_19FAF0/func_80274A18.s diff --git a/asm/nonmatchings/code_197F40/func_802752AC.s b/asm/nonmatchings/code_19FAF0/func_802752AC.s similarity index 100% rename from asm/nonmatchings/code_197F40/func_802752AC.s rename to asm/nonmatchings/code_19FAF0/func_802752AC.s diff --git a/asm/nonmatchings/code_197F40/func_80275F00.s b/asm/nonmatchings/code_19FAF0/func_80275F00.s similarity index 100% rename from asm/nonmatchings/code_197F40/func_80275F00.s rename to asm/nonmatchings/code_19FAF0/func_80275F00.s diff --git a/asm/nonmatchings/code_759b0_len_61b0/appendGfx_player.s b/asm/nonmatchings/code_77480/appendGfx_player.s similarity index 100% rename from asm/nonmatchings/code_759b0_len_61b0/appendGfx_player.s rename to asm/nonmatchings/code_77480/appendGfx_player.s diff --git a/asm/nonmatchings/code_759b0_len_61b0/appendGfx_player_spin.s b/asm/nonmatchings/code_77480/appendGfx_player_spin.s similarity index 100% rename from asm/nonmatchings/code_759b0_len_61b0/appendGfx_player_spin.s rename to asm/nonmatchings/code_77480/appendGfx_player_spin.s diff --git a/asm/nonmatchings/code_759b0_len_61b0/check_input_use_partner.s b/asm/nonmatchings/code_77480/check_input_use_partner.s similarity index 100% rename from asm/nonmatchings/code_759b0_len_61b0/check_input_use_partner.s rename to asm/nonmatchings/code_77480/check_input_use_partner.s diff --git a/asm/nonmatchings/code_759b0_len_61b0/collision_check_above.s b/asm/nonmatchings/code_77480/collision_check_above.s similarity index 100% rename from asm/nonmatchings/code_759b0_len_61b0/collision_check_above.s rename to asm/nonmatchings/code_77480/collision_check_above.s diff --git a/asm/nonmatchings/code_759b0_len_61b0/do_lateral_collision.s b/asm/nonmatchings/code_77480/do_lateral_collision.s similarity index 100% rename from asm/nonmatchings/code_759b0_len_61b0/do_lateral_collision.s rename to asm/nonmatchings/code_77480/do_lateral_collision.s diff --git a/asm/nonmatchings/code_759b0_len_61b0/func_800DE46C.s b/asm/nonmatchings/code_77480/func_800DE46C.s similarity index 100% rename from asm/nonmatchings/code_759b0_len_61b0/func_800DE46C.s rename to asm/nonmatchings/code_77480/func_800DE46C.s diff --git a/asm/nonmatchings/code_759b0_len_61b0/func_800DEE5C.s b/asm/nonmatchings/code_77480/func_800DEE5C.s similarity index 100% rename from asm/nonmatchings/code_759b0_len_61b0/func_800DEE5C.s rename to asm/nonmatchings/code_77480/func_800DEE5C.s diff --git a/asm/nonmatchings/code_759b0_len_61b0/func_800DF15C.s b/asm/nonmatchings/code_77480/func_800DF15C.s similarity index 100% rename from asm/nonmatchings/code_759b0_len_61b0/func_800DF15C.s rename to asm/nonmatchings/code_77480/func_800DF15C.s diff --git a/asm/nonmatchings/code_759b0_len_61b0/func_800DFAAC.s b/asm/nonmatchings/code_77480/func_800DFAAC.s similarity index 100% rename from asm/nonmatchings/code_759b0_len_61b0/func_800DFAAC.s rename to asm/nonmatchings/code_77480/func_800DFAAC.s diff --git a/asm/nonmatchings/code_759b0_len_61b0/func_800DFD48.s b/asm/nonmatchings/code_77480/func_800DFD48.s similarity index 100% rename from asm/nonmatchings/code_759b0_len_61b0/func_800DFD48.s rename to asm/nonmatchings/code_77480/func_800DFD48.s diff --git a/asm/nonmatchings/code_759b0_len_61b0/func_800DFFCC.s b/asm/nonmatchings/code_77480/func_800DFFCC.s similarity index 100% rename from asm/nonmatchings/code_759b0_len_61b0/func_800DFFCC.s rename to asm/nonmatchings/code_77480/func_800DFFCC.s diff --git a/asm/nonmatchings/code_759b0_len_61b0/func_800E0294.s b/asm/nonmatchings/code_77480/func_800E0294.s similarity index 100% rename from asm/nonmatchings/code_759b0_len_61b0/func_800E0294.s rename to asm/nonmatchings/code_77480/func_800E0294.s diff --git a/asm/nonmatchings/code_759b0_len_61b0/func_800E0398.s b/asm/nonmatchings/code_77480/func_800E0398.s similarity index 100% rename from asm/nonmatchings/code_759b0_len_61b0/func_800E0398.s rename to asm/nonmatchings/code_77480/func_800E0398.s diff --git a/asm/nonmatchings/code_759b0_len_61b0/func_800E0580.s b/asm/nonmatchings/code_77480/func_800E0580.s similarity index 100% rename from asm/nonmatchings/code_759b0_len_61b0/func_800E0580.s rename to asm/nonmatchings/code_77480/func_800E0580.s diff --git a/asm/nonmatchings/code_759b0_len_61b0/func_800E06D8.s b/asm/nonmatchings/code_77480/func_800E06D8.s similarity index 100% rename from asm/nonmatchings/code_759b0_len_61b0/func_800E06D8.s rename to asm/nonmatchings/code_77480/func_800E06D8.s diff --git a/asm/nonmatchings/code_759b0_len_61b0/func_800E0818.s b/asm/nonmatchings/code_77480/func_800E0818.s similarity index 100% rename from asm/nonmatchings/code_759b0_len_61b0/func_800E0818.s rename to asm/nonmatchings/code_77480/func_800E0818.s diff --git a/asm/nonmatchings/code_759b0_len_61b0/func_800E0B90.s b/asm/nonmatchings/code_77480/func_800E0B90.s similarity index 100% rename from asm/nonmatchings/code_759b0_len_61b0/func_800E0B90.s rename to asm/nonmatchings/code_77480/func_800E0B90.s diff --git a/asm/nonmatchings/code_759b0_len_61b0/func_800E0FEC.s b/asm/nonmatchings/code_77480/func_800E0FEC.s similarity index 100% rename from asm/nonmatchings/code_759b0_len_61b0/func_800E0FEC.s rename to asm/nonmatchings/code_77480/func_800E0FEC.s diff --git a/asm/nonmatchings/code_759b0_len_61b0/render_player_model.s b/asm/nonmatchings/code_77480/render_player_model.s similarity index 100% rename from asm/nonmatchings/code_759b0_len_61b0/render_player_model.s rename to asm/nonmatchings/code_77480/render_player_model.s diff --git a/asm/nonmatchings/code_759b0_len_61b0/test_below_player.s b/asm/nonmatchings/code_77480/test_below_player.s similarity index 100% rename from asm/nonmatchings/code_759b0_len_61b0/test_below_player.s rename to asm/nonmatchings/code_77480/test_below_player.s diff --git a/asm/nonmatchings/code_759b0_len_61b0/test_player_lateral.s b/asm/nonmatchings/code_77480/test_player_lateral.s similarity index 100% rename from asm/nonmatchings/code_759b0_len_61b0/test_player_lateral.s rename to asm/nonmatchings/code_77480/test_player_lateral.s diff --git a/asm/nonmatchings/code_759b0_len_61b0/trace_above_player.s b/asm/nonmatchings/code_77480/trace_above_player.s similarity index 100% rename from asm/nonmatchings/code_759b0_len_61b0/trace_above_player.s rename to asm/nonmatchings/code_77480/trace_above_player.s diff --git a/asm/nonmatchings/code_759b0_len_61b0/trace_below_player.s b/asm/nonmatchings/code_77480/trace_below_player.s similarity index 100% rename from asm/nonmatchings/code_759b0_len_61b0/trace_below_player.s rename to asm/nonmatchings/code_77480/trace_below_player.s diff --git a/asm/nonmatchings/code_759b0_len_61b0/update_player.s b/asm/nonmatchings/code_77480/update_player.s similarity index 100% rename from asm/nonmatchings/code_759b0_len_61b0/update_player.s rename to asm/nonmatchings/code_77480/update_player.s diff --git a/asm/nonmatchings/code_759b0_len_61b0/update_player_shadow.s b/asm/nonmatchings/code_77480/update_player_shadow.s similarity index 100% rename from asm/nonmatchings/code_759b0_len_61b0/update_player_shadow.s rename to asm/nonmatchings/code_77480/update_player_shadow.s diff --git a/asm/nonmatchings/code_759b0_len_61b0/func_800E205C.s b/asm/nonmatchings/code_7B440/func_800E205C.s similarity index 100% rename from asm/nonmatchings/code_759b0_len_61b0/func_800E205C.s rename to asm/nonmatchings/code_7B440/func_800E205C.s diff --git a/asm/nonmatchings/code_759b0_len_61b0/func_800E23FC.s b/asm/nonmatchings/code_7B440/func_800E23FC.s similarity index 100% rename from asm/nonmatchings/code_759b0_len_61b0/func_800E23FC.s rename to asm/nonmatchings/code_7B440/func_800E23FC.s diff --git a/asm/nonmatchings/code_759b0_len_61b0/func_800E24F8.s b/asm/nonmatchings/code_7B440/func_800E24F8.s similarity index 100% rename from asm/nonmatchings/code_759b0_len_61b0/func_800E24F8.s rename to asm/nonmatchings/code_7B440/func_800E24F8.s diff --git a/asm/nonmatchings/code_759b0_len_61b0/input_to_move_vector.s b/asm/nonmatchings/code_7B440/input_to_move_vector.s similarity index 100% rename from asm/nonmatchings/code_759b0_len_61b0/input_to_move_vector.s rename to asm/nonmatchings/code_7B440/input_to_move_vector.s diff --git a/asm/nonmatchings/code_759b0_len_61b0/update_player_input.s b/asm/nonmatchings/code_7B440/update_player_input.s similarity index 100% rename from asm/nonmatchings/code_759b0_len_61b0/update_player_input.s rename to asm/nonmatchings/code_7B440/update_player_input.s diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011DE80.s b/asm/nonmatchings/code_B4580/func_8011DE80.s similarity index 100% rename from asm/nonmatchings/code_a5dd0_len_114e0/func_8011DE80.s rename to asm/nonmatchings/code_B4580/func_8011DE80.s diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011DFD0.s b/asm/nonmatchings/code_B4580/func_8011DFD0.s similarity index 100% rename from asm/nonmatchings/code_a5dd0_len_114e0/func_8011DFD0.s rename to asm/nonmatchings/code_B4580/func_8011DFD0.s diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011E014.s b/asm/nonmatchings/code_B4580/func_8011E014.s similarity index 100% rename from asm/nonmatchings/code_a5dd0_len_114e0/func_8011E014.s rename to asm/nonmatchings/code_B4580/func_8011E014.s diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011E058.s b/asm/nonmatchings/code_B4580/func_8011E058.s similarity index 100% rename from asm/nonmatchings/code_a5dd0_len_114e0/func_8011E058.s rename to asm/nonmatchings/code_B4580/func_8011E058.s diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011E09C.s b/asm/nonmatchings/code_B4580/func_8011E09C.s similarity index 100% rename from asm/nonmatchings/code_a5dd0_len_114e0/func_8011E09C.s rename to asm/nonmatchings/code_B4580/func_8011E09C.s diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011E0DC.s b/asm/nonmatchings/code_B4580/func_8011E0DC.s similarity index 100% rename from asm/nonmatchings/code_a5dd0_len_114e0/func_8011E0DC.s rename to asm/nonmatchings/code_B4580/func_8011E0DC.s diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011E150.s b/asm/nonmatchings/code_B4580/func_8011E150.s similarity index 100% rename from asm/nonmatchings/code_a5dd0_len_114e0/func_8011E150.s rename to asm/nonmatchings/code_B4580/func_8011E150.s diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011E1C4.s b/asm/nonmatchings/code_B4580/func_8011E1C4.s similarity index 100% rename from asm/nonmatchings/code_a5dd0_len_114e0/func_8011E1C4.s rename to asm/nonmatchings/code_B4580/func_8011E1C4.s diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011E224.s b/asm/nonmatchings/code_B4580/func_8011E224.s similarity index 100% rename from asm/nonmatchings/code_a5dd0_len_114e0/func_8011E224.s rename to asm/nonmatchings/code_B4580/func_8011E224.s diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011E310.s b/asm/nonmatchings/code_B4580/func_8011E310.s similarity index 100% rename from asm/nonmatchings/code_a5dd0_len_114e0/func_8011E310.s rename to asm/nonmatchings/code_B4580/func_8011E310.s diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011E398.s b/asm/nonmatchings/code_B4580/func_8011E398.s similarity index 100% rename from asm/nonmatchings/code_a5dd0_len_114e0/func_8011E398.s rename to asm/nonmatchings/code_B4580/func_8011E398.s diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011E400.s b/asm/nonmatchings/code_B4580/func_8011E400.s similarity index 100% rename from asm/nonmatchings/code_a5dd0_len_114e0/func_8011E400.s rename to asm/nonmatchings/code_B4580/func_8011E400.s diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011E438.s b/asm/nonmatchings/code_B4580/func_8011E438.s similarity index 100% rename from asm/nonmatchings/code_a5dd0_len_114e0/func_8011E438.s rename to asm/nonmatchings/code_B4580/func_8011E438.s diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011E4B8.s b/asm/nonmatchings/code_B4580/func_8011E4B8.s similarity index 100% rename from asm/nonmatchings/code_a5dd0_len_114e0/func_8011E4B8.s rename to asm/nonmatchings/code_B4580/func_8011E4B8.s diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011E5E0.s b/asm/nonmatchings/code_B4580/func_8011E5E0.s similarity index 100% rename from asm/nonmatchings/code_a5dd0_len_114e0/func_8011E5E0.s rename to asm/nonmatchings/code_B4580/func_8011E5E0.s diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011E718.s b/asm/nonmatchings/code_B4580/func_8011E718.s similarity index 100% rename from asm/nonmatchings/code_a5dd0_len_114e0/func_8011E718.s rename to asm/nonmatchings/code_B4580/func_8011E718.s diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011E8BC.s b/asm/nonmatchings/code_B4580/func_8011E8BC.s similarity index 100% rename from asm/nonmatchings/code_a5dd0_len_114e0/func_8011E8BC.s rename to asm/nonmatchings/code_B4580/func_8011E8BC.s diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011EA54.s b/asm/nonmatchings/code_B4580/func_8011EA54.s similarity index 100% rename from asm/nonmatchings/code_a5dd0_len_114e0/func_8011EA54.s rename to asm/nonmatchings/code_B4580/func_8011EA54.s diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011EBF0.s b/asm/nonmatchings/code_B4580/func_8011EBF0.s similarity index 100% rename from asm/nonmatchings/code_a5dd0_len_114e0/func_8011EBF0.s rename to asm/nonmatchings/code_B4580/func_8011EBF0.s diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011F058.s b/asm/nonmatchings/code_B4580/func_8011F058.s similarity index 100% rename from asm/nonmatchings/code_a5dd0_len_114e0/func_8011F058.s rename to asm/nonmatchings/code_B4580/func_8011F058.s diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011F118.s b/asm/nonmatchings/code_B4580/func_8011F118.s similarity index 100% rename from asm/nonmatchings/code_a5dd0_len_114e0/func_8011F118.s rename to asm/nonmatchings/code_B4580/func_8011F118.s diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011F304.s b/asm/nonmatchings/code_B4580/func_8011F304.s similarity index 100% rename from asm/nonmatchings/code_a5dd0_len_114e0/func_8011F304.s rename to asm/nonmatchings/code_B4580/func_8011F304.s diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011F3E8.s b/asm/nonmatchings/code_B4580/func_8011F3E8.s similarity index 100% rename from asm/nonmatchings/code_a5dd0_len_114e0/func_8011F3E8.s rename to asm/nonmatchings/code_B4580/func_8011F3E8.s diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011F4D4.s b/asm/nonmatchings/code_B4580/func_8011F4D4.s similarity index 100% rename from asm/nonmatchings/code_a5dd0_len_114e0/func_8011F4D4.s rename to asm/nonmatchings/code_B4580/func_8011F4D4.s diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011FA54.s b/asm/nonmatchings/code_B4580/func_8011FA54.s similarity index 100% rename from asm/nonmatchings/code_a5dd0_len_114e0/func_8011FA54.s rename to asm/nonmatchings/code_B4580/func_8011FA54.s diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011FF74.s b/asm/nonmatchings/code_B4580/func_8011FF74.s similarity index 100% rename from asm/nonmatchings/code_a5dd0_len_114e0/func_8011FF74.s rename to asm/nonmatchings/code_B4580/func_8011FF74.s diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011FF98.s b/asm/nonmatchings/code_B4580/func_8011FF98.s similarity index 100% rename from asm/nonmatchings/code_a5dd0_len_114e0/func_8011FF98.s rename to asm/nonmatchings/code_B4580/func_8011FF98.s diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011FFB4.s b/asm/nonmatchings/code_B4580/func_8011FFB4.s similarity index 100% rename from asm/nonmatchings/code_a5dd0_len_114e0/func_8011FFB4.s rename to asm/nonmatchings/code_B4580/func_8011FFB4.s diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_80120028.s b/asm/nonmatchings/code_B4580/func_80120028.s similarity index 100% rename from asm/nonmatchings/code_a5dd0_len_114e0/func_80120028.s rename to asm/nonmatchings/code_B4580/func_80120028.s diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_8012003C.s b/asm/nonmatchings/code_B4580/func_8012003C.s similarity index 100% rename from asm/nonmatchings/code_a5dd0_len_114e0/func_8012003C.s rename to asm/nonmatchings/code_B4580/func_8012003C.s diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_8012004C.s b/asm/nonmatchings/code_B4580/func_8012004C.s similarity index 100% rename from asm/nonmatchings/code_a5dd0_len_114e0/func_8012004C.s rename to asm/nonmatchings/code_B4580/func_8012004C.s diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_80120064.s b/asm/nonmatchings/code_B4580/func_80120064.s similarity index 100% rename from asm/nonmatchings/code_a5dd0_len_114e0/func_80120064.s rename to asm/nonmatchings/code_B4580/func_80120064.s diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_8012008C.s b/asm/nonmatchings/code_B4580/func_8012008C.s similarity index 100% rename from asm/nonmatchings/code_a5dd0_len_114e0/func_8012008C.s rename to asm/nonmatchings/code_B4580/func_8012008C.s diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_8012009C.s b/asm/nonmatchings/code_B4580/func_8012009C.s similarity index 100% rename from asm/nonmatchings/code_a5dd0_len_114e0/func_8012009C.s rename to asm/nonmatchings/code_B4580/func_8012009C.s diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_801200B8.s b/asm/nonmatchings/code_B4580/func_801200B8.s similarity index 100% rename from asm/nonmatchings/code_a5dd0_len_114e0/func_801200B8.s rename to asm/nonmatchings/code_B4580/func_801200B8.s diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_801200EC.s b/asm/nonmatchings/code_B4580/func_801200EC.s similarity index 100% rename from asm/nonmatchings/code_a5dd0_len_114e0/func_801200EC.s rename to asm/nonmatchings/code_B4580/func_801200EC.s diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_80120118.s b/asm/nonmatchings/code_B4580/func_80120118.s similarity index 100% rename from asm/nonmatchings/code_a5dd0_len_114e0/func_80120118.s rename to asm/nonmatchings/code_B4580/func_80120118.s diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_80120198.s b/asm/nonmatchings/code_B4580/func_80120198.s similarity index 100% rename from asm/nonmatchings/code_a5dd0_len_114e0/func_80120198.s rename to asm/nonmatchings/code_B4580/func_80120198.s diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_80120234.s b/asm/nonmatchings/code_B4580/func_80120234.s similarity index 100% rename from asm/nonmatchings/code_a5dd0_len_114e0/func_80120234.s rename to asm/nonmatchings/code_B4580/func_80120234.s diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_801203AC.s b/asm/nonmatchings/code_B4580/func_801203AC.s similarity index 100% rename from asm/nonmatchings/code_a5dd0_len_114e0/func_801203AC.s rename to asm/nonmatchings/code_B4580/func_801203AC.s diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_80120420.s b/asm/nonmatchings/code_B4580/func_80120420.s similarity index 100% rename from asm/nonmatchings/code_a5dd0_len_114e0/func_80120420.s rename to asm/nonmatchings/code_B4580/func_80120420.s diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_80120474.s b/asm/nonmatchings/code_B4580/func_80120474.s similarity index 100% rename from asm/nonmatchings/code_a5dd0_len_114e0/func_80120474.s rename to asm/nonmatchings/code_B4580/func_80120474.s diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_80120530.s b/asm/nonmatchings/code_B4580/func_80120530.s similarity index 100% rename from asm/nonmatchings/code_a5dd0_len_114e0/func_80120530.s rename to asm/nonmatchings/code_B4580/func_80120530.s diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_80120678.s b/asm/nonmatchings/code_B4580/func_80120678.s similarity index 100% rename from asm/nonmatchings/code_a5dd0_len_114e0/func_80120678.s rename to asm/nonmatchings/code_B4580/func_80120678.s diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_801206F8.s b/asm/nonmatchings/code_B4580/func_801206F8.s similarity index 100% rename from asm/nonmatchings/code_a5dd0_len_114e0/func_801206F8.s rename to asm/nonmatchings/code_B4580/func_801206F8.s diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/play_model_animation.s b/asm/nonmatchings/code_B4580/play_model_animation.s similarity index 100% rename from asm/nonmatchings/code_a5dd0_len_114e0/play_model_animation.s rename to asm/nonmatchings/code_B4580/play_model_animation.s diff --git a/asm/nonmatchings/code_B9D60/make_item_entity.s b/asm/nonmatchings/code_B9D60/make_item_entity.s index de69019bcd..cefaff22aa 100644 --- a/asm/nonmatchings/code_B9D60/make_item_entity.s +++ b/asm/nonmatchings/code_B9D60/make_item_entity.s @@ -27,21 +27,19 @@ glabel make_item_entity /* C7B48 80131448 2E620017 */ sltiu $v0, $s3, 0x17 /* C7B4C 8013144C 1040000A */ beqz $v0, .L80131478 /* C7B50 80131450 00131080 */ sll $v0, $s3, 2 -/* C7B54 80131454 3C018015 */ lui $at, %hi(jtbl_80150A98_E7198) +/* C7B54 80131454 3C018015 */ lui $at, %hi(D_80150A98) /* C7B58 80131458 00220821 */ addu $at, $at, $v0 -/* C7B5C 8013145C 8C220A98 */ lw $v0, %lo(jtbl_80150A98_E7198)($at) +/* C7B5C 8013145C 8C220A98 */ lw $v0, %lo(D_80150A98)($at) /* C7B60 80131460 00400008 */ jr $v0 /* C7B64 80131464 00000000 */ nop -glabel L80131468_C7B68 /* C7B68 80131468 0C05152F */ jal get_global_flag /* C7B6C 8013146C 0220202D */ daddu $a0, $s1, $zero /* C7B70 80131470 14400180 */ bnez $v0, .L80131A74 /* C7B74 80131474 2402FFFF */ addiu $v0, $zero, -1 .L80131478: -glabel L80131478_C7B78 /* C7B78 80131478 0000182D */ daddu $v1, $zero, $zero -/* C7B7C 8013147C 3C048015 */ lui $a0, %hi(D_801565A0) -/* C7B80 80131480 8C8465A0 */ lw $a0, %lo(D_801565A0)($a0) +/* C7B7C 8013147C 3C048015 */ lui $a0, 0x8015 +/* C7B80 80131480 8C8465A0 */ lw $a0, 0x65a0($a0) .L80131484: /* C7B84 80131484 8C820000 */ lw $v0, ($a0) /* C7B88 80131488 10400006 */ beqz $v0, .L801314A4 @@ -61,10 +59,10 @@ glabel L80131478_C7B78 /* C7BB4 801314B4 0C00AB39 */ jal heap_malloc /* C7BB8 801314B8 0060A02D */ daddu $s4, $v1, $zero /* C7BBC 801314BC 00142080 */ sll $a0, $s4, 2 -/* C7BC0 801314C0 3C038015 */ lui $v1, %hi(D_801565A0) -/* C7BC4 801314C4 8C6365A0 */ lw $v1, %lo(D_801565A0)($v1) -/* C7BC8 801314C8 3C058015 */ lui $a1, %hi(D_801512F8) -/* C7BCC 801314CC 24A512F8 */ addiu $a1, $a1, %lo(D_801512F8) +/* C7BC0 801314C0 3C038015 */ lui $v1, 0x8015 +/* C7BC4 801314C4 8C6365A0 */ lw $v1, 0x65a0($v1) +/* C7BC8 801314C8 3C058015 */ lui $a1, 0x8015 +/* C7BCC 801314CC 24A512F8 */ addiu $a1, $a1, 0x12f8 /* C7BD0 801314D0 00832021 */ addu $a0, $a0, $v1 /* C7BD4 801314D4 8CA30000 */ lw $v1, ($a1) /* C7BD8 801314D8 0040802D */ daddu $s0, $v0, $zero @@ -118,12 +116,12 @@ glabel L80131478_C7B78 /* C7C8C 8013158C A6020036 */ sh $v0, 0x36($s0) /* C7C90 80131590 A6020038 */ sh $v0, 0x38($s0) /* C7C94 80131594 00121140 */ sll $v0, $s2, 5 -/* C7C98 80131598 3C018008 */ lui $at, %hi(gItemTable+0x18) +/* C7C98 80131598 3C018008 */ lui $at, 0x8008 /* C7C9C 8013159C 00220821 */ addu $at, $at, $v0 -/* C7CA0 801315A0 942278F8 */ lhu $v0, %lo(gItemTable+0x18)($at) +/* C7CA0 801315A0 942278F8 */ lhu $v0, 0x78f8($at) /* C7CA4 801315A4 2403001E */ addiu $v1, $zero, 0x1e -/* C7CA8 801315A8 3C018015 */ lui $at, %hi(D_801565A6) -/* C7CAC 801315AC A42365A6 */ sh $v1, %lo(D_801565A6)($at) +/* C7CA8 801315A8 3C018015 */ lui $at, 0x8015 +/* C7CAC 801315AC A42365A6 */ sh $v1, 0x65a6($at) /* C7CB0 801315B0 30421000 */ andi $v0, $v0, 0x1000 /* C7CB4 801315B4 10400005 */ beqz $v0, .L801315CC /* C7CB8 801315B8 3C020004 */ lui $v0, 4 @@ -132,8 +130,8 @@ glabel L80131478_C7B78 /* C7CC4 801315C4 00431024 */ and $v0, $v0, $v1 /* C7CC8 801315C8 AE020000 */ sw $v0, ($s0) .L801315CC: -/* C7CCC 801315CC 3C048015 */ lui $a0, %hi(D_80155D84) -/* C7CD0 801315D0 24845D84 */ addiu $a0, $a0, %lo(D_80155D84) +/* C7CCC 801315CC 3C048015 */ lui $a0, 0x8015 +/* C7CD0 801315D0 24845D84 */ addiu $a0, $a0, 0x5d84 /* C7CD4 801315D4 8C820000 */ lw $v0, ($a0) /* C7CD8 801315D8 10400005 */ beqz $v0, .L801315F0 /* C7CDC 801315DC 3C030002 */ lui $v1, 2 @@ -149,24 +147,20 @@ glabel L80131478_C7B78 /* C7D00 80131600 2C62001C */ sltiu $v0, $v1, 0x1c /* C7D04 80131604 104000C1 */ beqz $v0, .L8013190C /* C7D08 80131608 00031080 */ sll $v0, $v1, 2 -/* C7D0C 8013160C 3C018015 */ lui $at, %hi(jtbl_80150AF8_E71F8) +/* C7D0C 8013160C 3C018015 */ lui $at, %hi(D_80150AF8) /* C7D10 80131610 00220821 */ addu $at, $at, $v0 -/* C7D14 80131614 8C220AF8 */ lw $v0, %lo(jtbl_80150AF8_E71F8)($at) +/* C7D14 80131614 8C220AF8 */ lw $v0, %lo(D_80150AF8)($at) /* C7D18 80131618 00400008 */ jr $v0 /* C7D1C 8013161C 00000000 */ nop -glabel L80131620_C7D20 /* C7D20 80131620 8E020000 */ lw $v0, ($s0) /* C7D24 80131624 0804C640 */ j .L80131900 /* C7D28 80131628 3C038000 */ lui $v1, 0x8000 -glabel L8013162C_C7D2C /* C7D2C 8013162C 8E020000 */ lw $v0, ($s0) /* C7D30 80131630 0804C640 */ j .L80131900 /* C7D34 80131634 3C030080 */ lui $v1, 0x80 -glabel L80131638_C7D38 /* C7D38 80131638 8E020000 */ lw $v0, ($s0) /* C7D3C 8013163C 0804C640 */ j .L80131900 /* C7D40 80131640 3C030010 */ lui $v1, 0x10 -glabel L80131644_C7D44 /* C7D44 80131644 24020003 */ addiu $v0, $zero, 3 /* C7D48 80131648 A202001B */ sb $v0, 0x1b($s0) /* C7D4C 8013164C 8E020000 */ lw $v0, ($s0) @@ -174,37 +168,31 @@ glabel L80131644_C7D44 /* C7D54 80131654 00431025 */ or $v0, $v0, $v1 /* C7D58 80131658 0804C640 */ j .L80131900 /* C7D5C 8013165C 3C030001 */ lui $v1, 1 -glabel L80131660_C7D60 /* C7D60 80131660 3C020080 */ lui $v0, 0x80 /* C7D64 80131664 34420600 */ ori $v0, $v0, 0x600 /* C7D68 80131668 8E030000 */ lw $v1, ($s0) /* C7D6C 8013166C 0804C635 */ j .L801318D4 /* C7D70 80131670 24040003 */ addiu $a0, $zero, 3 -glabel L80131674_C7D74 /* C7D74 80131674 3C020080 */ lui $v0, 0x80 /* C7D78 80131678 34420400 */ ori $v0, $v0, 0x400 /* C7D7C 8013167C 8E030000 */ lw $v1, ($s0) /* C7D80 80131680 0804C635 */ j .L801318D4 /* C7D84 80131684 24040003 */ addiu $a0, $zero, 3 -glabel L80131688_C7D88 /* C7D88 80131688 3C020080 */ lui $v0, 0x80 /* C7D8C 8013168C 34420800 */ ori $v0, $v0, 0x800 /* C7D90 80131690 8E030000 */ lw $v1, ($s0) /* C7D94 80131694 0804C635 */ j .L801318D4 /* C7D98 80131698 24040003 */ addiu $a0, $zero, 3 -glabel L8013169C_C7D9C /* C7D9C 8013169C 3C020080 */ lui $v0, 0x80 /* C7DA0 801316A0 34420A00 */ ori $v0, $v0, 0xa00 /* C7DA4 801316A4 8E030000 */ lw $v1, ($s0) /* C7DA8 801316A8 0804C635 */ j .L801318D4 /* C7DAC 801316AC 24040003 */ addiu $a0, $zero, 3 -glabel L801316B0_C7DB0 /* C7DB0 801316B0 3C020080 */ lui $v0, 0x80 /* C7DB4 801316B4 34420200 */ ori $v0, $v0, 0x200 /* C7DB8 801316B8 8E030000 */ lw $v1, ($s0) /* C7DBC 801316BC 0804C635 */ j .L801318D4 /* C7DC0 801316C0 24040003 */ addiu $a0, $zero, 3 -glabel L801316C4_C7DC4 /* C7DC4 801316C4 3C040080 */ lui $a0, 0x80 /* C7DC8 801316C8 34840400 */ ori $a0, $a0, 0x400 /* C7DCC 801316CC 8E020000 */ lw $v0, ($s0) @@ -212,7 +200,6 @@ glabel L801316C4_C7DC4 /* C7DD4 801316D4 A203001B */ sb $v1, 0x1b($s0) /* C7DD8 801316D8 0804C63F */ j .L801318FC /* C7DDC 801316DC 3C034000 */ lui $v1, 0x4000 -glabel L801316E0_C7DE0 /* C7DE0 801316E0 3C050080 */ lui $a1, 0x80 /* C7DE4 801316E4 34A50400 */ ori $a1, $a1, 0x400 /* C7DE8 801316E8 3C044000 */ lui $a0, 0x4000 @@ -223,36 +210,30 @@ glabel L801316E0_C7DE0 /* C7DFC 801316FC 00451025 */ or $v0, $v0, $a1 /* C7E00 80131700 0804C641 */ j .L80131904 /* C7E04 80131704 00441025 */ or $v0, $v0, $a0 -glabel L80131708_C7E08 /* C7E08 80131708 8E020000 */ lw $v0, ($s0) /* C7E0C 8013170C 0804C640 */ j .L80131900 /* C7E10 80131710 3C030080 */ lui $v1, 0x80 -glabel L80131714_C7E14 /* C7E14 80131714 3C020080 */ lui $v0, 0x80 /* C7E18 80131718 34420600 */ ori $v0, $v0, 0x600 /* C7E1C 8013171C 8E030000 */ lw $v1, ($s0) /* C7E20 80131720 0804C635 */ j .L801318D4 /* C7E24 80131724 2404000C */ addiu $a0, $zero, 0xc -glabel L80131728_C7E28 /* C7E28 80131728 3C020080 */ lui $v0, 0x80 /* C7E2C 8013172C 34420400 */ ori $v0, $v0, 0x400 /* C7E30 80131730 8E030000 */ lw $v1, ($s0) /* C7E34 80131734 0804C635 */ j .L801318D4 /* C7E38 80131738 2404000C */ addiu $a0, $zero, 0xc -glabel L8013173C_C7E3C /* C7E3C 8013173C 3C020080 */ lui $v0, 0x80 /* C7E40 80131740 34420800 */ ori $v0, $v0, 0x800 /* C7E44 80131744 8E030000 */ lw $v1, ($s0) /* C7E48 80131748 0804C635 */ j .L801318D4 /* C7E4C 8013174C 2404000C */ addiu $a0, $zero, 0xc -glabel L80131750_C7E50 /* C7E50 80131750 3C020080 */ lui $v0, 0x80 /* C7E54 80131754 8E030000 */ lw $v1, ($s0) /* C7E58 80131758 34422000 */ ori $v0, $v0, 0x2000 /* C7E5C 8013175C 00621825 */ or $v1, $v1, $v0 /* C7E60 80131760 0804C636 */ j .L801318D8 /* C7E64 80131764 3C021000 */ lui $v0, 0x1000 -glabel L80131768_C7E68 /* C7E68 80131768 3C040080 */ lui $a0, 0x80 /* C7E6C 8013176C 34842600 */ ori $a0, $a0, 0x2600 /* C7E70 80131770 8E020000 */ lw $v0, ($s0) @@ -260,7 +241,6 @@ glabel L80131768_C7E68 /* C7E78 80131778 A203001B */ sb $v1, 0x1b($s0) /* C7E7C 8013177C 0804C63F */ j .L801318FC /* C7E80 80131780 3C031000 */ lui $v1, 0x1000 -glabel L80131784_C7E84 /* C7E84 80131784 3C040080 */ lui $a0, 0x80 /* C7E88 80131788 34842400 */ ori $a0, $a0, 0x2400 /* C7E8C 8013178C 8E020000 */ lw $v0, ($s0) @@ -268,7 +248,6 @@ glabel L80131784_C7E84 /* C7E94 80131794 A203001B */ sb $v1, 0x1b($s0) /* C7E98 80131798 0804C63F */ j .L801318FC /* C7E9C 8013179C 3C031000 */ lui $v1, 0x1000 -glabel L801317A0_C7EA0 /* C7EA0 801317A0 3C040080 */ lui $a0, 0x80 /* C7EA4 801317A4 34842200 */ ori $a0, $a0, 0x2200 /* C7EA8 801317A8 8E020000 */ lw $v0, ($s0) @@ -276,7 +255,6 @@ glabel L801317A0_C7EA0 /* C7EB0 801317B0 A203001B */ sb $v1, 0x1b($s0) /* C7EB4 801317B4 0804C63F */ j .L801318FC /* C7EB8 801317B8 3C031000 */ lui $v1, 0x1000 -glabel L801317BC_C7EBC /* C7EBC 801317BC 3C030080 */ lui $v1, 0x80 /* C7EC0 801317C0 34631000 */ ori $v1, $v1, 0x1000 /* C7EC4 801317C4 8E020000 */ lw $v0, ($s0) @@ -288,7 +266,6 @@ glabel L801317BC_C7EBC /* C7EDC 801317DC 34424000 */ ori $v0, $v0, 0x4000 /* C7EE0 801317E0 0804C641 */ j .L80131904 /* C7EE4 801317E4 E6000030 */ swc1 $f0, 0x30($s0) -glabel L801317E8_C7EE8 /* C7EE8 801317E8 3C030080 */ lui $v1, 0x80 /* C7EEC 801317EC 34631000 */ ori $v1, $v1, 0x1000 /* C7EF0 801317F0 8E020000 */ lw $v0, ($s0) @@ -302,7 +279,6 @@ glabel L801317E8_C7EE8 /* C7F10 80131810 0040182D */ daddu $v1, $v0, $zero /* C7F14 80131814 0804C628 */ j .L801318A0 /* C7F18 80131818 24020017 */ addiu $v0, $zero, 0x17 -glabel L8013181C_C7F1C /* C7F1C 8013181C 3C030080 */ lui $v1, 0x80 /* C7F20 80131820 34631000 */ ori $v1, $v1, 0x1000 /* C7F24 80131824 8E020000 */ lw $v0, ($s0) @@ -316,7 +292,6 @@ glabel L8013181C_C7F1C /* C7F44 80131844 0040182D */ daddu $v1, $v0, $zero /* C7F48 80131848 0804C628 */ j .L801318A0 /* C7F4C 8013184C 24020017 */ addiu $v0, $zero, 0x17 -glabel L80131850_C7F50 /* C7F50 80131850 3C030080 */ lui $v1, 0x80 /* C7F54 80131854 8E020000 */ lw $v0, ($s0) /* C7F58 80131858 3C013F4C */ lui $at, 0x3f4c @@ -327,7 +302,6 @@ glabel L80131850_C7F50 /* C7F6C 8013186C 0040182D */ daddu $v1, $v0, $zero /* C7F70 80131870 0804C628 */ j .L801318A0 /* C7F74 80131874 24020003 */ addiu $v0, $zero, 3 -glabel L80131878_C7F78 /* C7F78 80131878 3C030080 */ lui $v1, 0x80 /* C7F7C 8013187C 34638000 */ ori $v1, $v1, 0x8000 /* C7F80 80131880 8E020000 */ lw $v0, ($s0) @@ -344,12 +318,10 @@ glabel L80131878_C7F78 /* C7FA8 801318A8 E6000030 */ swc1 $f0, 0x30($s0) /* C7FAC 801318AC 0804C642 */ j .L80131908 /* C7FB0 801318B0 AE030000 */ sw $v1, ($s0) -glabel L801318B4_C7FB4 /* C7FB4 801318B4 3C030080 */ lui $v1, 0x80 /* C7FB8 801318B8 8E020000 */ lw $v0, ($s0) /* C7FBC 801318BC 0804C640 */ j .L80131900 /* C7FC0 801318C0 34638200 */ ori $v1, $v1, 0x8200 -glabel L801318C4_C7FC4 /* C7FC4 801318C4 3C020080 */ lui $v0, 0x80 /* C7FC8 801318C8 34428600 */ ori $v0, $v0, 0x8600 /* C7FCC 801318CC 8E030000 */ lw $v1, ($s0) @@ -360,7 +332,6 @@ glabel L801318C4_C7FC4 /* C7FD8 801318D8 00621825 */ or $v1, $v1, $v0 /* C7FDC 801318DC 0804C642 */ j .L80131908 /* C7FE0 801318E0 AE030000 */ sw $v1, ($s0) -glabel L801318E4_C7FE4 /* C7FE4 801318E4 3C040080 */ lui $a0, 0x80 /* C7FE8 801318E8 34840600 */ ori $a0, $a0, 0x600 /* C7FEC 801318EC 8E020000 */ lw $v0, ($s0) @@ -379,12 +350,11 @@ glabel L801318E4_C7FE4 /* C800C 8013190C 2C620015 */ sltiu $v0, $v1, 0x15 /* C8010 80131910 1040003E */ beqz $v0, .L80131A0C /* C8014 80131914 00031080 */ sll $v0, $v1, 2 -/* C8018 80131918 3C018015 */ lui $at, %hi(jtbl_80150B68_E7268) +/* C8018 80131918 3C018015 */ lui $at, %hi(D_80150B68) /* C801C 8013191C 00220821 */ addu $at, $at, $v0 -/* C8020 80131920 8C220B68 */ lw $v0, %lo(jtbl_80150B68_E7268)($at) +/* C8020 80131920 8C220B68 */ lw $v0, %lo(D_80150B68)($at) /* C8024 80131924 00400008 */ jr $v0 /* C8028 80131928 00000000 */ nop -glabel L8013192C_C802C /* C802C 8013192C 8E050008 */ lw $a1, 8($s0) /* C8030 80131930 8E06000C */ lw $a2, 0xc($s0) /* C8034 80131934 8E070010 */ lw $a3, 0x10($s0) @@ -424,8 +394,8 @@ glabel L8013192C_C802C /* C80B8 801319B8 C7A0003C */ lwc1 $f0, 0x3c($sp) /* C80BC 801319BC C7A20040 */ lwc1 $f2, 0x40($sp) /* C80C0 801319C0 C7A40044 */ lwc1 $f4, 0x44($sp) -/* C80C4 801319C4 3C028007 */ lui $v0, %hi(gGameStatusPtr) -/* C80C8 801319C8 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) +/* C80C4 801319C4 3C028007 */ lui $v0, 0x8007 +/* C80C8 801319C8 8C42419C */ lw $v0, 0x419c($v0) /* C80CC 801319CC E6200010 */ swc1 $f0, 0x10($s1) /* C80D0 801319D0 E6220014 */ swc1 $f2, 0x14($s1) /* C80D4 801319D4 E6240018 */ swc1 $f4, 0x18($s1) @@ -443,7 +413,6 @@ glabel L8013192C_C802C /* C8104 80131A04 0C044A17 */ jal set_standard_shadow_scale /* C8108 80131A08 E4800030 */ swc1 $f0, 0x30($a0) .L80131A0C: -glabel L80131A0C_C810C /* C810C 80131A0C 9202001C */ lbu $v0, 0x1c($s0) /* C8110 80131A10 10400003 */ beqz $v0, .L80131A20 /* C8114 80131A14 00000000 */ nop @@ -456,8 +425,8 @@ glabel L80131A0C_C810C /* C812C 80131A2C 24020157 */ addiu $v0, $zero, 0x157 /* C8130 80131A30 14620009 */ bne $v1, $v0, .L80131A58 /* C8134 80131A34 2402015C */ addiu $v0, $zero, 0x15c -/* C8138 80131A38 3C058010 */ lui $a1, %hi(D_80104AC0) -/* C813C 80131A3C 24A54AC0 */ addiu $a1, $a1, %lo(D_80104AC0) +/* C8138 80131A38 3C058010 */ lui $a1, 0x8010 +/* C813C 80131A3C 24A54AC0 */ addiu $a1, $a1, 0x4ac0 /* C8140 80131A40 0C04C27C */ jal func_801309F0 /* C8144 80131A44 0200202D */ daddu $a0, $s0, $zero /* C8148 80131A48 0C04C2B3 */ jal func_80130ACC diff --git a/asm/nonmatchings/code_B9D60/appendGfx_item_entity.s b/asm/nonmatchings/code_C50A0/appendGfx_item_entity.s similarity index 100% rename from asm/nonmatchings/code_B9D60/appendGfx_item_entity.s rename to asm/nonmatchings/code_C50A0/appendGfx_item_entity.s diff --git a/asm/nonmatchings/code_B9D60/clear_item_entity_data.s b/asm/nonmatchings/code_C50A0/clear_item_entity_data.s similarity index 100% rename from asm/nonmatchings/code_B9D60/clear_item_entity_data.s rename to asm/nonmatchings/code_C50A0/clear_item_entity_data.s diff --git a/asm/nonmatchings/code_B9D60/draw_coin_sparkles.s b/asm/nonmatchings/code_C50A0/draw_coin_sparkles.s similarity index 100% rename from asm/nonmatchings/code_B9D60/draw_coin_sparkles.s rename to asm/nonmatchings/code_C50A0/draw_coin_sparkles.s diff --git a/asm/nonmatchings/code_B9D60/draw_item_entities.s b/asm/nonmatchings/code_C50A0/draw_item_entities.s similarity index 100% rename from asm/nonmatchings/code_B9D60/draw_item_entities.s rename to asm/nonmatchings/code_C50A0/draw_item_entities.s diff --git a/asm/nonmatchings/code_B9D60/func_8012E9A0.s b/asm/nonmatchings/code_C50A0/func_8012E9A0.s similarity index 100% rename from asm/nonmatchings/code_B9D60/func_8012E9A0.s rename to asm/nonmatchings/code_C50A0/func_8012E9A0.s diff --git a/asm/nonmatchings/code_B9D60/func_8012EC94.s b/asm/nonmatchings/code_C50A0/func_8012EC94.s similarity index 100% rename from asm/nonmatchings/code_B9D60/func_8012EC94.s rename to asm/nonmatchings/code_C50A0/func_8012EC94.s diff --git a/asm/nonmatchings/code_B9D60/func_8012F500.s b/asm/nonmatchings/code_C50A0/func_8012F500.s similarity index 100% rename from asm/nonmatchings/code_B9D60/func_8012F500.s rename to asm/nonmatchings/code_C50A0/func_8012F500.s diff --git a/asm/nonmatchings/code_B9D60/func_8012FE10.s b/asm/nonmatchings/code_C50A0/func_8012FE10.s similarity index 100% rename from asm/nonmatchings/code_B9D60/func_8012FE10.s rename to asm/nonmatchings/code_C50A0/func_8012FE10.s diff --git a/asm/nonmatchings/code_B9D60/func_8012FE78.s b/asm/nonmatchings/code_C50A0/func_8012FE78.s similarity index 100% rename from asm/nonmatchings/code_B9D60/func_8012FE78.s rename to asm/nonmatchings/code_C50A0/func_8012FE78.s diff --git a/asm/nonmatchings/code_B9D60/func_801309F0.s b/asm/nonmatchings/code_C50A0/func_801309F0.s similarity index 100% rename from asm/nonmatchings/code_B9D60/func_801309F0.s rename to asm/nonmatchings/code_C50A0/func_801309F0.s diff --git a/asm/nonmatchings/code_B9D60/func_80130A04.s b/asm/nonmatchings/code_C50A0/func_80130A04.s similarity index 100% rename from asm/nonmatchings/code_B9D60/func_80130A04.s rename to asm/nonmatchings/code_C50A0/func_80130A04.s diff --git a/asm/nonmatchings/code_B9D60/func_80130ACC.s b/asm/nonmatchings/code_C50A0/func_80130ACC.s similarity index 100% rename from asm/nonmatchings/code_B9D60/func_80130ACC.s rename to asm/nonmatchings/code_C50A0/func_80130ACC.s diff --git a/asm/nonmatchings/code_B9D60/func_80130F70.s b/asm/nonmatchings/code_C50A0/func_80130F70.s similarity index 100% rename from asm/nonmatchings/code_B9D60/func_80130F70.s rename to asm/nonmatchings/code_C50A0/func_80130F70.s diff --git a/asm/nonmatchings/code_B9D60/func_80130FAC.s b/asm/nonmatchings/code_C50A0/func_80130FAC.s similarity index 100% rename from asm/nonmatchings/code_B9D60/func_80130FAC.s rename to asm/nonmatchings/code_C50A0/func_80130FAC.s diff --git a/asm/nonmatchings/code_B9D60/func_80131128.s b/asm/nonmatchings/code_C50A0/func_80131128.s similarity index 100% rename from asm/nonmatchings/code_B9D60/func_80131128.s rename to asm/nonmatchings/code_C50A0/func_80131128.s diff --git a/asm/nonmatchings/code_B9D60/func_80131DD4.s b/asm/nonmatchings/code_C50A0/func_80131DD4.s similarity index 100% rename from asm/nonmatchings/code_B9D60/func_80131DD4.s rename to asm/nonmatchings/code_C50A0/func_80131DD4.s diff --git a/asm/nonmatchings/code_B9D60/func_80132D94.s b/asm/nonmatchings/code_C50A0/func_80132D94.s similarity index 100% rename from asm/nonmatchings/code_B9D60/func_80132D94.s rename to asm/nonmatchings/code_C50A0/func_80132D94.s diff --git a/asm/nonmatchings/code_B9D60/func_80133A94.s b/asm/nonmatchings/code_C50A0/func_80133A94.s similarity index 100% rename from asm/nonmatchings/code_B9D60/func_80133A94.s rename to asm/nonmatchings/code_C50A0/func_80133A94.s diff --git a/asm/nonmatchings/code_B9D60/func_80133FC8.s b/asm/nonmatchings/code_C50A0/func_80133FC8.s similarity index 100% rename from asm/nonmatchings/code_B9D60/func_80133FC8.s rename to asm/nonmatchings/code_C50A0/func_80133FC8.s diff --git a/asm/nonmatchings/code_B9D60/func_8013559C.s b/asm/nonmatchings/code_C50A0/func_8013559C.s similarity index 100% rename from asm/nonmatchings/code_B9D60/func_8013559C.s rename to asm/nonmatchings/code_C50A0/func_8013559C.s diff --git a/asm/nonmatchings/code_B9D60/func_801363A0.s b/asm/nonmatchings/code_C50A0/func_801363A0.s similarity index 100% rename from asm/nonmatchings/code_B9D60/func_801363A0.s rename to asm/nonmatchings/code_C50A0/func_801363A0.s diff --git a/asm/nonmatchings/code_B9D60/func_8013673C.s b/asm/nonmatchings/code_C50A0/func_8013673C.s similarity index 100% rename from asm/nonmatchings/code_B9D60/func_8013673C.s rename to asm/nonmatchings/code_C50A0/func_8013673C.s diff --git a/asm/nonmatchings/code_B9D60/func_801369D0.s b/asm/nonmatchings/code_C50A0/func_801369D0.s similarity index 100% rename from asm/nonmatchings/code_B9D60/func_801369D0.s rename to asm/nonmatchings/code_C50A0/func_801369D0.s diff --git a/asm/nonmatchings/code_B9D60/func_80136A08.s b/asm/nonmatchings/code_C50A0/func_80136A08.s similarity index 100% rename from asm/nonmatchings/code_B9D60/func_80136A08.s rename to asm/nonmatchings/code_C50A0/func_80136A08.s diff --git a/asm/nonmatchings/code_B9D60/init_got_item.s b/asm/nonmatchings/code_C50A0/init_got_item.s similarity index 100% rename from asm/nonmatchings/code_B9D60/init_got_item.s rename to asm/nonmatchings/code_C50A0/init_got_item.s diff --git a/asm/nonmatchings/code_B9D60/init_item_entity_list.s b/asm/nonmatchings/code_C50A0/init_item_entity_list.s similarity index 100% rename from asm/nonmatchings/code_B9D60/init_item_entity_list.s rename to asm/nonmatchings/code_C50A0/init_item_entity_list.s diff --git a/asm/nonmatchings/code_C50A0/make_item_entity.s b/asm/nonmatchings/code_C50A0/make_item_entity.s new file mode 100644 index 0000000000..de69019bcd --- /dev/null +++ b/asm/nonmatchings/code_C50A0/make_item_entity.s @@ -0,0 +1,483 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel make_item_entity +/* C7AF4 801313F4 27BDFFC8 */ addiu $sp, $sp, -0x38 +/* C7AF8 801313F8 AFB20028 */ sw $s2, 0x28($sp) +/* C7AFC 801313FC 0080902D */ daddu $s2, $a0, $zero +/* C7B00 80131400 AFB10024 */ sw $s1, 0x24($sp) +/* C7B04 80131404 8FB10054 */ lw $s1, 0x54($sp) +/* C7B08 80131408 3C02F8D8 */ lui $v0, 0xf8d8 +/* C7B0C 8013140C AFB3002C */ sw $s3, 0x2c($sp) +/* C7B10 80131410 8FB30048 */ lw $s3, 0x48($sp) +/* C7B14 80131414 3442F200 */ ori $v0, $v0, 0xf200 +/* C7B18 80131418 AFBF0034 */ sw $ra, 0x34($sp) +/* C7B1C 8013141C AFB40030 */ sw $s4, 0x30($sp) +/* C7B20 80131420 AFB00020 */ sw $s0, 0x20($sp) +/* C7B24 80131424 AFA5003C */ sw $a1, 0x3c($sp) +/* C7B28 80131428 AFA60040 */ sw $a2, 0x40($sp) +/* C7B2C 8013142C 0051102A */ slt $v0, $v0, $s1 +/* C7B30 80131430 14400004 */ bnez $v0, .L80131444 +/* C7B34 80131434 AFA70044 */ sw $a3, 0x44($sp) +/* C7B38 80131438 3C0207BF */ lui $v0, 0x7bf +/* C7B3C 8013143C 3442A480 */ ori $v0, $v0, 0xa480 +/* C7B40 80131440 02228821 */ addu $s1, $s1, $v0 +.L80131444: +/* C7B44 80131444 1A20000C */ blez $s1, .L80131478 +/* C7B48 80131448 2E620017 */ sltiu $v0, $s3, 0x17 +/* C7B4C 8013144C 1040000A */ beqz $v0, .L80131478 +/* C7B50 80131450 00131080 */ sll $v0, $s3, 2 +/* C7B54 80131454 3C018015 */ lui $at, %hi(jtbl_80150A98_E7198) +/* C7B58 80131458 00220821 */ addu $at, $at, $v0 +/* C7B5C 8013145C 8C220A98 */ lw $v0, %lo(jtbl_80150A98_E7198)($at) +/* C7B60 80131460 00400008 */ jr $v0 +/* C7B64 80131464 00000000 */ nop +glabel L80131468_C7B68 +/* C7B68 80131468 0C05152F */ jal get_global_flag +/* C7B6C 8013146C 0220202D */ daddu $a0, $s1, $zero +/* C7B70 80131470 14400180 */ bnez $v0, .L80131A74 +/* C7B74 80131474 2402FFFF */ addiu $v0, $zero, -1 +.L80131478: +glabel L80131478_C7B78 +/* C7B78 80131478 0000182D */ daddu $v1, $zero, $zero +/* C7B7C 8013147C 3C048015 */ lui $a0, %hi(D_801565A0) +/* C7B80 80131480 8C8465A0 */ lw $a0, %lo(D_801565A0)($a0) +.L80131484: +/* C7B84 80131484 8C820000 */ lw $v0, ($a0) +/* C7B88 80131488 10400006 */ beqz $v0, .L801314A4 +/* C7B8C 8013148C 28620100 */ slti $v0, $v1, 0x100 +/* C7B90 80131490 24630001 */ addiu $v1, $v1, 1 +/* C7B94 80131494 28620100 */ slti $v0, $v1, 0x100 +/* C7B98 80131498 1440FFFA */ bnez $v0, .L80131484 +/* C7B9C 8013149C 24840004 */ addiu $a0, $a0, 4 +/* C7BA0 801314A0 28620100 */ slti $v0, $v1, 0x100 +.L801314A4: +/* C7BA4 801314A4 54400003 */ bnel $v0, $zero, .L801314B4 +/* C7BA8 801314A8 2404005C */ addiu $a0, $zero, 0x5c +.L801314AC: +/* C7BAC 801314AC 0804C52B */ j .L801314AC +/* C7BB0 801314B0 00000000 */ nop +.L801314B4: +/* C7BB4 801314B4 0C00AB39 */ jal heap_malloc +/* C7BB8 801314B8 0060A02D */ daddu $s4, $v1, $zero +/* C7BBC 801314BC 00142080 */ sll $a0, $s4, 2 +/* C7BC0 801314C0 3C038015 */ lui $v1, %hi(D_801565A0) +/* C7BC4 801314C4 8C6365A0 */ lw $v1, %lo(D_801565A0)($v1) +/* C7BC8 801314C8 3C058015 */ lui $a1, %hi(D_801512F8) +/* C7BCC 801314CC 24A512F8 */ addiu $a1, $a1, %lo(D_801512F8) +/* C7BD0 801314D0 00832021 */ addu $a0, $a0, $v1 +/* C7BD4 801314D4 8CA30000 */ lw $v1, ($a1) +/* C7BD8 801314D8 0040802D */ daddu $s0, $v0, $zero +/* C7BDC 801314DC AC900000 */ sw $s0, ($a0) +/* C7BE0 801314E0 24630001 */ addiu $v1, $v1, 1 +/* C7BE4 801314E4 16000003 */ bnez $s0, .L801314F4 +/* C7BE8 801314E8 ACA30000 */ sw $v1, ($a1) +.L801314EC: +/* C7BEC 801314EC 0804C53B */ j .L801314EC +/* C7BF0 801314F0 00000000 */ nop +.L801314F4: +/* C7BF4 801314F4 00121402 */ srl $v0, $s2, 0x10 +/* C7BF8 801314F8 3042000F */ andi $v0, $v0, 0xf +/* C7BFC 801314FC 24030005 */ addiu $v1, $zero, 5 +/* C7C00 80131500 14430003 */ bne $v0, $v1, .L80131510 +/* C7C04 80131504 A202001D */ sb $v0, 0x1d($s0) +/* C7C08 80131508 2402FFFF */ addiu $v0, $zero, -1 +/* C7C0C 8013150C A202001D */ sb $v0, 0x1d($s0) +.L80131510: +/* C7C10 80131510 3252FFFF */ andi $s2, $s2, 0xffff +/* C7C14 80131514 A213001B */ sb $s3, 0x1b($s0) +/* C7C18 80131518 A200001A */ sb $zero, 0x1a($s0) +/* C7C1C 8013151C C7A2003C */ lwc1 $f2, 0x3c($sp) +/* C7C20 80131520 C7A40040 */ lwc1 $f4, 0x40($sp) +/* C7C24 80131524 C7A60044 */ lwc1 $f6, 0x44($sp) +/* C7C28 80131528 24020097 */ addiu $v0, $zero, 0x97 +/* C7C2C 8013152C AE020000 */ sw $v0, ($s0) +/* C7C30 80131530 A6000006 */ sh $zero, 6($s0) +/* C7C34 80131534 A6110004 */ sh $s1, 4($s0) +/* C7C38 80131538 A6120018 */ sh $s2, 0x18($s0) +/* C7C3C 8013153C AE000014 */ sw $zero, 0x14($s0) +/* C7C40 80131540 8FA2004C */ lw $v0, 0x4c($sp) +/* C7C44 80131544 3C013F80 */ lui $at, 0x3f80 +/* C7C48 80131548 44810000 */ mtc1 $at, $f0 +/* C7C4C 8013154C 8E030000 */ lw $v1, ($s0) +/* C7C50 80131550 A202001C */ sb $v0, 0x1c($s0) +/* C7C54 80131554 8FA20050 */ lw $v0, 0x50($sp) +/* C7C58 80131558 34644000 */ ori $a0, $v1, 0x4000 +/* C7C5C 8013155C E6020008 */ swc1 $f2, 8($s0) +/* C7C60 80131560 E604000C */ swc1 $f4, 0xc($s0) +/* C7C64 80131564 E6060010 */ swc1 $f6, 0x10($s0) +/* C7C68 80131568 E6000030 */ swc1 $f0, 0x30($s0) +/* C7C6C 8013156C AE040000 */ sw $a0, ($s0) +/* C7C70 80131570 A602001E */ sh $v0, 0x1e($s0) +/* C7C74 80131574 2402FFFF */ addiu $v0, $zero, -1 +/* C7C78 80131578 A6020020 */ sh $v0, 0x20($s0) +/* C7C7C 8013157C 24020001 */ addiu $v0, $zero, 1 +/* C7C80 80131580 A202002E */ sb $v0, 0x2e($s0) +/* C7C84 80131584 2402D8F1 */ addiu $v0, $zero, -0x270f +/* C7C88 80131588 A6020034 */ sh $v0, 0x34($s0) +/* C7C8C 8013158C A6020036 */ sh $v0, 0x36($s0) +/* C7C90 80131590 A6020038 */ sh $v0, 0x38($s0) +/* C7C94 80131594 00121140 */ sll $v0, $s2, 5 +/* C7C98 80131598 3C018008 */ lui $at, %hi(gItemTable+0x18) +/* C7C9C 8013159C 00220821 */ addu $at, $at, $v0 +/* C7CA0 801315A0 942278F8 */ lhu $v0, %lo(gItemTable+0x18)($at) +/* C7CA4 801315A4 2403001E */ addiu $v1, $zero, 0x1e +/* C7CA8 801315A8 3C018015 */ lui $at, %hi(D_801565A6) +/* C7CAC 801315AC A42365A6 */ sh $v1, %lo(D_801565A6)($at) +/* C7CB0 801315B0 30421000 */ andi $v0, $v0, 0x1000 +/* C7CB4 801315B4 10400005 */ beqz $v0, .L801315CC +/* C7CB8 801315B8 3C020004 */ lui $v0, 4 +/* C7CBC 801315BC 00821025 */ or $v0, $a0, $v0 +/* C7CC0 801315C0 2403BFFF */ addiu $v1, $zero, -0x4001 +/* C7CC4 801315C4 00431024 */ and $v0, $v0, $v1 +/* C7CC8 801315C8 AE020000 */ sw $v0, ($s0) +.L801315CC: +/* C7CCC 801315CC 3C048015 */ lui $a0, %hi(D_80155D84) +/* C7CD0 801315D0 24845D84 */ addiu $a0, $a0, %lo(D_80155D84) +/* C7CD4 801315D4 8C820000 */ lw $v0, ($a0) +/* C7CD8 801315D8 10400005 */ beqz $v0, .L801315F0 +/* C7CDC 801315DC 3C030002 */ lui $v1, 2 +/* C7CE0 801315E0 8E020000 */ lw $v0, ($s0) +/* C7CE4 801315E4 00431025 */ or $v0, $v0, $v1 +/* C7CE8 801315E8 AE020000 */ sw $v0, ($s0) +/* C7CEC 801315EC 8C820000 */ lw $v0, ($a0) +.L801315F0: +/* C7CF0 801315F0 24030001 */ addiu $v1, $zero, 1 +/* C7CF4 801315F4 00621823 */ subu $v1, $v1, $v0 +/* C7CF8 801315F8 AC830000 */ sw $v1, ($a0) +/* C7CFC 801315FC 8203001B */ lb $v1, 0x1b($s0) +/* C7D00 80131600 2C62001C */ sltiu $v0, $v1, 0x1c +/* C7D04 80131604 104000C1 */ beqz $v0, .L8013190C +/* C7D08 80131608 00031080 */ sll $v0, $v1, 2 +/* C7D0C 8013160C 3C018015 */ lui $at, %hi(jtbl_80150AF8_E71F8) +/* C7D10 80131610 00220821 */ addu $at, $at, $v0 +/* C7D14 80131614 8C220AF8 */ lw $v0, %lo(jtbl_80150AF8_E71F8)($at) +/* C7D18 80131618 00400008 */ jr $v0 +/* C7D1C 8013161C 00000000 */ nop +glabel L80131620_C7D20 +/* C7D20 80131620 8E020000 */ lw $v0, ($s0) +/* C7D24 80131624 0804C640 */ j .L80131900 +/* C7D28 80131628 3C038000 */ lui $v1, 0x8000 +glabel L8013162C_C7D2C +/* C7D2C 8013162C 8E020000 */ lw $v0, ($s0) +/* C7D30 80131630 0804C640 */ j .L80131900 +/* C7D34 80131634 3C030080 */ lui $v1, 0x80 +glabel L80131638_C7D38 +/* C7D38 80131638 8E020000 */ lw $v0, ($s0) +/* C7D3C 8013163C 0804C640 */ j .L80131900 +/* C7D40 80131640 3C030010 */ lui $v1, 0x10 +glabel L80131644_C7D44 +/* C7D44 80131644 24020003 */ addiu $v0, $zero, 3 +/* C7D48 80131648 A202001B */ sb $v0, 0x1b($s0) +/* C7D4C 8013164C 8E020000 */ lw $v0, ($s0) +/* C7D50 80131650 3C030080 */ lui $v1, 0x80 +/* C7D54 80131654 00431025 */ or $v0, $v0, $v1 +/* C7D58 80131658 0804C640 */ j .L80131900 +/* C7D5C 8013165C 3C030001 */ lui $v1, 1 +glabel L80131660_C7D60 +/* C7D60 80131660 3C020080 */ lui $v0, 0x80 +/* C7D64 80131664 34420600 */ ori $v0, $v0, 0x600 +/* C7D68 80131668 8E030000 */ lw $v1, ($s0) +/* C7D6C 8013166C 0804C635 */ j .L801318D4 +/* C7D70 80131670 24040003 */ addiu $a0, $zero, 3 +glabel L80131674_C7D74 +/* C7D74 80131674 3C020080 */ lui $v0, 0x80 +/* C7D78 80131678 34420400 */ ori $v0, $v0, 0x400 +/* C7D7C 8013167C 8E030000 */ lw $v1, ($s0) +/* C7D80 80131680 0804C635 */ j .L801318D4 +/* C7D84 80131684 24040003 */ addiu $a0, $zero, 3 +glabel L80131688_C7D88 +/* C7D88 80131688 3C020080 */ lui $v0, 0x80 +/* C7D8C 8013168C 34420800 */ ori $v0, $v0, 0x800 +/* C7D90 80131690 8E030000 */ lw $v1, ($s0) +/* C7D94 80131694 0804C635 */ j .L801318D4 +/* C7D98 80131698 24040003 */ addiu $a0, $zero, 3 +glabel L8013169C_C7D9C +/* C7D9C 8013169C 3C020080 */ lui $v0, 0x80 +/* C7DA0 801316A0 34420A00 */ ori $v0, $v0, 0xa00 +/* C7DA4 801316A4 8E030000 */ lw $v1, ($s0) +/* C7DA8 801316A8 0804C635 */ j .L801318D4 +/* C7DAC 801316AC 24040003 */ addiu $a0, $zero, 3 +glabel L801316B0_C7DB0 +/* C7DB0 801316B0 3C020080 */ lui $v0, 0x80 +/* C7DB4 801316B4 34420200 */ ori $v0, $v0, 0x200 +/* C7DB8 801316B8 8E030000 */ lw $v1, ($s0) +/* C7DBC 801316BC 0804C635 */ j .L801318D4 +/* C7DC0 801316C0 24040003 */ addiu $a0, $zero, 3 +glabel L801316C4_C7DC4 +/* C7DC4 801316C4 3C040080 */ lui $a0, 0x80 +/* C7DC8 801316C8 34840400 */ ori $a0, $a0, 0x400 +/* C7DCC 801316CC 8E020000 */ lw $v0, ($s0) +/* C7DD0 801316D0 24030003 */ addiu $v1, $zero, 3 +/* C7DD4 801316D4 A203001B */ sb $v1, 0x1b($s0) +/* C7DD8 801316D8 0804C63F */ j .L801318FC +/* C7DDC 801316DC 3C034000 */ lui $v1, 0x4000 +glabel L801316E0_C7DE0 +/* C7DE0 801316E0 3C050080 */ lui $a1, 0x80 +/* C7DE4 801316E4 34A50400 */ ori $a1, $a1, 0x400 +/* C7DE8 801316E8 3C044000 */ lui $a0, 0x4000 +/* C7DEC 801316EC 34840200 */ ori $a0, $a0, 0x200 +/* C7DF0 801316F0 8E020000 */ lw $v0, ($s0) +/* C7DF4 801316F4 24030003 */ addiu $v1, $zero, 3 +/* C7DF8 801316F8 A203001B */ sb $v1, 0x1b($s0) +/* C7DFC 801316FC 00451025 */ or $v0, $v0, $a1 +/* C7E00 80131700 0804C641 */ j .L80131904 +/* C7E04 80131704 00441025 */ or $v0, $v0, $a0 +glabel L80131708_C7E08 +/* C7E08 80131708 8E020000 */ lw $v0, ($s0) +/* C7E0C 8013170C 0804C640 */ j .L80131900 +/* C7E10 80131710 3C030080 */ lui $v1, 0x80 +glabel L80131714_C7E14 +/* C7E14 80131714 3C020080 */ lui $v0, 0x80 +/* C7E18 80131718 34420600 */ ori $v0, $v0, 0x600 +/* C7E1C 8013171C 8E030000 */ lw $v1, ($s0) +/* C7E20 80131720 0804C635 */ j .L801318D4 +/* C7E24 80131724 2404000C */ addiu $a0, $zero, 0xc +glabel L80131728_C7E28 +/* C7E28 80131728 3C020080 */ lui $v0, 0x80 +/* C7E2C 8013172C 34420400 */ ori $v0, $v0, 0x400 +/* C7E30 80131730 8E030000 */ lw $v1, ($s0) +/* C7E34 80131734 0804C635 */ j .L801318D4 +/* C7E38 80131738 2404000C */ addiu $a0, $zero, 0xc +glabel L8013173C_C7E3C +/* C7E3C 8013173C 3C020080 */ lui $v0, 0x80 +/* C7E40 80131740 34420800 */ ori $v0, $v0, 0x800 +/* C7E44 80131744 8E030000 */ lw $v1, ($s0) +/* C7E48 80131748 0804C635 */ j .L801318D4 +/* C7E4C 8013174C 2404000C */ addiu $a0, $zero, 0xc +glabel L80131750_C7E50 +/* C7E50 80131750 3C020080 */ lui $v0, 0x80 +/* C7E54 80131754 8E030000 */ lw $v1, ($s0) +/* C7E58 80131758 34422000 */ ori $v0, $v0, 0x2000 +/* C7E5C 8013175C 00621825 */ or $v1, $v1, $v0 +/* C7E60 80131760 0804C636 */ j .L801318D8 +/* C7E64 80131764 3C021000 */ lui $v0, 0x1000 +glabel L80131768_C7E68 +/* C7E68 80131768 3C040080 */ lui $a0, 0x80 +/* C7E6C 8013176C 34842600 */ ori $a0, $a0, 0x2600 +/* C7E70 80131770 8E020000 */ lw $v0, ($s0) +/* C7E74 80131774 24030010 */ addiu $v1, $zero, 0x10 +/* C7E78 80131778 A203001B */ sb $v1, 0x1b($s0) +/* C7E7C 8013177C 0804C63F */ j .L801318FC +/* C7E80 80131780 3C031000 */ lui $v1, 0x1000 +glabel L80131784_C7E84 +/* C7E84 80131784 3C040080 */ lui $a0, 0x80 +/* C7E88 80131788 34842400 */ ori $a0, $a0, 0x2400 +/* C7E8C 8013178C 8E020000 */ lw $v0, ($s0) +/* C7E90 80131790 24030010 */ addiu $v1, $zero, 0x10 +/* C7E94 80131794 A203001B */ sb $v1, 0x1b($s0) +/* C7E98 80131798 0804C63F */ j .L801318FC +/* C7E9C 8013179C 3C031000 */ lui $v1, 0x1000 +glabel L801317A0_C7EA0 +/* C7EA0 801317A0 3C040080 */ lui $a0, 0x80 +/* C7EA4 801317A4 34842200 */ ori $a0, $a0, 0x2200 +/* C7EA8 801317A8 8E020000 */ lw $v0, ($s0) +/* C7EAC 801317AC 24030010 */ addiu $v1, $zero, 0x10 +/* C7EB0 801317B0 A203001B */ sb $v1, 0x1b($s0) +/* C7EB4 801317B4 0804C63F */ j .L801318FC +/* C7EB8 801317B8 3C031000 */ lui $v1, 0x1000 +glabel L801317BC_C7EBC +/* C7EBC 801317BC 3C030080 */ lui $v1, 0x80 +/* C7EC0 801317C0 34631000 */ ori $v1, $v1, 0x1000 +/* C7EC4 801317C4 8E020000 */ lw $v0, ($s0) +/* C7EC8 801317C8 3C013F4C */ lui $at, 0x3f4c +/* C7ECC 801317CC 3421CCCD */ ori $at, $at, 0xcccd +/* C7ED0 801317D0 44810000 */ mtc1 $at, $f0 +/* C7ED4 801317D4 00431025 */ or $v0, $v0, $v1 +/* C7ED8 801317D8 AE020000 */ sw $v0, ($s0) +/* C7EDC 801317DC 34424000 */ ori $v0, $v0, 0x4000 +/* C7EE0 801317E0 0804C641 */ j .L80131904 +/* C7EE4 801317E4 E6000030 */ swc1 $f0, 0x30($s0) +glabel L801317E8_C7EE8 +/* C7EE8 801317E8 3C030080 */ lui $v1, 0x80 +/* C7EEC 801317EC 34631000 */ ori $v1, $v1, 0x1000 +/* C7EF0 801317F0 8E020000 */ lw $v0, ($s0) +/* C7EF4 801317F4 3C013F4C */ lui $at, 0x3f4c +/* C7EF8 801317F8 3421CCCD */ ori $at, $at, 0xcccd +/* C7EFC 801317FC 44810000 */ mtc1 $at, $f0 +/* C7F00 80131800 00431025 */ or $v0, $v0, $v1 +/* C7F04 80131804 3C030001 */ lui $v1, 1 +/* C7F08 80131808 00431025 */ or $v0, $v0, $v1 +/* C7F0C 8013180C AE020000 */ sw $v0, ($s0) +/* C7F10 80131810 0040182D */ daddu $v1, $v0, $zero +/* C7F14 80131814 0804C628 */ j .L801318A0 +/* C7F18 80131818 24020017 */ addiu $v0, $zero, 0x17 +glabel L8013181C_C7F1C +/* C7F1C 8013181C 3C030080 */ lui $v1, 0x80 +/* C7F20 80131820 34631000 */ ori $v1, $v1, 0x1000 +/* C7F24 80131824 8E020000 */ lw $v0, ($s0) +/* C7F28 80131828 3C013F4C */ lui $at, 0x3f4c +/* C7F2C 8013182C 3421CCCD */ ori $at, $at, 0xcccd +/* C7F30 80131830 44810000 */ mtc1 $at, $f0 +/* C7F34 80131834 00431025 */ or $v0, $v0, $v1 +/* C7F38 80131838 3C030040 */ lui $v1, 0x40 +/* C7F3C 8013183C 00431025 */ or $v0, $v0, $v1 +/* C7F40 80131840 AE020000 */ sw $v0, ($s0) +/* C7F44 80131844 0040182D */ daddu $v1, $v0, $zero +/* C7F48 80131848 0804C628 */ j .L801318A0 +/* C7F4C 8013184C 24020017 */ addiu $v0, $zero, 0x17 +glabel L80131850_C7F50 +/* C7F50 80131850 3C030080 */ lui $v1, 0x80 +/* C7F54 80131854 8E020000 */ lw $v0, ($s0) +/* C7F58 80131858 3C013F4C */ lui $at, 0x3f4c +/* C7F5C 8013185C 3421CCCD */ ori $at, $at, 0xcccd +/* C7F60 80131860 44810000 */ mtc1 $at, $f0 +/* C7F64 80131864 00431025 */ or $v0, $v0, $v1 +/* C7F68 80131868 AE020000 */ sw $v0, ($s0) +/* C7F6C 8013186C 0040182D */ daddu $v1, $v0, $zero +/* C7F70 80131870 0804C628 */ j .L801318A0 +/* C7F74 80131874 24020003 */ addiu $v0, $zero, 3 +glabel L80131878_C7F78 +/* C7F78 80131878 3C030080 */ lui $v1, 0x80 +/* C7F7C 8013187C 34638000 */ ori $v1, $v1, 0x8000 +/* C7F80 80131880 8E020000 */ lw $v0, ($s0) +/* C7F84 80131884 3C013F4C */ lui $at, 0x3f4c +/* C7F88 80131888 3421CCCD */ ori $at, $at, 0xcccd +/* C7F8C 8013188C 44810000 */ mtc1 $at, $f0 +/* C7F90 80131890 00431025 */ or $v0, $v0, $v1 +/* C7F94 80131894 AE020000 */ sw $v0, ($s0) +/* C7F98 80131898 0040182D */ daddu $v1, $v0, $zero +/* C7F9C 8013189C 24020014 */ addiu $v0, $zero, 0x14 +.L801318A0: +/* C7FA0 801318A0 34634000 */ ori $v1, $v1, 0x4000 +/* C7FA4 801318A4 A202001B */ sb $v0, 0x1b($s0) +/* C7FA8 801318A8 E6000030 */ swc1 $f0, 0x30($s0) +/* C7FAC 801318AC 0804C642 */ j .L80131908 +/* C7FB0 801318B0 AE030000 */ sw $v1, ($s0) +glabel L801318B4_C7FB4 +/* C7FB4 801318B4 3C030080 */ lui $v1, 0x80 +/* C7FB8 801318B8 8E020000 */ lw $v0, ($s0) +/* C7FBC 801318BC 0804C640 */ j .L80131900 +/* C7FC0 801318C0 34638200 */ ori $v1, $v1, 0x8200 +glabel L801318C4_C7FC4 +/* C7FC4 801318C4 3C020080 */ lui $v0, 0x80 +/* C7FC8 801318C8 34428600 */ ori $v0, $v0, 0x8600 +/* C7FCC 801318CC 8E030000 */ lw $v1, ($s0) +/* C7FD0 801318D0 24040014 */ addiu $a0, $zero, 0x14 +.L801318D4: +/* C7FD4 801318D4 A204001B */ sb $a0, 0x1b($s0) +.L801318D8: +/* C7FD8 801318D8 00621825 */ or $v1, $v1, $v0 +/* C7FDC 801318DC 0804C642 */ j .L80131908 +/* C7FE0 801318E0 AE030000 */ sw $v1, ($s0) +glabel L801318E4_C7FE4 +/* C7FE4 801318E4 3C040080 */ lui $a0, 0x80 +/* C7FE8 801318E8 34840600 */ ori $a0, $a0, 0x600 +/* C7FEC 801318EC 8E020000 */ lw $v0, ($s0) +/* C7FF0 801318F0 24030003 */ addiu $v1, $zero, 3 +/* C7FF4 801318F4 A203001B */ sb $v1, 0x1b($s0) +/* C7FF8 801318F8 3C030100 */ lui $v1, 0x100 +.L801318FC: +/* C7FFC 801318FC 00441025 */ or $v0, $v0, $a0 +.L80131900: +/* C8000 80131900 00431025 */ or $v0, $v0, $v1 +.L80131904: +/* C8004 80131904 AE020000 */ sw $v0, ($s0) +.L80131908: +/* C8008 80131908 8203001B */ lb $v1, 0x1b($s0) +.L8013190C: +/* C800C 8013190C 2C620015 */ sltiu $v0, $v1, 0x15 +/* C8010 80131910 1040003E */ beqz $v0, .L80131A0C +/* C8014 80131914 00031080 */ sll $v0, $v1, 2 +/* C8018 80131918 3C018015 */ lui $at, %hi(jtbl_80150B68_E7268) +/* C801C 8013191C 00220821 */ addu $at, $at, $v0 +/* C8020 80131920 8C220B68 */ lw $v0, %lo(jtbl_80150B68_E7268)($at) +/* C8024 80131924 00400008 */ jr $v0 +/* C8028 80131928 00000000 */ nop +glabel L8013192C_C802C +/* C802C 8013192C 8E050008 */ lw $a1, 8($s0) +/* C8030 80131930 8E06000C */ lw $a2, 0xc($s0) +/* C8034 80131934 8E070010 */ lw $a3, 0x10($s0) +/* C8038 80131938 0C044898 */ jal create_shadow_type +/* C803C 8013193C 0000202D */ daddu $a0, $zero, $zero +/* C8040 80131940 00022400 */ sll $a0, $v0, 0x10 +/* C8044 80131944 00042403 */ sra $a0, $a0, 0x10 +/* C8048 80131948 0C044181 */ jal get_shadow_by_index +/* C804C 8013194C A6020020 */ sh $v0, 0x20($s0) +/* C8050 80131950 0040882D */ daddu $s1, $v0, $zero +/* C8054 80131954 8203001B */ lb $v1, 0x1b($s0) +/* C8058 80131958 24020014 */ addiu $v0, $zero, 0x14 +/* C805C 8013195C 14620004 */ bne $v1, $v0, .L80131970 +/* C8060 80131960 3C040002 */ lui $a0, 2 +/* C8064 80131964 8E220000 */ lw $v0, ($s1) +/* C8068 80131968 34420001 */ ori $v0, $v0, 1 +/* C806C 8013196C AE220000 */ sw $v0, ($s1) +.L80131970: +/* C8070 80131970 27A5003C */ addiu $a1, $sp, 0x3c +/* C8074 80131974 27A60040 */ addiu $a2, $sp, 0x40 +/* C8078 80131978 27A70044 */ addiu $a3, $sp, 0x44 +/* C807C 8013197C 27A20018 */ addiu $v0, $sp, 0x18 +/* C8080 80131980 C6080008 */ lwc1 $f8, 8($s0) +/* C8084 80131984 C600000C */ lwc1 $f0, 0xc($s0) +/* C8088 80131988 3C014140 */ lui $at, 0x4140 +/* C808C 8013198C 44811000 */ mtc1 $at, $f2 +/* C8090 80131990 C6040010 */ lwc1 $f4, 0x10($s0) +/* C8094 80131994 3C01447A */ lui $at, 0x447a +/* C8098 80131998 44813000 */ mtc1 $at, $f6 +/* C809C 8013199C 46020000 */ add.s $f0, $f0, $f2 +/* C80A0 801319A0 E7A8003C */ swc1 $f8, 0x3c($sp) +/* C80A4 801319A4 E7A40044 */ swc1 $f4, 0x44($sp) +/* C80A8 801319A8 E7A00040 */ swc1 $f0, 0x40($sp) +/* C80AC 801319AC E7A60018 */ swc1 $f6, 0x18($sp) +/* C80B0 801319B0 0C0372DF */ jal func_800DCB7C +/* C80B4 801319B4 AFA20010 */ sw $v0, 0x10($sp) +/* C80B8 801319B8 C7A0003C */ lwc1 $f0, 0x3c($sp) +/* C80BC 801319BC C7A20040 */ lwc1 $f2, 0x40($sp) +/* C80C0 801319C0 C7A40044 */ lwc1 $f4, 0x44($sp) +/* C80C4 801319C4 3C028007 */ lui $v0, %hi(gGameStatusPtr) +/* C80C8 801319C8 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) +/* C80CC 801319CC E6200010 */ swc1 $f0, 0x10($s1) +/* C80D0 801319D0 E6220014 */ swc1 $f2, 0x14($s1) +/* C80D4 801319D4 E6240018 */ swc1 $f4, 0x18($s1) +/* C80D8 801319D8 C7A20018 */ lwc1 $f2, 0x18($sp) +/* C80DC 801319DC 3C013F00 */ lui $at, 0x3f00 +/* C80E0 801319E0 44810000 */ mtc1 $at, $f0 +/* C80E4 801319E4 C444011C */ lwc1 $f4, 0x11c($v0) +/* C80E8 801319E8 46001082 */ mul.s $f2, $f2, $f0 +/* C80EC 801319EC 00000000 */ nop +/* C80F0 801319F0 AE20002C */ sw $zero, 0x2c($s1) +/* C80F4 801319F4 E6240028 */ swc1 $f4, 0x28($s1) +/* C80F8 801319F8 C4400124 */ lwc1 $f0, 0x124($v0) +/* C80FC 801319FC 44051000 */ mfc1 $a1, $f2 +/* C8100 80131A00 0220202D */ daddu $a0, $s1, $zero +/* C8104 80131A04 0C044A17 */ jal set_standard_shadow_scale +/* C8108 80131A08 E4800030 */ swc1 $f0, 0x30($a0) +.L80131A0C: +glabel L80131A0C_C810C +/* C810C 80131A0C 9202001C */ lbu $v0, 0x1c($s0) +/* C8110 80131A10 10400003 */ beqz $v0, .L80131A20 +/* C8114 80131A14 00000000 */ nop +/* C8118 80131A18 0C04C3DC */ jal func_80130F70 +/* C811C 80131A1C 0200202D */ daddu $a0, $s0, $zero +.L80131A20: +/* C8120 80131A20 0C04C44A */ jal func_80131128 +/* C8124 80131A24 0200202D */ daddu $a0, $s0, $zero +/* C8128 80131A28 86030018 */ lh $v1, 0x18($s0) +/* C812C 80131A2C 24020157 */ addiu $v0, $zero, 0x157 +/* C8130 80131A30 14620009 */ bne $v1, $v0, .L80131A58 +/* C8134 80131A34 2402015C */ addiu $v0, $zero, 0x15c +/* C8138 80131A38 3C058010 */ lui $a1, %hi(D_80104AC0) +/* C813C 80131A3C 24A54AC0 */ addiu $a1, $a1, %lo(D_80104AC0) +/* C8140 80131A40 0C04C27C */ jal func_801309F0 +/* C8144 80131A44 0200202D */ daddu $a0, $s0, $zero +/* C8148 80131A48 0C04C2B3 */ jal func_80130ACC +/* C814C 80131A4C 0200202D */ daddu $a0, $s0, $zero +/* C8150 80131A50 86030018 */ lh $v1, 0x18($s0) +/* C8154 80131A54 2402015C */ addiu $v0, $zero, 0x15c +.L80131A58: +/* C8158 80131A58 14620006 */ bne $v1, $v0, .L80131A74 +/* C815C 80131A5C 0280102D */ daddu $v0, $s4, $zero +/* C8160 80131A60 8E020000 */ lw $v0, ($s0) +/* C8164 80131A64 2403FF7F */ addiu $v1, $zero, -0x81 +/* C8168 80131A68 00431024 */ and $v0, $v0, $v1 +/* C816C 80131A6C AE020000 */ sw $v0, ($s0) +/* C8170 80131A70 0280102D */ daddu $v0, $s4, $zero +.L80131A74: +/* C8174 80131A74 8FBF0034 */ lw $ra, 0x34($sp) +/* C8178 80131A78 8FB40030 */ lw $s4, 0x30($sp) +/* C817C 80131A7C 8FB3002C */ lw $s3, 0x2c($sp) +/* C8180 80131A80 8FB20028 */ lw $s2, 0x28($sp) +/* C8184 80131A84 8FB10024 */ lw $s1, 0x24($sp) +/* C8188 80131A88 8FB00020 */ lw $s0, 0x20($sp) +/* C818C 80131A8C 03E00008 */ jr $ra +/* C8190 80131A90 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/code_B9D60/remove_item_entity_by_index.s b/asm/nonmatchings/code_C50A0/remove_item_entity_by_index.s similarity index 100% rename from asm/nonmatchings/code_B9D60/remove_item_entity_by_index.s rename to asm/nonmatchings/code_C50A0/remove_item_entity_by_index.s diff --git a/asm/nonmatchings/code_B9D60/remove_item_entity_by_reference.s b/asm/nonmatchings/code_C50A0/remove_item_entity_by_reference.s similarity index 100% rename from asm/nonmatchings/code_B9D60/remove_item_entity_by_reference.s rename to asm/nonmatchings/code_C50A0/remove_item_entity_by_reference.s diff --git a/asm/nonmatchings/code_B9D60/render_item_entities.s b/asm/nonmatchings/code_C50A0/render_item_entities.s similarity index 100% rename from asm/nonmatchings/code_B9D60/render_item_entities.s rename to asm/nonmatchings/code_C50A0/render_item_entities.s diff --git a/asm/nonmatchings/code_B9D60/test_item_player_collision.s b/asm/nonmatchings/code_C50A0/test_item_player_collision.s similarity index 100% rename from asm/nonmatchings/code_B9D60/test_item_player_collision.s rename to asm/nonmatchings/code_C50A0/test_item_player_collision.s diff --git a/asm/nonmatchings/code_B9D60/update_item_entities.s b/asm/nonmatchings/code_C50A0/update_item_entities.s similarity index 100% rename from asm/nonmatchings/code_B9D60/update_item_entities.s rename to asm/nonmatchings/code_C50A0/update_item_entities.s diff --git a/asm/nonmatchings/code_B9D60/update_item_entity_collectable.s b/asm/nonmatchings/code_C50A0/update_item_entity_collectable.s similarity index 100% rename from asm/nonmatchings/code_B9D60/update_item_entity_collectable.s rename to asm/nonmatchings/code_C50A0/update_item_entity_collectable.s diff --git a/asm/nonmatchings/code_B9D60/update_item_entity_static.s b/asm/nonmatchings/code_C50A0/update_item_entity_static.s similarity index 100% rename from asm/nonmatchings/code_B9D60/update_item_entity_static.s rename to asm/nonmatchings/code_C50A0/update_item_entity_static.s diff --git a/asm/nonmatchings/code_B9D60/update_item_entity_temp.s b/asm/nonmatchings/code_C50A0/update_item_entity_temp.s similarity index 100% rename from asm/nonmatchings/code_B9D60/update_item_entity_temp.s rename to asm/nonmatchings/code_C50A0/update_item_entity_temp.s diff --git a/asm/nonmatchings/code_cd180_len_38f0/func_80138740.s b/asm/nonmatchings/code_CEE40/func_80138740.s similarity index 100% rename from asm/nonmatchings/code_cd180_len_38f0/func_80138740.s rename to asm/nonmatchings/code_CEE40/func_80138740.s diff --git a/asm/nonmatchings/code_cd180_len_38f0/func_80138D88.s b/asm/nonmatchings/code_CEE40/func_80138D88.s similarity index 100% rename from asm/nonmatchings/code_cd180_len_38f0/func_80138D88.s rename to asm/nonmatchings/code_CEE40/func_80138D88.s diff --git a/asm/nonmatchings/code_cd180_len_38f0/func_80138E54.s b/asm/nonmatchings/code_CEE40/func_80138E54.s similarity index 100% rename from asm/nonmatchings/code_cd180_len_38f0/func_80138E54.s rename to asm/nonmatchings/code_CEE40/func_80138E54.s diff --git a/asm/nonmatchings/code_cd180_len_38f0/func_80139F10.s b/asm/nonmatchings/code_CEE40/func_80139F10.s similarity index 100% rename from asm/nonmatchings/code_cd180_len_38f0/func_80139F10.s rename to asm/nonmatchings/code_CEE40/func_80139F10.s diff --git a/asm/nonmatchings/code_de740_len_23f0/_play_sound.s b/asm/nonmatchings/code_DF950/_play_sound.s similarity index 100% rename from asm/nonmatchings/code_de740_len_23f0/_play_sound.s rename to asm/nonmatchings/code_DF950/_play_sound.s diff --git a/asm/nonmatchings/code_de740_len_23f0/func_80149250.s b/asm/nonmatchings/code_DF950/func_80149250.s similarity index 100% rename from asm/nonmatchings/code_de740_len_23f0/func_80149250.s rename to asm/nonmatchings/code_DF950/func_80149250.s diff --git a/asm/nonmatchings/code_de740_len_23f0/func_80149618.s b/asm/nonmatchings/code_DF950/func_80149618.s similarity index 100% rename from asm/nonmatchings/code_de740_len_23f0/func_80149618.s rename to asm/nonmatchings/code_DF950/func_80149618.s diff --git a/asm/nonmatchings/code_de740_len_23f0/func_80149670.s b/asm/nonmatchings/code_DF950/func_80149670.s similarity index 100% rename from asm/nonmatchings/code_de740_len_23f0/func_80149670.s rename to asm/nonmatchings/code_DF950/func_80149670.s diff --git a/asm/nonmatchings/code_de740_len_23f0/func_80149734.s b/asm/nonmatchings/code_DF950/func_80149734.s similarity index 100% rename from asm/nonmatchings/code_de740_len_23f0/func_80149734.s rename to asm/nonmatchings/code_DF950/func_80149734.s diff --git a/asm/nonmatchings/code_de740_len_23f0/func_801497FC.s b/asm/nonmatchings/code_DF950/func_801497FC.s similarity index 100% rename from asm/nonmatchings/code_de740_len_23f0/func_801497FC.s rename to asm/nonmatchings/code_DF950/func_801497FC.s diff --git a/asm/nonmatchings/code_de740_len_23f0/func_80149828.s b/asm/nonmatchings/code_DF950/func_80149828.s similarity index 100% rename from asm/nonmatchings/code_de740_len_23f0/func_80149828.s rename to asm/nonmatchings/code_DF950/func_80149828.s diff --git a/asm/nonmatchings/code_de740_len_23f0/func_80149838.s b/asm/nonmatchings/code_DF950/func_80149838.s similarity index 100% rename from asm/nonmatchings/code_de740_len_23f0/func_80149838.s rename to asm/nonmatchings/code_DF950/func_80149838.s diff --git a/asm/nonmatchings/code_de740_len_23f0/func_801498C4.s b/asm/nonmatchings/code_DF950/func_801498C4.s similarity index 100% rename from asm/nonmatchings/code_de740_len_23f0/func_801498C4.s rename to asm/nonmatchings/code_DF950/func_801498C4.s diff --git a/asm/nonmatchings/code_de740_len_23f0/func_80149908.s b/asm/nonmatchings/code_DF950/func_80149908.s similarity index 100% rename from asm/nonmatchings/code_de740_len_23f0/func_80149908.s rename to asm/nonmatchings/code_DF950/func_80149908.s diff --git a/asm/nonmatchings/code_de740_len_23f0/func_80149974.s b/asm/nonmatchings/code_DF950/func_80149974.s similarity index 100% rename from asm/nonmatchings/code_de740_len_23f0/func_80149974.s rename to asm/nonmatchings/code_DF950/func_80149974.s diff --git a/asm/nonmatchings/code_de740_len_23f0/func_801499EC.s b/asm/nonmatchings/code_DF950/func_801499EC.s similarity index 100% rename from asm/nonmatchings/code_de740_len_23f0/func_801499EC.s rename to asm/nonmatchings/code_DF950/func_801499EC.s diff --git a/asm/nonmatchings/code_de740_len_23f0/func_80149A6C.s b/asm/nonmatchings/code_DF950/func_80149A6C.s similarity index 100% rename from asm/nonmatchings/code_de740_len_23f0/func_80149A6C.s rename to asm/nonmatchings/code_DF950/func_80149A6C.s diff --git a/asm/nonmatchings/code_de740_len_23f0/func_80149BE4.s b/asm/nonmatchings/code_DF950/func_80149BE4.s similarity index 100% rename from asm/nonmatchings/code_de740_len_23f0/func_80149BE4.s rename to asm/nonmatchings/code_DF950/func_80149BE4.s diff --git a/asm/nonmatchings/code_de740_len_23f0/func_80149E04.s b/asm/nonmatchings/code_DF950/func_80149E04.s similarity index 100% rename from asm/nonmatchings/code_de740_len_23f0/func_80149E04.s rename to asm/nonmatchings/code_DF950/func_80149E04.s diff --git a/asm/nonmatchings/code_de740_len_23f0/func_80149F58.s b/asm/nonmatchings/code_DF950/func_80149F58.s similarity index 100% rename from asm/nonmatchings/code_de740_len_23f0/func_80149F58.s rename to asm/nonmatchings/code_DF950/func_80149F58.s diff --git a/asm/nonmatchings/code_de740_len_23f0/func_8014A1B4.s b/asm/nonmatchings/code_DF950/func_8014A1B4.s similarity index 100% rename from asm/nonmatchings/code_de740_len_23f0/func_8014A1B4.s rename to asm/nonmatchings/code_DF950/func_8014A1B4.s diff --git a/asm/nonmatchings/code_de740_len_23f0/play_sound_at_position.s b/asm/nonmatchings/code_DF950/play_sound_at_position.s similarity index 100% rename from asm/nonmatchings/code_de740_len_23f0/play_sound_at_position.s rename to asm/nonmatchings/code_DF950/play_sound_at_position.s diff --git a/asm/nonmatchings/code_de740_len_23f0/stop_sound.s b/asm/nonmatchings/code_DF950/stop_sound.s similarity index 100% rename from asm/nonmatchings/code_de740_len_23f0/stop_sound.s rename to asm/nonmatchings/code_DF950/stop_sound.s diff --git a/asm/nonmatchings/code_E2F750/func_802BBE70_E307C0.s b/asm/nonmatchings/code_E307C0/func_802BBE70_E307C0.s similarity index 100% rename from asm/nonmatchings/code_E2F750/func_802BBE70_E307C0.s rename to asm/nonmatchings/code_E307C0/func_802BBE70_E307C0.s diff --git a/asm/nonmatchings/code_E2F750/func_802BC2BC_E30C0C.s b/asm/nonmatchings/code_E307C0/func_802BC2BC_E30C0C.s similarity index 100% rename from asm/nonmatchings/code_E2F750/func_802BC2BC_E30C0C.s rename to asm/nonmatchings/code_E307C0/func_802BC2BC_E30C0C.s diff --git a/asm/nonmatchings/code_E2F750/func_802BC4B8_E30E08.s b/asm/nonmatchings/code_E307C0/func_802BC4B8_E30E08.s similarity index 100% rename from asm/nonmatchings/code_E2F750/func_802BC4B8_E30E08.s rename to asm/nonmatchings/code_E307C0/func_802BC4B8_E30E08.s diff --git a/asm/nonmatchings/code_E2F750/func_802BC514_E30E64.s b/asm/nonmatchings/code_E307C0/func_802BC514_E30E64.s similarity index 100% rename from asm/nonmatchings/code_E2F750/func_802BC514_E30E64.s rename to asm/nonmatchings/code_E307C0/func_802BC514_E30E64.s diff --git a/asm/nonmatchings/code_E2F750/func_802BC558_E30EA8.s b/asm/nonmatchings/code_E307C0/func_802BC558_E30EA8.s similarity index 100% rename from asm/nonmatchings/code_E2F750/func_802BC558_E30EA8.s rename to asm/nonmatchings/code_E307C0/func_802BC558_E30EA8.s diff --git a/asm/nonmatchings/code_E2F750/func_802BC570_E30EC0.s b/asm/nonmatchings/code_E307C0/func_802BC570_E30EC0.s similarity index 100% rename from asm/nonmatchings/code_E2F750/func_802BC570_E30EC0.s rename to asm/nonmatchings/code_E307C0/func_802BC570_E30EC0.s diff --git a/asm/nonmatchings/code_E2F750/func_802BC99C_E312EC.s b/asm/nonmatchings/code_E307C0/func_802BC99C_E312EC.s similarity index 100% rename from asm/nonmatchings/code_E2F750/func_802BC99C_E312EC.s rename to asm/nonmatchings/code_E307C0/func_802BC99C_E312EC.s diff --git a/asm/nonmatchings/code_E2F750/func_802BC9CC_E3131C.s b/asm/nonmatchings/code_E307C0/func_802BC9CC_E3131C.s similarity index 100% rename from asm/nonmatchings/code_E2F750/func_802BC9CC_E3131C.s rename to asm/nonmatchings/code_E307C0/func_802BC9CC_E3131C.s diff --git a/asm/nonmatchings/code_E2F750/func_802BC9FC_E3134C.s b/asm/nonmatchings/code_E307C0/func_802BC9FC_E3134C.s similarity index 100% rename from asm/nonmatchings/code_E2F750/func_802BC9FC_E3134C.s rename to asm/nonmatchings/code_E307C0/func_802BC9FC_E3134C.s diff --git a/asm/nonmatchings/code_de740_len_23f0/func_801491E4.s b/asm/nonmatchings/code_de740_len_23f0/func_801491E4.s deleted file mode 100644 index 7638dc35b7..0000000000 --- a/asm/nonmatchings/code_de740_len_23f0/func_801491E4.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_801491E4 -/* DF8E4 801491E4 3C06800A */ lui $a2, %hi(gMasterGfxPos) -/* DF8E8 801491E8 24C6A66C */ addiu $a2, $a2, %lo(gMasterGfxPos) -/* DF8EC 801491EC 3C02FA00 */ lui $v0, 0xfa00 -/* DF8F0 801491F0 8CC50000 */ lw $a1, ($a2) -/* DF8F4 801491F4 8FA40014 */ lw $a0, 0x14($sp) -/* DF8F8 801491F8 00A0182D */ daddu $v1, $a1, $zero -/* DF8FC 801491FC 24A50008 */ addiu $a1, $a1, 8 -/* DF900 80149200 ACC50000 */ sw $a1, ($a2) -/* DF904 80149204 AC620000 */ sw $v0, ($v1) -/* DF908 80149208 308200FF */ andi $v0, $a0, 0xff -/* DF90C 8014920C AC620004 */ sw $v0, 4($v1) -/* DF910 80149210 240200FF */ addiu $v0, $zero, 0xff -/* DF914 80149214 14820005 */ bne $a0, $v0, .L8014922C -/* DF918 80149218 3C04FCFF */ lui $a0, 0xfcff -/* DF91C 8014921C 3484FFFF */ ori $a0, $a0, 0xffff -/* DF920 80149220 3C03FFFD */ lui $v1, 0xfffd -/* DF924 80149224 0805248E */ j .L80149238 -/* DF928 80149228 34637438 */ ori $v1, $v1, 0x7438 -.L8014922C: -/* DF92C 8014922C 348497FF */ ori $a0, $a0, 0x97ff -/* DF930 80149230 3C03FFFC */ lui $v1, 0xfffc -/* DF934 80149234 3463FE38 */ ori $v1, $v1, 0xfe38 -.L80149238: -/* DF938 80149238 24A20008 */ addiu $v0, $a1, 8 -/* DF93C 8014923C ACC20000 */ sw $v0, ($a2) -/* DF940 80149240 ACA40000 */ sw $a0, ($a1) -/* DF944 80149244 03E00008 */ jr $ra -/* DF948 80149248 ACA30004 */ sw $v1, 4($a1) -/* DF94C 8014924C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_hos/hos_02/A16220/func_80240FD0_A171F0.s b/asm/nonmatchings/world/area_hos/hos_02/A171F0/func_80240FD0_A171F0.s similarity index 100% rename from asm/nonmatchings/world/area_hos/hos_02/A16220/func_80240FD0_A171F0.s rename to asm/nonmatchings/world/area_hos/hos_02/A171F0/func_80240FD0_A171F0.s diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_80243370_8B33E0.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B33E0/func_80243370_8B33E0.s similarity index 100% rename from asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_80243370_8B33E0.s rename to asm/nonmatchings/world/area_kmr/kmr_02/8B33E0/func_80243370_8B33E0.s diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_802433AC_8B341C.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B33E0/func_802433AC_8B341C.s similarity index 100% rename from asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_802433AC_8B341C.s rename to asm/nonmatchings/world/area_kmr/kmr_02/8B33E0/func_802433AC_8B341C.s diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_80243514_8B3584.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B33E0/func_80243514_8B3584.s similarity index 100% rename from asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_80243514_8B3584.s rename to asm/nonmatchings/world/area_kmr/kmr_02/8B33E0/func_80243514_8B3584.s diff --git a/asm/nonmatchings/world/script_api/7E3700/func_80283908.s b/asm/nonmatchings/world/script_api/7E4690/func_80283908.s similarity index 93% rename from asm/nonmatchings/world/script_api/7E3700/func_80283908.s rename to asm/nonmatchings/world/script_api/7E4690/func_80283908.s index e00af2cf6e..831fd91c0e 100644 --- a/asm/nonmatchings/world/script_api/7E3700/func_80283908.s +++ b/asm/nonmatchings/world/script_api/7E4690/func_80283908.s @@ -14,21 +14,21 @@ glabel func_80283908 /* 7E47AC 8028392C 84620160 */ lh $v0, 0x160($v1) /* 7E47B0 80283930 0200882D */ daddu $s1, $s0, $zero /* 7E47B4 80283934 44820000 */ mtc1 $v0, $f0 -/* 7E47B8 80283938 00000000 */ nop +/* 7E47B8 80283938 00000000 */ nop /* 7E47BC 8028393C 46800020 */ cvt.s.w $f0, $f0 /* 7E47C0 80283940 E6000028 */ swc1 $f0, 0x28($s0) /* 7E47C4 80283944 84620162 */ lh $v0, 0x162($v1) /* 7E47C8 80283948 3C04800B */ lui $a0, %hi(gCameras) /* 7E47CC 8028394C 24841D80 */ addiu $a0, $a0, %lo(gCameras) /* 7E47D0 80283950 44820000 */ mtc1 $v0, $f0 -/* 7E47D4 80283954 00000000 */ nop +/* 7E47D4 80283954 00000000 */ nop /* 7E47D8 80283958 46800020 */ cvt.s.w $f0, $f0 /* 7E47DC 8028395C E600002C */ swc1 $f0, 0x2c($s0) /* 7E47E0 80283960 84620164 */ lh $v0, 0x164($v1) /* 7E47E4 80283964 3C038007 */ lui $v1, %hi(gCurrentCameraID) /* 7E47E8 80283968 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) /* 7E47EC 8028396C 44820000 */ mtc1 $v0, $f0 -/* 7E47F0 80283970 00000000 */ nop +/* 7E47F0 80283970 00000000 */ nop /* 7E47F4 80283974 46800020 */ cvt.s.w $f0, $f0 /* 7E47F8 80283978 00031080 */ sll $v0, $v1, 2 /* 7E47FC 8028397C 00431021 */ addu $v0, $v0, $v1 @@ -50,14 +50,14 @@ glabel func_80283908 /* 7E483C 802839BC 3C01C2B4 */ lui $at, 0xc2b4 /* 7E4840 802839C0 44816000 */ mtc1 $at, $f12 /* 7E4844 802839C4 4600103C */ c.lt.s $f2, $f0 -/* 7E4848 802839C8 00000000 */ nop +/* 7E4848 802839C8 00000000 */ nop /* 7E484C 802839CC 45000003 */ bc1f .L802839DC /* 7E4850 802839D0 0040802D */ daddu $s0, $v0, $zero /* 7E4854 802839D4 3C0142B4 */ lui $at, 0x42b4 /* 7E4858 802839D8 44816000 */ mtc1 $at, $f12 .L802839DC: /* 7E485C 802839DC 0C00A6C9 */ jal clamp_angle -/* 7E4860 802839E0 00000000 */ nop +/* 7E4860 802839E0 00000000 */ nop /* 7E4864 802839E4 C6220028 */ lwc1 $f2, 0x28($s1) /* 7E4868 802839E8 E6020038 */ swc1 $f2, 0x38($s0) /* 7E486C 802839EC C622002C */ lwc1 $f2, 0x2c($s1) @@ -69,13 +69,13 @@ glabel func_80283908 /* 7E4884 80283A04 44070000 */ mfc1 $a3, $f0 /* 7E4888 80283A08 24420005 */ addiu $v0, $v0, 5 /* 7E488C 80283A0C 44822000 */ mtc1 $v0, $f4 -/* 7E4890 80283A10 00000000 */ nop +/* 7E4890 80283A10 00000000 */ nop /* 7E4894 80283A14 46802120 */ cvt.s.w $f4, $f4 /* 7E4898 80283A18 44062000 */ mfc1 $a2, $f4 /* 7E489C 80283A1C 0C00A7E7 */ jal add_vec2D_polar /* 7E48A0 80283A20 26050040 */ addiu $a1, $s0, 0x40 /* 7E48A4 80283A24 0C03BCCA */ jal enable_partner_ai -/* 7E48A8 80283A28 00000000 */ nop +/* 7E48A8 80283A28 00000000 */ nop .L80283A2C: /* 7E48AC 80283A2C 24020001 */ addiu $v0, $zero, 1 /* 7E48B0 80283A30 A6420008 */ sh $v0, 8($s2) diff --git a/asm/nonmatchings/world/script_api/7E3700/func_80283A50.s b/asm/nonmatchings/world/script_api/7E4690/func_80283A50.s similarity index 100% rename from asm/nonmatchings/world/script_api/7E3700/func_80283A50.s rename to asm/nonmatchings/world/script_api/7E4690/func_80283A50.s diff --git a/asm/nonmatchings/world/script_api/7E3700/func_80283C34.s b/asm/nonmatchings/world/script_api/7E4690/func_80283C34.s similarity index 100% rename from asm/nonmatchings/world/script_api/7E3700/func_80283C34.s rename to asm/nonmatchings/world/script_api/7E4690/func_80283C34.s diff --git a/asm/nonmatchings/world/script_api/7E3700/func_80283D00.s b/asm/nonmatchings/world/script_api/7E4690/func_80283D00.s similarity index 100% rename from asm/nonmatchings/world/script_api/7E3700/func_80283D00.s rename to asm/nonmatchings/world/script_api/7E4690/func_80283D00.s diff --git a/asm/nonmatchings/world/script_api/7E3700/func_80283D6C.s b/asm/nonmatchings/world/script_api/7E4690/func_80283D6C.s similarity index 100% rename from asm/nonmatchings/world/script_api/7E3700/func_80283D6C.s rename to asm/nonmatchings/world/script_api/7E4690/func_80283D6C.s diff --git a/asm/nonmatchings/world/script_api/7E3700/func_80283DF0.s b/asm/nonmatchings/world/script_api/7E4690/func_80283DF0.s similarity index 100% rename from asm/nonmatchings/world/script_api/7E3700/func_80283DF0.s rename to asm/nonmatchings/world/script_api/7E4690/func_80283DF0.s diff --git a/asm/nonmatchings/world/script_api/7E3700/func_80283E2C.s b/asm/nonmatchings/world/script_api/7E4690/func_80283E2C.s similarity index 100% rename from asm/nonmatchings/world/script_api/7E3700/func_80283E2C.s rename to asm/nonmatchings/world/script_api/7E4690/func_80283E2C.s diff --git a/src/battle/area_flo/5B16A0.c b/src/battle/area_flo/5B16A0.c index 21126c2120..3d8bff4470 100644 --- a/src/battle/area_flo/5B16A0.c +++ b/src/battle/area_flo/5B16A0.c @@ -9,89 +9,3 @@ #define NAMESPACE b_area_flo INCLUDE_ASM(s32, "battle/area_flo/5B16A0", func_8021844C_5B18FC); - -INCLUDE_ASM(s32, "battle/area_flo/5B16A0", func_80218560_5B1A10); - -INCLUDE_ASM(s32, "battle/area_flo/5B16A0", func_802186B8_5B1B68); - -#define NAMESPACE dup2_b_area_flo -#include "common/UnkBattleFunc1.inc.c" -#define NAMESPACE b_area_flo - -#include "common/StartRumbleWithParams.inc.c" - -INCLUDE_ASM(s32, "battle/area_flo/5B16A0", func_80218808_5B1CB8); - -INCLUDE_ASM(s32, "battle/area_flo/5B16A0", func_802188D0_5B1D80); - -INCLUDE_ASM(s32, "battle/area_flo/5B16A0", func_80218A28_5B1ED8); - -#define NAMESPACE dup3_b_area_flo -#include "common/UnkBattleFunc1.inc.c" -#define NAMESPACE b_area_flo - -#define NAMESPACE dup_b_area_flo -#include "common/StartRumbleWithParams.inc.c" -#define NAMESPACE b_area_flo - -INCLUDE_ASM(s32, "battle/area_flo/5B16A0", func_80218B78_5B2028); - -INCLUDE_ASM(s32, "battle/area_flo/5B16A0", func_80218C40_5B20F0); - -INCLUDE_ASM(s32, "battle/area_flo/5B16A0", func_80218D98_5B2248); - -#define NAMESPACE dup4_b_area_flo -#include "common/UnkBattleFunc1.inc.c" -#define NAMESPACE b_area_flo - -#define NAMESPACE dup2_b_area_flo -#include "common/StartRumbleWithParams.inc.c" -#define NAMESPACE b_area_flo - -INCLUDE_ASM(s32, "battle/area_flo/5B16A0", func_80218EE8_5B2398); - -INCLUDE_ASM(s32, "battle/area_flo/5B16A0", func_80218FAC_5B245C); - -INCLUDE_ASM(s32, "battle/area_flo/5B16A0", func_8021900C_5B24BC); - -INCLUDE_ASM(s32, "battle/area_flo/5B16A0", func_802190B0_5B2560); - -INCLUDE_ASM(s32, "battle/area_flo/5B16A0", func_80219208_5B26B8); - -#define NAMESPACE dup5_b_area_flo -#include "common/UnkBattleFunc1.inc.c" -#define NAMESPACE b_area_flo - -#define NAMESPACE dup3_b_area_flo -#include "common/StartRumbleWithParams.inc.c" -#define NAMESPACE b_area_flo - -INCLUDE_ASM(s32, "battle/area_flo/5B16A0", func_80219358_5B2808); - -INCLUDE_ASM(s32, "battle/area_flo/5B16A0", func_80219420_5B28D0); - -INCLUDE_ASM(s32, "battle/area_flo/5B16A0", func_802194E0_5B2990); - -INCLUDE_ASM(s32, "battle/area_flo/5B16A0", func_802195A0_5B2A50); - -INCLUDE_ASM(s32, "battle/area_flo/5B16A0", func_80219660_5B2B10); - -INCLUDE_ASM(s32, "battle/area_flo/5B16A0", func_80219720_5B2BD0); - -INCLUDE_ASM(s32, "battle/area_flo/5B16A0", func_802197E0_5B2C90); - -INCLUDE_ASM(s32, "battle/area_flo/5B16A0", func_802198A0_5B2D50); - -#define NAMESPACE dup_b_area_flo -#include "common/UnkFloatFunc.inc.c" -#define NAMESPACE b_area_flo - -#define NAMESPACE dup2_b_area_flo -#include "common/UnkFloatFunc.inc.c" -#define NAMESPACE b_area_flo - -INCLUDE_ASM(s32, "battle/area_flo/5B16A0", func_80219C80_5B3130); - -INCLUDE_ASM(s32, "battle/area_flo/5B16A0", func_80219D40_5B31F0); - -INCLUDE_ASM(s32, "battle/area_flo/5B16A0", func_80219E00_5B32B0); diff --git a/src/battle/area_flo/5B1A10.c b/src/battle/area_flo/5B1A10.c new file mode 100644 index 0000000000..472b10f9a4 --- /dev/null +++ b/src/battle/area_flo/5B1A10.c @@ -0,0 +1,15 @@ +#include "common.h" + +#define NAMESPACE b_area_flo + +INCLUDE_ASM(s32, "battle/area_flo/5B1A10", func_80218560_5B1A10); + +INCLUDE_ASM(s32, "battle/area_flo/5B1A10", func_802186B8_5B1B68); + +#define NAMESPACE dup2_b_area_flo +#include "common/UnkBattleFunc1.inc.c" +#define NAMESPACE b_area_flo + +#include "common/StartRumbleWithParams.inc.c" + +INCLUDE_ASM(s32, "battle/area_flo/5B1A10", func_80218808_5B1CB8); diff --git a/src/battle/area_flo/5B1D80.c b/src/battle/area_flo/5B1D80.c new file mode 100644 index 0000000000..c0ed0cf5ef --- /dev/null +++ b/src/battle/area_flo/5B1D80.c @@ -0,0 +1,17 @@ +#include "common.h" + +#define NAMESPACE b_area_flo + +INCLUDE_ASM(s32, "battle/area_flo/5B1D80", func_802188D0_5B1D80); + +INCLUDE_ASM(s32, "battle/area_flo/5B1D80", func_80218A28_5B1ED8); + +#define NAMESPACE dup3_b_area_flo +#include "common/UnkBattleFunc1.inc.c" +#define NAMESPACE b_area_flo + +#define NAMESPACE dup_b_area_flo +#include "common/StartRumbleWithParams.inc.c" +#define NAMESPACE b_area_flo + +INCLUDE_ASM(s32, "battle/area_flo/5B1D80", func_80218B78_5B2028); diff --git a/src/battle/area_flo/5B20F0.c b/src/battle/area_flo/5B20F0.c new file mode 100644 index 0000000000..3116d59b9e --- /dev/null +++ b/src/battle/area_flo/5B20F0.c @@ -0,0 +1,35 @@ +#include "common.h" + +#define NAMESPACE b_area_flo + +INCLUDE_ASM(s32, "battle/area_flo/5B20F0", func_80218C40_5B20F0); + +INCLUDE_ASM(s32, "battle/area_flo/5B20F0", func_80218D98_5B2248); + +#define NAMESPACE dup4_b_area_flo +#include "common/UnkBattleFunc1.inc.c" +#define NAMESPACE b_area_flo + +#define NAMESPACE dup2_b_area_flo +#include "common/StartRumbleWithParams.inc.c" +#define NAMESPACE b_area_flo + +INCLUDE_ASM(s32, "battle/area_flo/5B20F0", func_80218EE8_5B2398); + +INCLUDE_ASM(s32, "battle/area_flo/5B20F0", func_80218FAC_5B245C); + +INCLUDE_ASM(s32, "battle/area_flo/5B20F0", func_8021900C_5B24BC); + +INCLUDE_ASM(s32, "battle/area_flo/5B20F0", func_802190B0_5B2560); + +INCLUDE_ASM(s32, "battle/area_flo/5B20F0", func_80219208_5B26B8); + +#define NAMESPACE dup5_b_area_flo +#include "common/UnkBattleFunc1.inc.c" +#define NAMESPACE b_area_flo + +#define NAMESPACE dup3_b_area_flo +#include "common/StartRumbleWithParams.inc.c" +#define NAMESPACE b_area_flo + +INCLUDE_ASM(s32, "battle/area_flo/5B20F0", func_80219358_5B2808); diff --git a/src/battle/area_flo/5B28D0.c b/src/battle/area_flo/5B28D0.c new file mode 100644 index 0000000000..2eab6a1be3 --- /dev/null +++ b/src/battle/area_flo/5B28D0.c @@ -0,0 +1,31 @@ +#include "common.h" + +#define NAMESPACE b_area_flo + +INCLUDE_ASM(s32, "battle/area_flo/5B28D0", func_80219420_5B28D0); + +INCLUDE_ASM(s32, "battle/area_flo/5B28D0", func_802194E0_5B2990); + +INCLUDE_ASM(s32, "battle/area_flo/5B28D0", func_802195A0_5B2A50); + +INCLUDE_ASM(s32, "battle/area_flo/5B28D0", func_80219660_5B2B10); + +INCLUDE_ASM(s32, "battle/area_flo/5B28D0", func_80219720_5B2BD0); + +INCLUDE_ASM(s32, "battle/area_flo/5B28D0", func_802197E0_5B2C90); + +INCLUDE_ASM(s32, "battle/area_flo/5B28D0", func_802198A0_5B2D50); + +#define NAMESPACE dup_b_area_flo +#include "common/UnkFloatFunc.inc.c" +#define NAMESPACE b_area_flo + +#define NAMESPACE dup2_b_area_flo +#include "common/UnkFloatFunc.inc.c" +#define NAMESPACE b_area_flo + +INCLUDE_ASM(s32, "battle/area_flo/5B28D0", func_80219C80_5B3130); + +INCLUDE_ASM(s32, "battle/area_flo/5B28D0", func_80219D40_5B31F0); + +INCLUDE_ASM(s32, "battle/area_flo/5B28D0", func_80219E00_5B32B0); diff --git a/src/battle/area_hos/47F0D0.c b/src/battle/area_hos/47F0D0.c index 31ebf3dc54..c263ee2e58 100644 --- a/src/battle/area_hos/47F0D0.c +++ b/src/battle/area_hos/47F0D0.c @@ -13,11 +13,3 @@ INCLUDE_ASM(s32, "battle/area_hos/47F0D0", func_802182A8_47F358); #include "common/StartRumbleWithParams.inc.c" INCLUDE_ASM(s32, "battle/area_hos/47F0D0", func_802183F8_47F4A8); - -INCLUDE_ASM(s32, "battle/area_hos/47F0D0", func_802184C0_47F570); - -INCLUDE_ASM(s32, "battle/area_hos/47F0D0", func_802186B8_47F768); - -INCLUDE_ASM(s32, "battle/area_hos/47F0D0", func_802189D0_47FA80); - -INCLUDE_ASM(s32, "battle/area_hos/47F0D0", func_80218CEC_47FD9C); diff --git a/src/battle/area_hos/47F570.c b/src/battle/area_hos/47F570.c new file mode 100644 index 0000000000..4798eef250 --- /dev/null +++ b/src/battle/area_hos/47F570.c @@ -0,0 +1,9 @@ +#include "common.h" + +INCLUDE_ASM(s32, "battle/area_hos/47F570", func_802184C0_47F570); + +INCLUDE_ASM(s32, "battle/area_hos/47F570", func_802186B8_47F768); + +INCLUDE_ASM(s32, "battle/area_hos/47F570", func_802189D0_47FA80); + +INCLUDE_ASM(s32, "battle/area_hos/47F570", func_80218CEC_47FD9C); diff --git a/src/battle/area_isk_part_1/4E29B0.c b/src/battle/area_isk_part_1/4E29B0.c index d301a61cba..04a1f69547 100644 --- a/src/battle/area_isk_part_1/4E29B0.c +++ b/src/battle/area_isk_part_1/4E29B0.c @@ -13,7 +13,3 @@ INCLUDE_ASM(s32, "battle/area_isk_part_1/4E29B0", func_802184CC_4E2C0C); INCLUDE_ASM(s32, "battle/area_isk_part_1/4E29B0", func_802188B0_4E2FF0); INCLUDE_ASM(s32, "battle/area_isk_part_1/4E29B0", func_80218944_4E3084); - -INCLUDE_ASM(s32, "battle/area_isk_part_1/4E29B0", func_80218980_4E30C0); - -INCLUDE_ASM(s32, "battle/area_isk_part_1/4E29B0", func_80218A10_4E3150); diff --git a/src/battle/area_isk_part_1/4E30C0.c b/src/battle/area_isk_part_1/4E30C0.c new file mode 100644 index 0000000000..187a9bcbe4 --- /dev/null +++ b/src/battle/area_isk_part_1/4E30C0.c @@ -0,0 +1,7 @@ +#include "common.h" + +#define NAMESPACE b_area_isk_part_1 + +INCLUDE_ASM(s32, "battle/area_isk_part_1/4E30C0", func_80218980_4E30C0); + +INCLUDE_ASM(s32, "battle/area_isk_part_1/4E30C0", func_80218A10_4E3150); diff --git a/src/battle/area_isk_part_2/4EFCF0.c b/src/battle/area_isk_part_2/4EFCF0.c index deea928248..4f1ffaa719 100644 --- a/src/battle/area_isk_part_2/4EFCF0.c +++ b/src/battle/area_isk_part_2/4EFCF0.c @@ -5,7 +5,3 @@ INCLUDE_ASM(s32, "battle/area_isk_part_2/4EFCF0", func_80218850_4EFCF0); INCLUDE_ASM(s32, "battle/area_isk_part_2/4EFCF0", func_802188E4_4EFD84); - -INCLUDE_ASM(s32, "battle/area_isk_part_2/4EFCF0", func_80218920_4EFDC0); - -INCLUDE_ASM(s32, "battle/area_isk_part_2/4EFCF0", func_802189B0_4EFE50); diff --git a/src/battle/area_isk_part_2/4EFDC0.c b/src/battle/area_isk_part_2/4EFDC0.c new file mode 100644 index 0000000000..1c452e61a5 --- /dev/null +++ b/src/battle/area_isk_part_2/4EFDC0.c @@ -0,0 +1,7 @@ +#include "common.h" + +#define NAMESPACE b_area_isk_part_2 + +INCLUDE_ASM(s32, "battle/area_isk_part_2/4EFDC0", func_80218920_4EFDC0); + +INCLUDE_ASM(s32, "battle/area_isk_part_2/4EFDC0", func_802189B0_4EFE50); diff --git a/src/battle/area_jan/573C30.c b/src/battle/area_jan/573C30.c index ef3a9e55b3..df8210263f 100644 --- a/src/battle/area_jan/573C30.c +++ b/src/battle/area_jan/573C30.c @@ -5,7 +5,3 @@ #include "common/UnkBattleFunc1.inc.c" INCLUDE_ASM(s32, "battle/area_jan/573C30", func_802183DC_573CFC); - -#define NAMESPACE dup_b_area_jan -#include "common/UnkBattleFunc1.inc.c" -#define NAMESPACE b_area_jan diff --git a/src/battle/area_jan/573E10.c b/src/battle/area_jan/573E10.c new file mode 100644 index 0000000000..1acd1273f9 --- /dev/null +++ b/src/battle/area_jan/573E10.c @@ -0,0 +1,7 @@ +#include "common.h" + +#define NAMESPACE b_area_jan + +#define NAMESPACE dup_b_area_jan +#include "common/UnkBattleFunc1.inc.c" +#define NAMESPACE b_area_jan diff --git a/src/battle/area_kmr_part_3/447D50.c b/src/battle/area_kmr_part_3/447D50.c index fa1c9f9b5b..3c025d9f40 100644 --- a/src/battle/area_kmr_part_3/447D50.c +++ b/src/battle/area_kmr_part_3/447D50.c @@ -23,5 +23,3 @@ INCLUDE_ASM(s32, "battle/area_kmr_part_3/447D50", func_80218E1C_44825C); INCLUDE_ASM(s32, "battle/area_kmr_part_3/447D50", func_80218F60_4483A0); INCLUDE_ASM(s32, "battle/area_kmr_part_3/447D50", func_80218FA4_4483E4); - -INCLUDE_ASM(s32, "battle/area_kmr_part_3/447D50", func_80218FE0_448420); diff --git a/src/battle/area_kmr_part_3/448420.c b/src/battle/area_kmr_part_3/448420.c new file mode 100644 index 0000000000..5166fc631a --- /dev/null +++ b/src/battle/area_kmr_part_3/448420.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "battle/area_kmr_part_3/448420", func_80218FE0_448420); diff --git a/src/battle/area_kmr_part_3/448E20.c b/src/battle/area_kmr_part_3/448E20.c index 14934f082d..abd125c897 100644 --- a/src/battle/area_kmr_part_3/448E20.c +++ b/src/battle/area_kmr_part_3/448E20.c @@ -3,11 +3,3 @@ #define NAMESPACE b_area_kmr_part_3 INCLUDE_ASM(s32, "battle/area_kmr_part_3/448E20", func_802199E0_448E20); - -INCLUDE_ASM(s32, "battle/area_kmr_part_3/448E20", func_80219A40_448E80); - -INCLUDE_ASM(s32, "battle/area_kmr_part_3/448E20", func_80219C38_449078); - -INCLUDE_ASM(s32, "battle/area_kmr_part_3/448E20", func_80219C5C_44909C); - -INCLUDE_ASM(s32, "battle/area_kmr_part_3/448E20", func_80219D60_4491A0); diff --git a/src/battle/area_kmr_part_3/448E80.c b/src/battle/area_kmr_part_3/448E80.c new file mode 100644 index 0000000000..d31fa25260 --- /dev/null +++ b/src/battle/area_kmr_part_3/448E80.c @@ -0,0 +1,9 @@ +#include "common.h" + +INCLUDE_ASM(s32, "battle/area_kmr_part_3/448E80", func_80219A40_448E80); + +INCLUDE_ASM(s32, "battle/area_kmr_part_3/448E80", func_80219C38_449078); + +INCLUDE_ASM(s32, "battle/area_kmr_part_3/448E80", func_80219C5C_44909C); + +INCLUDE_ASM(s32, "battle/area_kmr_part_3/448E80", func_80219D60_4491A0); diff --git a/src/battle/area_kpa/684C30.c b/src/battle/area_kpa/684C30.c index 4751cf7b65..4caad22548 100644 --- a/src/battle/area_kpa/684C30.c +++ b/src/battle/area_kpa/684C30.c @@ -17,5 +17,3 @@ INCLUDE_ASM(s32, "battle/area_kpa/684C30", func_802184E8_684F18); #define NAMESPACE b_area_kpa INCLUDE_ASM(s32, "battle/area_kpa/684C30", func_80218638_685068); - -INCLUDE_ASM(s32, "battle/area_kpa/684C30", func_80218700_685130); diff --git a/src/battle/area_kpa/685130.c b/src/battle/area_kpa/685130.c new file mode 100644 index 0000000000..1511ff60e1 --- /dev/null +++ b/src/battle/area_kpa/685130.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "battle/area_kpa/685130", func_80218700_685130); diff --git a/src/battle/area_kzn/58C740.c b/src/battle/area_kzn/58C740.c index c396572c0d..c954f33d53 100644 --- a/src/battle/area_kzn/58C740.c +++ b/src/battle/area_kzn/58C740.c @@ -7,33 +7,3 @@ #define NAMESPACE b_area_kzn INCLUDE_ASM(s32, "battle/area_kzn/58C740", func_8021851C_58C80C); - -INCLUDE_ASM(s32, "battle/area_kzn/58C740", func_80218630_58C920); - -INCLUDE_ASM(s32, "battle/area_kzn/58C740", func_80218788_58CA78); - -#define NAMESPACE dup3_b_area_kzn -#include "common/UnkBattleFunc1.inc.c" -#define NAMESPACE b_area_kzn - -#include "common/StartRumbleWithParams.inc.c" - -INCLUDE_ASM(s32, "battle/area_kzn/58C740", func_802188D8_58CBC8); - -INCLUDE_ASM(s32, "battle/area_kzn/58C740", func_802189A0_58CC90); - -INCLUDE_ASM(s32, "battle/area_kzn/58C740", func_80218AF8_58CDE8); - -#define NAMESPACE dup4_b_area_kzn -#include "common/UnkBattleFunc1.inc.c" -#define NAMESPACE b_area_kzn - -#define NAMESPACE dup_b_area_kzn -#include "common/StartRumbleWithParams.inc.c" -#define NAMESPACE b_area_kzn - -INCLUDE_ASM(s32, "battle/area_kzn/58C740", func_80218C48_58CF38); - -INCLUDE_ASM(s32, "battle/area_kzn/58C740", func_80218D0C_58CFFC); - -INCLUDE_ASM(s32, "battle/area_kzn/58C740", func_80218D6C_58D05C); diff --git a/src/battle/area_kzn/58C920.c b/src/battle/area_kzn/58C920.c new file mode 100644 index 0000000000..c75a50dc6d --- /dev/null +++ b/src/battle/area_kzn/58C920.c @@ -0,0 +1,15 @@ +#include "common.h" + +#define NAMESPACE b_area_kzn + +INCLUDE_ASM(s32, "battle/area_kzn/58C920", func_80218630_58C920); + +INCLUDE_ASM(s32, "battle/area_kzn/58C920", func_80218788_58CA78); + +#define NAMESPACE dup3_b_area_kzn +#include "common/UnkBattleFunc1.inc.c" +#define NAMESPACE b_area_kzn + +#include "common/StartRumbleWithParams.inc.c" + +INCLUDE_ASM(s32, "battle/area_kzn/58C920", func_802188D8_58CBC8); diff --git a/src/battle/area_kzn/58CC90.c b/src/battle/area_kzn/58CC90.c new file mode 100644 index 0000000000..4e6e0f9467 --- /dev/null +++ b/src/battle/area_kzn/58CC90.c @@ -0,0 +1,21 @@ +#include "common.h" + +#define NAMESPACE b_area_kzn + +INCLUDE_ASM(s32, "battle/area_kzn/58CC90", func_802189A0_58CC90); + +INCLUDE_ASM(s32, "battle/area_kzn/58CC90", func_80218AF8_58CDE8); + +#define NAMESPACE dup4_b_area_kzn +#include "common/UnkBattleFunc1.inc.c" +#define NAMESPACE b_area_kzn + +#define NAMESPACE dup_b_area_kzn +#include "common/StartRumbleWithParams.inc.c" +#define NAMESPACE b_area_kzn + +INCLUDE_ASM(s32, "battle/area_kzn/58CC90", func_80218C48_58CF38); + +INCLUDE_ASM(s32, "battle/area_kzn/58CC90", func_80218D0C_58CFFC); + +INCLUDE_ASM(s32, "battle/area_kzn/58CC90", func_80218D6C_58D05C); diff --git a/src/battle/area_kzn2/59F420.c b/src/battle/area_kzn2/59F420.c index d0df79747f..ecbdb9f6d0 100644 --- a/src/battle/area_kzn2/59F420.c +++ b/src/battle/area_kzn2/59F420.c @@ -5,5 +5,3 @@ INCLUDE_ASM(s32, "battle/area_kzn2/59F420", func_80218D40_59F420); INCLUDE_ASM(s32, "battle/area_kzn2/59F420", func_80218D90_59F470); - -INCLUDE_ASM(s32, "battle/area_kzn2/59F420", func_80218DF0_59F4D0); diff --git a/src/battle/area_kzn2/59F4D0.c b/src/battle/area_kzn2/59F4D0.c new file mode 100644 index 0000000000..20600675f3 --- /dev/null +++ b/src/battle/area_kzn2/59F4D0.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "battle/area_kzn2/59F4D0", func_80218DF0_59F4D0); diff --git a/src/battle/area_omo/512AB0.c b/src/battle/area_omo/512AB0.c index 7434c40936..4cd98dcaed 100644 --- a/src/battle/area_omo/512AB0.c +++ b/src/battle/area_omo/512AB0.c @@ -7,19 +7,3 @@ #define NAMESPACE b_area_omo INCLUDE_ASM(s32, "battle/area_omo/512AB0", func_802185AC_512B7C); - -#define NAMESPACE dup7_b_area_omo -#include "common/UnkBattleFunc1.inc.c" -#define NAMESPACE b_area_omo - -INCLUDE_ASM(s32, "battle/area_omo/512AB0", func_8021878C_512D5C); - -INCLUDE_ASM(s32, "battle/area_omo/512AB0", func_80218880_512E50); - -INCLUDE_ASM(s32, "battle/area_omo/512AB0", func_80218A98_513068); - -INCLUDE_ASM(s32, "battle/area_omo/512AB0", func_80218B38_513108); - -INCLUDE_ASM(s32, "battle/area_omo/512AB0", func_80218CF4_5132C4); - -#include "common/StartRumbleWithParams.inc.c" diff --git a/src/battle/area_omo/512C90.c b/src/battle/area_omo/512C90.c new file mode 100644 index 0000000000..e44e8512f5 --- /dev/null +++ b/src/battle/area_omo/512C90.c @@ -0,0 +1,9 @@ +#include "common.h" + +#define NAMESPACE b_area_omo + +#define NAMESPACE dup7_b_area_omo +#include "common/UnkBattleFunc1.inc.c" +#define NAMESPACE b_area_omo + +INCLUDE_ASM(s32, "battle/area_omo/512C90", func_8021878C_512D5C); diff --git a/src/battle/area_omo/512E50.c b/src/battle/area_omo/512E50.c new file mode 100644 index 0000000000..b7f126aefd --- /dev/null +++ b/src/battle/area_omo/512E50.c @@ -0,0 +1,13 @@ +#include "common.h" + +#define NAMESPACE b_area_omo + +INCLUDE_ASM(s32, "battle/area_omo/512E50", func_80218880_512E50); + +INCLUDE_ASM(s32, "battle/area_omo/512E50", func_80218A98_513068); + +INCLUDE_ASM(s32, "battle/area_omo/512E50", func_80218B38_513108); + +INCLUDE_ASM(s32, "battle/area_omo/512E50", func_80218CF4_5132C4); + +#include "common/StartRumbleWithParams.inc.c" diff --git a/src/battle/area_pra/649050.c b/src/battle/area_pra/649050.c index 4467579bcf..1952224b69 100644 --- a/src/battle/area_pra/649050.c +++ b/src/battle/area_pra/649050.c @@ -15,63 +15,3 @@ INCLUDE_ASM(s32, "battle/area_pra/649050", func_80218458_649268); #include "common/StartRumbleWithParams.inc.c" INCLUDE_ASM(s32, "battle/area_pra/649050", func_802185A8_6493B8); - -INCLUDE_ASM(s32, "battle/area_pra/649050", func_80218670_649480); - -INCLUDE_ASM(s32, "battle/area_pra/649050", func_802187C8_6495D8); - -#define NAMESPACE dup2_b_area_pra -#include "common/UnkBattleFunc1.inc.c" -#define NAMESPACE b_area_pra - -#define NAMESPACE dup_b_area_pra -#include "common/StartRumbleWithParams.inc.c" -#define NAMESPACE b_area_pra - -INCLUDE_ASM(s32, "battle/area_pra/649050", func_80218918_649728); - -INCLUDE_ASM(s32, "battle/area_pra/649050", func_802189E0_6497F0); - -INCLUDE_ASM(s32, "battle/area_pra/649050", func_80218B38_649948); - -#define NAMESPACE dup3_b_area_pra -#include "common/UnkBattleFunc1.inc.c" -#define NAMESPACE b_area_pra - -#define NAMESPACE dup2_b_area_pra -#include "common/StartRumbleWithParams.inc.c" -#define NAMESPACE b_area_pra - -INCLUDE_ASM(s32, "battle/area_pra/649050", func_80218C88_649A98); - -INCLUDE_ASM(s32, "battle/area_pra/649050", func_80218D50_649B60); - -INCLUDE_ASM(s32, "battle/area_pra/649050", func_80218EA8_649CB8); - -#define NAMESPACE dup4_b_area_pra -#include "common/UnkBattleFunc1.inc.c" -#define NAMESPACE b_area_pra - -#define NAMESPACE dup3_b_area_pra -#include "common/StartRumbleWithParams.inc.c" -#define NAMESPACE b_area_pra - -INCLUDE_ASM(s32, "battle/area_pra/649050", func_80218FF8_649E08); - -INCLUDE_ASM(s32, "battle/area_pra/649050", func_802190C0_649ED0); - -INCLUDE_ASM(s32, "battle/area_pra/649050", func_80219218_64A028); - -#define NAMESPACE dup5_b_area_pra -#include "common/UnkBattleFunc1.inc.c" -#define NAMESPACE b_area_pra - -#define NAMESPACE dup4_b_area_pra -#include "common/StartRumbleWithParams.inc.c" -#define NAMESPACE b_area_pra - -INCLUDE_ASM(s32, "battle/area_pra/649050", func_80219368_64A178); - -INCLUDE_ASM(s32, "battle/area_pra/649050", func_8021942C_64A23C); - -INCLUDE_ASM(s32, "battle/area_pra/649050", func_8021948C_64A29C); diff --git a/src/battle/area_pra/649480.c b/src/battle/area_pra/649480.c new file mode 100644 index 0000000000..ff2bcf11d5 --- /dev/null +++ b/src/battle/area_pra/649480.c @@ -0,0 +1,17 @@ +#include "common.h" + +#define NAMESPACE b_area_pra + +INCLUDE_ASM(s32, "battle/area_pra/649480", func_80218670_649480); + +INCLUDE_ASM(s32, "battle/area_pra/649480", func_802187C8_6495D8); + +#define NAMESPACE dup2_b_area_pra +#include "common/UnkBattleFunc1.inc.c" +#define NAMESPACE b_area_pra + +#define NAMESPACE dup_b_area_pra +#include "common/StartRumbleWithParams.inc.c" +#define NAMESPACE b_area_pra + +INCLUDE_ASM(s32, "battle/area_pra/649480", func_80218918_649728); diff --git a/src/battle/area_pra/6497F0.c b/src/battle/area_pra/6497F0.c new file mode 100644 index 0000000000..f12a4ab1c2 --- /dev/null +++ b/src/battle/area_pra/6497F0.c @@ -0,0 +1,17 @@ +#include "common.h" + +#define NAMESPACE b_area_pra + +INCLUDE_ASM(s32, "battle/area_pra/6497F0", func_802189E0_6497F0); + +INCLUDE_ASM(s32, "battle/area_pra/6497F0", func_80218B38_649948); + +#define NAMESPACE dup3_b_area_pra +#include "common/UnkBattleFunc1.inc.c" +#define NAMESPACE b_area_pra + +#define NAMESPACE dup2_b_area_pra +#include "common/StartRumbleWithParams.inc.c" +#define NAMESPACE b_area_pra + +INCLUDE_ASM(s32, "battle/area_pra/6497F0", func_80218C88_649A98); diff --git a/src/battle/area_pra/649B60.c b/src/battle/area_pra/649B60.c new file mode 100644 index 0000000000..6778f04778 --- /dev/null +++ b/src/battle/area_pra/649B60.c @@ -0,0 +1,17 @@ +#include "common.h" + +#define NAMESPACE b_area_pra + +INCLUDE_ASM(s32, "battle/area_pra/649B60", func_80218D50_649B60); + +INCLUDE_ASM(s32, "battle/area_pra/649B60", func_80218EA8_649CB8); + +#define NAMESPACE dup4_b_area_pra +#include "common/UnkBattleFunc1.inc.c" +#define NAMESPACE b_area_pra + +#define NAMESPACE dup3_b_area_pra +#include "common/StartRumbleWithParams.inc.c" +#define NAMESPACE b_area_pra + +INCLUDE_ASM(s32, "battle/area_pra/649B60", func_80218FF8_649E08); diff --git a/src/battle/area_pra/649ED0.c b/src/battle/area_pra/649ED0.c new file mode 100644 index 0000000000..0035023fa7 --- /dev/null +++ b/src/battle/area_pra/649ED0.c @@ -0,0 +1,21 @@ +#include "common.h" + +#define NAMESPACE b_area_pra + +INCLUDE_ASM(s32, "battle/area_pra/649ED0", func_802190C0_649ED0); + +INCLUDE_ASM(s32, "battle/area_pra/649ED0", func_80219218_64A028); + +#define NAMESPACE dup5_b_area_pra +#include "common/UnkBattleFunc1.inc.c" +#define NAMESPACE b_area_pra + +#define NAMESPACE dup4_b_area_pra +#include "common/StartRumbleWithParams.inc.c" +#define NAMESPACE b_area_pra + +INCLUDE_ASM(s32, "battle/area_pra/649ED0", func_80219368_64A178); + +INCLUDE_ASM(s32, "battle/area_pra/649ED0", func_8021942C_64A23C); + +INCLUDE_ASM(s32, "battle/area_pra/649ED0", func_8021948C_64A29C); diff --git a/src/battle/area_pra2/660750.c b/src/battle/area_pra2/660750.c index 8fba7981f7..352c0e7a5c 100644 --- a/src/battle/area_pra2/660750.c +++ b/src/battle/area_pra2/660750.c @@ -17,13 +17,3 @@ INCLUDE_ASM(s32, "battle/area_pra2/660750", func_80218344_660A94); INCLUDE_ASM(s32, "battle/area_pra2/660750", func_802183A4_660AF4); INCLUDE_ASM(s32, "battle/area_pra2/660750", func_8021848C_660BDC); - -INCLUDE_ASM(s32, "battle/area_pra2/660750", func_802185D0_660D20); - -INCLUDE_ASM(s32, "battle/area_pra2/660750", func_802186C0_660E10); - -INCLUDE_ASM(s32, "battle/area_pra2/660750", func_802188B8_661008); - -INCLUDE_ASM(s32, "battle/area_pra2/660750", func_802188DC_66102C); - -INCLUDE_ASM(s32, "battle/area_pra2/660750", func_802189E0_661130); diff --git a/src/battle/area_pra2/660D20.c b/src/battle/area_pra2/660D20.c new file mode 100644 index 0000000000..2d48bbcdac --- /dev/null +++ b/src/battle/area_pra2/660D20.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "battle/area_pra2/660D20", func_802185D0_660D20); diff --git a/src/battle/area_pra2/660E10.c b/src/battle/area_pra2/660E10.c new file mode 100644 index 0000000000..760834365b --- /dev/null +++ b/src/battle/area_pra2/660E10.c @@ -0,0 +1,9 @@ +#include "common.h" + +INCLUDE_ASM(s32, "battle/area_pra2/660E10", func_802186C0_660E10); + +INCLUDE_ASM(s32, "battle/area_pra2/660E10", func_802188B8_661008); + +INCLUDE_ASM(s32, "battle/area_pra2/660E10", func_802188DC_66102C); + +INCLUDE_ASM(s32, "battle/area_pra2/660E10", func_802189E0_661130); diff --git a/src/battle/area_pra3/66B5B0.c b/src/battle/area_pra3/66B5B0.c index 0ecafd93cb..97fd3e3260 100644 --- a/src/battle/area_pra3/66B5B0.c +++ b/src/battle/area_pra3/66B5B0.c @@ -11,17 +11,3 @@ INCLUDE_ASM(s32, "battle/area_pra3/66B5B0", func_80219988_66B708); #include "common/StartRumbleWithParams.inc.c" INCLUDE_ASM(s32, "battle/area_pra3/66B5B0", func_80219AD8_66B858); - -INCLUDE_ASM(s32, "battle/area_pra3/66B5B0", func_80219BA0_66B920); - -INCLUDE_ASM(s32, "battle/area_pra3/66B5B0", func_80219CF8_66BA78); - -#define NAMESPACE dup_b_area_pra3 -#include "common/UnkBattleFunc1.inc.c" -#define NAMESPACE b_area_pra3 - -#define NAMESPACE dup_b_area_pra3 -#include "common/StartRumbleWithParams.inc.c" -#define NAMESPACE b_area_pra3 - -INCLUDE_ASM(s32, "battle/area_pra3/66B5B0", func_80219E48_66BBC8); diff --git a/src/battle/area_pra3/66B920.c b/src/battle/area_pra3/66B920.c new file mode 100644 index 0000000000..715bc779bb --- /dev/null +++ b/src/battle/area_pra3/66B920.c @@ -0,0 +1,17 @@ +#include "common.h" + +#define NAMESPACE b_area_pra3 + +INCLUDE_ASM(s32, "battle/area_pra3/66B920", func_80219BA0_66B920); + +INCLUDE_ASM(s32, "battle/area_pra3/66B920", func_80219CF8_66BA78); + +#define NAMESPACE dup_b_area_pra3 +#include "common/UnkBattleFunc1.inc.c" +#define NAMESPACE b_area_pra3 + +#define NAMESPACE dup_b_area_pra3 +#include "common/StartRumbleWithParams.inc.c" +#define NAMESPACE b_area_pra3 + +INCLUDE_ASM(s32, "battle/area_pra3/66B920", func_80219E48_66BBC8); diff --git a/src/battle/area_sam/6253E0.c b/src/battle/area_sam/6253E0.c index 58a66d85cf..d7b00c29c4 100644 --- a/src/battle/area_sam/6253E0.c +++ b/src/battle/area_sam/6253E0.c @@ -13,41 +13,3 @@ INCLUDE_ASM(s32, "battle/area_sam/6253E0", func_80219998_625538); #include "common/StartRumbleWithParams.inc.c" INCLUDE_ASM(s32, "battle/area_sam/6253E0", func_80219AE8_625688); - -INCLUDE_ASM(s32, "battle/area_sam/6253E0", func_80219BB0_625750); - -INCLUDE_ASM(s32, "battle/area_sam/6253E0", func_80219DA8_625948); - -INCLUDE_ASM(s32, "battle/area_sam/6253E0", func_80219DCC_62596C); - -INCLUDE_ASM(s32, "battle/area_sam/6253E0", func_80219ED0_625A70); - -INCLUDE_ASM(s32, "battle/area_sam/6253E0", func_8021A0C8_625C68); - -INCLUDE_ASM(s32, "battle/area_sam/6253E0", func_8021A0EC_625C8C); - -INCLUDE_ASM(s32, "battle/area_sam/6253E0", func_8021A1F0_625D90); - -INCLUDE_ASM(s32, "battle/area_sam/6253E0", func_8021A3E8_625F88); - -INCLUDE_ASM(s32, "battle/area_sam/6253E0", func_8021A40C_625FAC); - -INCLUDE_ASM(s32, "battle/area_sam/6253E0", func_8021A510_6260B0); - -INCLUDE_ASM(s32, "battle/area_sam/6253E0", func_8021A708_6262A8); - -INCLUDE_ASM(s32, "battle/area_sam/6253E0", func_8021A72C_6262CC); - -INCLUDE_ASM(s32, "battle/area_sam/6253E0", func_8021A830_6263D0); - -INCLUDE_ASM(s32, "battle/area_sam/6253E0", func_8021AA28_6265C8); - -INCLUDE_ASM(s32, "battle/area_sam/6253E0", func_8021AA4C_6265EC); - -INCLUDE_ASM(s32, "battle/area_sam/6253E0", func_8021AB50_6266F0); - -INCLUDE_ASM(s32, "battle/area_sam/6253E0", func_8021AD48_6268E8); - -INCLUDE_ASM(s32, "battle/area_sam/6253E0", func_8021AD6C_62690C); - -INCLUDE_ASM(s32, "battle/area_sam/6253E0", func_8021AE70_626A10); diff --git a/src/battle/area_sam/625750.c b/src/battle/area_sam/625750.c new file mode 100644 index 0000000000..cae8f9ea9d --- /dev/null +++ b/src/battle/area_sam/625750.c @@ -0,0 +1,39 @@ +#include "common.h" + +INCLUDE_ASM(s32, "battle/area_sam/625750", func_80219BB0_625750); + +INCLUDE_ASM(s32, "battle/area_sam/625750", func_80219DA8_625948); + +INCLUDE_ASM(s32, "battle/area_sam/625750", func_80219DCC_62596C); + +INCLUDE_ASM(s32, "battle/area_sam/625750", func_80219ED0_625A70); + +INCLUDE_ASM(s32, "battle/area_sam/625750", func_8021A0C8_625C68); + +INCLUDE_ASM(s32, "battle/area_sam/625750", func_8021A0EC_625C8C); + +INCLUDE_ASM(s32, "battle/area_sam/625750", func_8021A1F0_625D90); + +INCLUDE_ASM(s32, "battle/area_sam/625750", func_8021A3E8_625F88); + +INCLUDE_ASM(s32, "battle/area_sam/625750", func_8021A40C_625FAC); + +INCLUDE_ASM(s32, "battle/area_sam/625750", func_8021A510_6260B0); + +INCLUDE_ASM(s32, "battle/area_sam/625750", func_8021A708_6262A8); + +INCLUDE_ASM(s32, "battle/area_sam/625750", func_8021A72C_6262CC); + +INCLUDE_ASM(s32, "battle/area_sam/625750", func_8021A830_6263D0); + +INCLUDE_ASM(s32, "battle/area_sam/625750", func_8021AA28_6265C8); + +INCLUDE_ASM(s32, "battle/area_sam/625750", func_8021AA4C_6265EC); + +INCLUDE_ASM(s32, "battle/area_sam/625750", func_8021AB50_6266F0); + +INCLUDE_ASM(s32, "battle/area_sam/625750", func_8021AD48_6268E8); + +INCLUDE_ASM(s32, "battle/area_sam/625750", func_8021AD6C_62690C); + +INCLUDE_ASM(s32, "battle/area_sam/625750", func_8021AE70_626A10); diff --git a/src/battle/area_sam2/63D9F0.c b/src/battle/area_sam2/63D9F0.c index 18d4247fbc..0f4d9b7614 100644 --- a/src/battle/area_sam2/63D9F0.c +++ b/src/battle/area_sam2/63D9F0.c @@ -13,41 +13,3 @@ INCLUDE_ASM(s32, "battle/area_sam2/63D9F0", func_80218968_63DB48); #define NAMESPACE b_area_sam2 INCLUDE_ASM(s32, "battle/area_sam2/63D9F0", func_80218AB8_63DC98); - -INCLUDE_ASM(s32, "battle/area_sam2/63D9F0", func_80218B80_63DD60); - -INCLUDE_ASM(s32, "battle/area_sam2/63D9F0", func_80218D78_63DF58); - -INCLUDE_ASM(s32, "battle/area_sam2/63D9F0", func_80218D9C_63DF7C); - -INCLUDE_ASM(s32, "battle/area_sam2/63D9F0", func_80218EA0_63E080); - -INCLUDE_ASM(s32, "battle/area_sam2/63D9F0", func_80219098_63E278); - -INCLUDE_ASM(s32, "battle/area_sam2/63D9F0", func_802190BC_63E29C); - -INCLUDE_ASM(s32, "battle/area_sam2/63D9F0", func_802191C0_63E3A0); - -INCLUDE_ASM(s32, "battle/area_sam2/63D9F0", func_802193B8_63E598); - -INCLUDE_ASM(s32, "battle/area_sam2/63D9F0", func_802193DC_63E5BC); - -INCLUDE_ASM(s32, "battle/area_sam2/63D9F0", func_802194E0_63E6C0); - -INCLUDE_ASM(s32, "battle/area_sam2/63D9F0", func_802196D8_63E8B8); - -INCLUDE_ASM(s32, "battle/area_sam2/63D9F0", func_802196FC_63E8DC); - -INCLUDE_ASM(s32, "battle/area_sam2/63D9F0", func_80219800_63E9E0); - -INCLUDE_ASM(s32, "battle/area_sam2/63D9F0", func_802199F8_63EBD8); - -INCLUDE_ASM(s32, "battle/area_sam2/63D9F0", func_80219A1C_63EBFC); - -INCLUDE_ASM(s32, "battle/area_sam2/63D9F0", func_80219B20_63ED00); - -INCLUDE_ASM(s32, "battle/area_sam2/63D9F0", func_80219D18_63EEF8); - -INCLUDE_ASM(s32, "battle/area_sam2/63D9F0", func_80219D3C_63EF1C); - -INCLUDE_ASM(s32, "battle/area_sam2/63D9F0", func_80219E40_63F020); diff --git a/src/battle/area_sam2/63DD60.c b/src/battle/area_sam2/63DD60.c new file mode 100644 index 0000000000..41db24ee22 --- /dev/null +++ b/src/battle/area_sam2/63DD60.c @@ -0,0 +1,39 @@ +#include "common.h" + +INCLUDE_ASM(s32, "battle/area_sam2/63DD60", func_80218B80_63DD60); + +INCLUDE_ASM(s32, "battle/area_sam2/63DD60", func_80218D78_63DF58); + +INCLUDE_ASM(s32, "battle/area_sam2/63DD60", func_80218D9C_63DF7C); + +INCLUDE_ASM(s32, "battle/area_sam2/63DD60", func_80218EA0_63E080); + +INCLUDE_ASM(s32, "battle/area_sam2/63DD60", func_80219098_63E278); + +INCLUDE_ASM(s32, "battle/area_sam2/63DD60", func_802190BC_63E29C); + +INCLUDE_ASM(s32, "battle/area_sam2/63DD60", func_802191C0_63E3A0); + +INCLUDE_ASM(s32, "battle/area_sam2/63DD60", func_802193B8_63E598); + +INCLUDE_ASM(s32, "battle/area_sam2/63DD60", func_802193DC_63E5BC); + +INCLUDE_ASM(s32, "battle/area_sam2/63DD60", func_802194E0_63E6C0); + +INCLUDE_ASM(s32, "battle/area_sam2/63DD60", func_802196D8_63E8B8); + +INCLUDE_ASM(s32, "battle/area_sam2/63DD60", func_802196FC_63E8DC); + +INCLUDE_ASM(s32, "battle/area_sam2/63DD60", func_80219800_63E9E0); + +INCLUDE_ASM(s32, "battle/area_sam2/63DD60", func_802199F8_63EBD8); + +INCLUDE_ASM(s32, "battle/area_sam2/63DD60", func_80219A1C_63EBFC); + +INCLUDE_ASM(s32, "battle/area_sam2/63DD60", func_80219B20_63ED00); + +INCLUDE_ASM(s32, "battle/area_sam2/63DD60", func_80219D18_63EEF8); + +INCLUDE_ASM(s32, "battle/area_sam2/63DD60", func_80219D3C_63EF1C); + +INCLUDE_ASM(s32, "battle/area_sam2/63DD60", func_80219E40_63F020); diff --git a/src/code_102610_len_2330.c b/src/code_102610_len_2330.c index 75e136b1a3..ce5f376525 100644 --- a/src/code_102610_len_2330.c +++ b/src/code_102610_len_2330.c @@ -40,43 +40,3 @@ INCLUDE_ASM(s32, "code_102610_len_2330", func_802E1328); INCLUDE_ASM(s32, "code_102610_len_2330", func_802E1350); INCLUDE_ASM(s32, "code_102610_len_2330", func_802E13B8); - -INCLUDE_ASM(s32, "code_102610_len_2330", func_802E1400); - -INCLUDE_ASM(s32, "code_102610_len_2330", func_802E1460); - -INCLUDE_ASM(s32, "code_102610_len_2330", func_802E14D8); - -INCLUDE_ASM(s32, "code_102610_len_2330", func_802E153C); - -INCLUDE_ASM(s32, "code_102610_len_2330", func_802E1614); - -INCLUDE_ASM(s32, "code_102610_len_2330", func_802E1660); - -INCLUDE_ASM(s32, "code_102610_len_2330", func_802E1740); - -INCLUDE_ASM(s32, "code_102610_len_2330", func_802E176C); - -INCLUDE_ASM(s32, "code_102610_len_2330", func_802E17A8); - -INCLUDE_ASM(s32, "code_102610_len_2330", func_802E1EA8); - -INCLUDE_ASM(s32, "code_102610_len_2330", func_802E1EDC); - -INCLUDE_ASM(s32, "code_102610_len_2330", func_802E234C); - -INCLUDE_ASM(s32, "code_102610_len_2330", entity_init_BlueSwitch); - -INCLUDE_ASM(s32, "code_102610_len_2330", entity_init_HugeBlueSwitch); - -INCLUDE_ASM(s32, "code_102610_len_2330", func_802E2450); - -INCLUDE_ASM(s32, "code_102610_len_2330", func_802E246C); - -INCLUDE_ASM(s32, "code_102610_len_2330", func_802E263C); - -INCLUDE_ASM(s32, "code_102610_len_2330", func_802E2BA4); - -INCLUDE_ASM(s32, "code_102610_len_2330", func_802E2EB0); - -INCLUDE_ASM(s32, "code_102610_len_2330", func_802E2FD0); diff --git a/src/code_102C80.c b/src/code_102C80.c new file mode 100644 index 0000000000..ba1d7a8a8a --- /dev/null +++ b/src/code_102C80.c @@ -0,0 +1,37 @@ +#include "common.h" + +INCLUDE_ASM(s32, "code_102C80", func_802E1400); + +INCLUDE_ASM(s32, "code_102C80", func_802E1460); + +INCLUDE_ASM(s32, "code_102C80", func_802E14D8); + +INCLUDE_ASM(s32, "code_102C80", func_802E153C); + +INCLUDE_ASM(s32, "code_102C80", func_802E1614); + +INCLUDE_ASM(s32, "code_102C80", func_802E1660); + +INCLUDE_ASM(s32, "code_102C80", func_802E1740); + +INCLUDE_ASM(s32, "code_102C80", func_802E176C); + +INCLUDE_ASM(s32, "code_102C80", func_802E17A8); + +INCLUDE_ASM(s32, "code_102C80", func_802E1EA8); + +INCLUDE_ASM(s32, "code_102C80", func_802E1EDC); + +INCLUDE_ASM(s32, "code_102C80", func_802E234C); + +INCLUDE_ASM(s32, "code_102C80", entity_init_BlueSwitch); + +INCLUDE_ASM(s32, "code_102C80", entity_init_HugeBlueSwitch); + +INCLUDE_ASM(s32, "code_102C80", func_802E2450); + +INCLUDE_ASM(s32, "code_102C80", func_802E246C); + +INCLUDE_ASM(s32, "code_102C80", func_802E263C); + +INCLUDE_ASM(s32, "code_102C80", func_802E2BA4); diff --git a/src/code_104730.c b/src/code_104730.c new file mode 100644 index 0000000000..585e174008 --- /dev/null +++ b/src/code_104730.c @@ -0,0 +1,5 @@ +#include "common.h" + +INCLUDE_ASM(s32, "code_104730", func_802E2EB0); + +INCLUDE_ASM(s32, "code_104730", func_802E2FD0); diff --git a/src/code_105700_len_2130.c b/src/code_105700_len_2130.c index c2d8644019..205ee439ca 100644 --- a/src/code_105700_len_2130.c +++ b/src/code_105700_len_2130.c @@ -35,65 +35,3 @@ INCLUDE_ASM(s32, "code_105700_len_2130", func_802E464C); INCLUDE_ASM(s32, "code_105700_len_2130", func_802E4694); INCLUDE_ASM(s32, "code_105700_len_2130", func_802E46BC); - -INCLUDE_ASM(s32, "code_105700_len_2130", func_802E4710); - -INCLUDE_ASM(s32, "code_105700_len_2130", func_802E4730); - -INCLUDE_ASM(s32, "code_105700_len_2130", func_802E4AEC); - -INCLUDE_ASM(s32, "code_105700_len_2130", func_802E4B10); - -INCLUDE_ASM(s32, "code_105700_len_2130", func_802E4B60); - -INCLUDE_ASM(s32, "code_105700_len_2130", func_802E4C10); - -INCLUDE_ASM(s32, "code_105700_len_2130", func_802E4DE0); - -INCLUDE_ASM(s32, "code_105700_len_2130", func_802E4E04); - -INCLUDE_ASM(s32, "code_105700_len_2130", func_802E5308); - -INCLUDE_ASM(s32, "code_105700_len_2130", func_802E5324); - -INCLUDE_ASM(s32, "code_105700_len_2130", func_802E540C); - -INCLUDE_ASM(s32, "code_105700_len_2130", func_802E5428); - -INCLUDE_ASM(s32, "code_105700_len_2130", func_802E545C); - -INCLUDE_ASM(s32, "code_105700_len_2130", func_802E548C); - -INCLUDE_ASM(s32, "code_105700_len_2130", func_802E54A8); - -INCLUDE_ASM(s32, "code_105700_len_2130", func_802E54CC); - -INCLUDE_ASM(s32, "code_105700_len_2130", func_802E555C); - -INCLUDE_ASM(s32, "code_105700_len_2130", func_802E55A8); - -INCLUDE_ASM(s32, "code_105700_len_2130", func_802E5648); - -INCLUDE_ASM(s32, "code_105700_len_2130", func_802E5670); - -INCLUDE_ASM(s32, "code_105700_len_2130", func_802E5690); - -INCLUDE_ASM(s32, "code_105700_len_2130", func_802E56D0); - -INCLUDE_ASM(s32, "code_105700_len_2130", func_802E56EC); - -INCLUDE_ASM(s32, "code_105700_len_2130", func_802E578C); - -INCLUDE_ASM(s32, "code_105700_len_2130", func_802E57E4); - -INCLUDE_ASM(s32, "code_105700_len_2130", func_802E5800); - -INCLUDE_ASM(s32, "code_105700_len_2130", func_802E581C); - -INCLUDE_ASM(s32, "code_105700_len_2130", func_802E586C); - -INCLUDE_ASM(s32, "code_105700_len_2130", func_802E5E50); - -INCLUDE_ASM(s32, "code_105700_len_2130", func_802E5F50); - -INCLUDE_ASM(s32, "code_105700_len_2130", func_802E5F7C); diff --git a/src/code_105F90.c b/src/code_105F90.c new file mode 100644 index 0000000000..ca0a9d41f5 --- /dev/null +++ b/src/code_105F90.c @@ -0,0 +1,39 @@ +#include "common.h" + +INCLUDE_ASM(s32, "code_105F90", func_802E4710); + +INCLUDE_ASM(s32, "code_105F90", func_802E4730); + +INCLUDE_ASM(s32, "code_105F90", func_802E4AEC); + +INCLUDE_ASM(s32, "code_105F90", func_802E4B10); + +INCLUDE_ASM(s32, "code_105F90", func_802E4B60); + +INCLUDE_ASM(s32, "code_105F90", func_802E4C10); + +INCLUDE_ASM(s32, "code_105F90", func_802E4DE0); + +INCLUDE_ASM(s32, "code_105F90", func_802E4E04); + +INCLUDE_ASM(s32, "code_105F90", func_802E5308); + +INCLUDE_ASM(s32, "code_105F90", func_802E5324); + +INCLUDE_ASM(s32, "code_105F90", func_802E540C); + +INCLUDE_ASM(s32, "code_105F90", func_802E5428); + +INCLUDE_ASM(s32, "code_105F90", func_802E545C); + +INCLUDE_ASM(s32, "code_105F90", func_802E548C); + +INCLUDE_ASM(s32, "code_105F90", func_802E54A8); + +INCLUDE_ASM(s32, "code_105F90", func_802E54CC); + +INCLUDE_ASM(s32, "code_105F90", func_802E555C); + +INCLUDE_ASM(s32, "code_105F90", func_802E55A8); + +INCLUDE_ASM(s32, "code_105F90", func_802E5648); diff --git a/src/code_106EF0.c b/src/code_106EF0.c new file mode 100644 index 0000000000..cd03bd5581 --- /dev/null +++ b/src/code_106EF0.c @@ -0,0 +1,25 @@ +#include "common.h" + +INCLUDE_ASM(s32, "code_106EF0", func_802E5670); + +INCLUDE_ASM(s32, "code_106EF0", func_802E5690); + +INCLUDE_ASM(s32, "code_106EF0", func_802E56D0); + +INCLUDE_ASM(s32, "code_106EF0", func_802E56EC); + +INCLUDE_ASM(s32, "code_106EF0", func_802E578C); + +INCLUDE_ASM(s32, "code_106EF0", func_802E57E4); + +INCLUDE_ASM(s32, "code_106EF0", func_802E5800); + +INCLUDE_ASM(s32, "code_106EF0", func_802E581C); + +INCLUDE_ASM(s32, "code_106EF0", func_802E586C); + +INCLUDE_ASM(s32, "code_106EF0", func_802E5E50); + +INCLUDE_ASM(s32, "code_106EF0", func_802E5F50); + +INCLUDE_ASM(s32, "code_106EF0", func_802E5F7C); diff --git a/src/code_135EE0.c b/src/code_135EE0.c index a76329be3f..35f7c8b81a 100644 --- a/src/code_135EE0.c +++ b/src/code_135EE0.c @@ -153,33 +153,3 @@ INCLUDE_ASM(void, "code_135EE0", pause_draw_rect, s32 ulx, s32 uly, s32 lrx, s32 s32 ult, s32 dsdx, s32 dtdy); INCLUDE_ASM(s32, "code_135EE0", pause_sort_item_list); - -void pause_tabs_draw_invis(void) { -} - -INCLUDE_ASM(s32, "code_135EE0", pause_tabs_draw_stats); - -INCLUDE_ASM(s32, "code_135EE0", pause_tabs_draw_badges); - -INCLUDE_ASM(s32, "code_135EE0", pause_tabs_draw_items); - -INCLUDE_ASM(s32, "code_135EE0", pause_tabs_draw_party); - -INCLUDE_ASM(s32, "code_135EE0", pause_tabs_draw_spirits); - -INCLUDE_ASM(s32, "code_135EE0", pause_tabs_draw_map); - -INCLUDE_ASM(s32, "code_135EE0", pause_tabs_init); - -INCLUDE_ASM(s32, "code_135EE0", pause_tabs_handle_input); - -INCLUDE_ASM(s32, "code_135EE0", pause_tabs_update); - -void pause_tabs_cleanup(void) { - s32* iconIDs = gPauseMenuTabIconIDs; - s32 i; - - for (i = 0; i < ARRAY_COUNT(gPauseMenuTabIconIDs); i++) { - free_icon(iconIDs[i]); - } -} diff --git a/src/code_137ED0.c b/src/code_137ED0.c new file mode 100644 index 0000000000..327733d56b --- /dev/null +++ b/src/code_137ED0.c @@ -0,0 +1,31 @@ +#include "common.h" + +void pause_tabs_draw_invis(void) { +} + +INCLUDE_ASM(s32, "code_137ED0", pause_tabs_draw_stats); + +INCLUDE_ASM(s32, "code_137ED0", pause_tabs_draw_badges); + +INCLUDE_ASM(s32, "code_137ED0", pause_tabs_draw_items); + +INCLUDE_ASM(s32, "code_137ED0", pause_tabs_draw_party); + +INCLUDE_ASM(s32, "code_137ED0", pause_tabs_draw_spirits); + +INCLUDE_ASM(s32, "code_137ED0", pause_tabs_draw_map); + +INCLUDE_ASM(s32, "code_137ED0", pause_tabs_init); + +INCLUDE_ASM(s32, "code_137ED0", pause_tabs_handle_input); + +INCLUDE_ASM(s32, "code_137ED0", pause_tabs_update); + +void pause_tabs_cleanup(void) { + s32* iconIDs = gPauseMenuTabIconIDs; + s32 i; + + for (i = 0; i < ARRAY_COUNT(gPauseMenuTabIconIDs); i++) { + free_icon(iconIDs[i]); + } +} diff --git a/src/code_18F340.c b/src/code_18F340.c index 74badbdd52..76b3189b91 100644 --- a/src/code_18F340.c +++ b/src/code_18F340.c @@ -144,7 +144,3 @@ INCLUDE_ASM(s32, "code_18F340", func_80261DF4); INCLUDE_ASM(s32, "code_18F340", func_80261FB4); INCLUDE_ASM(s32, "code_18F340", func_802620F8); - -INCLUDE_ASM(s32, "code_18F340", func_80262130); - -INCLUDE_ASM(s32, "code_18F340", func_8026220C); diff --git a/src/code_190A10.c b/src/code_190A10.c new file mode 100644 index 0000000000..07fd79a4f8 --- /dev/null +++ b/src/code_190A10.c @@ -0,0 +1,5 @@ +#include "common.h" + +INCLUDE_ASM(s32, "code_190A10", func_80262130); + +INCLUDE_ASM(s32, "code_190A10", func_8026220C); diff --git a/src/code_197F40.c b/src/code_197F40.c index 9f1a52e929..1856a3e239 100644 --- a/src/code_197F40.c +++ b/src/code_197F40.c @@ -2207,105 +2207,3 @@ ApiStatus WaitForBuffDone(ScriptInstance* script, s32 isInitialCall) { } INCLUDE_ASM(s32, "code_197F40", CopyBuffs); - -ApiStatus func_80271210(ScriptInstance* script, s32 isInitialCall) { - func_80070AF0(0, script->varTable[0], script->varTable[1], script->varTable[2]); - return ApiStatus_DONE2; -} - -ApiStatus func_80271258(ScriptInstance* script, s32 isInitialCall) { - func_80070AF0(1, script->varTable[0], script->varTable[1], script->varTable[2]); - return ApiStatus_DONE2; -} - -INCLUDE_ASM(s32, "code_197F40", func_802712A0); - -INCLUDE_ASM(s32, "code_197F40", func_80271328); - -INCLUDE_ASM(s32, "code_197F40", func_802713B0); - -ApiStatus func_8027143C(ScriptInstance* script, s32 isInitialCall) { - func_80070A90(0, script->varTable[0], script->varTable[1], script->varTable[2]); - return ApiStatus_DONE2; -} - -INCLUDE_ASM(s32, "code_197F40", func_80271484); - -INCLUDE_ASM(s32, "code_197F40", func_80271588); - -INCLUDE_ASM(s32, "code_197F40", dispatch_event_player); - -INCLUDE_ASM(s32, "code_197F40", dispatch_event_player_continue_turn); - -INCLUDE_ASM(s32, "code_197F40", calc_player_test_enemy); - -INCLUDE_ASM(s32, "code_197F40", calc_player_damage_enemy); - -INCLUDE_ASM(s32, "code_197F40", dispatch_damage_event_player); - -void dispatch_damage_event_player_0(s32 damageAmount, Event event) { - BattleStatus* battleStatus = BATTLE_STATUS; - - battleStatus->currentAttackElement = Element_END; - battleStatus->unk_19A = 0; - dispatch_damage_event_player(damageAmount, event, FALSE); -} - -void dispatch_damage_event_player_1(s32 damageAmount, Event event) { - dispatch_damage_event_player(damageAmount, event, TRUE); -} - -INCLUDE_ASM(s32, "code_197F40", GetMenuSelection); - -INCLUDE_ASM(s32, "code_197F40", func_80273444); - -INCLUDE_ASM(s32, "code_197F40", PlayerFallToGoal); - -INCLUDE_ASM(s32, "code_197F40", PlayerLandJump); - -INCLUDE_ASM(s32, "code_197F40", PlayerRunToGoal); - -INCLUDE_ASM(s32, "code_197F40", CancelablePlayerRunToGoal); - -ApiStatus GetPlayerHP(ScriptInstance* script, s32 isInitialCall) { - set_variable(script, *script->ptrReadPos, gPlayerData.curHP); - return ApiStatus_DONE2; -} - -INCLUDE_ASM(s32, "code_197F40", PlayerDamageEnemy); - -INCLUDE_ASM(s32, "code_197F40", PlayerPowerBounceEnemy); - -INCLUDE_ASM(s32, "code_197F40", PlayerTestEnemy); - -INCLUDE_ASM(s32, "code_197F40", DispatchDamagePlayerEvent); - -INCLUDE_ASM(s32, "code_197F40", EnablePlayerBlur); - -ApiStatus func_802749D8(ScriptInstance* script, s32 isInitialCall) { - func_802549A0(); - return ApiStatus_DONE2; -} - -ApiStatus func_802749F8(ScriptInstance* script, s32 isInitialCall) { - func_802549C0(); - return ApiStatus_DONE2; -} - -INCLUDE_ASM(s32, "code_197F40", func_80274A18); - -INCLUDE_ASM(s32, "code_197F40", func_802752AC); - -INCLUDE_ASM(s32, "code_197F40", func_80275F00); - -INCLUDE_ASM(s32, "code_197F40", DidActionSucceed); - -ApiStatus func_80276EFC(ScriptInstance* script, s32 isInitialCall) { - gBattleStatus.flags1 |= 0x200000; - return ApiStatus_DONE2; -} - -ApiStatus func_80276F1C(ScriptInstance* script, s32 isInitialCall) { - dispatch_event_player(get_variable(script, *script->ptrReadPos)); - return ApiStatus_DONE2; -} diff --git a/src/code_19FAF0.c b/src/code_19FAF0.c new file mode 100644 index 0000000000..86d80fc6e6 --- /dev/null +++ b/src/code_19FAF0.c @@ -0,0 +1,104 @@ +#include "common.h" +#include "battle/battle.h" + +ApiStatus func_80271210(ScriptInstance* script, s32 isInitialCall) { + func_80070AF0(0, script->varTable[0], script->varTable[1], script->varTable[2]); + return ApiStatus_DONE2; +} + +ApiStatus func_80271258(ScriptInstance* script, s32 isInitialCall) { + func_80070AF0(1, script->varTable[0], script->varTable[1], script->varTable[2]); + return ApiStatus_DONE2; +} + +INCLUDE_ASM(s32, "code_19FAF0", func_802712A0); + +INCLUDE_ASM(s32, "code_19FAF0", func_80271328); + +INCLUDE_ASM(s32, "code_19FAF0", func_802713B0); + +ApiStatus func_8027143C(ScriptInstance* script, s32 isInitialCall) { + func_80070A90(0, script->varTable[0], script->varTable[1], script->varTable[2]); + return ApiStatus_DONE2; +} + +INCLUDE_ASM(s32, "code_19FAF0", func_80271484); + +INCLUDE_ASM(s32, "code_19FAF0", func_80271588); + +INCLUDE_ASM(s32, "code_19FAF0", dispatch_event_player); + +INCLUDE_ASM(s32, "code_19FAF0", dispatch_event_player_continue_turn); + +INCLUDE_ASM(s32, "code_19FAF0", calc_player_test_enemy); + +INCLUDE_ASM(s32, "code_19FAF0", calc_player_damage_enemy); + +INCLUDE_ASM(s32, "code_19FAF0", dispatch_damage_event_player); + +void dispatch_damage_event_player_0(s32 damageAmount, Event event) { + BattleStatus* battleStatus = BATTLE_STATUS; + + battleStatus->currentAttackElement = Element_END; + battleStatus->unk_19A = 0; + dispatch_damage_event_player(damageAmount, event, FALSE); +} + +void dispatch_damage_event_player_1(s32 damageAmount, Event event) { + dispatch_damage_event_player(damageAmount, event, TRUE); +} + +INCLUDE_ASM(s32, "code_19FAF0", GetMenuSelection); + +INCLUDE_ASM(s32, "code_19FAF0", func_80273444); + +INCLUDE_ASM(s32, "code_19FAF0", PlayerFallToGoal); + +INCLUDE_ASM(s32, "code_19FAF0", PlayerLandJump); + +INCLUDE_ASM(s32, "code_19FAF0", PlayerRunToGoal); + +INCLUDE_ASM(s32, "code_19FAF0", CancelablePlayerRunToGoal); + +ApiStatus GetPlayerHP(ScriptInstance* script, s32 isInitialCall) { + set_variable(script, *script->ptrReadPos, gPlayerData.curHP); + return ApiStatus_DONE2; +} + +INCLUDE_ASM(s32, "code_19FAF0", PlayerDamageEnemy); + +INCLUDE_ASM(s32, "code_19FAF0", PlayerPowerBounceEnemy); + +INCLUDE_ASM(s32, "code_19FAF0", PlayerTestEnemy); + +INCLUDE_ASM(s32, "code_19FAF0", DispatchDamagePlayerEvent); + +INCLUDE_ASM(s32, "code_19FAF0", EnablePlayerBlur); + +ApiStatus func_802749D8(ScriptInstance* script, s32 isInitialCall) { + func_802549A0(); + return ApiStatus_DONE2; +} + +ApiStatus func_802749F8(ScriptInstance* script, s32 isInitialCall) { + func_802549C0(); + return ApiStatus_DONE2; +} + +INCLUDE_ASM(s32, "code_19FAF0", func_80274A18); + +INCLUDE_ASM(s32, "code_19FAF0", func_802752AC); + +INCLUDE_ASM(s32, "code_19FAF0", func_80275F00); + +INCLUDE_ASM(s32, "code_19FAF0", DidActionSucceed); + +ApiStatus func_80276EFC(ScriptInstance* script, s32 isInitialCall) { + gBattleStatus.flags1 |= 0x200000; + return ApiStatus_DONE2; +} + +ApiStatus func_80276F1C(ScriptInstance* script, s32 isInitialCall) { + dispatch_event_player(get_variable(script, *script->ptrReadPos)); + return ApiStatus_DONE2; +} diff --git a/src/code_759b0_len_61b0.c b/src/code_759b0_len_61b0.c index 3d8232b5eb..67bb7a0469 100644 --- a/src/code_759b0_len_61b0.c +++ b/src/code_759b0_len_61b0.c @@ -1,11 +1,5 @@ #include "common.h" -extern s32 D_8010C920; -extern s32 D_8010C93C; -extern s32 D_8010C940; -extern s32 D_8010C950; -extern s32 D_8010C958; - INCLUDE_ASM(s32, "code_759b0_len_61b0", func_800DC500); INCLUDE_ASM(s32, "code_759b0_len_61b0", func_800DC778); @@ -39,308 +33,3 @@ INCLUDE_ASM(s32, "code_759b0_len_61b0", func_800DDC44, s32 arg0, f32* arg1, f32* INCLUDE_ASM(s32, "code_759b0_len_61b0", func_800DDCEC); INCLUDE_ASM(s32, "code_759b0_len_61b0", func_800DDD94); - -INCLUDE_ASM(s32, "code_759b0_len_61b0", test_below_player); - -INCLUDE_ASM(s32, "code_759b0_len_61b0", func_800DE46C); - -INCLUDE_ASM(s32, "code_759b0_len_61b0", trace_below_player); - -INCLUDE_ASM(s32, "code_759b0_len_61b0", collision_check_above); - -INCLUDE_ASM(s32, "code_759b0_len_61b0", trace_above_player); - -INCLUDE_ASM(s32, "code_759b0_len_61b0", do_lateral_collision); - -INCLUDE_ASM(s32, "code_759b0_len_61b0", func_800DEE5C); - -INCLUDE_ASM(s32, "code_759b0_len_61b0", func_800DF15C); - -void func_800DF3FC(f32* arg0, f32* arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5) { - f32 temp = (arg2 * arg4) + (arg3 * arg5); - - *arg0 = (arg2 - (temp * arg4)) * 0.5f; - *arg1 = (arg3 - (temp * arg5)) * 0.5f; -} - -INCLUDE_ASM(s32, "code_759b0_len_61b0", test_player_lateral); - -INCLUDE_ASM(s32, "code_759b0_len_61b0", update_player); - -INCLUDE_ASM(s32, "code_759b0_len_61b0", check_input_use_partner); - -INCLUDE_ASM(s32, "code_759b0_len_61b0", func_800DFAAC); - -void func_800DFBE8(void) { - func_800E5A2C(); - collision_main_lateral(); - func_800E4BB8(); - - if (!(gPlayerStatusPtr->flags & 0x4000000)) { - Camera* camera = &gCameras[0]; - - camera->targetPos.x = gPlayerStatusPtr->position.x; - camera->targetPos.y = gPlayerStatusPtr->position.y; - camera->targetPos.z = gPlayerStatusPtr->position.z; - } -} - -void clear_player_status(void) { - mem_clear(&gPlayerStatus, sizeof(gPlayerStatus)); -} - -void func_800DFC74(void) { - PlayerStatus* playerStatus = PLAYER_STATUS; - - 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); - func_800E6B68(); - func_800E0B14(); - func_800E069C(); - func_800E0514(); - func_800E0374(); - func_800E5520(); -} - -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)) { - return 0; - } - return 1; -} - -INCLUDE_ASM(s32, "code_759b0_len_61b0", func_800DFD48); - -void func_800DFEFC(void) { - PlayerStatus* playerStatus = PLAYER_STATUS; - s32 temp_v0 = func_800DFD48(); - - if (temp_v0 != -1) { - playerStatus->anim = temp_v0; - playerStatus->unk_BC = 0; - playerStatus->flags &= ~0x10000000; - } -} - -void func_800DFF50(s32 arg0) { - PlayerStatus* playerStatus = PLAYER_STATUS; - - playerStatus->anim = arg0; - playerStatus->unk_BC = 0; - playerStatus->flags &= ~0x10000000; -} - -void func_800DFF78(void) { - PlayerStatus* playerStatus = PLAYER_STATUS; - s32 temp_v0 = func_800DFD48(); - - if (temp_v0 != -1) { - playerStatus->anim = temp_v0; - playerStatus->unk_BC = 0; - playerStatus->flags |= 0x10000000; - } -} - -INCLUDE_ASM(s32, "code_759b0_len_61b0", func_800DFFCC); - -// dist_to_player2D -f32 func_800E0088(f32 x, f32 z) { - PlayerStatus* playerStatus = PLAYER_STATUS; - - return dist2D(x, z, playerStatus->position.x, playerStatus->position.z); -} - -void enable_player_shadow(void) { - get_shadow_by_index(PLAYER_STATUS->shadowID)->flags &= ~1; -} - -void disable_player_shadow(void) { - get_shadow_by_index(PLAYER_STATUS->shadowID)->flags |= 1; -} - -s32 disable_player_static_collisions(void) { - PlayerStatus* playerStatus = &gPlayerStatus; - - playerStatus->flags |= 0x1000; - playerStatus->enableCollisionOverlapsCheck++; - return playerStatus->enableCollisionOverlapsCheck; -} - -s32 enable_player_static_collisions(void) { - PlayerStatus* playerStatus = &gPlayerStatus; - - playerStatus->enableCollisionOverlapsCheck--; - if (playerStatus->enableCollisionOverlapsCheck == 0) { - playerStatus->flags &= ~0x1000; - } - return playerStatus->enableCollisionOverlapsCheck; -} - -s32 disable_player_input(void) { - PlayerStatus* playerStatus = &gPlayerStatus; - - playerStatus->flags |= 0x2000; - playerStatus->statusMenuCounterinputEnabledCounter++; - return playerStatus->statusMenuCounterinputEnabledCounter; -} - -s32 enable_player_input(void) { - PlayerStatus* playerStatus = &gPlayerStatus; - - playerStatus->statusMenuCounterinputEnabledCounter--; - if (playerStatus->statusMenuCounterinputEnabledCounter == 0) { - playerStatus->flags &= ~0x2000; - } - return playerStatus->statusMenuCounterinputEnabledCounter; -} - -void func_800E01DC(void) { - PlayerStatus* playerStatus = &gPlayerStatus; - - if (playerStatus->animFlags & 0x10) { - playerStatus->flags |= 0x8000000; - } -} - -s32 func_800E0208(void) { - GameStatus* gameStatus = GAME_STATUS; - s32 ret = 0; - - if (gameStatus->disableScripts && (gameStatus->currentButtons & 0x10)) { - if (D_8010EBB0[0] == 0) { - set_action_state(ActionState_IDLE); - } - ret = 1; - } - return ret; -} - -void func_800E0260(void) { - func_800E0658(); - func_800E0AD0(); - func_800E04D0(); - func_800E0330(); -} - -INCLUDE_ASM(s32, "code_759b0_len_61b0", func_800E0294); - -void func_800E0330(void) { - if ((gPlayerStatusPtr->animFlags & 0x100) && (D_8010C93C != 0)) { - func_802B7000(); - } -} - -void func_800E0374(void) { - D_8010C93C = 0; - gPlayerStatusPtr->animFlags &= ~0x100; -} - -INCLUDE_ASM(s32, "code_759b0_len_61b0", func_800E0398); - -void func_800E04D0(void) { - if ((gPlayerStatusPtr->animFlags & 0x40) && (D_8010C920 != 0)) { - func_802B71D4(); - } -} - -void func_800E0514(void) { - D_8010C920 = 0; - gPlayerStatusPtr->animFlags &= ~0x40; -} - -s32 func_800E0538(void) { - PlayerStatus* playerStatus = PLAYER_STATUS; - s32* unk_C8 = playerStatus->unk_C8; - s32 ret = 0; - s32 cond; - - if (unk_C8 != NULL && !(*unk_C8 & 0x10000000)) { - cond = (playerStatus->flags & 0x2002000) == 0x2000000; - ret = cond; - } - return ret; -} - -INCLUDE_ASM(s32, "code_759b0_len_61b0", func_800E0580); - -void func_800E0658(void) { - if ((gPlayerStatusPtr->animFlags & 0x20) && (D_8010C940 != 0)) { - func_802B71C8(); - } -} - -void func_800E069C(void) { - D_8010C940 = 0; - gPlayerStatusPtr->animFlags &= ~0x20; -} - -void func_800E06C0(s32 arg0) { - D_8010C950 = (arg0 == 1); -} - -INCLUDE_ASM(s32, "code_759b0_len_61b0", func_800E06D8); - -INCLUDE_ASM(s32, "code_759b0_len_61b0", func_800E0818); - -void func_800E0AD0(void) { - if ((gPlayerStatusPtr->animFlags & 0x10) && (D_8010C958 != 0)) { - func_802B71E8(); - } -} - -void func_800E0B14(void) { - D_8010C958 = 0; - gPlayerStatusPtr->animFlags &= ~0x10; -} - -void func_800E0B38(void) { - PlayerData* playerData = PLAYER_DATA; - - if (!GAME_STATUS->isBattle) { - s32 i; - - for (i = 1; i < ARRAY_COUNT(playerData->unk_2C4); i++) { - if (playerData->partners[i].enabled) { - playerData->unk_2C4[i] += 1; - } - } - } -} - -INCLUDE_ASM(s32, "code_759b0_len_61b0", func_800E0B90); - -INCLUDE_ASM(s32, "code_759b0_len_61b0", func_800E0FEC); - -void render_player(void) { - if (!GAME_STATUS->disableScripts) { - render_player_model(); - } -} - -INCLUDE_ASM(void, "code_759b0_len_61b0", render_player_model); - -INCLUDE_ASM(s32, "code_759b0_len_61b0", appendGfx_player); - -INCLUDE_ASM(s32, "code_759b0_len_61b0", appendGfx_player_spin); - -INCLUDE_ASM(s32, "code_759b0_len_61b0", update_player_shadow); - -INCLUDE_ASM(s32, "code_759b0_len_61b0", update_player_input); - -INCLUDE_ASM(s32, "code_759b0_len_61b0", func_800E205C); - -void func_800E22E4(s32* arg0) { - PlayerStatus* playerStatus = PLAYER_STATUS; - - *arg0 = (u16)playerStatus->currentButtons | (playerStatus->pressedButtons << 16); -} - -INCLUDE_ASM(s32, "code_759b0_len_61b0", input_to_move_vector); - -INCLUDE_ASM(s32, "code_759b0_len_61b0", func_800E23FC); - -INCLUDE_ASM(s32, "code_759b0_len_61b0", func_800E24F8); diff --git a/src/code_77480.c b/src/code_77480.c new file mode 100644 index 0000000000..80f676e91e --- /dev/null +++ b/src/code_77480.c @@ -0,0 +1,296 @@ +#include "common.h" + +extern s32 D_8010C920; +extern s32 D_8010C93C; +extern s32 D_8010C940; +extern s32 D_8010C950; +extern s32 D_8010C958; + +INCLUDE_ASM(s32, "code_77480", test_below_player); + +INCLUDE_ASM(s32, "code_77480", func_800DE46C); + +INCLUDE_ASM(s32, "code_77480", trace_below_player); + +INCLUDE_ASM(s32, "code_77480", collision_check_above); + +INCLUDE_ASM(s32, "code_77480", trace_above_player); + +INCLUDE_ASM(s32, "code_77480", do_lateral_collision); + +INCLUDE_ASM(s32, "code_77480", func_800DEE5C); + +INCLUDE_ASM(s32, "code_77480", func_800DF15C); + +void func_800DF3FC(f32* arg0, f32* arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5) { + f32 temp = (arg2 * arg4) + (arg3 * arg5); + + *arg0 = (arg2 - (temp * arg4)) * 0.5f; + *arg1 = (arg3 - (temp * arg5)) * 0.5f; +} + +INCLUDE_ASM(s32, "code_77480", test_player_lateral); + +INCLUDE_ASM(s32, "code_77480", update_player); + +INCLUDE_ASM(s32, "code_77480", check_input_use_partner); + +INCLUDE_ASM(s32, "code_77480", func_800DFAAC); + +void func_800DFBE8(void) { + func_800E5A2C(); + collision_main_lateral(); + func_800E4BB8(); + + if (!(gPlayerStatusPtr->flags & 0x4000000)) { + Camera* camera = &gCameras[0]; + + camera->targetPos.x = gPlayerStatusPtr->position.x; + camera->targetPos.y = gPlayerStatusPtr->position.y; + camera->targetPos.z = gPlayerStatusPtr->position.z; + } +} + +void clear_player_status(void) { + mem_clear(&gPlayerStatus, sizeof(gPlayerStatus)); +} + +void func_800DFC74(void) { + PlayerStatus* playerStatus = PLAYER_STATUS; + + 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); + func_800E6B68(); + func_800E0B14(); + func_800E069C(); + func_800E0514(); + func_800E0374(); + func_800E5520(); +} + +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)) { + return 0; + } + return 1; +} + +INCLUDE_ASM(s32, "code_77480", func_800DFD48); + +void func_800DFEFC(void) { + PlayerStatus* playerStatus = PLAYER_STATUS; + s32 temp_v0 = func_800DFD48(); + + if (temp_v0 != -1) { + playerStatus->anim = temp_v0; + playerStatus->unk_BC = 0; + playerStatus->flags &= ~0x10000000; + } +} + +void func_800DFF50(s32 arg0) { + PlayerStatus* playerStatus = PLAYER_STATUS; + + playerStatus->anim = arg0; + playerStatus->unk_BC = 0; + playerStatus->flags &= ~0x10000000; +} + +void func_800DFF78(void) { + PlayerStatus* playerStatus = PLAYER_STATUS; + s32 temp_v0 = func_800DFD48(); + + if (temp_v0 != -1) { + playerStatus->anim = temp_v0; + playerStatus->unk_BC = 0; + playerStatus->flags |= 0x10000000; + } +} + +INCLUDE_ASM(s32, "code_77480", func_800DFFCC); + +// dist_to_player2D +f32 func_800E0088(f32 x, f32 z) { + PlayerStatus* playerStatus = PLAYER_STATUS; + + return dist2D(x, z, playerStatus->position.x, playerStatus->position.z); +} + +void enable_player_shadow(void) { + get_shadow_by_index(PLAYER_STATUS->shadowID)->flags &= ~1; +} + +void disable_player_shadow(void) { + get_shadow_by_index(PLAYER_STATUS->shadowID)->flags |= 1; +} + +s32 disable_player_static_collisions(void) { + PlayerStatus* playerStatus = &gPlayerStatus; + + playerStatus->flags |= 0x1000; + playerStatus->enableCollisionOverlapsCheck++; + return playerStatus->enableCollisionOverlapsCheck; +} + +s32 enable_player_static_collisions(void) { + PlayerStatus* playerStatus = &gPlayerStatus; + + playerStatus->enableCollisionOverlapsCheck--; + if (playerStatus->enableCollisionOverlapsCheck == 0) { + playerStatus->flags &= ~0x1000; + } + return playerStatus->enableCollisionOverlapsCheck; +} + +s32 disable_player_input(void) { + PlayerStatus* playerStatus = &gPlayerStatus; + + playerStatus->flags |= 0x2000; + playerStatus->statusMenuCounterinputEnabledCounter++; + return playerStatus->statusMenuCounterinputEnabledCounter; +} + +s32 enable_player_input(void) { + PlayerStatus* playerStatus = &gPlayerStatus; + + playerStatus->statusMenuCounterinputEnabledCounter--; + if (playerStatus->statusMenuCounterinputEnabledCounter == 0) { + playerStatus->flags &= ~0x2000; + } + return playerStatus->statusMenuCounterinputEnabledCounter; +} + +void func_800E01DC(void) { + PlayerStatus* playerStatus = &gPlayerStatus; + + if (playerStatus->animFlags & 0x10) { + playerStatus->flags |= 0x8000000; + } +} + +s32 func_800E0208(void) { + GameStatus* gameStatus = GAME_STATUS; + s32 ret = 0; + + if (gameStatus->disableScripts && (gameStatus->currentButtons & 0x10)) { + if (D_8010EBB0[0] == 0) { + set_action_state(ActionState_IDLE); + } + ret = 1; + } + return ret; +} + +void func_800E0260(void) { + func_800E0658(); + func_800E0AD0(); + func_800E04D0(); + func_800E0330(); +} + +INCLUDE_ASM(s32, "code_77480", func_800E0294); + +void func_800E0330(void) { + if ((gPlayerStatusPtr->animFlags & 0x100) && (D_8010C93C != 0)) { + func_802B7000(); + } +} + +void func_800E0374(void) { + D_8010C93C = 0; + gPlayerStatusPtr->animFlags &= ~0x100; +} + +INCLUDE_ASM(s32, "code_77480", func_800E0398); + +void func_800E04D0(void) { + if ((gPlayerStatusPtr->animFlags & 0x40) && (D_8010C920 != 0)) { + func_802B71D4(); + } +} + +void func_800E0514(void) { + D_8010C920 = 0; + gPlayerStatusPtr->animFlags &= ~0x40; +} + +s32 func_800E0538(void) { + PlayerStatus* playerStatus = PLAYER_STATUS; + s32* unk_C8 = playerStatus->unk_C8; + s32 ret = 0; + s32 cond; + + if (unk_C8 != NULL && !(*unk_C8 & 0x10000000)) { + cond = (playerStatus->flags & 0x2002000) == 0x2000000; + ret = cond; + } + return ret; +} + +INCLUDE_ASM(s32, "code_77480", func_800E0580); + +void func_800E0658(void) { + if ((gPlayerStatusPtr->animFlags & 0x20) && (D_8010C940 != 0)) { + func_802B71C8(); + } +} + +void func_800E069C(void) { + D_8010C940 = 0; + gPlayerStatusPtr->animFlags &= ~0x20; +} + +void func_800E06C0(s32 arg0) { + D_8010C950 = (arg0 == 1); +} + +INCLUDE_ASM(s32, "code_77480", func_800E06D8); + +INCLUDE_ASM(s32, "code_77480", func_800E0818); + +void func_800E0AD0(void) { + if ((gPlayerStatusPtr->animFlags & 0x10) && (D_8010C958 != 0)) { + func_802B71E8(); + } +} + +void func_800E0B14(void) { + D_8010C958 = 0; + gPlayerStatusPtr->animFlags &= ~0x10; +} + +void func_800E0B38(void) { + PlayerData* playerData = PLAYER_DATA; + + if (!GAME_STATUS->isBattle) { + s32 i; + + for (i = 1; i < ARRAY_COUNT(playerData->unk_2C4); i++) { + if (playerData->partners[i].enabled) { + playerData->unk_2C4[i] += 1; + } + } + } +} + +INCLUDE_ASM(s32, "code_77480", func_800E0B90); + +INCLUDE_ASM(s32, "code_77480", func_800E0FEC); + +void render_player(void) { + if (!GAME_STATUS->disableScripts) { + render_player_model(); + } +} + +INCLUDE_ASM(void, "code_77480", render_player_model); + +INCLUDE_ASM(s32, "code_77480", appendGfx_player); + +INCLUDE_ASM(s32, "code_77480", appendGfx_player_spin); + +INCLUDE_ASM(s32, "code_77480", update_player_shadow); diff --git a/src/code_7B440.c b/src/code_7B440.c new file mode 100644 index 0000000000..21dd143159 --- /dev/null +++ b/src/code_7B440.c @@ -0,0 +1,17 @@ +#include "common.h" + +INCLUDE_ASM(s32, "code_7B440", update_player_input); + +INCLUDE_ASM(s32, "code_7B440", func_800E205C); + +void func_800E22E4(s32* arg0) { + PlayerStatus* playerStatus = PLAYER_STATUS; + + *arg0 = (u16)playerStatus->currentButtons | (playerStatus->pressedButtons << 16); +} + +INCLUDE_ASM(s32, "code_7B440", input_to_move_vector); + +INCLUDE_ASM(s32, "code_7B440", func_800E23FC); + +INCLUDE_ASM(s32, "code_7B440", func_800E24F8); diff --git a/src/code_B4580.c b/src/code_B4580.c new file mode 100644 index 0000000000..3593ffb1a0 --- /dev/null +++ b/src/code_B4580.c @@ -0,0 +1,105 @@ +#include "common.h" + +INCLUDE_ASM(s32, "code_B4580", func_8011DE80); + +INCLUDE_ASM(s32, "code_B4580", func_8011DFD0); + +INCLUDE_ASM(s32, "code_B4580", func_8011E014); + +INCLUDE_ASM(s32, "code_B4580", func_8011E058); + +INCLUDE_ASM(s32, "code_B4580", func_8011E09C); + +INCLUDE_ASM(s32, "code_B4580", func_8011E0DC); + +INCLUDE_ASM(s32, "code_B4580", func_8011E150); + +INCLUDE_ASM(s32, "code_B4580", func_8011E1C4); + +INCLUDE_ASM(s32, "code_B4580", func_8011E224); + +INCLUDE_ASM(s32, "code_B4580", func_8011E310); + +INCLUDE_ASM(s32, "code_B4580", func_8011E398); + +INCLUDE_ASM(s32, "code_B4580", func_8011E400); + +INCLUDE_ASM(s32, "code_B4580", func_8011E438); + +INCLUDE_ASM(s32, "code_B4580", func_8011E4B8); + +INCLUDE_ASM(s32, "code_B4580", func_8011E5E0); + +INCLUDE_ASM(s32, "code_B4580", func_8011E718); + +INCLUDE_ASM(s32, "code_B4580", func_8011E8BC); + +INCLUDE_ASM(s32, "code_B4580", func_8011EA54); + +INCLUDE_ASM(s32, "code_B4580", func_8011EBF0); + +INCLUDE_ASM(s32, "code_B4580", func_8011F058); + +INCLUDE_ASM(s32, "code_B4580", func_8011F118); + +INCLUDE_ASM(s32, "code_B4580", func_8011F304); + +INCLUDE_ASM(s32, "code_B4580", func_8011F3E8); + +INCLUDE_ASM(s32, "code_B4580", func_8011F4D4); + +INCLUDE_ASM(s32, "code_B4580", func_8011FA54); + +INCLUDE_ASM(s32, "code_B4580", func_8011FF74); + +INCLUDE_ASM(s32, "code_B4580", func_8011FF98); + +INCLUDE_ASM(s32, "code_B4580", func_8011FFB4); + +AnimatedMesh* get_anim_mesh(s32 animModelID) { + return (*gCurrentAnimMeshListPtr)[animModelID & ~0x800]; +} + +AnimatedMesh* func_80120000(s32 animModelID, s32 arg1, s32 arg2) { + AnimatedMesh* ret = (*gCurrentAnimMeshListPtr)[animModelID & ~0x800]; + + ret->unk_2D4 = arg2; + ret->unk_2D8 = arg1; + return ret; +} + +INCLUDE_ASM(s32, "code_B4580", func_80120028); + +INCLUDE_ASM(s32, "code_B4580", func_8012003C); + +INCLUDE_ASM(s32, "code_B4580", func_8012004C); + +INCLUDE_ASM(s32, "code_B4580", func_80120064); + +INCLUDE_ASM(s32, "code_B4580", func_8012008C); + +INCLUDE_ASM(s32, "code_B4580", func_8012009C); + +INCLUDE_ASM(s32, "code_B4580", func_801200B8); + +INCLUDE_ASM(s32, "code_B4580", func_801200EC); + +INCLUDE_ASM(s32, "code_B4580", func_80120118); + +INCLUDE_ASM(s32, "code_B4580", play_model_animation); + +INCLUDE_ASM(s32, "code_B4580", func_80120198); + +INCLUDE_ASM(s32, "code_B4580", func_80120234); + +INCLUDE_ASM(s32, "code_B4580", func_801203AC); + +INCLUDE_ASM(s32, "code_B4580", func_80120420); + +INCLUDE_ASM(s32, "code_B4580", func_80120474); + +INCLUDE_ASM(s32, "code_B4580", func_80120530); + +INCLUDE_ASM(s32, "code_B4580", func_80120678); + +INCLUDE_ASM(s32, "code_B4580", func_801206F8); diff --git a/src/code_B9D60.c b/src/code_B9D60.c index 334bd7eb3a..e95afdc2e3 100644 --- a/src/code_B9D60.c +++ b/src/code_B9D60.c @@ -3,10 +3,6 @@ extern Gfx D_8014C500[]; extern s32 D_801512F4; // message images? extern s16 D_80155C98; -extern s32 D_80155D88; -ItemEntity** D_801565A0; // item entity list -extern s16 D_801565A4; -extern s16 D_801565A8; void clear_character_set(void) { D_80155C98 = -1; @@ -114,145 +110,3 @@ 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); - -s32 make_item_entity(s32 itemID, f32 x, f32 y, f32 z, s32 itemSpawnMode, s32 pickupDelay, s32 facingAngleSign, - s32 pickupVar); -INCLUDE_ASM(s32, "code_B9D60", make_item_entity, s32 itemID, f32 x, f32 y, f32 z, s32 itemSpawnMode, s32 pickupDelay, - s32 facingAngleSign, s32 pickupVar); - -s32 make_item_entity_nodelay(s32 itemID, f32 x, f32 y, f32 z, s32 itemSpawnMode, s32 pickupVar) { - return make_item_entity(itemID, x, y, z, itemSpawnMode, 0, -1, pickupVar); -} - -s32 make_item_entity_delayed(s32 itemID, f32 x, f32 y, f32 z, s32 itemSpawnMode, s32 pickupDelay, s32 pickupVar) { - return make_item_entity(itemID, x, y, z, itemSpawnMode, pickupDelay, -1, pickupVar); -} - -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); - -void set_item_entity_flags(s32 index, s32 flags) { - ItemEntity* itemEntity = D_801565A0[index]; - - itemEntity->flags |= flags; - if (itemEntity->flags & 0x200000) { - D_801565A8 = 1; - } -} - -void clear_item_entity_flags(s32 index, s32 flags) { - ItemEntity* itemEntity = D_801565A0[index]; - - itemEntity->flags &= ~flags; -} - -void func_801341B0(s32 index) { - ItemEntity* itemEntity = D_801565A0[index]; - s32* sym = D_8009A650; - - sym[0] |= 0x40; - itemEntity->flags |= 0x100; -} - -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_C50A0.c b/src/code_C50A0.c new file mode 100644 index 0000000000..0650e726ff --- /dev/null +++ b/src/code_C50A0.c @@ -0,0 +1,148 @@ +#include "common.h" + +extern s32 D_80155D88; +ItemEntity** D_801565A0; // item entity list +extern s16 D_801565A4; +extern s16 D_801565A8; + +INCLUDE_ASM(s32, "code_C50A0", func_8012E9A0); + +INCLUDE_ASM(s32, "code_C50A0", func_8012EC94); + +INCLUDE_ASM(s32, "code_C50A0", func_8012F500); + +INCLUDE_ASM(s32, "code_C50A0", func_8012FE10); + +INCLUDE_ASM(s32, "code_C50A0", func_8012FE78); + +INCLUDE_ASM(s32, "code_C50A0", func_801309F0); + +INCLUDE_ASM(s32, "code_C50A0", func_80130A04); + +INCLUDE_ASM(s32, "code_C50A0", func_80130ACC); + +INCLUDE_ASM(s32, "code_C50A0", draw_coin_sparkles); + +ItemEntity* get_item_entity(s32 itemEntityIndex) { + return D_801565A0[itemEntityIndex]; +} + +INCLUDE_ASM(s32, "code_C50A0", func_80130F70); + +INCLUDE_ASM(s32, "code_C50A0", func_80130FAC); + +INCLUDE_ASM(s32, "code_C50A0", clear_item_entity_data); + +INCLUDE_ASM(s32, "code_C50A0", init_item_entity_list); + +INCLUDE_ASM(s32, "code_C50A0", func_80131128); + +s32 make_item_entity(s32 itemID, f32 x, f32 y, f32 z, s32 itemSpawnMode, s32 pickupDelay, s32 facingAngleSign, + s32 pickupVar); +INCLUDE_ASM(s32, "code_C50A0", make_item_entity, s32 itemID, f32 x, f32 y, f32 z, s32 itemSpawnMode, s32 pickupDelay, + s32 facingAngleSign, s32 pickupVar); + +s32 make_item_entity_nodelay(s32 itemID, f32 x, f32 y, f32 z, s32 itemSpawnMode, s32 pickupVar) { + return make_item_entity(itemID, x, y, z, itemSpawnMode, 0, -1, pickupVar); +} + +s32 make_item_entity_delayed(s32 itemID, f32 x, f32 y, f32 z, s32 itemSpawnMode, s32 pickupDelay, s32 pickupVar) { + return make_item_entity(itemID, x, y, z, itemSpawnMode, pickupDelay, -1, pickupVar); +} + +INCLUDE_ASM(s32, "code_C50A0", init_got_item); + +INCLUDE_ASM(s32, "code_C50A0", func_80131DD4); + +INCLUDE_ASM(s32, "code_C50A0", update_item_entities); + +INCLUDE_ASM(s32, "code_C50A0", appendGfx_item_entity); + +INCLUDE_ASM(s32, "code_C50A0", draw_item_entities); + +INCLUDE_ASM(s32, "code_C50A0", func_80132D94); + +INCLUDE_ASM(s32, "code_C50A0", render_item_entities); + +INCLUDE_ASM(s32, "code_C50A0", remove_item_entity_by_reference); + +INCLUDE_ASM(s32, "code_C50A0", remove_item_entity_by_index); + +INCLUDE_ASM(s32, "code_C50A0", func_80133A94); + +INCLUDE_ASM(s32, "code_C50A0", test_item_player_collision); + +INCLUDE_ASM(s32, "code_C50A0", func_80133FC8); + +void set_item_entity_flags(s32 index, s32 flags) { + ItemEntity* itemEntity = D_801565A0[index]; + + itemEntity->flags |= flags; + if (itemEntity->flags & 0x200000) { + D_801565A8 = 1; + } +} + +void clear_item_entity_flags(s32 index, s32 flags) { + ItemEntity* itemEntity = D_801565A0[index]; + + itemEntity->flags &= ~flags; +} + +void func_801341B0(s32 index) { + ItemEntity* itemEntity = D_801565A0[index]; + s32* sym = D_8009A650; + + sym[0] |= 0x40; + itemEntity->flags |= 0x100; +} + +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_C50A0", update_item_entity_collectable); + +INCLUDE_ASM(s32, "code_C50A0", func_8013559C); + +INCLUDE_ASM(s32, "code_C50A0", update_item_entity_static); + +void func_801356C4(void) { +} + +void func_801356CC(void) { +} + +void func_801356D4(void) { +} + +INCLUDE_ASM(s32, "code_C50A0", update_item_entity_temp); + +INCLUDE_ASM(s32, "code_C50A0", func_801363A0); + +INCLUDE_ASM(s32, "code_C50A0", func_8013673C); + +INCLUDE_ASM(s32, "code_C50A0", func_801369D0); + +INCLUDE_ASM(s32, "code_C50A0", func_80136A08); diff --git a/src/code_CEE40.c b/src/code_CEE40.c new file mode 100644 index 0000000000..a3f368e27d --- /dev/null +++ b/src/code_CEE40.c @@ -0,0 +1,9 @@ +#include "common.h" + +INCLUDE_ASM(s32, "code_CEE40", func_80138740); + +INCLUDE_ASM(s32, "code_CEE40", func_80138D88); + +INCLUDE_ASM(s32, "code_CEE40", func_80138E54); + +INCLUDE_ASM(s32, "code_CEE40", func_80139F10); diff --git a/src/code_DF950.c b/src/code_DF950.c new file mode 100644 index 0000000000..f2e630f1b8 --- /dev/null +++ b/src/code_DF950.c @@ -0,0 +1,63 @@ +#include "common.h" + +INCLUDE_ASM(s32, "code_DF950", func_80149250); + +void func_80149600(void) { + gCurrentDoorSoundsSet = 0; + D_80151308 = 0; +} + +INCLUDE_ASM(s32, "code_DF950", func_80149618); + +INCLUDE_ASM(s32, "code_DF950", func_80149670); + +INCLUDE_ASM(s32, "code_DF950", func_80149734); + +INCLUDE_ASM(s32, "code_DF950", func_801497FC); + +INCLUDE_ASM(s32, "code_DF950", func_80149828); + +INCLUDE_ASM(s32, "code_DF950", func_80149838); + +INCLUDE_ASM(s32, "code_DF950", func_801498C4); + +INCLUDE_ASM(s32, "code_DF950", func_80149908); + +INCLUDE_ASM(s32, "code_DF950", func_80149974); + +INCLUDE_ASM(s32, "code_DF950", func_801499EC, s32 soundID, s32 arg1, f32 arg2, f32 arg3, f32 arg4); + +INCLUDE_ASM(s32, "code_DF950", func_80149A6C); + +INCLUDE_ASM(s32, "code_DF950", _play_sound); + +INCLUDE_ASM(s32, "code_DF950", func_80149BE4); + +INCLUDE_ASM(s32, "code_DF950", stop_sound); + +void play_sound(s32 soundID) { + _play_sound(soundID, 0, 0, 0); +} + +void play_sound_at_player(s32 soundID, s32 arg1) { + PlayerStatus* playerStatus = &gPlayerStatus; + + play_sound_at_position(soundID, arg1, playerStatus->position.x, playerStatus->position.y, playerStatus->position.z); +} + +void play_sound_at_npc(s32 soundID, s32 arg1, s32 npcID) { + Npc* npc = get_npc_safe(npcID); + + if (npc != NULL) { + play_sound_at_position(soundID, arg1, npc->pos.x, npc->pos.y, npc->pos.z); + } +} + +INCLUDE_ASM(s32, "code_DF950", play_sound_at_position, s32 soundID, s32 value2, f32 posX, f32 posY, + f32 posZ); + +INCLUDE_ASM(s32, "code_DF950", func_80149E04); + +INCLUDE_ASM(s32, "code_DF950", func_80149F58); + +INCLUDE_ASM(s32, "code_DF950", func_8014A1B4); diff --git a/src/code_E2F750.c b/src/code_E2F750.c index 9569576702..6fb2e57bc0 100644 --- a/src/code_E2F750.c +++ b/src/code_E2F750.c @@ -21,21 +21,3 @@ INCLUDE_ASM(s32, "code_E2F750", func_802BBA60_E303B0); INCLUDE_ASM(s32, "code_E2F750", func_802BBDB8_E30708); INCLUDE_ASM(s32, "code_E2F750", func_802BBE14_E30764); - -INCLUDE_ASM(s32, "code_E2F750", func_802BBE70_E307C0); - -INCLUDE_ASM(s32, "code_E2F750", func_802BC2BC_E30C0C); - -INCLUDE_ASM(s32, "code_E2F750", func_802BC4B8_E30E08); - -INCLUDE_ASM(s32, "code_E2F750", func_802BC514_E30E64); - -INCLUDE_ASM(s32, "code_E2F750", func_802BC558_E30EA8); - -INCLUDE_ASM(s32, "code_E2F750", func_802BC570_E30EC0); - -INCLUDE_ASM(s32, "code_E2F750", func_802BC99C_E312EC); - -INCLUDE_ASM(s32, "code_E2F750", func_802BC9CC_E3131C); - -INCLUDE_ASM(s32, "code_E2F750", func_802BC9FC_E3134C); diff --git a/src/code_E307C0.c b/src/code_E307C0.c new file mode 100644 index 0000000000..b5a9ee24a0 --- /dev/null +++ b/src/code_E307C0.c @@ -0,0 +1,19 @@ +#include "common.h" + +INCLUDE_ASM(s32, "code_E307C0", func_802BBE70_E307C0); + +INCLUDE_ASM(s32, "code_E307C0", func_802BC2BC_E30C0C); + +INCLUDE_ASM(s32, "code_E307C0", func_802BC4B8_E30E08); + +INCLUDE_ASM(s32, "code_E307C0", func_802BC514_E30E64); + +INCLUDE_ASM(s32, "code_E307C0", func_802BC558_E30EA8); + +INCLUDE_ASM(s32, "code_E307C0", func_802BC570_E30EC0); + +INCLUDE_ASM(s32, "code_E307C0", func_802BC99C_E312EC); + +INCLUDE_ASM(s32, "code_E307C0", func_802BC9CC_E3131C); + +INCLUDE_ASM(s32, "code_E307C0", func_802BC9FC_E3134C); diff --git a/src/code_a5dd0_len_114e0.c b/src/code_a5dd0_len_114e0.c index 6b2c968e7c..4d613ec259 100644 --- a/src/code_a5dd0_len_114e0.c +++ b/src/code_a5dd0_len_114e0.c @@ -333,107 +333,3 @@ INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_8011D8D0); INCLUDE_ASM(s32, "code_a5dd0_len_114e0", queue_render_task); INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_8011D9B8); - -INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_8011DE80); - -INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_8011DFD0); - -INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_8011E014); - -INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_8011E058); - -INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_8011E09C); - -INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_8011E0DC); - -INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_8011E150); - -INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_8011E1C4); - -INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_8011E224); - -INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_8011E310); - -INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_8011E398); - -INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_8011E400); - -INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_8011E438); - -INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_8011E4B8); - -INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_8011E5E0); - -INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_8011E718); - -INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_8011E8BC); - -INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_8011EA54); - -INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_8011EBF0); - -INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_8011F058); - -INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_8011F118); - -INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_8011F304); - -INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_8011F3E8); - -INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_8011F4D4); - -INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_8011FA54); - -INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_8011FF74); - -INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_8011FF98); - -INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_8011FFB4); - -AnimatedMesh* get_anim_mesh(s32 animModelID) { - return (*gCurrentAnimMeshListPtr)[animModelID & ~0x800]; -} - -AnimatedMesh* func_80120000(s32 animModelID, s32 arg1, s32 arg2) { - AnimatedMesh* ret = (*gCurrentAnimMeshListPtr)[animModelID & ~0x800]; - - ret->unk_2D4 = arg2; - ret->unk_2D8 = arg1; - return ret; -} - -INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_80120028); - -INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_8012003C); - -INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_8012004C); - -INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_80120064); - -INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_8012008C); - -INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_8012009C); - -INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_801200B8); - -INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_801200EC); - -INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_80120118); - -INCLUDE_ASM(s32, "code_a5dd0_len_114e0", play_model_animation); - -INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_80120198); - -INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_80120234); - -INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_801203AC); - -INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_80120420); - -INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_80120474); - -INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_80120530); - -INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_80120678); - -INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_801206F8); diff --git a/src/code_cd180_len_38f0.c b/src/code_cd180_len_38f0.c index 2f933f7171..d89afb0159 100644 --- a/src/code_cd180_len_38f0.c +++ b/src/code_cd180_len_38f0.c @@ -32,11 +32,3 @@ INCLUDE_ASM(s32, "code_cd180_len_38f0", set_map_transition_effect); INCLUDE_ASM(s32, "code_cd180_len_38f0", func_801382AC); INCLUDE_ASM(s32, "code_cd180_len_38f0", func_801385D4); - -INCLUDE_ASM(s32, "code_cd180_len_38f0", func_80138740); - -INCLUDE_ASM(s32, "code_cd180_len_38f0", func_80138D88); - -INCLUDE_ASM(s32, "code_cd180_len_38f0", func_80138E54); - -INCLUDE_ASM(s32, "code_cd180_len_38f0", func_80139F10); diff --git a/src/code_de740_len_23f0.c b/src/code_de740_len_23f0.c index 8dea620771..e8351663c6 100644 --- a/src/code_de740_len_23f0.c +++ b/src/code_de740_len_23f0.c @@ -10,66 +10,12 @@ INCLUDE_ASM(s32, "code_de740_len_23f0", func_801481C4); INCLUDE_ASM(s32, "code_de740_len_23f0", func_801489B8); -INCLUDE_ASM(s32, "code_de740_len_23f0", func_801491E4); +void func_801491E4(s32 arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4, s32 alpha) { + gDPSetPrimColor(gMasterGfxPos++, 0, 0, 0x00, 0x00, 0x00, alpha); -INCLUDE_ASM(s32, "code_de740_len_23f0", func_80149250); - -void func_80149600(void) { - gCurrentDoorSoundsSet = 0; - D_80151308 = 0; -} - -INCLUDE_ASM(s32, "code_de740_len_23f0", func_80149618); - -INCLUDE_ASM(s32, "code_de740_len_23f0", func_80149670); - -INCLUDE_ASM(s32, "code_de740_len_23f0", func_80149734); - -INCLUDE_ASM(s32, "code_de740_len_23f0", func_801497FC); - -INCLUDE_ASM(s32, "code_de740_len_23f0", func_80149828); - -INCLUDE_ASM(s32, "code_de740_len_23f0", func_80149838); - -INCLUDE_ASM(s32, "code_de740_len_23f0", func_801498C4); - -INCLUDE_ASM(s32, "code_de740_len_23f0", func_80149908); - -INCLUDE_ASM(s32, "code_de740_len_23f0", func_80149974); - -INCLUDE_ASM(s32, "code_de740_len_23f0", func_801499EC, s32 soundID, s32 arg1, f32 arg2, f32 arg3, f32 arg4); - -INCLUDE_ASM(s32, "code_de740_len_23f0", func_80149A6C); - -INCLUDE_ASM(s32, "code_de740_len_23f0", _play_sound); - -INCLUDE_ASM(s32, "code_de740_len_23f0", func_80149BE4); - -INCLUDE_ASM(s32, "code_de740_len_23f0", stop_sound); - -void play_sound(s32 soundID) { - _play_sound(soundID, 0, 0, 0); -} - -void play_sound_at_player(s32 soundID, s32 arg1) { - PlayerStatus* playerStatus = &gPlayerStatus; - - play_sound_at_position(soundID, arg1, playerStatus->position.x, playerStatus->position.y, playerStatus->position.z); -} - -void play_sound_at_npc(s32 soundID, s32 arg1, s32 npcID) { - Npc* npc = get_npc_safe(npcID); - - if (npc != NULL) { - play_sound_at_position(soundID, arg1, npc->pos.x, npc->pos.y, npc->pos.z); + if (alpha == 255) { + gDPSetCombineLERP(gMasterGfxPos++, 0, 0, 0, TEXEL1, 0, 0, 0, TEXEL1, 0, 0, 0, COMBINED, 0, 0, 0, COMBINED); + } else { + gDPSetCombineLERP(gMasterGfxPos++, 0, 0, 0, TEXEL0, TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0, COMBINED, 0, 0, 0, COMBINED); } } - -INCLUDE_ASM(s32, "code_de740_len_23f0", play_sound_at_position, s32 soundID, s32 value2, f32 posX, f32 posY, - f32 posZ); - -INCLUDE_ASM(s32, "code_de740_len_23f0", func_80149E04); - -INCLUDE_ASM(s32, "code_de740_len_23f0", func_80149F58); - -INCLUDE_ASM(s32, "code_de740_len_23f0", func_8014A1B4); diff --git a/src/world/area_hos/hos_02/A16220.c b/src/world/area_hos/hos_02/A16220.c index 01a702b305..bdf9783afd 100644 --- a/src/world/area_hos/hos_02/A16220.c +++ b/src/world/area_hos/hos_02/A16220.c @@ -17,5 +17,3 @@ INCLUDE_ASM(s32, "world/area_hos/hos_02/A16220", func_80240BFC_A16E1C); INCLUDE_ASM(s32, "world/area_hos/hos_02/A16220", func_80240EF4_A17114); INCLUDE_ASM(s32, "world/area_hos/hos_02/A16220", func_80240F68_A17188); - -INCLUDE_ASM(s32, "world/area_hos/hos_02/A16220", func_80240FD0_A171F0); diff --git a/src/world/area_hos/hos_02/A171F0.c b/src/world/area_hos/hos_02/A171F0.c new file mode 100644 index 0000000000..b92e86aeb0 --- /dev/null +++ b/src/world/area_hos/hos_02/A171F0.c @@ -0,0 +1,3 @@ +#include "hos_02.h" + +INCLUDE_ASM(s32, "world/area_hos/hos_02/A171F0", func_80240FD0_A171F0); diff --git a/src/world/area_kmr/kmr_02/8B30E0.c b/src/world/area_kmr/kmr_02/8B30E0.c index 7c2ab8a71e..a25a021e37 100644 --- a/src/world/area_kmr/kmr_02/8B30E0.c +++ b/src/world/area_kmr/kmr_02/8B30E0.c @@ -19,11 +19,3 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B30E0", func_80243284_8B32F4); #include "world/common/GetPartnerCall800EB168.inc.c" INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B30E0", func_80243364_8B33D4); - -INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B30E0", func_80243370_8B33E0); - -INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B30E0", func_802433AC_8B341C); - -#include "world/common/GetEntityPosition.inc.c" - -INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B30E0", func_80243514_8B3584); diff --git a/src/world/area_kmr/kmr_02/8B33E0.c b/src/world/area_kmr/kmr_02/8B33E0.c new file mode 100644 index 0000000000..667fb0e7b2 --- /dev/null +++ b/src/world/area_kmr/kmr_02/8B33E0.c @@ -0,0 +1,9 @@ +#include "kmr_02.h" + +INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B33E0", func_80243370_8B33E0); + +INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B33E0", func_802433AC_8B341C); + +#include "world/common/GetEntityPosition.inc.c" + +INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B33E0", func_80243514_8B3584); diff --git a/src/world/script_api/7E3700.c b/src/world/script_api/7E3700.c index 4d5d6c43a6..5b242a40e3 100644 --- a/src/world/script_api/7E3700.c +++ b/src/world/script_api/7E3700.c @@ -1,5 +1,4 @@ #include "common.h" -#include "../partners.h" ApiStatus func_80282880(ScriptInstance* script, s32 isInitialCall) { PlayerStatus* playerStatus = PLAYER_STATUS; @@ -40,106 +39,3 @@ INCLUDE_ASM(s32, "world/script_api/7E3700", GetPushBlock); INCLUDE_ASM(s32, "world/script_api/7E3700", GetGridIndexFromPos); INCLUDE_ASM(s32, "world/script_api/7E3700", SetPushBlockFallEffect); - -ApiStatus func_80283810(ScriptInstance* script, s32 isInitialCall) { - PlayerStatus* playerStatus = PLAYER_STATUS; - - script->varTable[10] = 0; - if (partner_get_ride_script() != NULL) { - if (D_8010EBB0[0] == 0) { - script->varTable[10] = 0; - } else { - script->varTable[10] = 1; - script->varTable[11] = partner_get_ride_script(); - script->varTable[13] = playerStatus->targetYaw; - } - } - - return ApiStatus_DONE2; -} - -ApiStatus TeleportPartnerToPlayer(ScriptInstance* script, s32 isInitialCall) { - PlayerStatus* playerStatus = PLAYER_STATUS; - PlayerStatus* playerStatus2 = PLAYER_STATUS; - Npc* partner; - - if (PLAYER_DATA->currentPartner == PartnerID_NONE) { - return ApiStatus_DONE2; - } - - partner = get_npc_unsafe(NpcId_PARTNER); - partner->pos.x = playerStatus->position.x; - partner->pos.z = playerStatus->position.z; - - if (is_current_partner_flying()) { - partner->pos.y = playerStatus->position.y; - } - - set_npc_yaw(partner, playerStatus2->targetYaw); - clear_partner_move_history(partner); - return ApiStatus_DONE2; -} - -// currentPartner is being loaded as unsigned instead of signed -#ifdef NON_MATCHING -ApiStatus func_80283908(ScriptInstance* script, s32 isInitialCall) { - PlayerStatus* playerStatus = PLAYER_STATUS; - PlayerStatus* playerStatus2 = PLAYER_STATUS; - Camera* camera = CURRENT_CAM; - s8 currentPartner = PLAYER_DATA->currentPartner; - - playerStatus->position.x = GAME_STATUS->savedPos.x; - playerStatus->position.y = GAME_STATUS->savedPos.y; - playerStatus->position.z = GAME_STATUS->savedPos.z; - - if (currentPartner != PartnerID_NONE) { - Npc* partner = get_npc_unsafe(NpcId_PARTNER); - f32 angle = clamp_angle((playerStatus2->spriteFacingAngle < 180.0f) ? (90.0f) : (-90.0f)); - partner->pos.x = playerStatus2->position.x; - partner->pos.y = playerStatus2->position.y; - partner->pos.z = playerStatus2->position.z; - add_vec2D_polar(&partner->pos.x, &partner->pos.z, playerStatus2->colliderDiameter + 5, angle); - enable_partner_ai(); - } - - camera->unk_08 = 1; - return ApiStatus_DONE2; -} -#else -INCLUDE_ASM(s32, "world/script_api/7E3700", func_80283908); -#endif - -INCLUDE_ASM(s32, "world/script_api/7E3700", func_80283A50); - -ApiStatus func_80283B88(ScriptInstance* script, s32 isInitialCall) { - func_800EF394(20.0f); - return ApiStatus_DONE2; -} - -ApiStatus func_80283BB0(ScriptInstance* script, s32 isInitialCall) { - func_800EF3A4(); - return ApiStatus_DONE2; -} - -ApiStatus func_80283BD0(ScriptInstance* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - PlayerStatus* playerStatus = PLAYER_STATUS; - - if (isInitialCall) { - script->functionTemp[0].s = get_variable(script, *args++); - move_player(script->functionTemp[0].s, playerStatus->targetYaw, playerStatus->runSpeed); - } - - script->functionTemp[0].s--; - return script->functionTemp[0].s < 0; -} - -INCLUDE_ASM(s32, "world/script_api/7E3700", func_80283C34); - -INCLUDE_ASM(s32, "world/script_api/7E3700", func_80283D00); - -INCLUDE_ASM(s32, "world/script_api/7E3700", func_80283D6C); - -INCLUDE_ASM(s32, "world/script_api/7E3700", func_80283DF0); - -INCLUDE_ASM(s32, "world/script_api/7E3700", func_80283E2C); diff --git a/src/world/script_api/7E4690.c b/src/world/script_api/7E4690.c new file mode 100644 index 0000000000..344d7dc702 --- /dev/null +++ b/src/world/script_api/7E4690.c @@ -0,0 +1,105 @@ +#include "common.h" +#include "../partners.h" + +ApiStatus func_80283810(ScriptInstance* script, s32 isInitialCall) { + PlayerStatus* playerStatus = PLAYER_STATUS; + + script->varTable[10] = 0; + if (partner_get_ride_script() != NULL) { + if (D_8010EBB0[0] == 0) { + script->varTable[10] = 0; + } else { + script->varTable[10] = 1; + script->varTable[11] = partner_get_ride_script(); + script->varTable[13] = playerStatus->targetYaw; + } + } + + return ApiStatus_DONE2; +} + +ApiStatus TeleportPartnerToPlayer(ScriptInstance* script, s32 isInitialCall) { + PlayerStatus* playerStatus = PLAYER_STATUS; + PlayerStatus* playerStatus2 = PLAYER_STATUS; + Npc* partner; + + if (PLAYER_DATA->currentPartner == PartnerID_NONE) { + return ApiStatus_DONE2; + } + + partner = get_npc_unsafe(NpcId_PARTNER); + partner->pos.x = playerStatus->position.x; + partner->pos.z = playerStatus->position.z; + + if (is_current_partner_flying()) { + partner->pos.y = playerStatus->position.y; + } + + set_npc_yaw(partner, playerStatus2->targetYaw); + clear_partner_move_history(partner); + return ApiStatus_DONE2; +} + +// currentPartner is being loaded as unsigned instead of signed +#ifdef NON_MATCHING +ApiStatus func_80283908(ScriptInstance* script, s32 isInitialCall) { + PlayerStatus* playerStatus = PLAYER_STATUS; + PlayerStatus* playerStatus2 = PLAYER_STATUS; + Camera* camera = CURRENT_CAM; + s8 currentPartner = PLAYER_DATA->currentPartner; + + playerStatus->position.x = GAME_STATUS->savedPos.x; + playerStatus->position.y = GAME_STATUS->savedPos.y; + playerStatus->position.z = GAME_STATUS->savedPos.z; + + if (currentPartner != PartnerID_NONE) { + Npc* partner = get_npc_unsafe(NpcId_PARTNER); + f32 angle = clamp_angle((playerStatus2->spriteFacingAngle < 180.0f) ? (90.0f) : (-90.0f)); + partner->pos.x = playerStatus2->position.x; + partner->pos.y = playerStatus2->position.y; + partner->pos.z = playerStatus2->position.z; + add_vec2D_polar(&partner->pos.x, &partner->pos.z, playerStatus2->colliderDiameter + 5, angle); + enable_partner_ai(); + } + + camera->unk_08 = 1; + return ApiStatus_DONE2; +} +#else +INCLUDE_ASM(s32, "world/script_api/7E4690", func_80283908); +#endif + +INCLUDE_ASM(s32, "world/script_api/7E4690", func_80283A50); + +ApiStatus func_80283B88(ScriptInstance* script, s32 isInitialCall) { + func_800EF394(20.0f); + return ApiStatus_DONE2; +} + +ApiStatus func_80283BB0(ScriptInstance* script, s32 isInitialCall) { + func_800EF3A4(); + return ApiStatus_DONE2; +} + +ApiStatus func_80283BD0(ScriptInstance* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + PlayerStatus* playerStatus = PLAYER_STATUS; + + if (isInitialCall) { + script->functionTemp[0].s = get_variable(script, *args++); + move_player(script->functionTemp[0].s, playerStatus->targetYaw, playerStatus->runSpeed); + } + + script->functionTemp[0].s--; + return script->functionTemp[0].s < 0; +} + +INCLUDE_ASM(s32, "world/script_api/7E4690", func_80283C34); + +INCLUDE_ASM(s32, "world/script_api/7E4690", func_80283D00); + +INCLUDE_ASM(s32, "world/script_api/7E4690", func_80283D6C); + +INCLUDE_ASM(s32, "world/script_api/7E4690", func_80283DF0); + +INCLUDE_ASM(s32, "world/script_api/7E4690", func_80283E2C); diff --git a/tools/duplicate_renames.txt b/tools/duplicate_renames.txt index a3d18fca86..ddcb8a368d 100644 --- a/tools/duplicate_renames.txt +++ b/tools/duplicate_renames.txt @@ -625,3 +625,5 @@ func_8024360C_9AB9FC,trd_04_UnkDurationCheck func_80245C80_806500,mac_01_NpcJumpFunc2 func_80245CF4_806574,mac_01_NpcJumpFunc func_80245FBC_80683C,mac_01_UnkNpcDurationFlagFunc +func_802413B4_9A97A4,trd_04_NpcJumpFunc2 +func_80241428_9A9818,trd_04_NpcJumpFunc diff --git a/tools/n64splat b/tools/n64splat index 41146bdb8f..7574db712e 160000 --- a/tools/n64splat +++ b/tools/n64splat @@ -1 +1 @@ -Subproject commit 41146bdb8f07bf82c7004f141126d6186ce3d43e +Subproject commit 7574db712ef19ca420904c82d3559e9ac4b8c5f5 diff --git a/tools/smallest_with_symbol.py b/tools/smallest_with_symbol.py index 471beece04..c57fb727b8 100755 --- a/tools/smallest_with_symbol.py +++ b/tools/smallest_with_symbol.py @@ -16,7 +16,7 @@ smallest_len = 1000 for root, dirs, files in os.walk(asm_dir): for f_name in files: - if f_name.endswith(".s"): + if f_name.endswith(".s") and f_name not in ["func_8024F768.s", "func_800271A0.s", "func_80240448_B141B8.s"]: f_path = os.path.join(root, f_name) with open(f_path) as f: f_text = f.read() diff --git a/tools/splat.yaml b/tools/splat.yaml index b79732682a..9c02a972d1 100644 --- a/tools/splat.yaml +++ b/tools/splat.yaml @@ -223,6 +223,8 @@ segments: vram: 0x800DC500 files: - [0x759b0, c, code_759b0_len_61b0] + - [0x77480, c] + - [0x7B440, c] - [0x7bb60, c, code_7bb60_len_41b0] - [0x7fd10, c, code_7fd10_len_b40] - [0x80850, c, code_80850_len_3060] @@ -251,9 +253,12 @@ segments: vram: 0x8010F6D0 files: - [0xa5dd0, c, code_a5dd0_len_114e0] + - [0xB4580, c] - [0xb72b0, c, code_b72b0_len_15ed0] - [0xB9D60, c, code_B9D60] + - [0xC50A0, c] - [0xcd180, c, code_cd180_len_38f0] + - [0xCEE40, c] - [0xd0a70, c, code_d0a70_len_4fe0] - [0xd5a50, c, code_d5a50_len_5fd0] - [0xdba20, c, code_dba20_len_350] @@ -262,6 +267,7 @@ segments: - [0xdd930, c, code_dd930_len_1c0] - [0xddaf0, c, code_ddaf0_len_c50] - [0xde740, c, code_de740_len_23f0] + - [0xDF950, c] - [0xe0b30, c, code_e0b30_len_b80] - [0xE16B0, data, code_a5dd0_len_114e0] - [0xE5510, .data, code_d0a70_len_4fe0] @@ -300,8 +306,12 @@ segments: vram: 0x802E0D90 files: - [0x102610, c, code_102610_len_2330] + - [0x102C80, c] + - [0x104730, c] - [0x104940, c, code_104940_len_dc0] - [0x105700, c, code_105700_len_2130] + - [0x105F90, c] + - [0x106EF0, c] - [0x107830, c, code_107830_len_e70] - [0x1086a0, c, code_1086a0_len_fc0] - [0x109660, c, code_109660_len_1270] @@ -322,6 +332,7 @@ segments: vram: 0x80242BA0 files: - [0x135EE0, c] + - [0x137ED0, c] - [0x138CC0, c] - [0x13CAF0, c] - [0x13E120, c] @@ -375,10 +386,12 @@ segments: - [0x182B30, c] - [0x18C790, c] - [0x18F340, c] + - [0x190A10, c] - [0x190B20, c] - [0x1967B0, c] - [0x196AA0, c] - [0x197F40, c] + - [0x19FAF0, c] - [0x1A5830, c] - [0x1AC760, c] - [0x1AF120, c] @@ -1553,10 +1566,12 @@ segments: - [0x4479A0, c] - [0x447C80, c] - [0x447D50, c] + - [0x448420, c] - [0x448690, c] - [0x448900, c] - [0x448B70, c] - [0x448E20, c] + - [0x448E80, c] - [0x4495F0, bin] - name: battle/area_mac/ type: code @@ -1576,6 +1591,7 @@ segments: files: - [0x47F0B0, c] - [0x47F0D0, c] + - [0x47F570, c] - [0x4800C0, bin] - name: battle/area_nok/ type: code @@ -1652,6 +1668,7 @@ segments: - [0x4E2810, c] - [0x4E28E0, c] - [0x4E29B0, c] + - [0x4E30C0, c] - [0x4E3190, c] - [0x4E3350, bin] - name: battle/area_isk_part_2/ @@ -1662,6 +1679,7 @@ segments: files: - [0x4EF4A0, c] - [0x4EFCF0, c] + - [0x4EFDC0, c] - [0x4EFE90, c] - [0x4EFFE0, bin] - name: battle/area_mim/ @@ -1705,6 +1723,8 @@ segments: - [0x512910, c] - [0x5129E0, c] - [0x512AB0, c] + - [0x512C90, c] + - [0x512E50, c] - [0x513380, c] - [0x5134B0, c] - [0x513580, c] @@ -1796,6 +1816,7 @@ segments: - [0x5739F0, c] - [0x573AC0, c] - [0x573C30, c] + - [0x573E10, c] - [0x573EE0, bin] - name: battle/area_jan2/ type: code @@ -1815,6 +1836,8 @@ segments: - [0x58C2F0, c] - [0x58C670, c] - [0x58C740, c] + - [0x58C920, c] + - [0x58CC90, c] - [0x58D100, bin] - name: battle/area_kzn2/ type: code @@ -1824,6 +1847,7 @@ segments: files: - [0x59E6E0, c] - [0x59F420, c] + - [0x59F4D0, c] - [0x59F530, bin] - name: battle/area_flo/ type: code @@ -1833,6 +1857,10 @@ segments: files: - [0x5B14B0, c] - [0x5B16A0, c] + - [0x5B1A10, c] + - [0x5B1D80, c] + - [0x5B20F0, c] + - [0x5B28D0, c] - [0x5B3370, bin] - name: battle/area_flo2/ type: code @@ -1892,6 +1920,7 @@ segments: files: - [0x623BA0, c] - [0x6253E0, c] + - [0x625750, c] - [0x626A30, bin] - name: battle/area_sam2/ type: code @@ -1902,6 +1931,7 @@ segments: - [0x63D1E0, c] - [0x63D710, c] - [0x63D9F0, c] + - [0x63DD60, c] - [0x63F040, bin] - name: battle/area_pra/ type: code @@ -1911,6 +1941,10 @@ segments: files: - [0x648E10, c] - [0x649050, c] + - [0x649480, c] + - [0x6497F0, c] + - [0x649B60, c] + - [0x649ED0, c] - [0x64A340, bin] - name: battle/area_pra2/ type: code @@ -1919,6 +1953,8 @@ segments: overlay: True files: - [0x660750, c] + - [0x660D20, c] + - [0x660E10, c] - [0x661150, bin] - name: battle/area_pra3/ type: code @@ -1928,6 +1964,7 @@ segments: files: - [0x669D80, c] - [0x66B5B0, c] + - [0x66B920, c] - [0x66BC90, bin] - name: battle/area_kpa/ type: code @@ -1938,6 +1975,7 @@ segments: - [0x684A30, c] - [0x684B00, c] - [0x684C30, c] + - [0x685130, c] - [0x685260, bin] - name: battle/area_kpa2/ type: code @@ -2603,6 +2641,7 @@ segments: - [0x7e0e80, c] - [0x7E2AA0, c] - [0x7E3700, c] + - [0x7E4690, c] - [0x7e4d00, bin] - name: world/area_mac/machi/ type: code @@ -3114,6 +3153,7 @@ segments: files: - [0x8B0070, c] - [0x8B30E0, c] + - [0x8B33E0, c] - [0x8B36B0, c] - [0x8B37D0, c] - [0x8B3A10, c] @@ -4630,6 +4670,7 @@ segments: vram: 0x80240000 files: - [0xA16220, c] + - [0xA171F0, c] - [0xA17210, c] - [0xA18D00, bin] - [0xA18E50, bin] @@ -8450,6 +8491,7 @@ segments: overlay: True files: - [0xE2F750, c] + - [0xE307C0, c] - [0xE31380, bin] - [0xE31530, bin] # unk data - type: code